admin/SergObsidian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault backup: 2025-06-20 16:39:39

Browse Source
This commit is contained in:
sShemet
2025-06-20 16:39:39 +05:00
parent ff512a9d2a
commit e556862dce
9 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.obsidian/workspace.json vendored
View File

@@ -15,9 +15,9 @@
"state": {
"file": "WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas",
"viewState": {
"x": -750.5796387376852,
"y": -676.1368720686853,
"zoom": 0.19544412975819925
"x": -563.0550996483,
"y": -0.7133645955451584,
"zoom": -0.549578174609922
}
},
"icon": "lucide-layout-dashboard",
@@ -206,11 +206,18 @@
},
"active": "7c810a5e9388d8b5",
"lastOpenFiles": [
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Products.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Modules.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Tariffs.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Расчёт тарифов и списаний.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Modules.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Billing.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Prio.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/АФ-01 Альбом форм.pdf",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации",
"WORK & PROJECTS/Mol/Планы и диаграммы/Разработка - 06_2025.md",
"WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
@@ -237,20 +244,14 @@
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa cloud readme.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Таблицы нумератора и документов.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Websockets scheme.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Alfa Cloud/Alfa cloud prod.canvas",
"WORK & PROJECTS/Mol/Серверы/PROXY_PASS/Traefik config.md",
"WORK & PROJECTS/Mol/Серверы/Supervisor/job_worker.md",
"WORK & PROJECTS/Mol/Серверы/Supervisor",
"WORK & PROJECTS/Mol/Серверы/1С Бухгалтерия.md",
"WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/1.0/1.0.md",
"WORK & PROJECTS/Mol/Серверы/00_Список серверов.md",
"WORK & PROJECTS/Mol/Серверы/mol-desk.mol-soft.PRODs.md",
"WORK & PROJECTS/Mol/Серверы/PROXY_PASS",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/Operation_Check_PJSC_Sberbank_06052025.pdf",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/beget_2024_05.pdf",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов/beget_2024_05.pdf.crdownload",
"WORK & PROJECTS/Mol/Документы ООО Моль-софт/Счета оплаты серверов",
"Структура объектов испытаний.png",
"Схема связей юрлиц и адресов.png",
"WORK & PROJECTS/img/Pasted image 20241212175419.png",

8
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Billing.md Normal file
View File

@@ -0,0 +1,8 @@
| client_id | product_id | type_id | **subscription_tariff** | **basis** | user | summ | currency | discount | days | expire_date | daily_withdrawal |
| --------- | ---------- | ------- | ----------------------- | ---------- | -------- | -------- | -------- | -------- | ---- | ----------- | ---------------- |
| 1 | 1 | 1 | 2 | счёт №4234 | Менеджер | 81000,00 | RUB | 15 | 365 | | 81000 |
| 1 | 2 | 1 | 1 | | | | | | | | |
| 2 | | | | | | | | | | | |
| 2 | | | | | | | | | | | |
| | | | | | | | | | | | |

8
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Modules.md Normal file
View File

@@ -0,0 +1,8 @@
| name | month_price | enabled |
| ---------- | ----------- | ------- |
| deals | 29000,00 | true |
| agreements | 24000,00 | true |
| commercial | 24000,00 | true |
| GPO 1 | 0,0 | true |
| SIL | 30000,00 | true |

6
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Tariffs.md Normal file
View File

@@ -0,0 +1,6 @@
| name | month_price | 6m_discount | year_discount |
|-|-|-|-|
| base | 0,00 | 0 | 0 |
| commercial | 81000,00 | 12 | 15 |
| manufacture | 75000,00 | 12 | 15 |

15
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации 1/Расчёт тарифов и списаний.canvas Normal file
View File

@@ -0,0 +1,15 @@
{
"nodes":[
{"id":"1eabd68c1a33fe8f","type":"text","text":"Таблица списаний","x":360,"y":-200,"width":250,"height":120},
{"id":"4513da48716f1769","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Modules.md","x":-580,"y":-72,"width":351,"height":295},
{"id":"5e2d2e90f5a23569","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md","x":-1660,"y":-40,"width":633,"height":229},
{"id":"cc6102d4b208ab1b","type":"text","text":"m2m\nenabled_modules","x":-940,"y":45,"width":250,"height":60},
{"id":"02737c4081f9953a","x":-1000,"y":-886,"width":1160,"height":406,"type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md"},
{"id":"ec8bbe2b87a17651","type":"text","text":"Таблица начисления","x":-20,"y":-200,"width":250,"height":240},
{"id":"eb3c1b013563e015","type":"text","text":"Client\nfinancial_account","x":-1486,"y":-840,"width":405,"height":93}
],
"edges":[
{"id":"e9a0a5288907178c","fromNode":"5e2d2e90f5a23569","fromSide":"right","toNode":"cc6102d4b208ab1b","toSide":"left"},
{"id":"dcc2ccffee848fdc","fromNode":"cc6102d4b208ab1b","fromSide":"right","toNode":"4513da48716f1769","toSide":"left"}
]
}

14
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md
View File

@@ -1,8 +1,8 @@
| client_id | type_id | **subscription_tariff** | **basis** | user | summ | currency | discount | days | expire_date | daily_withdrawal |
| --------- | ------- | ----------------------- | ---------- | -------- | -------- | -------- | -------- | ---- | ----------- | ---------------- |
| 1 | 1 | 2 | счёт №4234 | Менеджер | 81000,00 | RUB | 15 | 365 | | 81000 |
| 2 | 1 | null | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| client_id | product_id | type_id | **subscription_tariff** | **basis** | user | summ | currency | discount | days | expire_date | daily_withdrawal |
| --------- | ---------- | ------- | ----------------------- | ---------- | -------- | -------- | -------- | -------- | ---- | ----------- | ---------------- |
| 1 | 1 | 1 | 2 | счёт №4234 | Менеджер | 81000,00 | RUB | 15 | 365 | | 81000 |
| 1 | 2 | 1 | 1 | | | | | | | | |
| 2 | | | | | | | | | | | |
| 2 | | | | | | | | | | | |
| | | | | | | | | | | | |

7
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Products.md Normal file
View File

@@ -0,0 +1,7 @@
| name | month_price | enabled |
| -------------- | ----------- | ------- |
| mol.LIMS | 29000,00 | true |
| mol.Logistics | 24000,00 | true |
| mol.Regulatory | 24000,00 | true |

11
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md
View File

@@ -1,6 +1,7 @@
| name | month_price | 6m_discount | year_discount |
|-|-|-|-|
| base | 0,00 | 0 | 0 |
| commercial | 81000,00 | 12 | 15 |
| manufacture | 75000,00 | 12 | 15 |
| name | product_id | month_price | discount_array |
| ----------- | ---------- | ----------- | ---------------------------------------------------------- |
| base | 1 | 0,00 | {} |
| commercial | 1 | 81000,00 | <br>{['months' : [<br> 6 => 12,<br> 12 => 15<br>]]<br> |
| manufacture | 1 | 75000,00 | {['months' : [<br> 6 => 12,<br> 12 => 15<br>]] |
| base | 2 | 37000,00 | {['months' : [<br> 6 => 12,<br> 12 => 15<br>]] |

10
WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas
View File

@@ -2,11 +2,11 @@
"nodes":[
{"id":"1eabd68c1a33fe8f","type":"text","text":"Таблица списаний","x":360,"y":-200,"width":250,"height":120},
{"id":"4513da48716f1769","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Modules.md","x":-580,"y":-72,"width":351,"height":295},
{"id":"5e2d2e90f5a23569","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md","x":-1540,"y":-40,"width":513,"height":229},
{"id":"cc6102d4b208ab1b","type":"text","text":"m2m\nenabled_modules","x":-940,"y":45,"width":250,"height":60},
{"id":"02737c4081f9953a","x":-1000,"y":-886,"width":1160,"height":506,"type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md"},
{"id":"eb3c1b013563e015","type":"text","text":"Client\nfinancial_account","x":-1486,"y":-773,"width":405,"height":93},
{"id":"ec8bbe2b87a17651","type":"text","text":"Таблица начисления","x":-20,"y":-200,"width":250,"height":240}
{"id":"5e2d2e90f5a23569","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Tariffs.md","x":-1660,"y":-40,"width":633,"height":460},
{"id":"02737c4081f9953a","type":"file","file":"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Billing.md","x":-1000,"y":-886,"width":1160,"height":406},
{"id":"ec8bbe2b87a17651","type":"text","text":"Таблица начисления","x":-20,"y":-200,"width":250,"height":240},
{"id":"eb3c1b013563e015","type":"text","text":"Client\nfinancial_account","x":-1486,"y":-840,"width":405,"height":93},
{"id":"cc6102d4b208ab1b","type":"text","text":"m2m\nenabled_modules","x":-940,"y":163,"width":250,"height":60}
],
"edges":[
{"id":"e9a0a5288907178c","fromNode":"5e2d2e90f5a23569","fromSide":"right","toNode":"cc6102d4b208ab1b","toSide":"left"},