Compare commits
45
Commits
4af248b06a
..
dev
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0998a1ec37 | ||
|
|
4979aa8b75 | ||
|
|
34d3689448 | ||
|
|
1e0b638a19 | ||
|
|
3db9c1c0fe | ||
|
|
6c6e32e099 | ||
|
|
1ef7f91771 | ||
|
|
94f0383c79 | ||
|
|
c976c0bcd6 | ||
|
|
57a0b379f6 | ||
|
|
7f6d9a84d6 | ||
|
|
6abbf8e8fd | ||
|
|
39cb5c2548 | ||
|
|
004d1dff93 | ||
|
|
78a7d6a68a | ||
|
|
5b18749005 | ||
|
|
08a278e1c8 | ||
|
|
d71c2dbef4 | ||
|
|
41f310f3a2 | ||
|
|
754cc43c98 | ||
|
|
a319085dca | ||
|
|
cb3a488b21 | ||
|
|
1ccbefa7a3 | ||
|
|
14f4e9d7d8 | ||
|
|
52edccf74e | ||
|
|
b11affbdfd | ||
|
|
bffe174162 | ||
|
|
35d74d33ed | ||
|
|
7aaa15fad2 | ||
|
|
39c62834e7 | ||
|
|
26792f9a37 | ||
|
|
c337b0b4c7 | ||
|
|
c26353624e | ||
|
|
534dae45b2 | ||
|
|
79733e6c96 | ||
|
|
fdabdc54a3 | ||
|
|
1b10ee30df | ||
|
|
c273dd6c58 | ||
|
|
acb5d51f24 | ||
|
|
06977d27ed | ||
|
|
43437b0280 | ||
|
|
28938e8f77 | ||
|
|
e6e90aabf3 | ||
|
|
a0936bf19f | ||
|
|
18a7cd3b5a |
@@ -41,11 +41,19 @@ Legacy CRM UI (`components/ui/*`, `.crm-*`, `.btn` / `.field` in `styles/`) rema
|
|||||||
6. **24-column grid only**
|
6. **24-column grid only**
|
||||||
Page layout on migrated screens uses Ant Grid: `a-row` / `a-col` with the **24-column** system (`:span`, `:xs`, `:sm`, `:md`, `:lg`, `:xl`). Do not invent parallel flex/grid CSS layouts for page chrome.
|
Page layout on migrated screens uses Ant Grid: `a-row` / `a-col` with the **24-column** system (`:span`, `:xs`, `:sm`, `:md`, `:lg`, `:xl`). Do not invent parallel flex/grid CSS layouts for page chrome.
|
||||||
|
|
||||||
7. **RTL + locale**
|
7. **RTL + locale + StyleProvider**
|
||||||
App root is wrapped with `<a-config-provider direction="rtl" :locale="faIR" :theme="antdTheme">`. Do not override direction to LTR on whole pages; use local `direction="ltr"` only for inherently LTR fragments (e.g. phone numbers, codes).
|
App root in `App.vue` **must** wrap ConfigProvider with `<a-style-provider hash-priority="high">` so legacy `main.css` cannot override Ant controls via higher specificity:
|
||||||
|
```vue
|
||||||
|
<a-style-provider hash-priority="high">
|
||||||
|
<a-config-provider direction="rtl" :locale="faIR" :theme="antdTheme">
|
||||||
|
<RouterView />
|
||||||
|
</a-config-provider>
|
||||||
|
</a-style-provider>
|
||||||
|
```
|
||||||
|
Do not override direction to LTR on whole pages; use local `direction="ltr"` only for inherently LTR fragments (e.g. phone numbers, codes).
|
||||||
|
|
||||||
8. **Auto-import**
|
8. **Auto-import**
|
||||||
`<a-*>` components are resolved via `unplugin-vue-components` + `AntDesignVueResolver({ importStyle: false })`. Do not add blanket `app.use(antd)` unless there is a documented exception. Do not per-component CSS imports (`importStyle` stays `false`; CSS-in-JS + theme).
|
`<a-*>` components are resolved via `unplugin-vue-components` + `AntDesignVueResolver({ importStyle: false })`. Do not add blanket `app.use(antd)` unless there is a documented exception. Do not per-component CSS imports (`importStyle` stays `false`; CSS-in-JS + theme). Prefer **explicit** `import { Button as AButton, … } from 'ant-design-vue'` in migrated files when the Vite resolver is missing or unreliable.
|
||||||
|
|
||||||
9. **Theme is central**
|
9. **Theme is central**
|
||||||
Visual tokens (primary, radius, `controlHeight`, padding/margin scale, shadows, Form/Card overrides) live only in `antdTheme.ts`. Do not fork theme objects inside views.
|
Visual tokens (primary, radius, `controlHeight`, padding/margin scale, shadows, Form/Card overrides) live only in `antdTheme.ts`. Do not fork theme objects inside views.
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
"plugins": {
|
||||||
|
"hex": {
|
||||||
|
"enabled": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,9 +38,13 @@ Also read and obey [`.cursor/rules/antd-strict-governance.mdc`](../../rules/antd
|
|||||||
| Dependency | `ant-design-vue` ^4, `@ant-design/icons-vue`, `unplugin-vue-components` in `@mento/web` |
|
| Dependency | `ant-design-vue` ^4, `@ant-design/icons-vue`, `unplugin-vue-components` in `@mento/web` |
|
||||||
| Vite plugin | `apps/web/vite.config.ts` — `Components` + `AntDesignVueResolver` |
|
| Vite plugin | `apps/web/vite.config.ts` — `Components` + `AntDesignVueResolver` |
|
||||||
| Theme | `apps/web/src/theme/antdTheme.ts` (`controlHeight: 36`) |
|
| Theme | `apps/web/src/theme/antdTheme.ts` (`controlHeight: 36`) |
|
||||||
| RTL + locale + theme | `apps/web/src/App.vue` — `<a-config-provider direction="rtl" :locale="faIR" :theme="antdTheme">` |
|
| RTL + locale + theme + StyleProvider | `apps/web/src/App.vue` — `<a-style-provider hash-priority="high">` wrapping `<a-config-provider direction="rtl" :locale="faIR" :theme="antdTheme">` (mandatory so legacy `main.css` cannot override Ant) |
|
||||||
| Legacy kit (do not touch) | `apps/web/src/components/ui/*`, `styles/main.css` utilities |
|
| Legacy kit (do not touch) | `apps/web/src/components/ui/*`, `styles/main.css` utilities |
|
||||||
|
|
||||||
|
### Mandatory child-control conversion (same pass)
|
||||||
|
|
||||||
|
هنگام بازنویسی یک صفحه (View)، ایجنت موظف است علاوه بر خود فایل View، تمام کامپوننتهای فرزندی را که در آن View ایمپورت شدهاند و حاوی اینپوت/سلکت/دکمه هستند نیز بازبینی کرده و درون آنها را به کامپوننتهای رسمی `ant-design-vue` تبدیل کند. هیچ تگ `<input>`, `<select>`, `<textarea>`, `<button>` خامی نباید در صفحه یا کامپوننتهای فرزندِ مصرفی آن باقی بماند.
|
||||||
|
|
||||||
## Migration workflow
|
## Migration workflow
|
||||||
|
|
||||||
1. Confirm the **single** route/view the user named.
|
1. Confirm the **single** route/view the user named.
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 246.7 46.59">
|
||||||
|
<defs>
|
||||||
|
<style>
|
||||||
|
.cls-1 {
|
||||||
|
fill: #10897d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-2 {
|
||||||
|
fill: #16c1a8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-3 {
|
||||||
|
fill: #43f7dd;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</defs>
|
||||||
|
<g id="Layer_1-2" data-name="Layer 1">
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M199.15,23.8v19.86c0,1.48-1.2,2.67-2.67,2.67h-8.09c-1.48,0-2.67-1.2-2.67-2.67V15.92c0-.91.47-1.76,1.23-2.25l12.85-8.23c1.13-.72,2.63-.5,3.49.53l11.02,13.14c.18.21.49.22.68.03l8.04-8.21c1.04-1.06,2.75-1.07,3.8-.02l5.99,5.99c1.05,1.05,1.05,2.74,0,3.78l-16.98,16.98c-1.1,1.1-2.92,1.03-3.93-.15l-11.96-14.01c-.28-.33-.81-.13-.81.3h0Z"/>
|
||||||
|
<circle class="cls-3" cx="237.24" cy="6.48" r="6.48"/>
|
||||||
|
<path class="cls-3" d="M242.84,16.26h0c2.13,0,3.86,1.73,3.86,3.86v22.61c0,2.13-1.73,3.86-3.86,3.86h0c-2.13,0-3.86-1.73-3.86-3.86v-22.61c0-2.13,1.73-3.86,3.86-3.86Z"/>
|
||||||
|
<path class="cls-2" d="M233.49,25.66h0c2.13,0,3.86,1.73,3.86,3.86v13.21c0,2.13-1.73,3.86-3.86,3.86h0c-2.13,0-3.86-1.73-3.86-3.86v-13.21c0-2.13,1.73-3.86,3.86-3.86Z"/>
|
||||||
|
<rect class="cls-1" x="220.08" y="35.24" width="7.72" height="11.35" rx="3.86" ry="3.86"/>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M132.19,17.19v2.66c0,1.27,1.03,2.29,2.29,2.29h2.66c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-2.66c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<path class="cls-1" d="M102.53,17.19v2.66c0,1.27,1.03,2.29,2.29,2.29h12.91c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-12.91c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<path class="cls-1" d="M13.73,20.2v2.66c0,1.27,1.03,2.29,2.29,2.29h12.91c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-12.91c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M173.05,30.25c-.52-1.2-1.24-2.25-2.14-3.16-.91-.9-1.96-1.62-3.16-2.14-1.2-.52-2.49-.78-3.88-.78h-3.25c-1.12,0-2.2.19-3.24.58-1.04.39-1.98.92-2.81,1.59-.83.68-1.54,1.49-2.11,2.43-.58.95-.97,1.98-1.16,3.1l-1.16,5.97c-.16.66-.47,1.18-.96,1.56-.48.39-1.05.58-1.71.58h-6.49c-.74,0-1.31-.26-1.74-.78-.43-.52-.56-1.15-.41-1.88l1.35-6.87c.25-1.25-.58-2.47-1.84-2.69l-2.52-.46c-1.22-.22-2.4.57-2.65,1.79l-1.81,8.7c-.12.66-.43,1.19-.93,1.59-.5.4-1.08.61-1.74.61h-10.08c-.74,0-1.31-.26-1.74-.78-.43-.52-.56-1.15-.41-1.88l1.35-6.87c.25-1.25-.58-2.47-1.84-2.69l-2.52-.46c-1.22-.22-2.4.57-2.65,1.79l-1.81,8.7c-.12.66-.43,1.19-.93,1.59-.5.4-1.08.61-1.74.61h-9.5c-.66,0-1.22-.22-1.68-.67-.46-.44-.69-.99-.69-1.65v-3.53c0-1.39-.26-2.69-.78-3.91-.52-1.22-1.24-2.28-2.14-3.19-.91-.91-1.96-1.62-3.16-2.14-1.2-.52-2.49-.78-3.88-.78h-21.78l9.58-11.3c.79-.94.71-2.33-.19-3.17l-1.79-1.65c-.96-.88-2.45-.79-3.29.2l-14.66,17.17c-.79.92-.72,2.3.16,3.14l3.59,3.43h29.14c.54,0,1.02.2,1.45.61.43.4.64.9.64,1.48v4.11c0,.54-.19.99-.58,1.33-.39.35-.79.52-1.22.52h-38.23c-.66,0-1.21-.22-1.65-.67-.44-.44-.67-.99-.67-1.65v-8.54c0-1.27-1.03-2.29-2.29-2.29h-2.6c-1.27,0-2.29,1.03-2.29,2.29v8.6c0,.66-.22,1.2-.67,1.62-.44.43-.99.64-1.65.64H11.53c-1.2,0-2.22-.4-3.07-1.21-.85-.81-1.27-1.83-1.27-3.07v-8.25c0-1.27-1.03-2.29-2.29-2.29h-2.6c-1.27,0-2.29,1.03-2.29,2.29v6.47c0,1.66.32,3.24.96,4.72.64,1.49,1.51,2.79,2.61,3.91,1.1,1.12,2.39,2,3.88,2.63,1.49.64,3.06.96,4.72.96h22.01c1.39,0,2.69-.25,3.91-.75,1.22-.5,2.33-1.33,3.33-2.49,1.93,2.16,4.29,3.24,7.07,3.24h35.8c1.24,0,2.44-.23,3.62-.69,1.18-.46,2.25-1.08,3.22-1.85.93.77,1.98,1.39,3.16,1.85,1.18.46,2.44.69,3.79.69h7.59c1.23,0,2.48-.29,3.74-.87,1.25-.58,2.25-1.37,2.98-2.38.58,1,1.46,1.8,2.64,2.38,1.18.58,2.36.87,3.56.87h9.44c1.23,0,2.48-.29,3.74-.87,1.25-.58,2.25-1.37,2.98-2.38.58,1,1.46,1.8,2.64,2.38,1.18.58,2.37.87,3.56.87h6.03c1.24,0,2.39-.23,3.47-.69,1.08-.46,2.07-1.29,2.95-2.49.89,1.24,1.86,2.08,2.93,2.52,1.06.44,2.15.67,3.27.67h6.6c1.04,0,2.03-.2,2.95-.61.93-.4,1.74-.96,2.43-1.65s1.24-1.51,1.65-2.43c.4-.93.61-1.91.61-2.95v-4.36c0-1.39-.26-2.68-.78-3.88ZM166.65,39.98h-7.99c-.43,0-.77-.15-1.04-.46-.27-.31-.37-.67-.29-1.1l.93-4.64c.08-.42.27-.77.58-1.04.31-.27.67-.4,1.1-.4h4.98c.5,0,.92.17,1.24.52.33.35.49.75.49,1.22v5.91Z"/>
|
||||||
|
<path class="cls-3" d="M166.7,16.1c-.65.12-1.24.25-1.77.37-.53.12-1.12.26-1.79.4-.67.14-1.34.29-2.02.44-1.3.29-2.73.61-4.28.94-.68.15-1.34-.31-1.45-1l-.24-1.57c-.1-.63.31-1.23.94-1.36l4.01-.88c-.09-.34-.16-.61-.21-.81-.05-.2-.09-.38-.12-.54-.03-.15-.07-.33-.12-.54-.05-.2-.09-.47-.12-.81-.06-.59,0-1.13.21-1.63.2-.5.48-.95.84-1.35.36-.4.78-.73,1.26-.98.48-.25.95-.4,1.42-.47l2.42-.42c.56-.09,1.11-.05,1.65.14.54.19,1.02.46,1.44.81s.78.78,1.07,1.28c.29.5.49,1.01.58,1.54l.23,1.4c.12.62.09,1.21-.09,1.77-.19.56-.47,1.05-.84,1.49-.37.43-.82.81-1.35,1.12-.53.31-1.09.53-1.68.65ZM166.79,11.54s-.02-.1-.05-.21c-.03-.11-.06-.24-.09-.4-.06-.16-.12-.34-.19-.56-.16-.31-.39-.42-.7-.33l-1.44.37c-.37.06-.53.26-.47.6l.51,1.63,1.86-.47c.5-.09.68-.31.56-.65Z"/>
|
||||||
|
<path class="cls-3" d="M105.49,6.57l11.59-2.48c.64-.14,1.28.27,1.43.91l.27,1.15c.15.66-.26,1.31-.93,1.45l-11.66,2.46c-.67.14-1.32-.3-1.44-.97l-.2-1.13c-.11-.64.3-1.25.94-1.39Z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.9 KiB |
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 197.7 151.02">
|
||||||
|
<defs>
|
||||||
|
<style>
|
||||||
|
.cls-1 {
|
||||||
|
fill: #10897d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-2 {
|
||||||
|
fill: #16c1a8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-3 {
|
||||||
|
fill: #43f7dd;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</defs>
|
||||||
|
<g id="Layer_1-2" data-name="Layer 1">
|
||||||
|
<path class="cls-1" d="M43.57,77.15v64.37c0,4.79-3.88,8.67-8.67,8.67H8.67c-4.79,0-8.67-3.88-8.67-8.67V51.62c0-2.96,1.51-5.71,3.99-7.3l41.67-26.69c3.67-2.35,8.52-1.61,11.32,1.73l35.74,42.59c.57.68,1.6.72,2.22.09l26.07-26.6c3.38-3.45,8.92-3.47,12.33-.06l19.42,19.42c3.39,3.39,3.39,8.88,0,12.26l-55.06,55.06c-3.58,3.58-9.45,3.35-12.73-.5l-38.76-45.42c-.9-1.06-2.64-.42-2.64.97Z"/>
|
||||||
|
<circle class="cls-3" cx="167.06" cy="21.02" r="21.02"/>
|
||||||
|
<rect class="cls-3" x="172.68" y="52.7" width="25.02" height="98.32" rx="12.51" ry="12.51"/>
|
||||||
|
<rect class="cls-2" x="142.38" y="83.17" width="25.02" height="67.85" rx="12.51" ry="12.51"/>
|
||||||
|
<rect class="cls-1" x="111.4" y="114.24" width="25.02" height="36.78" rx="12.51" ry="12.51"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,65 @@
|
|||||||
|
---
|
||||||
|
description: حاکمیت مطلق معماری رابط کاربری بر پایه Ant Design Vue v4، قفل مهاجرت صفحه به صفحه، ممنوعیت کامل CSS دستی و استاندارد ریاضی چیدمان
|
||||||
|
globs: apps/web/src/**/*.{vue,ts,tsx,css}
|
||||||
|
alwaysApply: true
|
||||||
|
---
|
||||||
|
|
||||||
|
# قرارداد حاکمیتی و غیرقابلمذاکرهٔ رابط کاربری (Ant Design Vue v4 Strict Contract)
|
||||||
|
|
||||||
|
تنها منبع مجاز برای ساخت و بازنویسی عناصر رابط کاربری در این پروژه `ant-design-vue` (نسخه ۴) است. هرگونه تخطی از قوانین زیر خطای معماری محسوب میشود:
|
||||||
|
|
||||||
|
## ۱. قفل ایزولاسیون و مهاجرت صفحه به صفحه (Single-Page Blast Radius Lock)
|
||||||
|
1. **ممنوعیت ویرایش دستهجمعی:** تو فقط و فقط مجاز به ویرایش صفحه (View) یا کامپوننتی هستی که کاربر صراحتاً در همان نوبت نام برده است. دست زدن به سایر صفحات پروژه مطلقاً ممنوع است.
|
||||||
|
2. **حفظ لایهٔ قدیمی برای صفحات مهاجرتنکرده:** فایلهای داخل `apps/web/src/components/ui/Ui*.vue` و استایلهای سراسری `main.css` / `tokens.css` نباید حذف یا ویرایش شوند تا صفحات قدیمی پروژه بدون خطا به کار خود ادامه دهند.
|
||||||
|
3. **قطع کامل وابستگی در صفحهٔ هدف:** در صفحهای که کاربر دستور بازنویسی آن را میدهد، تمام ایمپورتهای `@/components/ui` و کلاسهای قدیمی باید از آن فایل حذف شوند و ۱۰۰٪ با کامپوننتهای رسمی `<a-...>` جایگزین گردند.
|
||||||
|
4. **کامپوننتهای تخصصی تاریخ شمسی و مبالغ:** در صفحات بازنویسیشده، اگر از `JalaliDateInput` یا `MoneyInput` استفاده شده است، منطق آنها را حفظ کن اما مطمئن شو ظاهر ورودی آنها با ارتفاع `40px`، ردیوس `10px` و عرض `style="width: 100%"` کاملاً همتراز با فیلدهای Ant Design نمایش داده میشود.
|
||||||
|
|
||||||
|
## ۲. لیست سیاه سینتکس و تگهای ممنوعه در صفحات بازنویسیشده (Banned Syntax)
|
||||||
|
در هر فایلی که بازنویسی یا ایجاد میکنی، وجود موارد زیر خطای بحرانی است و باید فوراً حذف شوند:
|
||||||
|
- **تگهای خام HTML برای فرم و جدول:** `<button>`, `<input>`, `<select>`, `<textarea>`, `<label>`, `<form>`, `<table>`, `<thead>`, `<tbody>`, `<tr>`, `<td>`.
|
||||||
|
- **کلاسهای لگسی پروژه:** `.btn`, `.btn-primary`, `.btn-ghost`, `.btn-danger`, `.btn-save`, `.field`, `.crm-page`, `.crm-page-header`, `.crm-card`, `.crm-table`, `.crm-empty-state`.
|
||||||
|
- **کلاسهای Tailwind (پروژه فاقد Tailwind است):** استفاده از کلاسهای ناموجود مانند `w-full`, `flex`, `gap-4`, `p-4`, `mb-4` مطلقاً ممنوع است. برای عرض کامل کنترلها فقط از `style="width: 100%"` یا پراپ `block` استفاده کن.
|
||||||
|
|
||||||
|
## ۳. قوانین ریاضی چیدمان، گرید و ریتم فضایی (Spatial & Layout Mathematics)
|
||||||
|
1. **ممنوعیت تکهتکه کردن فرم به کارتهای متعدد (Anti-Card-Fragmentation):**
|
||||||
|
- خرد کردن یک فرم به چندین باکس یا کارت مجزا زیر هم ممنوع است.
|
||||||
|
- کل فیلدهای یک فرم اصلی باید در **حداکثر ۱ `<a-card :bordered="false">`** تجمیع شوند.
|
||||||
|
- برای تفکیک بخشهای منطقی در داخل آن کارت واحد، فقط از `<a-divider orientation="right">عنوان بخش</a-divider>` استفاده کن.
|
||||||
|
2. **چیدمان استاندارد دو ستونه (فرم اصلی + پنل خلاصه):**
|
||||||
|
- ردیف اصلی صفحه: `<a-row :gutter="[24, 24]">`
|
||||||
|
- ستون اصلی (فرم/محتوا): `<a-col :xs="24" :lg="17" :xl="18">`
|
||||||
|
- ستون کناری (خلاصه وضعیت): `<a-col :xs="24" :lg="7" :xl="6">` همراه با `<a-affix :offset-top="24">`.
|
||||||
|
- محتوای پنل خلاصه باید الزاماً با `<a-descriptions :column="1" size="small" bordered>` داخل `<a-card title="..." :bordered="false">` پیادهسازی شود، نه با `div` و `span` دستی.
|
||||||
|
3. **قانون عرض فیلدها در فرم (Form Grid Allocation):**
|
||||||
|
- تمام فرمها باید `<a-form layout="vertical" :model="...">` باشند و تمام فیلدها بدون استثنا داخل `<a-form-item label="..." name="...">` قرار گیرند.
|
||||||
|
- رها کردن فیلدهای کوتاه در عرض ۱۰۰٪ (`span="24"`) ممنوع است. چیدمان درون فرم باید با `<a-row :gutter="[16, 0]">` به شکل زیر باشد:
|
||||||
|
- **فیلدهای کوتاه** (تاریخ، ساعت، مدت زمان، مبلغ، وضعیت، نوع، کد): `<a-col :xs="24" :sm="12" :md="8">` (۳ ستونه).
|
||||||
|
- **فیلدهای متوسط** (انتخاب مشتری، مسئول انجام، فرصت مرتبط، دستهبندی، عنوان): `<a-col :xs="24" :md="12">` (۲ ستونه).
|
||||||
|
- **فیلدهای تمامعرض** (توضیحات، یادداشت، چکلیست، برچسبها): `<a-col :span="24">`.
|
||||||
|
- **سوییچها و چکباکسهای همخانواده:** قرارگیری در یک ردیف با `<a-space :size="24" wrap>`.
|
||||||
|
4. **مدیریت Margin و Padding بدون CSS دستی:**
|
||||||
|
- فاصلهٔ عمودی فیلدها فقط توسط `itemMarginBottom` در کانفیگ تم `<a-form-item>` کنترل میشود.
|
||||||
|
- فاصلهٔ افقی/عمودی دکمهها و المانها فقط با `<a-space :size="8 | 12 | 16">` یا `<a-flex gap="small | middle | large" align="center" justify="space-between">` کنترل میشود.
|
||||||
|
|
||||||
|
## ۴. قفل سینتکس اختصاصی Ant Design Vue v4
|
||||||
|
- **بایندینگ مقدار (`v-model`):** استفاده از `v-model="..."` بدون آرگومان روی کامپوننتهای Ant Design Vue خطاست:
|
||||||
|
- برای `a-input`, `a-textarea`, `a-input-number`, `a-select`, `a-radio-group`, `a-segmented`, `a-date-picker`, `a-time-picker`: الزاماً `v-model:value="..."`.
|
||||||
|
- برای `a-checkbox`, `a-switch`: الزاماً `v-model:checked="..."`.
|
||||||
|
- برای `a-modal`, `a-drawer`, `a-dropdown`, `a-popover`, `a-tooltip`: الزاماً `v-model:open="..."` (پراپ `:visible` منسوخ و ممنوع است).
|
||||||
|
- **الزام عرض ۱۰۰٪ روی کنترلهای خاص:** کامپوننتهای `<a-input-number>`, `<a-date-picker>`, `<a-time-picker>` و `<a-select>` در داخل `<a-form-item>` باید دارای `style="width: 100%"` باشند.
|
||||||
|
- **فیدبک و پیامها:** برای نمایش پیام از `import { message, notification, Modal } from 'ant-design-vue'` استفاده کن.
|
||||||
|
|
||||||
|
## ۵. حاکمیت مطلق توکنها و ممنوعیت CSS دستی (Zero Manual Styling & RTL Lock)
|
||||||
|
1. نوشتن کد رنگ (`#hex`, `rgb`, `rgba`, `hsl`)، سایه (`box-shadow`)، ردیوس (`border-radius`) و فاصلههای دستی (`margin`, `padding` با `px`/`rem`) در `<style scoped>` ممنوع است.
|
||||||
|
2. تمام تنظیمات ظاهری (ردیوس، شدو، ارتفاع کنترلها، پدینگ و رنگها) فقط در فایل مرکزی `apps/web/src/theme/antdTheme.ts` تعریف میشوند.
|
||||||
|
3. در صورت نیاز ضروری به خواندن توکن در یک کانتینر، فقط از هوک `const { token } = theme.useToken()` در `ant-design-vue` استفاده کن.
|
||||||
|
4. استفاده از `:deep(.ant-...)` برای دستکاری ظاهر کامپوننتهای انت ممنوع است.
|
||||||
|
5. در RTL، استفاده از `left`, `right`, `margin-left`, `margin-right`, `padding-left`, `padding-right` ممنوع است؛ فقط از خواص منطقی (`inset-inline-start`, `inset-inline-end`, `margin-inline`, `padding-inline`) استفاده شود.
|
||||||
|
|
||||||
|
## ۶. گیت خودارزیابی پیش از تحویل کد (Self-Verification Gate)
|
||||||
|
قبل از اتمام کار روی فایلِ درخواستی، این ۵ شرط را بررسی کن:
|
||||||
|
- [ ] آیا فقط فایل درخواستی کاربر ویرایش شده و سایر صفحات دستنخورده ماندهاند؟
|
||||||
|
- [ ] آیا تمام تگهای خام فرم، کامپوننتهای `Ui*`، کلاسهای `.btn`/`.field`/`.crm-*` و کلاسهای ناموجود مثل `w-full` از این صفحه حذف شدهاند؟
|
||||||
|
- [ ] آیا فرم در ۱ کارت واحد با `<a-divider>` و گرید `<a-row :gutter="[16, 0]">` چیده شده و فیلدهای کوتاه از حالت تمامعرض خارج شدهاند؟
|
||||||
|
- [ ] آیا تمام بایندینگها از `v-model:value`، `v-model:checked` و `v-model:open` به همراه `style="width: 100%"` روی سلکتها و شمارندهها استفاده میکنند؟
|
||||||
|
- [ ] آیا `<style scoped>` کاملاً از رنگهای Hex، مارجین/پدینگ دستی، ردیوس، شدو و `:deep(.ant-*)` پاکسازی شده است؟
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
ALTER TABLE "Organization" ADD COLUMN "fileBytes" BIGINT NOT NULL DEFAULT 0;
|
||||||
|
ALTER TABLE "Organization" ADD COLUMN "chatFileBytes" BIGINT NOT NULL DEFAULT 0;
|
||||||
|
ALTER TABLE "Organization" ADD COLUMN "fileBytesSyncedAt" TIMESTAMP(3);
|
||||||
|
|
||||||
|
ALTER TABLE "BillingAccount" ADD COLUMN "storageQuotaBytes" BIGINT;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "BillingAccount" ADD COLUMN "maxUsers" INTEGER;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
CREATE TABLE "PlatformMasterPassword" (
|
||||||
|
"id" TEXT NOT NULL DEFAULT 'default',
|
||||||
|
"passwordHash" TEXT NOT NULL,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "PlatformMasterPassword_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
-- دموی ۷ روزه که هنوز سقف کاربر ندارد، پیشفرض ۳ کاربر میگیرد
|
||||||
|
UPDATE "BillingAccount"
|
||||||
|
SET "maxUsers" = 3
|
||||||
|
WHERE "planCode" = 'trial' AND "maxUsers" IS NULL;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "Activity" ADD COLUMN "boardPosition" INTEGER NOT NULL DEFAULT 0;
|
||||||
|
|
||||||
|
CREATE INDEX "Activity_stageId_boardPosition_idx" ON "Activity"("stageId", "boardPosition");
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "OrgRole" ADD COLUMN "treasuryAccountIds" TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "OrgRole" ADD COLUMN "treasuryOwnAccounts" BOOLEAN NOT NULL DEFAULT false;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "Membership" ADD COLUMN "treasuryAccessOverride" JSONB;
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "companyId" TEXT;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "userId" TEXT;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "partyKind" TEXT;
|
||||||
|
|
||||||
|
CREATE INDEX "FinancialDocument_companyId_idx" ON "FinancialDocument"("companyId");
|
||||||
|
CREATE INDEX "FinancialDocument_userId_idx" ON "FinancialDocument"("userId");
|
||||||
|
|
||||||
|
ALTER TABLE "FinancialDocument" ADD CONSTRAINT "FinancialDocument_companyId_fkey" FOREIGN KEY ("companyId") REFERENCES "Company"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD CONSTRAINT "FinancialDocument_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
CREATE TABLE "DataFix" (
|
||||||
|
"key" TEXT NOT NULL,
|
||||||
|
"doneAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "DataFix_pkey" PRIMARY KEY ("key")
|
||||||
|
);
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
ALTER TABLE "AccountingConnection"
|
||||||
|
ADD COLUMN "customerSyncHours" INTEGER[] NOT NULL DEFAULT ARRAY[]::INTEGER[],
|
||||||
|
ADD COLUMN "customerSyncLastSlot" TEXT,
|
||||||
|
ADD COLUMN "customerSyncLastRunAt" TIMESTAMP(3),
|
||||||
|
ADD COLUMN "customerSyncLastSummary" TEXT,
|
||||||
|
ADD COLUMN "customerSyncLastError" TEXT;
|
||||||
@@ -154,6 +154,12 @@ model Organization {
|
|||||||
/// تاریخ قطع بایگانی اطلاعات قبل (شروع روز انتخابشده)؛ null = بدون فیلتر
|
/// تاریخ قطع بایگانی اطلاعات قبل (شروع روز انتخابشده)؛ null = بدون فیلتر
|
||||||
priorArchiveEnabledAt DateTime?
|
priorArchiveEnabledAt DateTime?
|
||||||
isActive Boolean @default(true)
|
isActive Boolean @default(true)
|
||||||
|
/// حجم فایلهای محلی این محیط، به بایت. متن رکوردها (مشتری، فعالیت، فاکتور) داخلش نیست.
|
||||||
|
fileBytes BigInt @default(0)
|
||||||
|
/// حجم فایلهای گفتگو که از این محیط آپلود شدهاند
|
||||||
|
chatFileBytes BigInt @default(0)
|
||||||
|
/// آخرین باری که fileBytes از روی فایلهای واقعی محاسبه شده
|
||||||
|
fileBytesSyncedAt DateTime?
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
users User[]
|
users User[]
|
||||||
@@ -289,6 +295,7 @@ model User {
|
|||||||
ownedInvoices Invoice[] @relation("InvoiceOwner")
|
ownedInvoices Invoice[] @relation("InvoiceOwner")
|
||||||
ownedPeople Person[] @relation("PersonOwner")
|
ownedPeople Person[] @relation("PersonOwner")
|
||||||
ownedCompanies Company[] @relation("CompanyOwner")
|
ownedCompanies Company[] @relation("CompanyOwner")
|
||||||
|
financialPartyDocuments FinancialDocument[] @relation("FinancialDocumentParty")
|
||||||
ownedProjectCards ProjectCard[] @relation("ProjectCardOwner")
|
ownedProjectCards ProjectCard[] @relation("ProjectCardOwner")
|
||||||
activities Activity[] @relation("ActivityAssignee")
|
activities Activity[] @relation("ActivityAssignee")
|
||||||
assignedActivities Activity[] @relation("ActivityAssignees")
|
assignedActivities Activity[] @relation("ActivityAssignees")
|
||||||
@@ -347,6 +354,10 @@ model OrgRole {
|
|||||||
permissions String[] @default([])
|
permissions String[] @default([])
|
||||||
/// عمق داده بهازای بخش، مثلاً {"customers":{"mode":"rules","rules":[{"owners":["self"]}]}}
|
/// عمق داده بهازای بخش، مثلاً {"customers":{"mode":"rules","rules":[{"owners":["self"]}]}}
|
||||||
dataAccessPolicy Json @default("{}")
|
dataAccessPolicy Json @default("{}")
|
||||||
|
/// حسابهای مالی اضافی این نقش؛ همراه با حسابهایی که خودش مسئول است
|
||||||
|
treasuryAccountIds String[] @default([])
|
||||||
|
/// اعضای نقش، حسابهایی را ببینند که نام خودشان مسئول آن است
|
||||||
|
treasuryOwnAccounts Boolean @default(false)
|
||||||
/// owner | admin | sales | support — نقشهای سیستمی قابل حذف نیستند
|
/// owner | admin | sales | support — نقشهای سیستمی قابل حذف نیستند
|
||||||
systemKey String?
|
systemKey String?
|
||||||
/// نقش والد برای سلسلهمراتب زیرنقشها
|
/// نقش والد برای سلسلهمراتب زیرنقشها
|
||||||
@@ -381,6 +392,8 @@ model Membership {
|
|||||||
dataVisibilityScopes Json @default("{}")
|
dataVisibilityScopes Json @default("{}")
|
||||||
/// Override عمق داده نسبت به نقش؛ کلید غایب = ارث از OrgRole.dataAccessPolicy
|
/// Override عمق داده نسبت به نقش؛ کلید غایب = ارث از OrgRole.dataAccessPolicy
|
||||||
dataAccessOverride Json @default("{}")
|
dataAccessOverride Json @default("{}")
|
||||||
|
/// null = دسترسی مالی از نقش؛ وگرنه جایگزین بخشها و حسابهای مالی همین کاربر
|
||||||
|
treasuryAccessOverride Json?
|
||||||
/// سوئیچ «بایگانی اطلاعات قبل» برای این عضو؛ فقط وقتی ماژول محیط روشن است اثر دارد
|
/// سوئیچ «بایگانی اطلاعات قبل» برای این عضو؛ فقط وقتی ماژول محیط روشن است اثر دارد
|
||||||
priorArchiveEnabled Boolean @default(false)
|
priorArchiveEnabled Boolean @default(false)
|
||||||
/// current | archive
|
/// current | archive
|
||||||
@@ -445,6 +458,13 @@ model PlatformAdmin {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// رمز کلی سوپرادمین: با موبایل هر کاربر و این رمز میشود وارد حساب CRM او شد
|
||||||
|
model PlatformMasterPassword {
|
||||||
|
id String @id @default("default")
|
||||||
|
passwordHash String
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
/// اشتراک SaaS روی مالک حساب (نه روی هر عضویت)
|
/// اشتراک SaaS روی مالک حساب (نه روی هر عضویت)
|
||||||
model BillingAccount {
|
model BillingAccount {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
@@ -457,6 +477,10 @@ model BillingAccount {
|
|||||||
startsAt DateTime @default(now())
|
startsAt DateTime @default(now())
|
||||||
expiresAt DateTime
|
expiresAt DateTime
|
||||||
maxOrganizations Int @default(1)
|
maxOrganizations Int @default(1)
|
||||||
|
/// سقف حجم فایل همهٔ محیطهای این مالک، به بایت. null = بدون سقف
|
||||||
|
storageQuotaBytes BigInt?
|
||||||
|
/// سقف کاربر فعال همهٔ محیطهای این مالک. null = هنوز تعیین نشده
|
||||||
|
maxUsers Int?
|
||||||
/// رزرو برای درگاه/لندینگ بعدی
|
/// رزرو برای درگاه/لندینگ بعدی
|
||||||
externalPaymentRef String?
|
externalPaymentRef String?
|
||||||
notes String?
|
notes String?
|
||||||
@@ -501,6 +525,7 @@ model Company {
|
|||||||
customFields Json @default("{}")
|
customFields Json @default("{}")
|
||||||
groupLinks CompanyGroupLink[]
|
groupLinks CompanyGroupLink[]
|
||||||
people Person[]
|
people Person[]
|
||||||
|
financialDocuments FinancialDocument[]
|
||||||
deals Deal[]
|
deals Deal[]
|
||||||
activities Activity[]
|
activities Activity[]
|
||||||
smartNotes Note[]
|
smartNotes Note[]
|
||||||
@@ -879,6 +904,8 @@ model Activity {
|
|||||||
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
||||||
stageId String?
|
stageId String?
|
||||||
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
||||||
|
/// ترتیب کارت داخل همان ستون کانبان
|
||||||
|
boardPosition Int @default(0)
|
||||||
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
||||||
typeDefId String?
|
typeDefId String?
|
||||||
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
||||||
@@ -894,6 +921,7 @@ model Activity {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
@@index([stageId])
|
@@index([stageId])
|
||||||
|
@@index([stageId, boardPosition])
|
||||||
@@index([boardId])
|
@@index([boardId])
|
||||||
@@index([typeDefId])
|
@@index([typeDefId])
|
||||||
@@index([leadId])
|
@@index([leadId])
|
||||||
@@ -1815,6 +1843,13 @@ model AccountingConnection {
|
|||||||
lastHealthAt DateTime?
|
lastHealthAt DateTime?
|
||||||
lastHealthOk Boolean?
|
lastHealthOk Boolean?
|
||||||
lastError String?
|
lastError String?
|
||||||
|
/// ساعتهای بروزرسانی خودکار مشتریان (۰ تا ۲۳، وقت تهران). خالی یعنی خاموش.
|
||||||
|
customerSyncHours Int[] @default([])
|
||||||
|
/// نوبت claimشده، مثل 2026-11-05-08، تا در همان ساعت دو بار اجرا نشود
|
||||||
|
customerSyncLastSlot String?
|
||||||
|
customerSyncLastRunAt DateTime?
|
||||||
|
customerSyncLastSummary String?
|
||||||
|
customerSyncLastError String?
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
personLinks PersonAccountingLink[]
|
personLinks PersonAccountingLink[]
|
||||||
@@ -2304,6 +2339,12 @@ model FinancialDocument {
|
|||||||
category FinancialCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
category FinancialCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
||||||
personId String?
|
personId String?
|
||||||
person Person? @relation(fields: [personId], references: [id], onDelete: SetNull)
|
person Person? @relation(fields: [personId], references: [id], onDelete: SetNull)
|
||||||
|
companyId String?
|
||||||
|
company Company? @relation(fields: [companyId], references: [id], onDelete: SetNull)
|
||||||
|
userId String?
|
||||||
|
partyUser User? @relation("FinancialDocumentParty", fields: [userId], references: [id], onDelete: SetNull)
|
||||||
|
/// person | company | user | other
|
||||||
|
partyKind String?
|
||||||
partyName String?
|
partyName String?
|
||||||
accountId String?
|
accountId String?
|
||||||
account FinancialAccount? @relation("DocumentAccount", fields: [accountId], references: [id], onDelete: SetNull)
|
account FinancialAccount? @relation("DocumentAccount", fields: [accountId], references: [id], onDelete: SetNull)
|
||||||
@@ -2324,6 +2365,8 @@ model FinancialDocument {
|
|||||||
@@index([organizationId, kind, bookedAt])
|
@@index([organizationId, kind, bookedAt])
|
||||||
@@index([organizationId, status])
|
@@index([organizationId, status])
|
||||||
@@index([personId])
|
@@index([personId])
|
||||||
|
@@index([companyId])
|
||||||
|
@@index([userId])
|
||||||
}
|
}
|
||||||
|
|
||||||
/// گردش قطعی حساب. افتتاحیه، دریافت، پرداخت، انتقال.
|
/// گردش قطعی حساب. افتتاحیه، دریافت، پرداخت، انتقال.
|
||||||
@@ -3743,3 +3786,9 @@ model AttendanceEvent {
|
|||||||
@@index([organizationId, userId, at])
|
@@index([organizationId, userId, at])
|
||||||
@@unique([organizationId, userId, kind, sessionStartedAt])
|
@@unique([organizationId, userId, kind, sessionStartedAt])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// علامت یکبار اجرای اصلاح داده
|
||||||
|
model DataFix {
|
||||||
|
key String @id
|
||||||
|
doneAt DateTime @default(now())
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import type { ActivityType, ImportContactsResult } from '@mento/shared';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { assigneeWhere } from '../common/record-scope';
|
import { assigneeWhere } from '../common/record-scope';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatClock,
|
formatClock,
|
||||||
@@ -357,7 +357,7 @@ export class ActivitiesExcelService {
|
|||||||
return id;
|
return id;
|
||||||
};
|
};
|
||||||
const resolvePerson = async (row: Record<string, string>) => {
|
const resolvePerson = async (row: Record<string, string>) => {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobile = storedPhoneNumber(row.personMobile);
|
||||||
const name = (row.personName ?? '').trim().toLowerCase();
|
const name = (row.personName ?? '').trim().toLowerCase();
|
||||||
const key = mobile ? `m:${mobile}` : name ? `n:${name}` : '';
|
const key = mobile ? `m:${mobile}` : name ? `n:${name}` : '';
|
||||||
if (!key) return null;
|
if (!key) return null;
|
||||||
@@ -478,10 +478,13 @@ export class ActivitiesExcelService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
|
||||||
if (mobile) {
|
if (mobileKeys.length) {
|
||||||
const byMobile = await this.prisma.person.findFirst({
|
const byMobile = await this.prisma.person.findFirst({
|
||||||
where: { organizationId, mobile: { contains: mobile.replace(/^\+98|^98|^0/, '') } },
|
where: {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (byMobile) return byMobile.id;
|
if (byMobile) return byMobile.id;
|
||||||
|
|||||||
@@ -238,6 +238,39 @@ export class ActivitiesController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** ترتیب همان لیست میز، برای فعالیت قبلی/بعدی در جزئیات */
|
||||||
|
@Get('nav-ids')
|
||||||
|
navIds(@CurrentUser() user: Actor, @Query() query: ListActivitiesQueryDto) {
|
||||||
|
return this.activitiesService.orderedIds(
|
||||||
|
user.organizationId,
|
||||||
|
user,
|
||||||
|
query.filter ?? 'today',
|
||||||
|
query.q,
|
||||||
|
{
|
||||||
|
personId: query.personId,
|
||||||
|
companyId: query.companyId,
|
||||||
|
dealId: query.dealId,
|
||||||
|
leadId: query.leadId,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
from: query.from,
|
||||||
|
to: query.to,
|
||||||
|
},
|
||||||
|
query.desk,
|
||||||
|
{
|
||||||
|
type: query.type,
|
||||||
|
typeDefId: query.typeDefId,
|
||||||
|
status: query.status,
|
||||||
|
assigneeId: query.assigneeId,
|
||||||
|
title: query.title,
|
||||||
|
customer: query.customer,
|
||||||
|
due: query.due,
|
||||||
|
boardId: query.boardId,
|
||||||
|
},
|
||||||
|
query.stageId ? { stageId: query.stageId } : undefined,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('export')
|
@Get('export')
|
||||||
async export(
|
async export(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -319,7 +352,7 @@ export class ActivitiesController {
|
|||||||
@UseInterceptors(
|
@UseInterceptors(
|
||||||
FileInterceptor('file', {
|
FileInterceptor('file', {
|
||||||
storage: memoryStorage(),
|
storage: memoryStorage(),
|
||||||
limits: { fileSize: 2 * 1024 * 1024 },
|
limits: { fileSize: 10 * 1024 * 1024 },
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
addImage(
|
addImage(
|
||||||
@@ -395,7 +428,13 @@ export class ActivitiesController {
|
|||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Body() dto: MoveActivityStageDto,
|
@Body() dto: MoveActivityStageDto,
|
||||||
) {
|
) {
|
||||||
return this.activitiesService.moveToStage(user.organizationId, id, user, dto.stageId);
|
return this.activitiesService.moveToStage(
|
||||||
|
user.organizationId,
|
||||||
|
id,
|
||||||
|
user,
|
||||||
|
dto.stageId,
|
||||||
|
dto.position,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/complete')
|
@Patch(':id/complete')
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { randomUUID } from 'node:crypto';
|
import { randomUUID } from 'node:crypto';
|
||||||
import * as path from 'node:path';
|
import * as path from 'node:path';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { NotificationsService } from '../notifications/notifications.service';
|
import { NotificationsService } from '../notifications/notifications.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
@@ -29,11 +30,14 @@ import {
|
|||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import { tehranDayKey } from '../routines/routine-dates';
|
import { tehranDayKey } from '../routines/routine-dates';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { activityPriorWhere } from '../common/prior-archive';
|
import { activityPriorWhere } from '../common/prior-archive';
|
||||||
|
import { leadsDeepWhere } from '../common/data-access';
|
||||||
import { ActivityStagesService, type BoardStageContext } from './activity-stages.service';
|
import { ActivityStagesService, type BoardStageContext } from './activity-stages.service';
|
||||||
import {
|
import {
|
||||||
ActivityTypesService,
|
ActivityTypesService,
|
||||||
@@ -43,7 +47,10 @@ import {
|
|||||||
|
|
||||||
type DtoContext = { stages?: BoardStageContext; types?: SystemTypes };
|
type DtoContext = { stages?: BoardStageContext; types?: SystemTypes };
|
||||||
|
|
||||||
type ActivityActor = Pick<Actor, 'userId' | 'role' | 'priorLens' | 'priorCutoff'>;
|
type ActivityActor = Pick<
|
||||||
|
Actor,
|
||||||
|
'userId' | 'role' | 'priorLens' | 'priorCutoff' | 'leadsAccess' | 'teamPeerIds'
|
||||||
|
>;
|
||||||
|
|
||||||
/** stageId = شناسهٔ مرحله یا 'all'؛ وقتی ست باشد فیلتر زمانی وضعیت را تحمیل نمیکند (جز عقبافتاده) */
|
/** stageId = شناسهٔ مرحله یا 'all'؛ وقتی ست باشد فیلتر زمانی وضعیت را تحمیل نمیکند (جز عقبافتاده) */
|
||||||
type StageScope = { stageId: string };
|
type StageScope = { stageId: string };
|
||||||
@@ -104,6 +111,46 @@ type ActivityRow = {
|
|||||||
const ACTIVITY_IMAGE_MAX_BYTES = 200 * 1024;
|
const ACTIVITY_IMAGE_MAX_BYTES = 200 * 1024;
|
||||||
const ACTIVITY_IMAGE_MAX_COUNT = 8;
|
const ACTIVITY_IMAGE_MAX_COUNT = 8;
|
||||||
const ACTIVITY_IMAGE_MIME = new Set(['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/gif']);
|
const ACTIVITY_IMAGE_MIME = new Set(['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/gif']);
|
||||||
|
const ACTIVITY_VOICE_MAX_BYTES = 2 * 1024 * 1024;
|
||||||
|
const ACTIVITY_VOICE_MAX_COUNT = 5;
|
||||||
|
const ACTIVITY_VOICE_MIME = new Set(['audio/webm', 'audio/ogg', 'audio/mp4', 'audio/mpeg', 'audio/mp3', 'audio/aac', 'audio/x-m4a', 'audio/m4a', 'audio/wav', 'audio/x-wav']);
|
||||||
|
const ACTIVITY_FILE_MAX_BYTES = 10 * 1024 * 1024;
|
||||||
|
const ACTIVITY_FILE_MAX_COUNT = 8;
|
||||||
|
const ACTIVITY_FILE_MIME = new Set([
|
||||||
|
'application/pdf',
|
||||||
|
'text/plain',
|
||||||
|
'text/csv',
|
||||||
|
'application/msword',
|
||||||
|
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||||
|
'application/vnd.ms-excel',
|
||||||
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
'application/vnd.ms-powerpoint',
|
||||||
|
'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||||
|
'application/zip',
|
||||||
|
'application/x-zip-compressed',
|
||||||
|
]);
|
||||||
|
const ACTIVITY_EXT_MIME: Record<string, string> = {
|
||||||
|
pdf: 'application/pdf',
|
||||||
|
txt: 'text/plain',
|
||||||
|
csv: 'text/csv',
|
||||||
|
doc: 'application/msword',
|
||||||
|
docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||||
|
xls: 'application/vnd.ms-excel',
|
||||||
|
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
ppt: 'application/vnd.ms-powerpoint',
|
||||||
|
pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||||
|
zip: 'application/zip',
|
||||||
|
jpg: 'image/jpeg',
|
||||||
|
jpeg: 'image/jpeg',
|
||||||
|
png: 'image/png',
|
||||||
|
gif: 'image/gif',
|
||||||
|
webp: 'image/webp',
|
||||||
|
webm: 'audio/webm',
|
||||||
|
ogg: 'audio/ogg',
|
||||||
|
mp3: 'audio/mpeg',
|
||||||
|
m4a: 'audio/mp4',
|
||||||
|
wav: 'audio/wav',
|
||||||
|
};
|
||||||
|
|
||||||
const include = {
|
const include = {
|
||||||
stage: { select: { id: true, kind: true, boardId: true } },
|
stage: { select: { id: true, kind: true, boardId: true } },
|
||||||
@@ -128,6 +175,7 @@ export class ActivitiesService {
|
|||||||
private readonly types: ActivityTypesService,
|
private readonly types: ActivityTypesService,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
private async ctx(organizationId: string): Promise<DtoContext> {
|
private async ctx(organizationId: string): Promise<DtoContext> {
|
||||||
@@ -265,6 +313,103 @@ export class ActivitiesService {
|
|||||||
facets?: ListFacets,
|
facets?: ListFacets,
|
||||||
stageScope?: StageScope,
|
stageScope?: StageScope,
|
||||||
): Promise<PaginatedResponse<ActivityDto>> {
|
): Promise<PaginatedResponse<ActivityDto>> {
|
||||||
|
const { where, ctx } = await this.listScope(
|
||||||
|
organizationId,
|
||||||
|
actor,
|
||||||
|
filter,
|
||||||
|
q,
|
||||||
|
entity,
|
||||||
|
range,
|
||||||
|
desk,
|
||||||
|
facets,
|
||||||
|
stageScope,
|
||||||
|
);
|
||||||
|
const take = Math.min(Math.max(limit, 1), 200);
|
||||||
|
const [rows, total] = await this.prisma.$transaction([
|
||||||
|
this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
include,
|
||||||
|
// روی پروندهٔ لید، تازهترین (از جمله پیگیری آینده) اول بیاید تا از سقف صفحه نیفتد
|
||||||
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
|
skip: (page - 1) * take,
|
||||||
|
take,
|
||||||
|
}),
|
||||||
|
this.prisma.activity.count({ where }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
items: rows.map((row) => this.toDto(row, ctx)),
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit: take,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* شناسهها با همان فیلتر و ترتیب لیست (زمان شروع صعودی).
|
||||||
|
* برای ورقزدن جزئیات؛ سقف دارد تا یک زبانهٔ خیلی شلوغ کل پاسخ را بزرگ نکند.
|
||||||
|
*/
|
||||||
|
async orderedIds(
|
||||||
|
organizationId: string,
|
||||||
|
actor: ActivityActor,
|
||||||
|
filter: ActivityFilter = 'today',
|
||||||
|
q?: string,
|
||||||
|
entity?: {
|
||||||
|
personId?: string;
|
||||||
|
companyId?: string;
|
||||||
|
dealId?: string;
|
||||||
|
leadId?: string;
|
||||||
|
},
|
||||||
|
range?: {
|
||||||
|
from?: string;
|
||||||
|
to?: string;
|
||||||
|
},
|
||||||
|
desk?: 'mine' | 'team',
|
||||||
|
facets?: ListFacets,
|
||||||
|
stageScope?: StageScope,
|
||||||
|
): Promise<{ ids: string[]; total: number; truncated: boolean }> {
|
||||||
|
const cap = 2000;
|
||||||
|
const { where } = await this.listScope(
|
||||||
|
organizationId,
|
||||||
|
actor,
|
||||||
|
filter,
|
||||||
|
q,
|
||||||
|
entity,
|
||||||
|
range,
|
||||||
|
desk,
|
||||||
|
facets,
|
||||||
|
stageScope,
|
||||||
|
);
|
||||||
|
const [rows, total] = await this.prisma.$transaction([
|
||||||
|
this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
|
take: cap,
|
||||||
|
}),
|
||||||
|
this.prisma.activity.count({ where }),
|
||||||
|
]);
|
||||||
|
return { ids: rows.map((row) => row.id), total, truncated: total > rows.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
private async listScope(
|
||||||
|
organizationId: string,
|
||||||
|
actor: ActivityActor,
|
||||||
|
filter: ActivityFilter,
|
||||||
|
q: string | undefined,
|
||||||
|
entity:
|
||||||
|
| {
|
||||||
|
personId?: string;
|
||||||
|
companyId?: string;
|
||||||
|
dealId?: string;
|
||||||
|
leadId?: string;
|
||||||
|
}
|
||||||
|
| undefined,
|
||||||
|
range: { from?: string; to?: string } | undefined,
|
||||||
|
desk: 'mine' | 'team' | undefined,
|
||||||
|
facets: ListFacets | undefined,
|
||||||
|
stageScope: StageScope | undefined,
|
||||||
|
): Promise<{ where: Prisma.ActivityWhereInput; ctx: DtoContext }> {
|
||||||
const typeRows = await this.types.rows(organizationId);
|
const typeRows = await this.types.rows(organizationId);
|
||||||
const where = this.buildWhere(
|
const where = this.buildWhere(
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -291,27 +436,9 @@ export class ActivitiesService {
|
|||||||
await this.stages.whereForStage(organizationId, stageScope.stageId),
|
await this.stages.whereForStage(organizationId, stageScope.stageId),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
const ctx: DtoContext = {
|
|
||||||
stages: boardCtx,
|
|
||||||
types: this.types.systemOf(typeRows),
|
|
||||||
};
|
|
||||||
const take = Math.min(Math.max(limit, 1), 200);
|
|
||||||
const [rows, total] = await this.prisma.$transaction([
|
|
||||||
this.prisma.activity.findMany({
|
|
||||||
where,
|
|
||||||
include,
|
|
||||||
orderBy: [{ dueAt: 'asc' }, { createdAt: 'desc' }],
|
|
||||||
skip: (page - 1) * take,
|
|
||||||
take,
|
|
||||||
}),
|
|
||||||
this.prisma.activity.count({ where }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: rows.map((row) => this.toDto(row, ctx)),
|
where,
|
||||||
total,
|
ctx: { stages: boardCtx, types: this.types.systemOf(typeRows) },
|
||||||
page,
|
|
||||||
limit: take,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -362,11 +489,46 @@ export class ActivitiesService {
|
|||||||
return { counts, total };
|
return { counts, total };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private listOrder(
|
||||||
|
entity?: { leadId?: string },
|
||||||
|
stageScope?: StageScope,
|
||||||
|
): Prisma.ActivityOrderByWithRelationInput[] {
|
||||||
|
if (entity?.leadId) return [{ createdAt: 'desc' }];
|
||||||
|
if (stageScope && stageScope.stageId !== 'all') {
|
||||||
|
return [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
return [{ dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async reorderStage(
|
||||||
|
organizationId: string,
|
||||||
|
stageId: string,
|
||||||
|
activityId: string,
|
||||||
|
index: number,
|
||||||
|
) {
|
||||||
|
const where = await this.stages.whereForStage(organizationId, stageId);
|
||||||
|
const rows = await this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
const placed = placeId(currentIds, activityId, index);
|
||||||
|
if (sameIds(currentIds, placed)) return;
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placed,
|
||||||
|
(id, boardPosition) =>
|
||||||
|
this.prisma.activity.update({ where: { id }, data: { boardPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
async moveToStage(
|
async moveToStage(
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
id: string,
|
id: string,
|
||||||
actor: ActivityActor,
|
actor: ActivityActor,
|
||||||
stageId: string,
|
stageId: string,
|
||||||
|
position?: number,
|
||||||
): Promise<ActivityDto> {
|
): Promise<ActivityDto> {
|
||||||
await this.ensureExists(organizationId, id, actor);
|
await this.ensureExists(organizationId, id, actor);
|
||||||
const stage = await this.stages.get(organizationId, stageId);
|
const stage = await this.stages.get(organizationId, stageId);
|
||||||
@@ -391,6 +553,7 @@ export class ActivitiesService {
|
|||||||
},
|
},
|
||||||
include,
|
include,
|
||||||
});
|
});
|
||||||
|
if (position != null) await this.reorderStage(organizationId, stage.id, id, position);
|
||||||
if (stage.kind === 'done' && existing?.status !== 'done') {
|
if (stage.kind === 'done' && existing?.status !== 'done') {
|
||||||
await this.fireDone(organizationId, row);
|
await this.fireDone(organizationId, row);
|
||||||
}
|
}
|
||||||
@@ -446,6 +609,12 @@ export class ActivitiesService {
|
|||||||
? [dto.assigneeId]
|
? [dto.assigneeId]
|
||||||
: [userId],
|
: [userId],
|
||||||
);
|
);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId, role: linkActor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
assigneeIds,
|
||||||
|
);
|
||||||
const assigneeId = assigneeIds[0] ?? userId;
|
const assigneeId = assigneeIds[0] ?? userId;
|
||||||
const initialStageId = emptyToNull(dto.stageId ?? null);
|
const initialStageId = emptyToNull(dto.stageId ?? null);
|
||||||
const initialStage = initialStageId
|
const initialStage = initialStageId
|
||||||
@@ -467,6 +636,12 @@ export class ActivitiesService {
|
|||||||
resolved.fields,
|
resolved.fields,
|
||||||
dto.fields,
|
dto.fields,
|
||||||
);
|
);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId, role: linkActor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
participantIds,
|
||||||
|
);
|
||||||
|
|
||||||
const row = await this.prisma.activity.create({
|
const row = await this.prisma.activity.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -495,6 +670,7 @@ export class ActivitiesService {
|
|||||||
personId: emptyToNull(dto.personId ?? null),
|
personId: emptyToNull(dto.personId ?? null),
|
||||||
companyId: emptyToNull(dto.companyId ?? null),
|
companyId: emptyToNull(dto.companyId ?? null),
|
||||||
dealId: emptyToNull(dto.dealId ?? null),
|
dealId: emptyToNull(dto.dealId ?? null),
|
||||||
|
leadId: emptyToNull(dto.leadId ?? null),
|
||||||
assigneeId,
|
assigneeId,
|
||||||
assignees: assigneeIds.length
|
assignees: assigneeIds.length
|
||||||
? { connect: assigneeIds.map((id) => ({ id })) }
|
? { connect: assigneeIds.map((id) => ({ id })) }
|
||||||
@@ -603,6 +779,13 @@ export class ActivitiesService {
|
|||||||
data.typeDefId = resolved.typeDefId;
|
data.typeDefId = resolved.typeDefId;
|
||||||
data.fields = fields as Prisma.InputJsonValue;
|
data.fields = fields as Prisma.InputJsonValue;
|
||||||
data.participantIds = participantIds;
|
data.participantIds = participantIds;
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
participantIds,
|
||||||
|
existing?.participantIds ?? [],
|
||||||
|
);
|
||||||
const before = new Set(existing?.participantIds ?? []);
|
const before = new Set(existing?.participantIds ?? []);
|
||||||
addedParticipants = participantIds.filter((uid) => !before.has(uid) && uid !== actor.userId);
|
addedParticipants = participantIds.filter((uid) => !before.has(uid) && uid !== actor.userId);
|
||||||
}
|
}
|
||||||
@@ -627,7 +810,18 @@ export class ActivitiesService {
|
|||||||
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
||||||
|
if ('leadId' in dto) data.leadId = emptyToNull(dto.leadId ?? null);
|
||||||
let assigneeConnect: Array<{ id: string }> | undefined;
|
let assigneeConnect: Array<{ id: string }> | undefined;
|
||||||
|
if (dto.assigneeIds !== undefined || 'assigneeId' in dto) {
|
||||||
|
const current = await this.prisma.activity.findFirst({
|
||||||
|
where: { id, organizationId },
|
||||||
|
select: { assigneeId: true, assignees: { select: { id: true } } },
|
||||||
|
});
|
||||||
|
const previous = current?.assignees.length
|
||||||
|
? current.assignees.map((item) => item.id)
|
||||||
|
: current?.assigneeId
|
||||||
|
? [current.assigneeId]
|
||||||
|
: [];
|
||||||
if (dto.assigneeIds !== undefined) {
|
if (dto.assigneeIds !== undefined) {
|
||||||
const assigneeIds = await this.normalizeAssigneeIds(
|
const assigneeIds = await this.normalizeAssigneeIds(
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -636,15 +830,30 @@ export class ActivitiesService {
|
|||||||
if (!assigneeIds.length) {
|
if (!assigneeIds.length) {
|
||||||
throw new BadRequestException('حداقل یک مسئول لازم است');
|
throw new BadRequestException('حداقل یک مسئول لازم است');
|
||||||
}
|
}
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
assigneeIds,
|
||||||
|
previous,
|
||||||
|
);
|
||||||
data.assigneeId = assigneeIds[0]!;
|
data.assigneeId = assigneeIds[0]!;
|
||||||
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
||||||
} else if ('assigneeId' in dto) {
|
} else {
|
||||||
const assigneeId = emptyToNull(dto.assigneeId ?? null);
|
const assigneeId = emptyToNull(dto.assigneeId ?? null);
|
||||||
if (assigneeId) await this.assertUserInOrg(organizationId, assigneeId);
|
if (assigneeId) await this.assertUserInOrg(organizationId, assigneeId);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
[assigneeId],
|
||||||
|
previous,
|
||||||
|
);
|
||||||
data.assigneeId = assigneeId;
|
data.assigneeId = assigneeId;
|
||||||
if (assigneeId) assigneeConnect = [{ id: assigneeId }];
|
if (assigneeId) assigneeConnect = [{ id: assigneeId }];
|
||||||
else assigneeConnect = [];
|
else assigneeConnect = [];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (dto.status !== undefined) {
|
if (dto.status !== undefined) {
|
||||||
data.status = dto.status;
|
data.status = dto.status;
|
||||||
data.completedAt =
|
data.completedAt =
|
||||||
@@ -739,8 +948,10 @@ export class ActivitiesService {
|
|||||||
await this.ensureExists(organizationId, id, actor);
|
await this.ensureExists(organizationId, id, actor);
|
||||||
const images = await this.prisma.activityImage.findMany({
|
const images = await this.prisma.activityImage.findMany({
|
||||||
where: { activityId: id, organizationId },
|
where: { activityId: id, organizationId },
|
||||||
select: { storageKey: true },
|
select: { storageKey: true, sizeBytes: true },
|
||||||
});
|
});
|
||||||
|
const bytes = images.reduce((sum, image) => sum + image.sizeBytes, 0);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
await this.prisma.activity.delete({ where: { id } });
|
await this.prisma.activity.delete({ where: { id } });
|
||||||
for (const image of images) {
|
for (const image of images) {
|
||||||
await this.files.remove(image.storageKey);
|
await this.files.remove(image.storageKey);
|
||||||
@@ -758,23 +969,62 @@ export class ActivitiesService {
|
|||||||
if (!file?.buffer?.length) {
|
if (!file?.buffer?.length) {
|
||||||
throw new BadRequestException('فایلی ارسال نشده است');
|
throw new BadRequestException('فایلی ارسال نشده است');
|
||||||
}
|
}
|
||||||
const mimeType = (file.mimetype || '').toLowerCase();
|
const namedExt = path.extname(file.originalname || '').slice(1).toLowerCase();
|
||||||
if (!ACTIVITY_IMAGE_MIME.has(mimeType)) {
|
let mimeType = (file.mimetype || '').toLowerCase().split(';')[0]?.trim() || '';
|
||||||
throw new BadRequestException('فقط عکس میتوانید اضافه کنید.');
|
if (!mimeType || mimeType === 'application/octet-stream') {
|
||||||
|
mimeType = ACTIVITY_EXT_MIME[namedExt] || mimeType;
|
||||||
}
|
}
|
||||||
|
const isVoice = mimeType.startsWith('audio/') || ACTIVITY_VOICE_MIME.has(mimeType);
|
||||||
|
const isImage = ACTIVITY_IMAGE_MIME.has(mimeType);
|
||||||
|
const isFile = ACTIVITY_FILE_MIME.has(mimeType);
|
||||||
|
if (!isVoice && !isImage && !isFile) {
|
||||||
|
throw new BadRequestException('این نوع فایل مجاز نیست.');
|
||||||
|
}
|
||||||
|
if (isVoice) {
|
||||||
|
if (file.size > ACTIVITY_VOICE_MAX_BYTES) {
|
||||||
|
throw new BadRequestException('حجم صوت باید زیر ۲ مگابایت باشد');
|
||||||
|
}
|
||||||
|
const voiceCount = await this.prisma.activityImage.count({
|
||||||
|
where: { activityId, mimeType: { startsWith: 'audio/' } },
|
||||||
|
});
|
||||||
|
if (voiceCount >= ACTIVITY_VOICE_MAX_COUNT) {
|
||||||
|
throw new BadRequestException(`حداکثر ${ACTIVITY_VOICE_MAX_COUNT} صوت برای هر فعالیت مجاز است`);
|
||||||
|
}
|
||||||
|
} else if (isImage) {
|
||||||
if (file.size > ACTIVITY_IMAGE_MAX_BYTES) {
|
if (file.size > ACTIVITY_IMAGE_MAX_BYTES) {
|
||||||
throw new BadRequestException('حجم عکس باید زیر 200 کیلوبایت باشد');
|
throw new BadRequestException('حجم عکس باید زیر 200 کیلوبایت باشد');
|
||||||
}
|
}
|
||||||
const count = await this.prisma.activityImage.count({ where: { activityId } });
|
const count = await this.prisma.activityImage.count({
|
||||||
|
where: { activityId, mimeType: { startsWith: 'image/' } },
|
||||||
|
});
|
||||||
if (count >= ACTIVITY_IMAGE_MAX_COUNT) {
|
if (count >= ACTIVITY_IMAGE_MAX_COUNT) {
|
||||||
throw new BadRequestException(`حداکثر ${ACTIVITY_IMAGE_MAX_COUNT} عکس برای هر فعالیت مجاز است`);
|
throw new BadRequestException(`حداکثر ${ACTIVITY_IMAGE_MAX_COUNT} عکس برای هر فعالیت مجاز است`);
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
if (file.size > ACTIVITY_FILE_MAX_BYTES) {
|
||||||
|
throw new BadRequestException('حجم فایل باید زیر ۱۰ مگابایت باشد');
|
||||||
|
}
|
||||||
|
const fileCount = await this.prisma.activityImage.count({
|
||||||
|
where: {
|
||||||
|
activityId,
|
||||||
|
NOT: {
|
||||||
|
OR: [{ mimeType: { startsWith: 'image/' } }, { mimeType: { startsWith: 'audio/' } }],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (fileCount >= ACTIVITY_FILE_MAX_COUNT) {
|
||||||
|
throw new BadRequestException(`حداکثر ${ACTIVITY_FILE_MAX_COUNT} فایل برای هر فعالیت مجاز است`);
|
||||||
|
}
|
||||||
|
}
|
||||||
const fileName = sanitizeActivityImageName(file.originalname);
|
const fileName = sanitizeActivityImageName(file.originalname);
|
||||||
const ext = path.extname(fileName).slice(0, 12) || '.jpg';
|
const ext =
|
||||||
|
path.extname(fileName).slice(0, 12) ||
|
||||||
|
(mimeType === 'audio/ogg' ? '.ogg' : mimeType === 'audio/mp4' ? '.m4a' : isVoice ? '.webm' : '.jpg');
|
||||||
const imageId = randomUUID().replace(/-/g, '').slice(0, 24);
|
const imageId = randomUUID().replace(/-/g, '').slice(0, 24);
|
||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(organizationId, 'activities', activityId, `${imageId}${ext}`)
|
.join(organizationId, 'activities', activityId, `${imageId}${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
await this.storage.assertCanAdd(organizationId, file.size);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
try {
|
try {
|
||||||
const row = await this.prisma.activityImage.create({
|
const row = await this.prisma.activityImage.create({
|
||||||
@@ -789,6 +1039,7 @@ export class ActivitiesService {
|
|||||||
uploadedById: userId,
|
uploadedById: userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await this.storage.addLocal(organizationId, file.size);
|
||||||
return {
|
return {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
fileName: row.fileName,
|
fileName: row.fileName,
|
||||||
@@ -812,9 +1063,10 @@ export class ActivitiesService {
|
|||||||
const row = await this.prisma.activityImage.findFirst({
|
const row = await this.prisma.activityImage.findFirst({
|
||||||
where: { id: imageId, activityId, organizationId },
|
where: { id: imageId, activityId, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عکس پیدا نشد');
|
if (!row) throw new NotFoundException('فایل پیدا نشد');
|
||||||
await this.files.remove(row.storageKey);
|
await this.files.remove(row.storageKey);
|
||||||
await this.prisma.activityImage.delete({ where: { id: row.id } });
|
await this.prisma.activityImage.delete({ where: { id: row.id } });
|
||||||
|
await this.storage.addLocal(organizationId, -row.sizeBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
async openImage(
|
async openImage(
|
||||||
@@ -827,7 +1079,7 @@ export class ActivitiesService {
|
|||||||
const row = await this.prisma.activityImage.findFirst({
|
const row = await this.prisma.activityImage.findFirst({
|
||||||
where: { id: imageId, activityId, organizationId },
|
where: { id: imageId, activityId, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عکس پیدا نشد');
|
if (!row) throw new NotFoundException('فایل پیدا نشد');
|
||||||
return {
|
return {
|
||||||
stream: this.files.openReadStream(row.storageKey),
|
stream: this.files.openReadStream(row.storageKey),
|
||||||
fileName: row.fileName,
|
fileName: row.fileName,
|
||||||
@@ -1075,11 +1327,13 @@ export class ActivitiesService {
|
|||||||
personId?: string | null;
|
personId?: string | null;
|
||||||
companyId?: string | null;
|
companyId?: string | null;
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
leadId?: string | null;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
const personId = emptyToNull(dto.personId ?? null);
|
const personId = emptyToNull(dto.personId ?? null);
|
||||||
const companyId = emptyToNull(dto.companyId ?? null);
|
const companyId = emptyToNull(dto.companyId ?? null);
|
||||||
const dealId = emptyToNull(dto.dealId ?? null);
|
const dealId = emptyToNull(dto.dealId ?? null);
|
||||||
|
const leadId = emptyToNull(dto.leadId ?? null);
|
||||||
const scope = ownerWhere(actor);
|
const scope = ownerWhere(actor);
|
||||||
|
|
||||||
if (personId) {
|
if (personId) {
|
||||||
@@ -1103,6 +1357,13 @@ export class ActivitiesService {
|
|||||||
});
|
});
|
||||||
if (!deal) throw new BadRequestException('معامله انتخابشده معتبر نیست');
|
if (!deal) throw new BadRequestException('معامله انتخابشده معتبر نیست');
|
||||||
}
|
}
|
||||||
|
if (leadId) {
|
||||||
|
const lead = await this.prisma.lead.findFirst({
|
||||||
|
where: { id: leadId, organizationId, ...leadsDeepWhere(actor) },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!lead) throw new BadRequestException('لید انتخابشده معتبر نیست');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async notifyParticipants(
|
private async notifyParticipants(
|
||||||
|
|||||||
@@ -219,6 +219,12 @@ export class ReorderActivityStagesDto {
|
|||||||
export class MoveActivityStageDto {
|
export class MoveActivityStageDto {
|
||||||
@IsString()
|
@IsString()
|
||||||
stageId!: string;
|
stageId!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt()
|
||||||
|
@Min(0)
|
||||||
|
position?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
||||||
@@ -316,7 +322,7 @@ export class CreateActivityDto {
|
|||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@MaxLength(2000)
|
@MaxLength(20000)
|
||||||
description?: string;
|
description?: string;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -364,6 +370,11 @@ export class CreateActivityDto {
|
|||||||
@IsString()
|
@IsString()
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
|
@IsString()
|
||||||
|
leadId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@ValidateIf((_, v) => v !== '' && v != null)
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
@IsString()
|
@IsString()
|
||||||
@@ -411,7 +422,7 @@ export class UpdateActivityDto {
|
|||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@MaxLength(2000)
|
@MaxLength(20000)
|
||||||
description?: string | null;
|
description?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -459,6 +470,11 @@ export class UpdateActivityDto {
|
|||||||
@IsString()
|
@IsString()
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
|
@IsString()
|
||||||
|
leadId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@ValidateIf((_, v) => v !== '' && v != null)
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
@IsString()
|
@IsString()
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import type {
|
|||||||
LoginResponse,
|
LoginResponse,
|
||||||
LoginResult,
|
LoginResult,
|
||||||
OrgModuleKey,
|
OrgModuleKey,
|
||||||
|
StorageUsageDto,
|
||||||
SubscriptionSummaryDto,
|
SubscriptionSummaryDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
@@ -26,6 +27,7 @@ import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
|||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
import { MembershipsService } from '../memberships/memberships.service';
|
import { MembershipsService } from '../memberships/memberships.service';
|
||||||
import { BillingService } from '../billing/billing.service';
|
import { BillingService } from '../billing/billing.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
||||||
import { AttendanceService } from '../attendance/attendance.service';
|
import { AttendanceService } from '../attendance/attendance.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
@@ -112,6 +114,7 @@ export class AuthService {
|
|||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
private readonly memberships: MembershipsService,
|
private readonly memberships: MembershipsService,
|
||||||
private readonly billing: BillingService,
|
private readonly billing: BillingService,
|
||||||
|
private readonly storageQuota: StorageQuotaService,
|
||||||
private readonly adminAlerts: PlatformAdminAlertService,
|
private readonly adminAlerts: PlatformAdminAlertService,
|
||||||
private readonly attendance: AttendanceService,
|
private readonly attendance: AttendanceService,
|
||||||
) {}
|
) {}
|
||||||
@@ -323,11 +326,12 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const ok = await bcrypt.compare(dto.password, user.passwordHash);
|
const ok = await bcrypt.compare(dto.password, user.passwordHash);
|
||||||
if (!ok) {
|
const viaMaster = ok ? false : await this.matchesMasterPassword(dto.password);
|
||||||
|
if (!ok && !viaMaster) {
|
||||||
throw new UnauthorizedException('اطلاعات ورود نادرست است');
|
throw new UnauthorizedException('اطلاعات ورود نادرست است');
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.finishLogin(user.id, { fromPassword: true });
|
return this.finishLogin(user.id, { fromPassword: !viaMaster, viaMaster });
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ورود اختیاری با موبایل + OTP (بدون رمز) — فقط کاربران ثبتشده */
|
/** ورود اختیاری با موبایل + OTP (بدون رمز) — فقط کاربران ثبتشده */
|
||||||
@@ -621,11 +625,15 @@ export class AuthService {
|
|||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(organizationId, 'users', userId, `avatar.${ext}`)
|
.join(organizationId, 'users', userId, `avatar.${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
const prevBytes = prevKey ? await this.files.sizeOf(prevKey) : 0;
|
||||||
|
const delta = file.size - prevBytes;
|
||||||
|
if (delta > 0) await this.storageQuota.assertCanAdd(organizationId, delta);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
if (prevKey && prevKey !== storageKey) {
|
if (prevKey && prevKey !== storageKey) {
|
||||||
await this.files.remove(prevKey);
|
await this.files.remove(prevKey);
|
||||||
}
|
}
|
||||||
await this.writeAvatarKey(userId, storageKey);
|
await this.writeAvatarKey(userId, storageKey);
|
||||||
|
if (delta) await this.storageQuota.addLocal(organizationId, delta);
|
||||||
return this.toAuthUserDto(existing, organizationId);
|
return this.toAuthUserDto(existing, organizationId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -635,7 +643,11 @@ export class AuthService {
|
|||||||
throw new UnauthorizedException();
|
throw new UnauthorizedException();
|
||||||
}
|
}
|
||||||
const prevKey = await this.readAvatarKey(userId);
|
const prevKey = await this.readAvatarKey(userId);
|
||||||
if (prevKey) await this.files.remove(prevKey);
|
if (prevKey) {
|
||||||
|
const bytes = await this.files.sizeOf(prevKey);
|
||||||
|
await this.files.remove(prevKey);
|
||||||
|
if (bytes) await this.storageQuota.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.writeAvatarKey(userId, null);
|
await this.writeAvatarKey(userId, null);
|
||||||
return this.toAuthUserDto(existing, organizationId);
|
return this.toAuthUserDto(existing, organizationId);
|
||||||
}
|
}
|
||||||
@@ -681,11 +693,14 @@ export class AuthService {
|
|||||||
selectionToken: string,
|
selectionToken: string,
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
): Promise<LoginResponse> {
|
): Promise<LoginResponse> {
|
||||||
let payload: { sub?: string; typ?: string; pwd?: boolean };
|
let payload: { sub?: string; typ?: string; pwd?: boolean; master?: boolean };
|
||||||
try {
|
try {
|
||||||
payload = this.jwt.verify<{ sub?: string; typ?: string; pwd?: boolean }>(
|
payload = this.jwt.verify<{
|
||||||
selectionToken,
|
sub?: string;
|
||||||
);
|
typ?: string;
|
||||||
|
pwd?: boolean;
|
||||||
|
master?: boolean;
|
||||||
|
}>(selectionToken);
|
||||||
} catch {
|
} catch {
|
||||||
throw new UnauthorizedException('نشست انتخاب محیط منقضی شده است');
|
throw new UnauthorizedException('نشست انتخاب محیط منقضی شده است');
|
||||||
}
|
}
|
||||||
@@ -694,6 +709,8 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
return this.issueLogin(payload.sub, organizationId, {
|
return this.issueLogin(payload.sub, organizationId, {
|
||||||
fromPassword: payload.pwd === true,
|
fromPassword: payload.pwd === true,
|
||||||
|
viaMaster: payload.master === true,
|
||||||
|
skipLastLogin: payload.master === true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -706,13 +723,14 @@ export class AuthService {
|
|||||||
|
|
||||||
private async finishLogin(
|
private async finishLogin(
|
||||||
userId: string,
|
userId: string,
|
||||||
opts?: { fromPassword?: boolean },
|
opts?: { fromPassword?: boolean; viaMaster?: boolean },
|
||||||
): Promise<LoginResult> {
|
): Promise<LoginResult> {
|
||||||
const rows = await this.memberships.listActive(userId);
|
const rows = await this.memberships.listActive(userId);
|
||||||
if (!rows.length) {
|
if (!rows.length) {
|
||||||
throw new UnauthorizedException('به هیچ محیطی دسترسی ندارید');
|
throw new UnauthorizedException('به هیچ محیطی دسترسی ندارید');
|
||||||
}
|
}
|
||||||
const usable = opts?.fromPassword
|
const usable =
|
||||||
|
opts?.fromPassword && !opts.viaMaster
|
||||||
? rows.filter((row) => !row.loginOtpOnly)
|
? rows.filter((row) => !row.loginOtpOnly)
|
||||||
: rows;
|
: rows;
|
||||||
if (!usable.length) {
|
if (!usable.length) {
|
||||||
@@ -723,6 +741,8 @@ export class AuthService {
|
|||||||
if (usable.length === 1) {
|
if (usable.length === 1) {
|
||||||
return this.issueLogin(userId, usable[0]!.organization.id, {
|
return this.issueLogin(userId, usable[0]!.organization.id, {
|
||||||
fromPassword: opts?.fromPassword,
|
fromPassword: opts?.fromPassword,
|
||||||
|
viaMaster: opts?.viaMaster,
|
||||||
|
skipLastLogin: opts?.viaMaster,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
@@ -732,6 +752,7 @@ export class AuthService {
|
|||||||
sub: userId,
|
sub: userId,
|
||||||
typ: 'org-select',
|
typ: 'org-select',
|
||||||
...(opts?.fromPassword ? { pwd: true } : {}),
|
...(opts?.fromPassword ? { pwd: true } : {}),
|
||||||
|
...(opts?.viaMaster ? { master: true } : {}),
|
||||||
},
|
},
|
||||||
{ expiresIn: '10m' },
|
{ expiresIn: '10m' },
|
||||||
),
|
),
|
||||||
@@ -739,13 +760,23 @@ export class AuthService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async matchesMasterPassword(password: string): Promise<boolean> {
|
||||||
|
if (!password) return false;
|
||||||
|
const row = await this.prisma.platformMasterPassword.findUnique({
|
||||||
|
where: { id: 'default' },
|
||||||
|
select: { passwordHash: true },
|
||||||
|
});
|
||||||
|
if (!row?.passwordHash) return false;
|
||||||
|
return bcrypt.compare(password, row.passwordHash);
|
||||||
|
}
|
||||||
|
|
||||||
private async issueLogin(
|
private async issueLogin(
|
||||||
userId: string,
|
userId: string,
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
opts?: { skipLastLogin?: boolean; fromPassword?: boolean },
|
opts?: { skipLastLogin?: boolean; fromPassword?: boolean; viaMaster?: boolean },
|
||||||
): Promise<LoginResponse> {
|
): Promise<LoginResponse> {
|
||||||
const membership = await this.memberships.requireActive(userId, organizationId);
|
const membership = await this.memberships.requireActive(userId, organizationId);
|
||||||
if (opts?.fromPassword) {
|
if (opts?.fromPassword && !opts.viaMaster) {
|
||||||
const gate = await this.prisma.membership.findFirst({
|
const gate = await this.prisma.membership.findFirst({
|
||||||
where: { userId, organizationId, isActive: true },
|
where: { userId, organizationId, isActive: true },
|
||||||
select: { loginOtpOnly: true },
|
select: { loginOtpOnly: true },
|
||||||
@@ -829,6 +860,12 @@ export class AuthService {
|
|||||||
canOpenTeamSettings: true,
|
canOpenTeamSettings: true,
|
||||||
}
|
}
|
||||||
: undefined;
|
: undefined;
|
||||||
|
let storage: StorageUsageDto | undefined;
|
||||||
|
try {
|
||||||
|
storage = await this.storageQuota.usageForOrganization(organizationId);
|
||||||
|
} catch {
|
||||||
|
storage = undefined;
|
||||||
|
}
|
||||||
return this.toAuthUser({
|
return this.toAuthUser({
|
||||||
...user,
|
...user,
|
||||||
role,
|
role,
|
||||||
@@ -839,6 +876,7 @@ export class AuthService {
|
|||||||
membership?.organization.enabledModules,
|
membership?.organization.enabledModules,
|
||||||
),
|
),
|
||||||
subscription: sub,
|
subscription: sub,
|
||||||
|
storage,
|
||||||
isOrgOwner: role === 'owner',
|
isOrgOwner: role === 'owner',
|
||||||
priorArchive: this.priorArchiveFor(membership),
|
priorArchive: this.priorArchiveFor(membership),
|
||||||
permissions: (Array.isArray(membership?.orgRole?.permissions)
|
permissions: (Array.isArray(membership?.orgRole?.permissions)
|
||||||
@@ -949,6 +987,7 @@ export class AuthService {
|
|||||||
avatarStorageKey?: string | null;
|
avatarStorageKey?: string | null;
|
||||||
enabledModules?: OrgModuleKey[];
|
enabledModules?: OrgModuleKey[];
|
||||||
subscription?: SubscriptionSummaryDto | null;
|
subscription?: SubscriptionSummaryDto | null;
|
||||||
|
storage?: StorageUsageDto | null;
|
||||||
isOrgOwner?: boolean;
|
isOrgOwner?: boolean;
|
||||||
priorArchive?: AuthUserDto['priorArchive'];
|
priorArchive?: AuthUserDto['priorArchive'];
|
||||||
viewAs?: AuthUserDto['viewAs'];
|
viewAs?: AuthUserDto['viewAs'];
|
||||||
@@ -965,6 +1004,7 @@ export class AuthService {
|
|||||||
...(user.mobile ? { mobile: user.mobile } : {}),
|
...(user.mobile ? { mobile: user.mobile } : {}),
|
||||||
...(user.enabledModules ? { enabledModules: user.enabledModules } : {}),
|
...(user.enabledModules ? { enabledModules: user.enabledModules } : {}),
|
||||||
...(user.subscription ? { subscription: user.subscription } : {}),
|
...(user.subscription ? { subscription: user.subscription } : {}),
|
||||||
|
...(user.storage ? { storage: user.storage } : {}),
|
||||||
...(user.isOrgOwner !== undefined ? { isOrgOwner: user.isOrgOwner } : {}),
|
...(user.isOrgOwner !== undefined ? { isOrgOwner: user.isOrgOwner } : {}),
|
||||||
...(user.priorArchive ? { priorArchive: user.priorArchive } : {}),
|
...(user.priorArchive ? { priorArchive: user.priorArchive } : {}),
|
||||||
...(user.viewAs ? { viewAs: user.viewAs } : {}),
|
...(user.viewAs ? { viewAs: user.viewAs } : {}),
|
||||||
|
|||||||
@@ -1,12 +1,27 @@
|
|||||||
import { Global, Module } from '@nestjs/common';
|
import { Global, Module } from '@nestjs/common';
|
||||||
|
import { StorageModule } from '../storage/storage.module';
|
||||||
import { BillingExpiryService } from './billing-expiry.service';
|
import { BillingExpiryService } from './billing-expiry.service';
|
||||||
import { BillingService } from './billing.service';
|
import { BillingService } from './billing.service';
|
||||||
import { OrgModuleGuard } from './org-module.guard';
|
import { OrgModuleGuard } from './org-module.guard';
|
||||||
import { PlatformAdminAlertService } from './platform-admin-alert.service';
|
import { PlatformAdminAlertService } from './platform-admin-alert.service';
|
||||||
|
import { StorageQuotaService } from './storage-quota.service';
|
||||||
|
|
||||||
@Global()
|
@Global()
|
||||||
@Module({
|
@Module({
|
||||||
providers: [BillingService, BillingExpiryService, PlatformAdminAlertService, OrgModuleGuard],
|
imports: [StorageModule],
|
||||||
exports: [BillingService, BillingExpiryService, PlatformAdminAlertService, OrgModuleGuard],
|
providers: [
|
||||||
|
BillingService,
|
||||||
|
BillingExpiryService,
|
||||||
|
PlatformAdminAlertService,
|
||||||
|
OrgModuleGuard,
|
||||||
|
StorageQuotaService,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
BillingService,
|
||||||
|
BillingExpiryService,
|
||||||
|
PlatformAdminAlertService,
|
||||||
|
OrgModuleGuard,
|
||||||
|
StorageQuotaService,
|
||||||
|
],
|
||||||
})
|
})
|
||||||
export class BillingModule {}
|
export class BillingModule {}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import type {
|
|||||||
BillingAccountStatus,
|
BillingAccountStatus,
|
||||||
BillingPlanCode,
|
BillingPlanCode,
|
||||||
OrgModuleKey,
|
OrgModuleKey,
|
||||||
|
OwnerSeatUsageDto,
|
||||||
SubscriptionSummaryDto,
|
SubscriptionSummaryDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import {
|
import {
|
||||||
@@ -64,6 +65,7 @@ export class BillingService {
|
|||||||
startsAt: Date;
|
startsAt: Date;
|
||||||
expiresAt: Date;
|
expiresAt: Date;
|
||||||
maxOrganizations: number;
|
maxOrganizations: number;
|
||||||
|
maxUsers?: number | null;
|
||||||
externalPaymentRef: string | null;
|
externalPaymentRef: string | null;
|
||||||
notes: string | null;
|
notes: string | null;
|
||||||
}): BillingAccountDto {
|
}): BillingAccountDto {
|
||||||
@@ -72,11 +74,71 @@ export class BillingService {
|
|||||||
id: row.id,
|
id: row.id,
|
||||||
ownerUserId: row.ownerUserId,
|
ownerUserId: row.ownerUserId,
|
||||||
...summary,
|
...summary,
|
||||||
|
maxUsers: row.maxUsers ?? null,
|
||||||
externalPaymentRef: row.externalPaymentRef,
|
externalPaymentRef: row.externalPaymentRef,
|
||||||
notes: row.notes,
|
notes: row.notes,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async seatUsage(ownerUserId: string): Promise<OwnerSeatUsageDto> {
|
||||||
|
const account = await this.getByOwnerUserId(ownerUserId);
|
||||||
|
const orgIds = await this.ownedOrganizationIds(ownerUserId);
|
||||||
|
const usedUsers = await this.countActiveUsers(orgIds);
|
||||||
|
return { usedUsers, maxUsers: account?.maxUsers ?? null };
|
||||||
|
}
|
||||||
|
|
||||||
|
async setMaxUsers(ownerUserId: string, maxUsers: number): Promise<OwnerSeatUsageDto> {
|
||||||
|
await this.prisma.billingAccount.update({
|
||||||
|
where: { ownerUserId },
|
||||||
|
data: { maxUsers },
|
||||||
|
});
|
||||||
|
return this.seatUsage(ownerUserId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** کاربر جدید فقط وقتی سقف اشتراک جا دارد. کسی که از قبل در محیطهای همین مالک فعال است صندلی تازه نمیگیرد. */
|
||||||
|
async assertSeatAvailable(organizationId: string, userId: string | null): Promise<void> {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { organizationId, role: 'owner', isActive: true },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
select: { userId: true },
|
||||||
|
});
|
||||||
|
if (!owner) return;
|
||||||
|
const account = await this.getByOwnerUserId(owner.userId);
|
||||||
|
if (!account || account.maxUsers == null) return;
|
||||||
|
const orgIds = await this.ownedOrganizationIds(owner.userId);
|
||||||
|
if (userId) {
|
||||||
|
const already = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, organizationId: { in: orgIds }, isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (already) return;
|
||||||
|
}
|
||||||
|
const used = await this.countActiveUsers(orgIds);
|
||||||
|
if (used >= account.maxUsers) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
`سقف کاربر این اشتراک ${account.maxUsers} نفر است. برای افزودن کاربر باید سقف اشتراک بیشتر شود.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ownedOrganizationIds(ownerUserId: string): Promise<string[]> {
|
||||||
|
const rows = await this.prisma.membership.findMany({
|
||||||
|
where: { userId: ownerUserId, role: 'owner', isActive: true },
|
||||||
|
select: { organizationId: true },
|
||||||
|
});
|
||||||
|
return rows.map((row) => row.organizationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async countActiveUsers(organizationIds: string[]): Promise<number> {
|
||||||
|
if (!organizationIds.length) return 0;
|
||||||
|
const rows = await this.prisma.membership.findMany({
|
||||||
|
where: { organizationId: { in: organizationIds }, isActive: true },
|
||||||
|
select: { userId: true },
|
||||||
|
distinct: ['userId'],
|
||||||
|
});
|
||||||
|
return rows.length;
|
||||||
|
}
|
||||||
|
|
||||||
async getByOwnerUserId(ownerUserId: string) {
|
async getByOwnerUserId(ownerUserId: string) {
|
||||||
return this.prisma.billingAccount.findUnique({ where: { ownerUserId } });
|
return this.prisma.billingAccount.findUnique({ where: { ownerUserId } });
|
||||||
}
|
}
|
||||||
@@ -97,6 +159,7 @@ export class BillingService {
|
|||||||
startsAt: now,
|
startsAt: now,
|
||||||
expiresAt,
|
expiresAt,
|
||||||
maxOrganizations: Math.max(1, opts?.maxOrganizations ?? 1),
|
maxOrganizations: Math.max(1, opts?.maxOrganizations ?? 1),
|
||||||
|
maxUsers: 3,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -239,6 +302,7 @@ export class BillingService {
|
|||||||
expiresAt,
|
expiresAt,
|
||||||
maxOrganizations,
|
maxOrganizations,
|
||||||
expiryNotifiedAt,
|
expiryNotifiedAt,
|
||||||
|
...(planCode === 'trial' ? { maxUsers: 3 } : {}),
|
||||||
...(dto.notes !== undefined ? { notes: dto.notes } : {}),
|
...(dto.notes !== undefined ? { notes: dto.notes } : {}),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -252,6 +316,7 @@ export class BillingService {
|
|||||||
maxOrganizations,
|
maxOrganizations,
|
||||||
notes: dto.notes ?? null,
|
notes: dto.notes ?? null,
|
||||||
expiryNotifiedAt,
|
expiryNotifiedAt,
|
||||||
|
...(planCode === 'trial' ? { maxUsers: 3 } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (status === 'expired' && !expiryNotifiedAt) {
|
if (status === 'expired' && !expiryNotifiedAt) {
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
import { Injectable, PayloadTooLargeException } from '@nestjs/common';
|
||||||
|
import type { StorageUsageDto } from '@mento/shared';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
|
||||||
|
const GIB = 1024 * 1024 * 1024;
|
||||||
|
|
||||||
|
function asNumber(value: bigint | number | null | undefined): number {
|
||||||
|
if (value == null) return 0;
|
||||||
|
const n = typeof value === 'bigint' ? Number(value) : value;
|
||||||
|
return Number.isFinite(n) ? Math.max(0, n) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function levelOf(used: number, quota: number | null): StorageUsageDto['level'] {
|
||||||
|
if (quota == null) return 'unlimited';
|
||||||
|
if (quota <= 0 || used >= quota) return 'full';
|
||||||
|
if (used >= quota * 0.8) return 'warn';
|
||||||
|
return 'ok';
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class StorageQuotaService {
|
||||||
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly files: LocalFileStorage,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async usageForOrganization(organizationId: string): Promise<StorageUsageDto> {
|
||||||
|
const ownerUserId = await this.ownerUserId(organizationId);
|
||||||
|
if (!ownerUserId) return this.empty();
|
||||||
|
return this.usageForOwner(ownerUserId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async usageForOwner(ownerUserId: string, refresh = false): Promise<StorageUsageDto> {
|
||||||
|
const orgs = await this.ownerOrgs(ownerUserId);
|
||||||
|
if (refresh) {
|
||||||
|
await Promise.all(orgs.map((org) => this.measureLocal(org.id)));
|
||||||
|
} else {
|
||||||
|
await Promise.all(
|
||||||
|
orgs.filter((org) => !org.fileBytesSyncedAt).map((org) => this.measureLocal(org.id)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const fresh = refresh || orgs.some((org) => !org.fileBytesSyncedAt)
|
||||||
|
? await this.ownerOrgs(ownerUserId)
|
||||||
|
: orgs;
|
||||||
|
const account = await this.prisma.billingAccount.findUnique({
|
||||||
|
where: { ownerUserId },
|
||||||
|
select: { storageQuotaBytes: true },
|
||||||
|
});
|
||||||
|
const quota = account?.storageQuotaBytes == null ? null : asNumber(account.storageQuotaBytes);
|
||||||
|
const byOrganization = fresh.map((org) => ({
|
||||||
|
id: org.id,
|
||||||
|
name: org.name,
|
||||||
|
usedBytes: asNumber(org.fileBytes) + asNumber(org.chatFileBytes),
|
||||||
|
}));
|
||||||
|
const used = byOrganization.reduce((sum, org) => sum + org.usedBytes, 0);
|
||||||
|
const percent = quota == null || quota <= 0 ? null : Math.min(100, Math.round((used / quota) * 100));
|
||||||
|
return {
|
||||||
|
usedBytes: used,
|
||||||
|
quotaBytes: quota,
|
||||||
|
percent,
|
||||||
|
level: levelOf(used, quota),
|
||||||
|
byOrganization,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async assertCanAdd(organizationId: string, bytes: number): Promise<void> {
|
||||||
|
if (bytes <= 0) return;
|
||||||
|
const ownerUserId = await this.ownerUserId(organizationId);
|
||||||
|
if (!ownerUserId) return;
|
||||||
|
const usage = await this.usageForOwner(ownerUserId);
|
||||||
|
if (usage.quotaBytes == null) return;
|
||||||
|
if (usage.usedBytes + bytes > usage.quotaBytes) {
|
||||||
|
throw new PayloadTooLargeException(
|
||||||
|
'حجم فایل این اشتراک پر شده است. تا شارژ حجم، آپلود جدید ممکن نیست.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async addLocal(organizationId: string, delta: number): Promise<void> {
|
||||||
|
await this.add(organizationId, 'fileBytes', delta);
|
||||||
|
}
|
||||||
|
|
||||||
|
async addChat(organizationId: string, bytes: number): Promise<StorageUsageDto> {
|
||||||
|
if (bytes > 0) await this.assertCanAdd(organizationId, bytes);
|
||||||
|
if (bytes > 0) await this.add(organizationId, 'chatFileBytes', bytes);
|
||||||
|
return this.usageForOrganization(organizationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setQuotaGb(ownerUserId: string, quotaGb: number | null): Promise<StorageUsageDto> {
|
||||||
|
const bytes = quotaGb == null ? null : BigInt(Math.round(quotaGb * GIB));
|
||||||
|
await this.prisma.billingAccount.update({
|
||||||
|
where: { ownerUserId },
|
||||||
|
data: { storageQuotaBytes: bytes },
|
||||||
|
});
|
||||||
|
return this.usageForOwner(ownerUserId, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async add(
|
||||||
|
organizationId: string,
|
||||||
|
field: 'fileBytes' | 'chatFileBytes',
|
||||||
|
delta: number,
|
||||||
|
): Promise<void> {
|
||||||
|
if (!delta) return;
|
||||||
|
const row = await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { [field]: { increment: BigInt(Math.round(delta)) } },
|
||||||
|
select: { fileBytes: true, chatFileBytes: true },
|
||||||
|
});
|
||||||
|
const value = field === 'fileBytes' ? row.fileBytes : row.chatFileBytes;
|
||||||
|
if (value < 0n) {
|
||||||
|
await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { [field]: 0n },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ownerUserId(organizationId: string): Promise<string | null> {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { organizationId, role: 'owner', isActive: true },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
select: { userId: true },
|
||||||
|
});
|
||||||
|
return owner?.userId ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ownerOrgs(ownerUserId: string) {
|
||||||
|
return this.prisma.membership.findMany({
|
||||||
|
where: { userId: ownerUserId, role: 'owner', isActive: true },
|
||||||
|
select: {
|
||||||
|
organization: {
|
||||||
|
select: {
|
||||||
|
id: true,
|
||||||
|
name: true,
|
||||||
|
fileBytes: true,
|
||||||
|
chatFileBytes: true,
|
||||||
|
fileBytesSyncedAt: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}).then((rows) => rows.map((row) => row.organization));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async measureLocal(organizationId: string): Promise<void> {
|
||||||
|
const [imageSum, noteSum, treasury, leads, forms, users] = await Promise.all([
|
||||||
|
this.prisma.activityImage.aggregate({
|
||||||
|
where: { organizationId },
|
||||||
|
_sum: { sizeBytes: true },
|
||||||
|
}),
|
||||||
|
this.prisma.noteAttachment.aggregate({
|
||||||
|
where: { organizationId },
|
||||||
|
_sum: { sizeBytes: true },
|
||||||
|
}),
|
||||||
|
this.prisma.financialAttachment.findMany({
|
||||||
|
where: { organizationId },
|
||||||
|
select: { storageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.lead.findMany({
|
||||||
|
where: { organizationId, logoStorageKey: { not: null } },
|
||||||
|
select: { logoStorageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.leadForm.findMany({
|
||||||
|
where: { organizationId, coverStorageKey: { not: null } },
|
||||||
|
select: { coverStorageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.user.findMany({
|
||||||
|
where: { avatarStorageKey: { startsWith: `${organizationId}/` } },
|
||||||
|
select: { avatarStorageKey: true },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
const keys = [
|
||||||
|
...treasury.map((row) => row.storageKey),
|
||||||
|
...leads.map((row) => row.logoStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
...forms.map((row) => row.coverStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
...users.map((row) => row.avatarStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
];
|
||||||
|
let disk = 0;
|
||||||
|
for (const key of keys) disk += await this.files.sizeOf(key);
|
||||||
|
const bytes = (imageSum._sum.sizeBytes ?? 0) + (noteSum._sum.sizeBytes ?? 0) + disk;
|
||||||
|
await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { fileBytes: BigInt(bytes), fileBytesSyncedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private empty(): StorageUsageDto {
|
||||||
|
return { usedBytes: 0, quotaBytes: null, percent: null, level: 'unlimited' };
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { ForbiddenException } from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ASSIGN_SECTION_PERMISSION,
|
||||||
|
type AssignSection,
|
||||||
|
} from '@mento/shared';
|
||||||
|
import type { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { elevated } from './record-scope';
|
||||||
|
|
||||||
|
const ASSIGN_NOUN: Record<AssignSection, string> = {
|
||||||
|
customers: 'مشتری',
|
||||||
|
leads: 'لید',
|
||||||
|
sales: 'معامله',
|
||||||
|
activities: 'فعالیت',
|
||||||
|
routines: 'کار روتین',
|
||||||
|
projects: 'کارت پروژه',
|
||||||
|
tickets: 'تیکت',
|
||||||
|
};
|
||||||
|
|
||||||
|
type AssignActor = { userId: string; role: string; organizationId: string };
|
||||||
|
|
||||||
|
export function assignOthersDeniedMessage(section: AssignSection): string {
|
||||||
|
return `تخصیص ${ASSIGN_NOUN[section]} به دیگران برای نقش شما مجاز نیست. فقط میتوانید برای خودتان ثبت کنید.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function actorCanAssignToOthers(
|
||||||
|
prisma: PrismaService,
|
||||||
|
actor: AssignActor,
|
||||||
|
section: AssignSection,
|
||||||
|
): Promise<boolean> {
|
||||||
|
if (elevated(actor.role)) return true;
|
||||||
|
const membership = await prisma.membership.findFirst({
|
||||||
|
where: {
|
||||||
|
userId: actor.userId,
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
isActive: true,
|
||||||
|
},
|
||||||
|
select: { orgRole: { select: { permissions: true } } },
|
||||||
|
});
|
||||||
|
const permissions = membership?.orgRole?.permissions;
|
||||||
|
const key = ASSIGN_SECTION_PERMISSION[section];
|
||||||
|
return Array.isArray(permissions) && permissions.includes(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* بدون مجوز همان بخش، مجموعهٔ مسئولانِ غیر از خود کاربر نباید عوض شود.
|
||||||
|
* ثبت تازه یعنی قبلی خالی است، پس فقط خود کاربر مجاز است.
|
||||||
|
*/
|
||||||
|
export async function assertAssigneeSet(
|
||||||
|
prisma: PrismaService,
|
||||||
|
actor: AssignActor,
|
||||||
|
section: AssignSection,
|
||||||
|
nextIds: Array<string | null | undefined>,
|
||||||
|
previousIds: Array<string | null | undefined> = [],
|
||||||
|
): Promise<void> {
|
||||||
|
if (await actorCanAssignToOthers(prisma, actor, section)) return;
|
||||||
|
const prev = new Set(
|
||||||
|
previousIds.filter((id): id is string => Boolean(id) && id !== actor.userId),
|
||||||
|
);
|
||||||
|
const next = nextIds.filter((id): id is string => Boolean(id) && id !== actor.userId);
|
||||||
|
const changed = next.length !== prev.size || next.some((id) => !prev.has(id));
|
||||||
|
if (changed) throw new ForbiddenException(assignOthersDeniedMessage(section));
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import type { Prisma } from '@prisma/client';
|
||||||
|
|
||||||
|
type PositionUpdate = Prisma.PrismaPromise<unknown>;
|
||||||
|
|
||||||
|
/** کارت را در ایندکس خواستهشده میگذارد. ایندکس نسبت به فهرست بدون خود کارت است. */
|
||||||
|
export function placeId(ids: string[], movingId: string, index: number): string[] {
|
||||||
|
const next = ids.filter((id) => id !== movingId);
|
||||||
|
const at = Math.max(0, Math.min(Math.trunc(index), next.length));
|
||||||
|
next.splice(at, 0, movingId);
|
||||||
|
return next;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sameIds(left: string[], right: string[]): boolean {
|
||||||
|
return left.length === right.length && left.every((id, index) => id === right[index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ترتیب ستون را ۰ تا n ذخیره میکند. */
|
||||||
|
export async function writePositions(
|
||||||
|
transaction: (ops: PositionUpdate[]) => Promise<unknown>,
|
||||||
|
ids: string[],
|
||||||
|
update: (id: string, position: number) => PositionUpdate,
|
||||||
|
) {
|
||||||
|
const size = 60;
|
||||||
|
for (let start = 0; start < ids.length; start += size) {
|
||||||
|
const slice = ids.slice(start, start + size);
|
||||||
|
await transaction(slice.map((id, offset) => update(id, start + offset)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -225,8 +225,10 @@ export function noteAccessWhere(
|
|||||||
export function resolveOwnerId(
|
export function resolveOwnerId(
|
||||||
actor: Pick<Actor, 'userId' | 'role'>,
|
actor: Pick<Actor, 'userId' | 'role'>,
|
||||||
requested?: string | null,
|
requested?: string | null,
|
||||||
|
allowOthers?: boolean,
|
||||||
): string {
|
): string {
|
||||||
if (elevated(actor.role) && requested?.trim()) {
|
const allowed = allowOthers ?? elevated(actor.role);
|
||||||
|
if (allowed && requested?.trim()) {
|
||||||
return requested.trim();
|
return requested.trim();
|
||||||
}
|
}
|
||||||
return actor.userId;
|
return actor.userId;
|
||||||
|
|||||||
@@ -20,10 +20,10 @@ import {
|
|||||||
import { customersCompanyWhere } from '../common/data-access';
|
import { customersCompanyWhere } from '../common/data-access';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
elevated,
|
elevated,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
import { normalizePersonImportSource } from './person-source';
|
import { normalizePersonImportSource } from './person-source';
|
||||||
import { buildSearchWhere, ci, splitCsv } from '../common/search';
|
import { buildSearchWhere, ci, splitCsv } from '../common/search';
|
||||||
@@ -201,7 +201,11 @@ export class CompaniesService {
|
|||||||
notes: emptyToNull(dto.notes),
|
notes: emptyToNull(dto.notes),
|
||||||
registeredAt: parseDateOrNull(dto.registeredAt),
|
registeredAt: parseDateOrNull(dto.registeredAt),
|
||||||
tags: normalizeTags(dto.tags),
|
tags: normalizeTags(dto.tags),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId: resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, actor, 'customers'),
|
||||||
|
),
|
||||||
customFields: toJsonCustomFields(dto.customFields),
|
customFields: toJsonCustomFields(dto.customFields),
|
||||||
};
|
};
|
||||||
await this.assertNoDuplicate(actor.organizationId, data);
|
await this.assertNoDuplicate(actor.organizationId, data);
|
||||||
@@ -266,8 +270,14 @@ export class CompaniesService {
|
|||||||
if ('customFields' in dto) {
|
if ('customFields' in dto) {
|
||||||
data.customFields = toJsonCustomFields(dto.customFields);
|
data.customFields = toJsonCustomFields(dto.customFields);
|
||||||
}
|
}
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
if (dto.ownerId !== undefined) {
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
const current = await this.prisma.company.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { ownerId: true },
|
||||||
|
});
|
||||||
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'customers', [nextOwner], [current?.ownerId]);
|
||||||
|
data.ownerId = nextOwner ?? actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.assertNoDuplicate(actor.organizationId, data, id);
|
await this.assertNoDuplicate(actor.organizationId, data, id);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { CompaniesService } from './companies.service';
|
|||||||
import { PeopleController } from './people.controller';
|
import { PeopleController } from './people.controller';
|
||||||
import { PeopleService } from './people.service';
|
import { PeopleService } from './people.service';
|
||||||
import { ContactsExcelService } from './contacts-excel.service';
|
import { ContactsExcelService } from './contacts-excel.service';
|
||||||
|
import { SameMobileMergeService } from './same-mobile-merge.service';
|
||||||
import { BehaviorModule } from '../behavior/behavior.module';
|
import { BehaviorModule } from '../behavior/behavior.module';
|
||||||
import { CustomerGroupsModule } from '../customer-groups/customer-groups.module';
|
import { CustomerGroupsModule } from '../customer-groups/customer-groups.module';
|
||||||
|
|
||||||
@@ -21,7 +22,7 @@ import { CustomerGroupsModule } from '../customer-groups/customer-groups.module'
|
|||||||
CustomerGroupsModule,
|
CustomerGroupsModule,
|
||||||
],
|
],
|
||||||
controllers: [PeopleController, CompaniesController],
|
controllers: [PeopleController, CompaniesController],
|
||||||
providers: [PeopleService, CompaniesService, ContactsExcelService],
|
providers: [PeopleService, CompaniesService, ContactsExcelService, SameMobileMergeService],
|
||||||
exports: [PeopleService, CompaniesService],
|
exports: [PeopleService, CompaniesService],
|
||||||
})
|
})
|
||||||
export class ContactsModule {}
|
export class ContactsModule {}
|
||||||
|
|||||||
@@ -0,0 +1,367 @@
|
|||||||
|
import { readFileSync } from 'node:fs';
|
||||||
|
import { resolve } from 'node:path';
|
||||||
|
import { Prisma, PrismaClient } from '@prisma/client';
|
||||||
|
import { canonicalIranMobile, storedPhoneNumber } from './normalize';
|
||||||
|
|
||||||
|
const personSelect = {
|
||||||
|
id: true,
|
||||||
|
createdAt: true,
|
||||||
|
firstName: true,
|
||||||
|
lastName: true,
|
||||||
|
gender: true,
|
||||||
|
showGenderInName: true,
|
||||||
|
previousFirstName: true,
|
||||||
|
previousLastName: true,
|
||||||
|
email: true,
|
||||||
|
phone: true,
|
||||||
|
mobile: true,
|
||||||
|
position: true,
|
||||||
|
website: true,
|
||||||
|
instagram: true,
|
||||||
|
birthDate: true,
|
||||||
|
referrer: true,
|
||||||
|
addresses: true,
|
||||||
|
notes: true,
|
||||||
|
tags: true,
|
||||||
|
companyId: true,
|
||||||
|
customFields: true,
|
||||||
|
importSource: true,
|
||||||
|
sourceRef: true,
|
||||||
|
previousImportSource: true,
|
||||||
|
previousSourceRef: true,
|
||||||
|
loyaltyPoints: true,
|
||||||
|
discLabel: true,
|
||||||
|
discReliable: true,
|
||||||
|
discAssessedAt: true,
|
||||||
|
} satisfies Prisma.PersonSelect;
|
||||||
|
|
||||||
|
type PersonRow = Prisma.PersonGetPayload<{ select: typeof personSelect }>;
|
||||||
|
|
||||||
|
function blank(value: string | null | undefined) {
|
||||||
|
return !value?.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
function asStrings(value: Prisma.JsonValue): string[] {
|
||||||
|
if (!Array.isArray(value)) return [];
|
||||||
|
return value.map((item) => String(item)).filter(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
function asObject(value: Prisma.JsonValue): Record<string, unknown> {
|
||||||
|
if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
|
||||||
|
return { ...(value as Record<string, unknown>) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergedFields(keeper: PersonRow, extras: PersonRow[], canon: string): Prisma.PersonUncheckedUpdateInput {
|
||||||
|
const notes = [keeper.notes?.trim() || ''];
|
||||||
|
let email = keeper.email;
|
||||||
|
let phone = storedPhoneNumber(keeper.phone);
|
||||||
|
let position = keeper.position;
|
||||||
|
let website = keeper.website;
|
||||||
|
let instagram = keeper.instagram;
|
||||||
|
let birthDate = keeper.birthDate;
|
||||||
|
let referrer = keeper.referrer;
|
||||||
|
let companyId = keeper.companyId;
|
||||||
|
let gender = keeper.gender;
|
||||||
|
let showGenderInName = keeper.showGenderInName;
|
||||||
|
let previousFirstName = keeper.previousFirstName;
|
||||||
|
let previousLastName = keeper.previousLastName;
|
||||||
|
let previousImportSource = keeper.previousImportSource;
|
||||||
|
let previousSourceRef = keeper.previousSourceRef;
|
||||||
|
let discLabel = keeper.discLabel;
|
||||||
|
let discReliable = keeper.discReliable;
|
||||||
|
let discAssessedAt = keeper.discAssessedAt;
|
||||||
|
let loyaltyPoints = keeper.loyaltyPoints;
|
||||||
|
const addresses = asStrings(keeper.addresses);
|
||||||
|
const tags = new Set(keeper.tags);
|
||||||
|
const customFields = asObject(keeper.customFields);
|
||||||
|
|
||||||
|
for (const extra of extras) {
|
||||||
|
const name = `${extra.firstName} ${extra.lastName}`.trim();
|
||||||
|
notes.push(
|
||||||
|
`ادغام شماره تکراری: ${name || 'بدون نام'} (${extra.mobile || 'بدون موبایل'})`,
|
||||||
|
);
|
||||||
|
if (blank(email) && extra.email) email = extra.email;
|
||||||
|
if (blank(phone)) phone = storedPhoneNumber(extra.phone);
|
||||||
|
if (blank(position) && extra.position) position = extra.position;
|
||||||
|
if (blank(website) && extra.website) website = extra.website;
|
||||||
|
if (blank(instagram) && extra.instagram) instagram = extra.instagram;
|
||||||
|
if (!birthDate && extra.birthDate) birthDate = extra.birthDate;
|
||||||
|
if (blank(referrer) && extra.referrer) referrer = extra.referrer;
|
||||||
|
if (!companyId && extra.companyId) companyId = extra.companyId;
|
||||||
|
if (gender === 'none' && extra.gender !== 'none') {
|
||||||
|
gender = extra.gender;
|
||||||
|
showGenderInName = extra.showGenderInName;
|
||||||
|
}
|
||||||
|
if (blank(previousFirstName) && extra.previousFirstName) {
|
||||||
|
previousFirstName = extra.previousFirstName;
|
||||||
|
}
|
||||||
|
if (blank(previousLastName) && extra.previousLastName) {
|
||||||
|
previousLastName = extra.previousLastName;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
blank(previousImportSource) &&
|
||||||
|
extra.importSource &&
|
||||||
|
extra.importSource !== keeper.importSource
|
||||||
|
) {
|
||||||
|
previousImportSource = extra.importSource;
|
||||||
|
previousSourceRef = extra.sourceRef;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
keeper.importSource === 'tahesab' &&
|
||||||
|
blank(previousFirstName) &&
|
||||||
|
blank(previousLastName)
|
||||||
|
) {
|
||||||
|
const extraName = `${extra.firstName} ${extra.lastName}`.trim();
|
||||||
|
const keeperName = `${keeper.firstName} ${keeper.lastName}`.trim();
|
||||||
|
if (extraName && extraName !== keeperName) {
|
||||||
|
previousFirstName = extra.firstName || null;
|
||||||
|
previousLastName = extra.lastName || null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!discLabel && extra.discLabel) {
|
||||||
|
discLabel = extra.discLabel;
|
||||||
|
discReliable = extra.discReliable;
|
||||||
|
discAssessedAt = extra.discAssessedAt;
|
||||||
|
}
|
||||||
|
loyaltyPoints = Math.max(loyaltyPoints, extra.loyaltyPoints);
|
||||||
|
for (const address of asStrings(extra.addresses)) {
|
||||||
|
if (!addresses.includes(address)) addresses.push(address);
|
||||||
|
}
|
||||||
|
for (const tag of extra.tags) tags.add(tag);
|
||||||
|
for (const [key, value] of Object.entries(asObject(extra.customFields))) {
|
||||||
|
if (customFields[key] == null || customFields[key] === '') customFields[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
mobile: canon,
|
||||||
|
email,
|
||||||
|
phone,
|
||||||
|
position,
|
||||||
|
website,
|
||||||
|
instagram,
|
||||||
|
birthDate,
|
||||||
|
referrer,
|
||||||
|
companyId,
|
||||||
|
gender,
|
||||||
|
showGenderInName,
|
||||||
|
previousFirstName,
|
||||||
|
previousLastName,
|
||||||
|
previousImportSource,
|
||||||
|
previousSourceRef,
|
||||||
|
discLabel,
|
||||||
|
discReliable,
|
||||||
|
discAssessedAt,
|
||||||
|
loyaltyPoints,
|
||||||
|
addresses,
|
||||||
|
tags: [...tags],
|
||||||
|
customFields: customFields as Prisma.InputJsonValue,
|
||||||
|
notes: notes.filter(Boolean).join('\n') || null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function personIdTables(prisma: PrismaClient | Prisma.TransactionClient) {
|
||||||
|
const rows = await prisma.$queryRaw<{ table_name: string }[]>`
|
||||||
|
SELECT table_name
|
||||||
|
FROM information_schema.columns
|
||||||
|
WHERE table_schema = 'public' AND column_name = 'personId'
|
||||||
|
`;
|
||||||
|
return rows
|
||||||
|
.map((row) => row.table_name)
|
||||||
|
.filter((name) => /^[A-Za-z0-9_]+$/.test(name) && name !== 'Person');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function moveLinks(
|
||||||
|
tx: Prisma.TransactionClient,
|
||||||
|
tables: string[],
|
||||||
|
keeperId: string,
|
||||||
|
dupId: string,
|
||||||
|
) {
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PersonGroupLink" AS d
|
||||||
|
USING "PersonGroupLink" AS k
|
||||||
|
WHERE d."personId" = ${dupId}
|
||||||
|
AND k."personId" = ${keeperId}
|
||||||
|
AND d."groupId" = k."groupId"
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PersonAccountingLink" AS d
|
||||||
|
USING "PersonAccountingLink" AS k
|
||||||
|
WHERE d."personId" = ${dupId}
|
||||||
|
AND k."personId" = ${keeperId}
|
||||||
|
AND d."connectionId" = k."connectionId"
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PartyOpeningBalance"
|
||||||
|
WHERE "personId" = ${dupId}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "PartyOpeningBalance" AS k WHERE k."personId" = ${keeperId}
|
||||||
|
)
|
||||||
|
`;
|
||||||
|
|
||||||
|
for (const table of tables) {
|
||||||
|
await tx.$executeRawUnsafe(
|
||||||
|
`UPDATE "${table}" SET "personId" = $1 WHERE "personId" = $2`,
|
||||||
|
keeperId,
|
||||||
|
dupId,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "Lead" SET "convertedPersonId" = ${keeperId} WHERE "convertedPersonId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "MontifyLink"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'customer' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "Notification"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "GamificationTransaction"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "FinancialAuditLog"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function mergeSameMobilePeople(
|
||||||
|
prisma: PrismaClient,
|
||||||
|
organizationId: string,
|
||||||
|
apply: boolean,
|
||||||
|
) {
|
||||||
|
const people = await prisma.person.findMany({
|
||||||
|
where: { organizationId },
|
||||||
|
select: personSelect,
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
});
|
||||||
|
const groups = new Map<string, PersonRow[]>();
|
||||||
|
for (const person of people) {
|
||||||
|
const key = canonicalIranMobile(person.mobile) ?? canonicalIranMobile(person.phone);
|
||||||
|
if (!key) continue;
|
||||||
|
const list = groups.get(key) ?? [];
|
||||||
|
list.push(person);
|
||||||
|
groups.set(key, list);
|
||||||
|
}
|
||||||
|
|
||||||
|
const duplicateGroups = [...groups.entries()].filter(([, list]) => list.length > 1);
|
||||||
|
const preview = duplicateGroups.map(([mobile, list]) => ({
|
||||||
|
mobile,
|
||||||
|
people: list.map((person) => ({
|
||||||
|
id: person.id,
|
||||||
|
stored: person.mobile,
|
||||||
|
name: `${person.firstName} ${person.lastName}`.trim(),
|
||||||
|
})),
|
||||||
|
}));
|
||||||
|
|
||||||
|
if (!apply) {
|
||||||
|
const needsRewrite = people.filter((person) => {
|
||||||
|
const canon = canonicalIranMobile(person.mobile) ?? canonicalIranMobile(person.phone);
|
||||||
|
return Boolean(canon && (person.mobile !== canon || canonicalIranMobile(person.phone)));
|
||||||
|
}).length;
|
||||||
|
return { merged: 0, rewritten: 0, needsRewrite, failed: 0, groups: preview };
|
||||||
|
}
|
||||||
|
|
||||||
|
const tables = await personIdTables(prisma);
|
||||||
|
let merged = 0;
|
||||||
|
let rewritten = 0;
|
||||||
|
let failed = 0;
|
||||||
|
|
||||||
|
for (const [canon, list] of groups) {
|
||||||
|
const ordered = [...list].sort((a, b) => {
|
||||||
|
const aTahesab = a.importSource === 'tahesab' ? 0 : 1;
|
||||||
|
const bTahesab = b.importSource === 'tahesab' ? 0 : 1;
|
||||||
|
if (aTahesab !== bTahesab) return aTahesab - bTahesab;
|
||||||
|
return a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id);
|
||||||
|
});
|
||||||
|
const [keeper, ...extras] = ordered;
|
||||||
|
if (!keeper) continue;
|
||||||
|
if (!extras.length) {
|
||||||
|
const phoneCanon = canonicalIranMobile(keeper.phone);
|
||||||
|
const data: Prisma.PersonUpdateInput = {};
|
||||||
|
if (keeper.mobile !== canon) data.mobile = canon;
|
||||||
|
if (phoneCanon && keeper.phone !== phoneCanon) data.phone = phoneCanon;
|
||||||
|
if (Object.keys(data).length) {
|
||||||
|
await prisma.person.update({ where: { id: keeper.id }, data });
|
||||||
|
rewritten += 1;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await prisma.$transaction(
|
||||||
|
async (tx) => {
|
||||||
|
await tx.person.update({
|
||||||
|
where: { id: keeper.id },
|
||||||
|
data: mergedFields(keeper, extras, canon),
|
||||||
|
});
|
||||||
|
for (const extra of extras) {
|
||||||
|
await moveLinks(tx, tables, keeper.id, extra.id);
|
||||||
|
await tx.person.delete({ where: { id: extra.id } });
|
||||||
|
merged += 1;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ timeout: 60_000 },
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
failed += 1;
|
||||||
|
console.error(
|
||||||
|
`merge mobile ${canon} failed`,
|
||||||
|
error instanceof Error ? error.message : error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { merged, rewritten, needsRewrite: 0, failed, groups: preview };
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadEnv(file: string) {
|
||||||
|
const text = readFileSync(file, 'utf8');
|
||||||
|
for (const line of text.split(/\r?\n/)) {
|
||||||
|
const match = line.match(/^([A-Za-z0-9_]+)=(.*)$/);
|
||||||
|
if (!match || process.env[match[1]]) continue;
|
||||||
|
let value = match[2].trim();
|
||||||
|
if (
|
||||||
|
(value.startsWith('"') && value.endsWith('"')) ||
|
||||||
|
(value.startsWith("'") && value.endsWith("'"))
|
||||||
|
) {
|
||||||
|
value = value.slice(1, -1);
|
||||||
|
}
|
||||||
|
process.env[match[1]] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const direct = process.argv[1]?.replace(/\\/g, '/').includes('merge-same-mobile');
|
||||||
|
if (direct) {
|
||||||
|
loadEnv(resolve(__dirname, '../../.env'));
|
||||||
|
const orgId = process.argv.find((arg) => arg.startsWith('--org='))?.slice(6);
|
||||||
|
const apply = process.argv.includes('--apply');
|
||||||
|
if (!orgId) {
|
||||||
|
console.error('org id required: --org=<id>');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
const prisma = new PrismaClient();
|
||||||
|
mergeSameMobilePeople(prisma, orgId, apply)
|
||||||
|
.then((result) => {
|
||||||
|
console.log(JSON.stringify({
|
||||||
|
apply,
|
||||||
|
merged: result.merged,
|
||||||
|
rewritten: result.rewritten,
|
||||||
|
needsRewrite: result.needsRewrite,
|
||||||
|
groupCount: result.groups.length,
|
||||||
|
groups: result.groups,
|
||||||
|
}, null, 2));
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(error);
|
||||||
|
process.exitCode = 1;
|
||||||
|
})
|
||||||
|
.finally(() => prisma.$disconnect());
|
||||||
|
}
|
||||||
@@ -9,11 +9,54 @@ export function normalizeEmail(value?: string | null): string | null {
|
|||||||
return v ? v.toLowerCase() : null;
|
return v ? v.toLowerCase() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const FA_DIGITS = '۰۱۲۳۴۵۶۷۸۹';
|
||||||
|
const AR_DIGITS = '٠١٢٣٤٥٦٧٨٩';
|
||||||
|
|
||||||
|
/** ارقام فارسی و عربی را به لاتین برمیگرداند تا از شماره حذف نشوند. */
|
||||||
|
function latinDigits(value: string): string {
|
||||||
|
return value.replace(/[۰-۹٠-٩]/g, (ch) => {
|
||||||
|
const fa = FA_DIGITS.indexOf(ch);
|
||||||
|
return String(fa >= 0 ? fa : AR_DIGITS.indexOf(ch));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/** Keep digits and leading + for Iranian/international numbers. */
|
/** Keep digits and leading + for Iranian/international numbers. */
|
||||||
export function normalizePhone(value?: string | null): string | null {
|
export function normalizePhone(value?: string | null): string | null {
|
||||||
const v = emptyToNull(value);
|
const v = emptyToNull(value);
|
||||||
if (!v) return null;
|
if (!v) return null;
|
||||||
const cleaned = v.replace(/[^\d+]/g, '');␍
|
const cleaned = latinDigits(v).replace(/[^\d+]/g, '');
|
||||||
return cleaned.length ? cleaned : null;
|
return cleaned.length ? cleaned : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** موبایل ایران به شکل 09xxxxxxxxx. 912… و 98912… و +98912… همان شمارهاند. */
|
||||||
|
export function canonicalIranMobile(value?: string | null): string | null {
|
||||||
|
const n = normalizePhone(value);
|
||||||
|
if (!n) return null;
|
||||||
|
let d = n.replace(/\D/g, '');
|
||||||
|
if (!d) return null;
|
||||||
|
if (d.startsWith('0098') && d.length >= 14) d = d.slice(4);
|
||||||
|
else if (d.startsWith('98') && d.length >= 12) d = d.slice(2);
|
||||||
|
if (d.length === 10 && d.startsWith('9')) d = `0${d}`;
|
||||||
|
return /^09\d{9}$/.test(d) ? d : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** شکلهایی که ممکن است همین موبایل با آنها ذخیره شده باشد. */
|
||||||
|
export function iranMobileLookupKeys(value?: string | null): string[] {
|
||||||
|
const canon = canonicalIranMobile(value);
|
||||||
|
if (!canon) return [];
|
||||||
|
const core = canon.slice(1);
|
||||||
|
return [canon, core, `98${core}`, `+98${core}`, `0098${core}`];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** برای تطبیق: اگر موبایل ایران است همه شکلها، وگرنه همان متن نرمالشده. */
|
||||||
|
export function phoneIdentityKeys(value?: string | null): string[] {
|
||||||
|
const keys = iranMobileLookupKeys(value);
|
||||||
|
if (keys.length) return keys;
|
||||||
|
const n = normalizePhone(value);
|
||||||
|
return n ? [n] : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ذخیره: موبایل ایران همیشه 09… ؛ بقیه شمارهها فقط تمیز میشوند. */
|
||||||
|
export function storedPhoneNumber(value?: string | null): string | null {
|
||||||
|
return canonicalIranMobile(value) ?? normalizePhone(value);
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,7 +28,12 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { OutboundSmsLogService } from '../outbound-sms/outbound-sms-log.service';
|
import { OutboundSmsLogService } from '../outbound-sms/outbound-sms-log.service';
|
||||||
import { CompaniesService } from './companies.service';
|
import { CompaniesService } from './companies.service';
|
||||||
import { emptyToNull, normalizeEmail, normalizePhone } from './normalize';
|
import {
|
||||||
|
emptyToNull,
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from './normalize';
|
||||||
import {
|
import {
|
||||||
asAddresses,
|
asAddresses,
|
||||||
asCustomFields,
|
asCustomFields,
|
||||||
@@ -38,9 +43,9 @@ import {
|
|||||||
import { customersPersonWhere } from '../common/data-access';
|
import { customersPersonWhere } from '../common/data-access';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { LoyaltyService } from '../loyalty/loyalty.service';
|
import { LoyaltyService } from '../loyalty/loyalty.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
@@ -399,7 +404,10 @@ export class PeopleService implements OnModuleInit {
|
|||||||
input: { mobile?: string | null; email?: string | null; birthDate: Date },
|
input: { mobile?: string | null; email?: string | null; birthDate: Date },
|
||||||
) {
|
) {
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (input.mobile) or.push({ mobile: input.mobile });
|
const mobileKeys = phoneIdentityKeys(input.mobile);
|
||||||
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
if (input.email) or.push({ email: input.email });
|
if (input.email) or.push({ email: input.email });
|
||||||
if (!or.length) return;
|
if (!or.length) return;
|
||||||
await this.prisma.person.updateMany({
|
await this.prisma.person.updateMany({
|
||||||
@@ -441,8 +449,8 @@ export class PeopleService implements OnModuleInit {
|
|||||||
importSource: normalizePersonImportSource(dto.importSource),
|
importSource: normalizePersonImportSource(dto.importSource),
|
||||||
sourceRef: emptyToNull(dto.sourceRef),
|
sourceRef: emptyToNull(dto.sourceRef),
|
||||||
email: normalizeEmail(dto.email),
|
email: normalizeEmail(dto.email),
|
||||||
phone: normalizePhone(dto.phone),
|
phone: storedPhoneNumber(dto.phone),
|
||||||
mobile: normalizePhone(dto.mobile),
|
mobile: storedPhoneNumber(dto.mobile),
|
||||||
position: emptyToNull(dto.position),
|
position: emptyToNull(dto.position),
|
||||||
website: emptyToNull(dto.website),
|
website: emptyToNull(dto.website),
|
||||||
instagram: emptyToNull(dto.instagram),
|
instagram: emptyToNull(dto.instagram),
|
||||||
@@ -453,7 +461,11 @@ export class PeopleService implements OnModuleInit {
|
|||||||
mood: dto.mood ?? 'newcomer',
|
mood: dto.mood ?? 'newcomer',
|
||||||
tags: normalizeTags(dto.tags),
|
tags: normalizeTags(dto.tags),
|
||||||
companyId,
|
companyId,
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId: resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, actor, 'customers'),
|
||||||
|
),
|
||||||
customFields: toJsonCustomFields(dto.customFields),
|
customFields: toJsonCustomFields(dto.customFields),
|
||||||
...(registeredAt && !Number.isNaN(registeredAt.getTime())
|
...(registeredAt && !Number.isNaN(registeredAt.getTime())
|
||||||
? { createdAt: registeredAt }
|
? { createdAt: registeredAt }
|
||||||
@@ -549,8 +561,8 @@ export class PeopleService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
if ('sourceRef' in dto) data.sourceRef = emptyToNull(dto.sourceRef);
|
if ('sourceRef' in dto) data.sourceRef = emptyToNull(dto.sourceRef);
|
||||||
if ('email' in dto) data.email = normalizeEmail(dto.email);
|
if ('email' in dto) data.email = normalizeEmail(dto.email);
|
||||||
if ('phone' in dto) data.phone = normalizePhone(dto.phone);
|
if ('phone' in dto) data.phone = storedPhoneNumber(dto.phone);
|
||||||
if ('mobile' in dto) data.mobile = normalizePhone(dto.mobile);
|
if ('mobile' in dto) data.mobile = storedPhoneNumber(dto.mobile);
|
||||||
if ('position' in dto) data.position = emptyToNull(dto.position);
|
if ('position' in dto) data.position = emptyToNull(dto.position);
|
||||||
if ('website' in dto) data.website = emptyToNull(dto.website);
|
if ('website' in dto) data.website = emptyToNull(dto.website);
|
||||||
if ('instagram' in dto) data.instagram = emptyToNull(dto.instagram);
|
if ('instagram' in dto) data.instagram = emptyToNull(dto.instagram);
|
||||||
@@ -574,8 +586,14 @@ export class PeopleService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
data.companyId = nextCompanyId;
|
data.companyId = nextCompanyId;
|
||||||
}
|
}
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
if (dto.ownerId !== undefined) {
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
const current = await this.prisma.person.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { ownerId: true },
|
||||||
|
});
|
||||||
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'customers', [nextOwner], [current?.ownerId]);
|
||||||
|
data.ownerId = nextOwner ?? actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.assertNoDuplicate(actor.organizationId, data, id);
|
await this.assertNoDuplicate(actor.organizationId, data, id);
|
||||||
@@ -631,10 +649,13 @@ export class PeopleService implements OnModuleInit {
|
|||||||
) {
|
) {
|
||||||
const email = typeof data.email === 'string' ? data.email : null;
|
const email = typeof data.email === 'string' ? data.email : null;
|
||||||
const mobile = typeof data.mobile === 'string' ? data.mobile : null;
|
const mobile = typeof data.mobile === 'string' ? data.mobile : null;
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
|
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (email) or.push({ email });
|
if (email) or.push({ email });
|
||||||
if (mobile) or.push({ mobile });
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
if (!or.length) return;
|
if (!or.length) return;
|
||||||
|
|
||||||
const clash = await this.prisma.person.findFirst({
|
const clash = await this.prisma.person.findFirst({
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import { Injectable, Logger, type OnApplicationBootstrap } from '@nestjs/common';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { mergeSameMobilePeople } from './merge-same-mobile';
|
||||||
|
|
||||||
|
const FIX_KEY = 'person-mobile-canonical-v3';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class SameMobileMergeService implements OnApplicationBootstrap {
|
||||||
|
private readonly logger = new Logger(SameMobileMergeService.name);
|
||||||
|
|
||||||
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
|
|
||||||
|
onApplicationBootstrap() {
|
||||||
|
if (process.env.NODE_ENV === 'test') return;
|
||||||
|
void this.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async run() {
|
||||||
|
try {
|
||||||
|
const ready = await this.prisma.$queryRaw<{ ok: number }[]>`
|
||||||
|
SELECT 1 AS ok
|
||||||
|
FROM information_schema.columns
|
||||||
|
WHERE table_schema = 'public'
|
||||||
|
AND lower(table_name) = 'person'
|
||||||
|
AND lower(column_name) = 'gender'
|
||||||
|
`;
|
||||||
|
if (!ready.length) {
|
||||||
|
this.logger.warn('یکسانسازی موبایل رد شد: ستون gender هنوز نیست');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.$executeRaw`
|
||||||
|
CREATE TABLE IF NOT EXISTS "DataFix" (
|
||||||
|
"key" TEXT PRIMARY KEY,
|
||||||
|
"doneAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
`;
|
||||||
|
|
||||||
|
const done = await this.prisma.$queryRaw<{ key: string }[]>`
|
||||||
|
SELECT "key" FROM "DataFix" WHERE "key" = ${FIX_KEY}
|
||||||
|
`;
|
||||||
|
if (done.length) return;
|
||||||
|
|
||||||
|
await this.prisma.$executeRaw`SELECT pg_advisory_lock(86051205)`;
|
||||||
|
try {
|
||||||
|
const again = await this.prisma.$queryRaw<{ key: string }[]>`
|
||||||
|
SELECT "key" FROM "DataFix" WHERE "key" = ${FIX_KEY}
|
||||||
|
`;
|
||||||
|
if (again.length) return;
|
||||||
|
|
||||||
|
const orgs = await this.prisma.organization.findMany({ select: { id: true } });
|
||||||
|
let merged = 0;
|
||||||
|
let rewritten = 0;
|
||||||
|
let failed = 0;
|
||||||
|
for (const org of orgs) {
|
||||||
|
try {
|
||||||
|
const result = await mergeSameMobilePeople(this.prisma, org.id, true);
|
||||||
|
merged += result.merged;
|
||||||
|
rewritten += result.rewritten;
|
||||||
|
failed += result.failed;
|
||||||
|
} catch (error) {
|
||||||
|
failed += 1;
|
||||||
|
this.logger.error(
|
||||||
|
`یکسانسازی موبایل برای محیط ${org.id} انجام نشد`,
|
||||||
|
error instanceof Error ? error.message : String(error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (failed) return;
|
||||||
|
await this.prisma.$executeRaw`
|
||||||
|
INSERT INTO "DataFix" ("key") VALUES (${FIX_KEY})
|
||||||
|
ON CONFLICT ("key") DO NOTHING
|
||||||
|
`;
|
||||||
|
this.logger.log(`شمارههای تکراری یکی شد: ${merged} ادغام، ${rewritten} بازنویسی`);
|
||||||
|
} finally {
|
||||||
|
await this.prisma.$executeRaw`SELECT pg_advisory_unlock(86051205)`;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
'یکسانسازی موبایل مشتریها انجام نشد',
|
||||||
|
error instanceof Error ? error.stack : String(error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ import { CurrentUser } from '../auth/current-user.decorator';
|
|||||||
import { RequireOrgModule } from '../billing/org-module.decorator';
|
import { RequireOrgModule } from '../billing/org-module.decorator';
|
||||||
import { OrgModuleGuard } from '../billing/org-module.guard';
|
import { OrgModuleGuard } from '../billing/org-module.guard';
|
||||||
import {
|
import {
|
||||||
|
ConversationFileBytesDto,
|
||||||
CreateConversationDmDto,
|
CreateConversationDmDto,
|
||||||
CreateConversationGroupDto,
|
CreateConversationGroupDto,
|
||||||
CreateConversationChannelDto,
|
CreateConversationChannelDto,
|
||||||
@@ -19,12 +20,34 @@ import {
|
|||||||
ToggleMessageReactionDto,
|
ToggleMessageReactionDto,
|
||||||
} from './dto';
|
} from './dto';
|
||||||
import { ConversationsService } from './conversations.service';
|
import { ConversationsService } from './conversations.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
|
|
||||||
@Controller('conversations')
|
@Controller('conversations')
|
||||||
@UseGuards(JwtAuthGuard, OrgModuleGuard)
|
@UseGuards(JwtAuthGuard, OrgModuleGuard)
|
||||||
@RequireOrgModule('conversations')
|
@RequireOrgModule('conversations')
|
||||||
export class ConversationsController {
|
export class ConversationsController {
|
||||||
constructor(private readonly conversations: ConversationsService) {}
|
constructor(
|
||||||
|
private readonly conversations: ConversationsService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Post('files/reserve')
|
||||||
|
reserveFile(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Body() dto: ConversationFileBytesDto,
|
||||||
|
) {
|
||||||
|
return this.storage.assertCanAdd(user.organizationId, dto.bytes).then(() =>
|
||||||
|
this.storage.usageForOrganization(user.organizationId),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('files/commit')
|
||||||
|
commitFile(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Body() dto: ConversationFileBytesDto,
|
||||||
|
) {
|
||||||
|
return this.storage.addChat(user.organizationId, dto.bytes);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('access')
|
@Get('access')
|
||||||
access(@CurrentUser() user: { userId: string; organizationId: string; role: string }) {
|
access(@CurrentUser() user: { userId: string; organizationId: string; role: string }) {
|
||||||
|
|||||||
@@ -656,7 +656,7 @@ export class ConversationsService {
|
|||||||
});
|
});
|
||||||
if (!row) {
|
if (!row) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → محیطها → تنظیمات گفتگو پیکربندی کنید.',
|
'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → گفتگو پیکربندی کنید.',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
|
import { Type } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsArray,
|
IsArray,
|
||||||
IsBoolean,
|
IsBoolean,
|
||||||
|
IsInt,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
|
Max,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
|
Min,
|
||||||
MinLength,
|
MinLength,
|
||||||
ArrayMinSize,
|
ArrayMinSize,
|
||||||
ArrayMaxSize,
|
ArrayMaxSize,
|
||||||
@@ -32,6 +36,14 @@ export class UpdateConversationSettingsDto {
|
|||||||
downloadUrl?: string;
|
downloadUrl?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class ConversationFileBytesDto {
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@Max(100 * 1024 * 1024)
|
||||||
|
bytes!: number;
|
||||||
|
}
|
||||||
|
|
||||||
export class CreateConversationDmDto {
|
export class CreateConversationDmDto {
|
||||||
@IsString()
|
@IsString()
|
||||||
@MinLength(1)
|
@MinLength(1)
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { parseBirthDate } from '../../common/excel';
|
import { parseBirthDate } from '../../common/excel';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { normalizeEmail, normalizePhone } from '../../contacts/normalize';
|
import {
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { carryPreviousSource } from '../../contacts/person-source';
|
import { carryPreviousSource } from '../../contacts/person-source';
|
||||||
import { ownerWhere, type Actor } from '../../common/record-scope';
|
import { ownerWhere, type Actor } from '../../common/record-scope';
|
||||||
import { MontifyConnectionsService } from './connections.service';
|
import { MontifyConnectionsService } from './connections.service';
|
||||||
@@ -100,13 +104,7 @@ function arr(v: unknown): unknown[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mobileVariants(mobile: string): string[] {
|
function mobileVariants(mobile: string): string[] {
|
||||||
const digits = mobile.replace(/\D/g, '');
|
return phoneIdentityKeys(mobile);
|
||||||
let core = digits;
|
|
||||||
if (core.startsWith('0098')) core = core.slice(4);
|
|
||||||
else if (core.startsWith('98') && core.length === 12) core = core.slice(2);
|
|
||||||
else if (core.startsWith('0')) core = core.slice(1);
|
|
||||||
if (!core) return [mobile];
|
|
||||||
return [...new Set([mobile, core, `0${core}`, `98${core}`, `+98${core}`])];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatAddress(a: MontifyAddress): string | null {
|
function formatAddress(a: MontifyAddress): string | null {
|
||||||
@@ -417,7 +415,7 @@ export class MontifySyncService {
|
|||||||
}> {
|
}> {
|
||||||
const externalId = String(c.id);
|
const externalId = String(c.id);
|
||||||
const { firstName, lastName } = splitName(c);
|
const { firstName, lastName } = splitName(c);
|
||||||
const mobile = normalizePhone(c.phone ?? null);
|
const mobile = storedPhoneNumber(c.phone ?? null);
|
||||||
const email = normalizeEmail(c.email ?? null);
|
const email = normalizeEmail(c.email ?? null);
|
||||||
const addressLines = addresses.map(formatAddress).filter((a): a is string => Boolean(a));
|
const addressLines = addresses.map(formatAddress).filter((a): a is string => Boolean(a));
|
||||||
const profile: CustomerProfile = {
|
const profile: CustomerProfile = {
|
||||||
|
|||||||
@@ -38,6 +38,12 @@ import {
|
|||||||
|
|
||||||
const ASNAD_COUNT_LAST = 5000;
|
const ASNAD_COUNT_LAST = 5000;
|
||||||
const SYNC_CONCURRENCY = 3;
|
const SYNC_CONCURRENCY = 3;
|
||||||
|
|
||||||
|
function latinDigits(value: string): string {
|
||||||
|
return value
|
||||||
|
.replace(/[۰-۹]/g, (ch) => String('۰۱۲۳۴۵۶۷۸۹'.indexOf(ch)))
|
||||||
|
.replace(/[٠-٩]/g, (ch) => String('٠١٢٣٤٥٦٧٨٩'.indexOf(ch)));
|
||||||
|
}
|
||||||
const ASNAD_KINDS = new Set<string>(['sale', 'return', 'purchase', 'other']);
|
const ASNAD_KINDS = new Set<string>(['sale', 'return', 'purchase', 'other']);
|
||||||
|
|
||||||
function normalizeShamsiYmd(input: string): string {
|
function normalizeShamsiYmd(input: string): string {
|
||||||
@@ -184,6 +190,7 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: string | undefined,
|
connectionId: string | undefined,
|
||||||
from: string,
|
from: string,
|
||||||
to: string,
|
to: string,
|
||||||
|
scope?: { personId?: string; groupIds?: string[] },
|
||||||
): Promise<TahesabAsnadSyncJobDto> {
|
): Promise<TahesabAsnadSyncJobDto> {
|
||||||
const fromNorm = normalizeShamsiYmd(from);
|
const fromNorm = normalizeShamsiYmd(from);
|
||||||
const toNorm = normalizeShamsiYmd(to);
|
const toNorm = normalizeShamsiYmd(to);
|
||||||
@@ -194,6 +201,22 @@ export class TahesabAsnadReportService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
connectionId,
|
connectionId,
|
||||||
);
|
);
|
||||||
|
const scopedPersonIds = await this.resolveSyncPersonIds(organizationId, scope);
|
||||||
|
if (scopedPersonIds && scopedPersonIds.length === 0) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'برای گروه یا شخص انتخابشده مشتریای پیدا نشد.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (scopedPersonIds) {
|
||||||
|
const linked = await this.prisma.personAccountingLink.count({
|
||||||
|
where: { connectionId: resolvedId, personId: { in: scopedPersonIds } },
|
||||||
|
});
|
||||||
|
if (linked === 0) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'مشتریان این فیلتر به تهحساب وصل نیستند. بهروزرسانی همه را بزنید یا اول اتصال مشتری را انجام دهید.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const job = await this.prisma.accountingSyncJob.create({
|
const job = await this.prisma.accountingSyncJob.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -201,7 +224,13 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: resolvedId,
|
connectionId: resolvedId,
|
||||||
kind: 'asnad-sync',
|
kind: 'asnad-sync',
|
||||||
status: 'pending',
|
status: 'pending',
|
||||||
request: { from: fromNorm, to: toNorm, connectionId: resolvedId },
|
request: {
|
||||||
|
from: fromNorm,
|
||||||
|
to: toNorm,
|
||||||
|
connectionId: resolvedId,
|
||||||
|
personId: scope?.personId ?? null,
|
||||||
|
groupIds: scope?.groupIds ?? [],
|
||||||
|
},
|
||||||
result: {
|
result: {
|
||||||
connectionId: resolvedId,
|
connectionId: resolvedId,
|
||||||
from: fromNorm,
|
from: fromNorm,
|
||||||
@@ -214,9 +243,14 @@ export class TahesabAsnadReportService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
void this.runSync(job.id, organizationId, resolvedId, fromNorm, toNorm).catch(
|
void this.runSync(
|
||||||
() => undefined,
|
job.id,
|
||||||
);
|
organizationId,
|
||||||
|
resolvedId,
|
||||||
|
fromNorm,
|
||||||
|
toNorm,
|
||||||
|
scopedPersonIds,
|
||||||
|
).catch(() => undefined);
|
||||||
|
|
||||||
return this.mapJob(job);
|
return this.mapJob(job);
|
||||||
}
|
}
|
||||||
@@ -238,6 +272,7 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: string,
|
connectionId: string,
|
||||||
from: string,
|
from: string,
|
||||||
to: string,
|
to: string,
|
||||||
|
personIds: string[] | null,
|
||||||
) {
|
) {
|
||||||
const progress: SyncProgress = {
|
const progress: SyncProgress = {
|
||||||
connectionId,
|
connectionId,
|
||||||
@@ -257,7 +292,10 @@ export class TahesabAsnadReportService {
|
|||||||
|
|
||||||
const { api } = await this.connections.getApi(organizationId, connectionId);
|
const { api } = await this.connections.getApi(organizationId, connectionId);
|
||||||
const links = await this.prisma.personAccountingLink.findMany({
|
const links = await this.prisma.personAccountingLink.findMany({
|
||||||
where: { connectionId },
|
where: {
|
||||||
|
connectionId,
|
||||||
|
...(personIds ? { personId: { in: personIds } } : {}),
|
||||||
|
},
|
||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
personId: true,
|
personId: true,
|
||||||
@@ -276,6 +314,7 @@ export class TahesabAsnadReportService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
connectionId,
|
connectionId,
|
||||||
tarikh: { gte: from, lte: to },
|
tarikh: { gte: from, lte: to },
|
||||||
|
...(personIds ? { personId: { in: personIds } } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -638,6 +677,82 @@ export class TahesabAsnadReportService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** null یعنی همهٔ مشتریان متصل. آرایه یعنی فقط همین اشخاص. */
|
||||||
|
private async resolveSyncPersonIds(
|
||||||
|
organizationId: string,
|
||||||
|
scope?: { personId?: string; groupIds?: string[] },
|
||||||
|
): Promise<string[] | null> {
|
||||||
|
const groupIds = (scope?.groupIds ?? []).map((id) => id.trim()).filter(Boolean);
|
||||||
|
const personId = scope?.personId?.trim() || undefined;
|
||||||
|
if (!personId && groupIds.length === 0) return null;
|
||||||
|
let ids: string[] | null = null;
|
||||||
|
if (groupIds.length) {
|
||||||
|
const expanded = await this.expandGroupIds(organizationId, groupIds);
|
||||||
|
const rows = await this.prisma.personGroupLink.findMany({
|
||||||
|
where: {
|
||||||
|
groupId: { in: expanded },
|
||||||
|
person: { organizationId },
|
||||||
|
},
|
||||||
|
select: { personId: true },
|
||||||
|
distinct: ['personId'],
|
||||||
|
});
|
||||||
|
ids = rows.map((row) => row.personId);
|
||||||
|
}
|
||||||
|
if (personId) ids = ids ? ids.filter((id) => id === personId) : [personId];
|
||||||
|
return ids ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async searchCustomers(
|
||||||
|
organizationId: string,
|
||||||
|
connectionId: string | undefined,
|
||||||
|
q: string,
|
||||||
|
) {
|
||||||
|
const resolvedId = await this.connections.resolveConnectionId(
|
||||||
|
organizationId,
|
||||||
|
connectionId,
|
||||||
|
);
|
||||||
|
const query = q.trim();
|
||||||
|
const tokens = query.split(/\s+/).filter(Boolean);
|
||||||
|
const code = Number(latinDigits(query));
|
||||||
|
const or: Prisma.PersonAccountingLinkWhereInput[] = [];
|
||||||
|
if (tokens.length) {
|
||||||
|
or.push({
|
||||||
|
person: {
|
||||||
|
organizationId,
|
||||||
|
AND: tokens.map((token) => ({
|
||||||
|
OR: [
|
||||||
|
{ firstName: { contains: token } },
|
||||||
|
{ lastName: { contains: token } },
|
||||||
|
],
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (Number.isInteger(code) && code > 0 && latinDigits(query) === String(code)) {
|
||||||
|
or.push({ moshtariCode: code, person: { organizationId } });
|
||||||
|
}
|
||||||
|
const rows = await this.prisma.personAccountingLink.findMany({
|
||||||
|
where: {
|
||||||
|
connectionId: resolvedId,
|
||||||
|
...(or.length ? { OR: or } : { person: { organizationId } }),
|
||||||
|
},
|
||||||
|
take: 30,
|
||||||
|
orderBy: [{ person: { lastName: 'asc' } }, { person: { firstName: 'asc' } }],
|
||||||
|
select: {
|
||||||
|
personId: true,
|
||||||
|
moshtariCode: true,
|
||||||
|
person: { select: { firstName: true, lastName: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
items: rows.map((row) => ({
|
||||||
|
personId: row.personId,
|
||||||
|
moshtariCode: row.moshtariCode,
|
||||||
|
name: `${row.person.firstName} ${row.person.lastName}`.trim(),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/** گروه اصلی، زیرگروهها را هم داخل فیلتر میآورد. */
|
/** گروه اصلی، زیرگروهها را هم داخل فیلتر میآورد. */
|
||||||
private async expandGroupIds(organizationId: string, ids: string[]): Promise<string[]> {
|
private async expandGroupIds(organizationId: string, ids: string[]): Promise<string[]> {
|
||||||
const rows = await this.prisma.customerGroup.findMany({
|
const rows = await this.prisma.customerGroup.findMany({
|
||||||
|
|||||||
@@ -43,6 +43,10 @@ export class TahesabConnectionsService {
|
|||||||
lastHealthAt: Date | null;
|
lastHealthAt: Date | null;
|
||||||
lastHealthOk: boolean | null;
|
lastHealthOk: boolean | null;
|
||||||
lastError: string | null;
|
lastError: string | null;
|
||||||
|
customerSyncHours: number[];
|
||||||
|
customerSyncLastRunAt: Date | null;
|
||||||
|
customerSyncLastSummary: string | null;
|
||||||
|
customerSyncLastError: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
}) {
|
}) {
|
||||||
@@ -60,6 +64,10 @@ export class TahesabConnectionsService {
|
|||||||
lastHealthAt: row.lastHealthAt?.toISOString() ?? null,
|
lastHealthAt: row.lastHealthAt?.toISOString() ?? null,
|
||||||
lastHealthOk: row.lastHealthOk,
|
lastHealthOk: row.lastHealthOk,
|
||||||
lastError: row.lastError,
|
lastError: row.lastError,
|
||||||
|
customerSyncHours: [...row.customerSyncHours].sort((a, b) => a - b),
|
||||||
|
customerSyncLastRunAt: row.customerSyncLastRunAt?.toISOString() ?? null,
|
||||||
|
customerSyncLastSummary: row.customerSyncLastSummary,
|
||||||
|
customerSyncLastError: row.customerSyncLastError,
|
||||||
createdAt: row.createdAt.toISOString(),
|
createdAt: row.createdAt.toISOString(),
|
||||||
updatedAt: row.updatedAt.toISOString(),
|
updatedAt: row.updatedAt.toISOString(),
|
||||||
};
|
};
|
||||||
@@ -201,6 +209,15 @@ export class TahesabConnectionsService {
|
|||||||
|
|
||||||
if (dto.isDefault === true) await this.clearOtherDefaults(organizationId, id);
|
if (dto.isDefault === true) await this.clearOtherDefaults(organizationId, id);
|
||||||
|
|
||||||
|
let customerSyncHours: number[] | undefined;
|
||||||
|
if (dto.customerSyncHours !== undefined) {
|
||||||
|
const hours = dto.customerSyncHours.map((hour) => Math.trunc(hour));
|
||||||
|
if (new Set(hours).size !== hours.length) {
|
||||||
|
throw new BadRequestException('ساعتهای بروزرسانی نباید تکراری باشند.');
|
||||||
|
}
|
||||||
|
customerSyncHours = [...hours].sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
let enc = {
|
let enc = {
|
||||||
ciphertext: row.tokenCiphertext,
|
ciphertext: row.tokenCiphertext,
|
||||||
iv: row.tokenIv,
|
iv: row.tokenIv,
|
||||||
@@ -225,6 +242,7 @@ export class TahesabConnectionsService {
|
|||||||
enabled: dto.enabled ?? row.enabled,
|
enabled: dto.enabled ?? row.enabled,
|
||||||
isDefault: dto.isDefault === true ? true : dto.isDefault === false ? false : row.isDefault,
|
isDefault: dto.isDefault === true ? true : dto.isDefault === false ? false : row.isDefault,
|
||||||
allowInsecureTls: dto.allowInsecureTls ?? row.allowInsecureTls,
|
allowInsecureTls: dto.allowInsecureTls ?? row.allowInsecureTls,
|
||||||
|
...(customerSyncHours !== undefined ? { customerSyncHours } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return this.toDto(updated);
|
return this.toDto(updated);
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
|
import { Cron } from '@nestjs/schedule';
|
||||||
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
|
import { TahesabPersonLinkService } from './person-link.service';
|
||||||
|
|
||||||
|
/** ساعت و تاریخ امروز به وقت تهران، برای نوبت یکبار در هر ساعت. */
|
||||||
|
export function tehranSyncSlot(now = new Date()): { hour: number; slot: string } {
|
||||||
|
const parts = new Intl.DateTimeFormat('en-GB', {
|
||||||
|
timeZone: 'Asia/Tehran',
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
hourCycle: 'h23',
|
||||||
|
}).formatToParts(now);
|
||||||
|
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||||
|
parts.find((part) => part.type === type)?.value ?? '';
|
||||||
|
let hour = Number(read('hour'));
|
||||||
|
if (!Number.isFinite(hour) || hour === 24) hour = 0;
|
||||||
|
const slot = `${read('year')}-${read('month')}-${read('day')}-${String(hour).padStart(2, '0')}`;
|
||||||
|
return { hour, slot };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TahesabCustomerSyncScheduler {
|
||||||
|
private readonly logger = new Logger(TahesabCustomerSyncScheduler.name);
|
||||||
|
private busy = false;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly links: TahesabPersonLinkService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Cron('* * * * *', { timeZone: 'Asia/Tehran' })
|
||||||
|
async tick() {
|
||||||
|
if (process.env.NODE_ENV === 'test' || this.busy) return;
|
||||||
|
this.busy = true;
|
||||||
|
try {
|
||||||
|
const { hour, slot } = tehranSyncSlot();
|
||||||
|
const connections = await this.prisma.accountingConnection.findMany({
|
||||||
|
where: {
|
||||||
|
provider: 'tahesab',
|
||||||
|
enabled: true,
|
||||||
|
customerSyncHours: { has: hour },
|
||||||
|
},
|
||||||
|
select: { id: true, organizationId: true, label: true, customerSyncLastSlot: true },
|
||||||
|
});
|
||||||
|
for (const connection of connections) {
|
||||||
|
if (connection.customerSyncLastSlot === slot) continue;
|
||||||
|
const claimed = await this.prisma.accountingConnection.updateMany({
|
||||||
|
where: {
|
||||||
|
id: connection.id,
|
||||||
|
OR: [
|
||||||
|
{ customerSyncLastSlot: null },
|
||||||
|
{ customerSyncLastSlot: { not: slot } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
data: { customerSyncLastSlot: slot },
|
||||||
|
});
|
||||||
|
if (claimed.count !== 1) continue;
|
||||||
|
await this.run(connection.organizationId, connection.id, connection.label);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.logger.warn(
|
||||||
|
`بررسی زمانبندی مشتریان تهحساب ناموفق بود: ${
|
||||||
|
err instanceof Error ? err.message : err
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
this.busy = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async run(organizationId: string, connectionId: string, label: string) {
|
||||||
|
try {
|
||||||
|
const result = await this.links.syncAllCustomers(organizationId, connectionId);
|
||||||
|
await this.prisma.accountingConnection.update({
|
||||||
|
where: { id: connectionId },
|
||||||
|
data: {
|
||||||
|
customerSyncLastRunAt: new Date(),
|
||||||
|
customerSyncLastSummary: result.summary,
|
||||||
|
customerSyncLastError: result.error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.logger.log(`بروزرسانی خودکار «${label}»: ${result.summary}`);
|
||||||
|
} catch (err) {
|
||||||
|
const message = (err instanceof Error ? err.message : 'همگامسازی ناموفق بود').slice(0, 500);
|
||||||
|
await this.prisma.accountingConnection.update({
|
||||||
|
where: { id: connectionId },
|
||||||
|
data: {
|
||||||
|
customerSyncLastRunAt: new Date(),
|
||||||
|
customerSyncLastSummary: null,
|
||||||
|
customerSyncLastError: message,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.logger.warn(`بروزرسانی خودکار «${label}» ناموفق بود: ${message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -86,6 +86,16 @@ export class UpdateTahesabConnectionDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
allowInsecureTls?: boolean;
|
allowInsecureTls?: boolean;
|
||||||
|
|
||||||
|
/** ساعتهای ۰ تا ۲۳. آرایهٔ خالی یعنی خاموش. */
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayMaxSize(6)
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt({ each: true })
|
||||||
|
@Min(0, { each: true })
|
||||||
|
@Max(23, { each: true })
|
||||||
|
customerSyncHours?: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ManualLinkDto {
|
export class ManualLinkDto {
|
||||||
@@ -447,6 +457,18 @@ export class SyncAsnadReportDto {
|
|||||||
@MinLength(8)
|
@MinLength(8)
|
||||||
@MaxLength(12)
|
@MaxLength(12)
|
||||||
to!: string;
|
to!: string;
|
||||||
|
|
||||||
|
/** اگر باشد، فقط سندهای همین شخص گرفته میشود */
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
personId?: string;
|
||||||
|
|
||||||
|
/** اگر باشد، فقط مشتریان این گروهها (و زیرگروهها) گرفته میشوند */
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@IsString({ each: true })
|
||||||
|
@ArrayMaxSize(200)
|
||||||
|
groupIds?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateTahesabInvoiceSettingsDto {
|
export class UpdateTahesabInvoiceSettingsDto {
|
||||||
|
|||||||
@@ -8,7 +8,12 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { carryPreviousSource } from '../../contacts/person-source';
|
import { carryPreviousSource, namesDiffer } from '../../contacts/person-source';
|
||||||
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { applyPersonGenderTitle } from '@mento/shared';
|
import { applyPersonGenderTitle } from '@mento/shared';
|
||||||
import { TahesabConnectionsService } from './connections.service';
|
import { TahesabConnectionsService } from './connections.service';
|
||||||
import {
|
import {
|
||||||
@@ -25,6 +30,20 @@ import { formatJalaliDate, parseBirthDate } from '../../common/excel';
|
|||||||
import { CustomerGroupsService } from '../../customer-groups/customer-groups.service';
|
import { CustomerGroupsService } from '../../customer-groups/customer-groups.service';
|
||||||
import { normalizeIranMobile, SanadBuilders, type TahesabApi } from './tahesab-methods';
|
import { normalizeIranMobile, SanadBuilders, type TahesabApi } from './tahesab-methods';
|
||||||
|
|
||||||
|
/** موبایل تهحساب را به شکل 0912… ذخیره میکند، حتی اگر قبلاً 912… یا +98912… بوده باشد. */
|
||||||
|
function canonicalMobileUpdate(
|
||||||
|
incoming: string | null,
|
||||||
|
current: { mobile: string | null; phone: string | null },
|
||||||
|
): { mobile?: string; phone?: string } {
|
||||||
|
const mobile =
|
||||||
|
canonicalIranMobile(incoming) ??
|
||||||
|
canonicalIranMobile(current.mobile) ??
|
||||||
|
canonicalIranMobile(current.phone);
|
||||||
|
if (!mobile) return {};
|
||||||
|
const phone = canonicalIranMobile(current.phone);
|
||||||
|
return phone ? { mobile, phone } : { mobile };
|
||||||
|
}
|
||||||
|
|
||||||
/** اندازهٔ هر صفحهٔ «همه» (بازهٔ کد) — امن برای پروکسی/nginx */
|
/** اندازهٔ هر صفحهٔ «همه» (بازهٔ کد) — امن برای پروکسی/nginx */
|
||||||
const LIST_PAGE_SIZE = 2000;
|
const LIST_PAGE_SIZE = 2000;
|
||||||
const LIST_TIMEOUT_MS = 55_000;
|
const LIST_TIMEOUT_MS = 55_000;
|
||||||
@@ -539,6 +558,7 @@ export class TahesabPersonLinkService {
|
|||||||
organizationId: string,
|
organizationId: string,
|
||||||
dto: ImportFromTahesabDto,
|
dto: ImportFromTahesabDto,
|
||||||
prefetched?: { api: TahesabApi; row?: Record<string, unknown> },
|
prefetched?: { api: TahesabApi; row?: Record<string, unknown> },
|
||||||
|
options?: { skipJob?: boolean },
|
||||||
) {
|
) {
|
||||||
const clash = await this.prisma.personAccountingLink.findFirst({
|
const clash = await this.prisma.personAccountingLink.findFirst({
|
||||||
where: {
|
where: {
|
||||||
@@ -577,10 +597,11 @@ export class TahesabPersonLinkService {
|
|||||||
const named = applyPersonGenderTitle({ firstName: name, lastName: '' });
|
const named = applyPersonGenderTitle({ firstName: name, lastName: '' });
|
||||||
const firstName = named.firstName;
|
const firstName = named.firstName;
|
||||||
const lastName = named.lastName;
|
const lastName = named.lastName;
|
||||||
const mobile = tel || null;
|
const mobile = storedPhoneNumber(tel);
|
||||||
const sourceRef = String(dto.moshtariCode);
|
const sourceRef = String(dto.moshtariCode);
|
||||||
|
|
||||||
let personId = dto.personId;
|
let personId = dto.personId;
|
||||||
|
let preserveExistingLink = false;
|
||||||
if (personId) {
|
if (personId) {
|
||||||
const existing = await this.getPerson(organizationId, personId);
|
const existing = await this.getPerson(organizationId, personId);
|
||||||
const prevFirst = existing.firstName;
|
const prevFirst = existing.firstName;
|
||||||
@@ -604,28 +625,33 @@ export class TahesabPersonLinkService {
|
|||||||
importSource: 'tahesab',
|
importSource: 'tahesab',
|
||||||
sourceRef,
|
sourceRef,
|
||||||
...(!existing.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
...(!existing.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
||||||
...(mobile
|
...canonicalMobileUpdate(mobile, existing),
|
||||||
? {
|
|
||||||
mobile: existing.mobile || mobile,
|
|
||||||
phone: existing.phone || mobile,
|
|
||||||
}
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// اگر موبایل تکراری است → همان شخص؛ نام قبلی حفظ و نام تهحساب جایگزین.
|
// اگر موبایل تکراری است → همان شخص؛ نام قبلی حفظ و نام تهحساب جایگزین.
|
||||||
// شخصی که روی همین اتصال به کد دیگری لینک است کنار گذاشته میشود؛
|
// اگر همان شخص قبلاً به کد دیگری از این اتصال لینک شده، لینک جابهجا نمیشود
|
||||||
// وگرنه upsert لینک، کد قبلی را جابهجا و آن مشتری را دوباره «واردنشده» میکند.
|
// تا کد قبلی دوباره «واردنشده» نشود و مشتری تکراری ساخته نشود.
|
||||||
const byMobile = mobile
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
? await this.prisma.person.findFirst({
|
const matches = mobileKeys.length
|
||||||
|
? await this.prisma.person.findMany({
|
||||||
where: {
|
where: {
|
||||||
organizationId,
|
organizationId,
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
accountingLinks: { none: { connectionId: dto.connectionId } },
|
|
||||||
},
|
},
|
||||||
|
include: {
|
||||||
|
accountingLinks: {
|
||||||
|
where: { connectionId: dto.connectionId },
|
||||||
|
select: { moshtariCode: true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
})
|
})
|
||||||
: null;
|
: [];
|
||||||
|
const byMobile = matches.find((person) => person.importSource === 'tahesab') ?? matches[0] ?? null;
|
||||||
if (byMobile) {
|
if (byMobile) {
|
||||||
|
const linkedCode = byMobile.accountingLinks[0]?.moshtariCode;
|
||||||
|
preserveExistingLink = linkedCode != null && linkedCode !== dto.moshtariCode;
|
||||||
const nameChanged =
|
const nameChanged =
|
||||||
`${byMobile.firstName} ${byMobile.lastName}`.trim() !==
|
`${byMobile.firstName} ${byMobile.lastName}`.trim() !==
|
||||||
`${firstName} ${lastName}`.trim();
|
`${firstName} ${lastName}`.trim();
|
||||||
@@ -644,8 +670,9 @@ export class TahesabPersonLinkService {
|
|||||||
: {}),
|
: {}),
|
||||||
...carryPreviousSource(byMobile, 'tahesab'),
|
...carryPreviousSource(byMobile, 'tahesab'),
|
||||||
importSource: 'tahesab',
|
importSource: 'tahesab',
|
||||||
sourceRef,
|
sourceRef: preserveExistingLink ? String(linkedCode) : sourceRef,
|
||||||
...(!byMobile.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
...(!byMobile.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
||||||
|
...canonicalMobileUpdate(mobile, byMobile),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
personId = byMobile.id;
|
personId = byMobile.id;
|
||||||
@@ -669,6 +696,32 @@ export class TahesabPersonLinkService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (preserveExistingLink) {
|
||||||
|
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
||||||
|
const existing = await this.prisma.personAccountingLink.findFirst({
|
||||||
|
where: { personId, connectionId: dto.connectionId },
|
||||||
|
include: {
|
||||||
|
connection: { select: { label: true, dbName: true, isDefault: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!existing) {
|
||||||
|
throw new NotFoundException('لینک تهحساب این مشتری یافت نشد.');
|
||||||
|
}
|
||||||
|
if (!options?.skipJob) {
|
||||||
|
await this.prisma.accountingSyncJob.create({
|
||||||
|
data: {
|
||||||
|
organizationId,
|
||||||
|
connectionId: dto.connectionId,
|
||||||
|
kind: 'import',
|
||||||
|
status: 'success',
|
||||||
|
request: dto as unknown as Prisma.InputJsonValue,
|
||||||
|
result: { personId, linkId: existing.id, keptLink: true } as Prisma.InputJsonValue,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return { personId, link: this.linkDto(existing) };
|
||||||
|
}
|
||||||
|
|
||||||
const link = await this.prisma.personAccountingLink.upsert({
|
const link = await this.prisma.personAccountingLink.upsert({
|
||||||
where: {
|
where: {
|
||||||
personId_connectionId: {
|
personId_connectionId: {
|
||||||
@@ -693,6 +746,7 @@ export class TahesabPersonLinkService {
|
|||||||
});
|
});
|
||||||
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
||||||
|
|
||||||
|
if (!options?.skipJob) {
|
||||||
await this.prisma.accountingSyncJob.create({
|
await this.prisma.accountingSyncJob.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -703,10 +757,160 @@ export class TahesabPersonLinkService {
|
|||||||
result: { personId, linkId: link.id } as Prisma.InputJsonValue,
|
result: { personId, linkId: link.id } as Prisma.InputJsonValue,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return { personId, link: this.linkDto(link) };
|
return { personId, link: this.linkDto(link) };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** نام، موبایل و گروه مشتریِ از قبل لینکشده را با ردیف تهحساب تازه میکند. */
|
||||||
|
private async refreshLinkedCustomer(
|
||||||
|
organizationId: string,
|
||||||
|
connectionId: string,
|
||||||
|
personId: string,
|
||||||
|
moshtariCode: number,
|
||||||
|
row: Record<string, unknown>,
|
||||||
|
) {
|
||||||
|
const existing = await this.getPerson(organizationId, personId);
|
||||||
|
const picked = pickName(row).trim();
|
||||||
|
const named = picked
|
||||||
|
? applyPersonGenderTitle({ firstName: picked, lastName: '' })
|
||||||
|
: null;
|
||||||
|
const nameChanged =
|
||||||
|
named != null &&
|
||||||
|
namesDiffer(
|
||||||
|
existing.firstName,
|
||||||
|
existing.lastName,
|
||||||
|
named.firstName,
|
||||||
|
named.lastName,
|
||||||
|
);
|
||||||
|
await this.prisma.person.update({
|
||||||
|
where: { id: personId },
|
||||||
|
data: {
|
||||||
|
...(named
|
||||||
|
? {
|
||||||
|
firstName: named.firstName,
|
||||||
|
lastName: named.lastName,
|
||||||
|
gender: named.gender,
|
||||||
|
showGenderInName: named.showGenderInName,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
|
...(nameChanged
|
||||||
|
? {
|
||||||
|
previousFirstName: existing.firstName || null,
|
||||||
|
previousLastName: existing.lastName || null,
|
||||||
|
}
|
||||||
|
: {}),
|
||||||
|
...carryPreviousSource(existing, 'tahesab'),
|
||||||
|
importSource: 'tahesab',
|
||||||
|
sourceRef: String(moshtariCode),
|
||||||
|
...(!existing.birthDate && pickBirthDate(row)
|
||||||
|
? { birthDate: pickBirthDate(row) }
|
||||||
|
: {}),
|
||||||
|
...canonicalMobileUpdate(storedPhoneNumber(pickTel(row)), existing),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await this.applyTahesabGroup(organizationId, connectionId, personId, row);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* همهٔ مشتریان تهحساب را صفحه به صفحه میخواند.
|
||||||
|
* کد تازه وارد میشود؛ کد لینکشده نام و شماره و گروهش تازه میشود.
|
||||||
|
*/
|
||||||
|
async syncAllCustomers(organizationId: string, connectionId: string) {
|
||||||
|
const { api } = await this.connections.getApi(organizationId, connectionId);
|
||||||
|
let page = 1;
|
||||||
|
let emptyStreak = 0;
|
||||||
|
let imported = 0;
|
||||||
|
let updated = 0;
|
||||||
|
let failed = 0;
|
||||||
|
const errors: string[] = [];
|
||||||
|
const maxPages = 300;
|
||||||
|
|
||||||
|
while (emptyStreak < 2 && page <= maxPages) {
|
||||||
|
let listed: Awaited<ReturnType<typeof this.listMoshtariPage>>;
|
||||||
|
try {
|
||||||
|
listed = await this.listMoshtariPage(api, page, LIST_PAGE_SIZE);
|
||||||
|
} catch (err) {
|
||||||
|
const message = err instanceof Error ? err.message : 'خواندن تهحساب ناموفق بود';
|
||||||
|
errors.push(message);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if (!listed.rows.length) {
|
||||||
|
emptyStreak += 1;
|
||||||
|
page += 1;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
emptyStreak = 0;
|
||||||
|
const rowsByCode = new Map<number, Record<string, unknown>>();
|
||||||
|
for (const row of listed.rows) {
|
||||||
|
const code = pickCode(row);
|
||||||
|
if (code != null && code >= 1) rowsByCode.set(code, row);
|
||||||
|
}
|
||||||
|
const links = rowsByCode.size
|
||||||
|
? await this.prisma.personAccountingLink.findMany({
|
||||||
|
where: {
|
||||||
|
connectionId,
|
||||||
|
moshtariCode: { in: [...rowsByCode.keys()] },
|
||||||
|
},
|
||||||
|
select: { moshtariCode: true, personId: true },
|
||||||
|
})
|
||||||
|
: [];
|
||||||
|
const linkedByCode = new Map(links.map((link) => [link.moshtariCode, link.personId]));
|
||||||
|
for (const [code, row] of rowsByCode) {
|
||||||
|
try {
|
||||||
|
const personId = linkedByCode.get(code);
|
||||||
|
if (personId) {
|
||||||
|
await this.refreshLinkedCustomer(
|
||||||
|
organizationId,
|
||||||
|
connectionId,
|
||||||
|
personId,
|
||||||
|
code,
|
||||||
|
row,
|
||||||
|
);
|
||||||
|
updated += 1;
|
||||||
|
} else {
|
||||||
|
await this.importFromTahesab(
|
||||||
|
organizationId,
|
||||||
|
{ connectionId, moshtariCode: code },
|
||||||
|
{ api, row },
|
||||||
|
{ skipJob: true },
|
||||||
|
);
|
||||||
|
imported += 1;
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
failed += 1;
|
||||||
|
if (errors.length < 5) {
|
||||||
|
errors.push(err instanceof Error ? err.message : 'خطا');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
page += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (page > maxPages && emptyStreak < 2) {
|
||||||
|
errors.push('فهرست مشتریان از سقف خواندن خودکار بیشتر بود.');
|
||||||
|
}
|
||||||
|
|
||||||
|
const summary = `${imported} وارد شد، ${updated} بهروز شد، ${failed} خطا`;
|
||||||
|
await this.prisma.accountingSyncJob.create({
|
||||||
|
data: {
|
||||||
|
organizationId,
|
||||||
|
connectionId,
|
||||||
|
kind: 'customer-sync',
|
||||||
|
status: !imported && !updated && (failed > 0 || errors.length > 0) ? 'error' : 'success',
|
||||||
|
result: { imported, updated, failed, pages: page - 1 } as Prisma.InputJsonValue,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.logger.log(`همگامسازی مشتریان تهحساب ${connectionId}: ${summary}`);
|
||||||
|
return {
|
||||||
|
imported,
|
||||||
|
updated,
|
||||||
|
failed,
|
||||||
|
summary,
|
||||||
|
error: errors.length ? errors.join('؛ ') : null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
async importBulk(organizationId: string, dto: ImportBulkFromTahesabDto) {
|
async importBulk(organizationId: string, dto: ImportBulkFromTahesabDto) {
|
||||||
let codes = (dto.moshtariCodes ?? []).filter((n) => Number.isFinite(n) && n >= 1);
|
let codes = (dto.moshtariCodes ?? []).filter((n) => Number.isFinite(n) && n >= 1);
|
||||||
const rowsByCode = new Map<number, Record<string, unknown>>();
|
const rowsByCode = new Map<number, Record<string, unknown>>();
|
||||||
|
|||||||
@@ -309,6 +309,20 @@ export class TahesabController {
|
|||||||
dto.connectionId,
|
dto.connectionId,
|
||||||
dto.from,
|
dto.from,
|
||||||
dto.to,
|
dto.to,
|
||||||
|
{ personId: dto.personId, groupIds: dto.groupIds },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('reports/asnad/customers')
|
||||||
|
searchAsnadCustomers(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Query('connectionId') connectionId?: string,
|
||||||
|
@Query('q') q?: string,
|
||||||
|
) {
|
||||||
|
return this.asnadReport.searchCustomers(
|
||||||
|
user.organizationId,
|
||||||
|
connectionId,
|
||||||
|
q ?? '',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { TahesabBalanceService } from './balance.service';
|
|||||||
import { TahesabDocumentsService } from './documents.service';
|
import { TahesabDocumentsService } from './documents.service';
|
||||||
import { TahesabAsnadReportService } from './asnad-report.service';
|
import { TahesabAsnadReportService } from './asnad-report.service';
|
||||||
import { TahesabInvoiceSettingsService } from './invoice-settings.service';
|
import { TahesabInvoiceSettingsService } from './invoice-settings.service';
|
||||||
|
import { TahesabCustomerSyncScheduler } from './customer-sync.scheduler';
|
||||||
import { TahesabController } from './tahesab.controller';
|
import { TahesabController } from './tahesab.controller';
|
||||||
import { CustomerGroupsModule } from '../../customer-groups/customer-groups.module';
|
import { CustomerGroupsModule } from '../../customer-groups/customer-groups.module';
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ import { CustomerGroupsModule } from '../../customer-groups/customer-groups.modu
|
|||||||
TahesabDocumentsService,
|
TahesabDocumentsService,
|
||||||
TahesabAsnadReportService,
|
TahesabAsnadReportService,
|
||||||
TahesabInvoiceSettingsService,
|
TahesabInvoiceSettingsService,
|
||||||
|
TahesabCustomerSyncScheduler,
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
TahesabCryptoService,
|
TahesabCryptoService,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { NotificationsService } from '../../notifications/notifications.service';
|
import { NotificationsService } from '../../notifications/notifications.service';
|
||||||
import { normalizePhone } from '../../contacts/normalize';
|
import { iranMobileLookupKeys, normalizePhone } from '../../contacts/normalize';
|
||||||
import { VoipConnectionsService } from './connections.service';
|
import { VoipConnectionsService } from './connections.service';
|
||||||
|
|
||||||
function digitsOnly(value: string | null | undefined): string {
|
function digitsOnly(value: string | null | undefined): string {
|
||||||
@@ -35,6 +35,7 @@ function phoneVariants(raw: string | null | undefined): string[] {
|
|||||||
variants.add(`0${d}`);
|
variants.add(`0${d}`);
|
||||||
variants.add(`98${d}`);
|
variants.add(`98${d}`);
|
||||||
}
|
}
|
||||||
|
for (const key of iranMobileLookupKeys(raw)) variants.add(key);
|
||||||
return [...variants];
|
return [...variants];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ import type {
|
|||||||
WooCommerceSyncResultDto,
|
WooCommerceSyncResultDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { normalizeEmail, normalizePhone } from '../../contacts/normalize';
|
import {
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { WooConnectionsService } from './connections.service';
|
import { WooConnectionsService } from './connections.service';
|
||||||
import type { WooOrder } from './woo-client';
|
import type { WooOrder } from './woo-client';
|
||||||
|
|
||||||
@@ -374,7 +378,8 @@ export class WooSyncService {
|
|||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const billing = order.billing ?? {};
|
const billing = order.billing ?? {};
|
||||||
const email = normalizeEmail(billing.email ?? null);
|
const email = normalizeEmail(billing.email ?? null);
|
||||||
const mobile = normalizePhone(billing.phone ?? null);
|
const mobile = storedPhoneNumber(billing.phone ?? null);
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const firstName = (billing.first_name ?? '').trim() || 'مشتری';
|
const firstName = (billing.first_name ?? '').trim() || 'مشتری';
|
||||||
const lastName = (billing.last_name ?? '').trim() || 'ووکامرس';
|
const lastName = (billing.last_name ?? '').trim() || 'ووکامرس';
|
||||||
|
|
||||||
@@ -387,7 +392,9 @@ export class WooSyncService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
OR: [
|
OR: [
|
||||||
...(email ? [{ email }] : []),
|
...(email ? [{ email }] : []),
|
||||||
...(mobile ? [{ mobile }, { phone: mobile }] : []),
|
...(mobileKeys.length
|
||||||
|
? [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }]
|
||||||
|
: []),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
|
|||||||
@@ -17,12 +17,16 @@ import { isGenderQuestionLabel, parsePersonGenderAnswer } from '@mento/shared';
|
|||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
import {
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
emptyToNull,
|
emptyToNull,
|
||||||
normalizeEmail,
|
normalizeEmail,
|
||||||
normalizePhone,
|
normalizePhone,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
} from '../contacts/normalize';
|
} from '../contacts/normalize';
|
||||||
import { LeadStagesService } from '../leads/lead-stages.service';
|
import { LeadStagesService } from '../leads/lead-stages.service';
|
||||||
|
|
||||||
@@ -84,6 +88,7 @@ export class LeadFormsService {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly automations: AutomationsService,
|
private readonly automations: AutomationsService,
|
||||||
private readonly messageAutomations: MessageAutomationsService,
|
private readonly messageAutomations: MessageAutomationsService,
|
||||||
private readonly leadStages: LeadStagesService,
|
private readonly leadStages: LeadStagesService,
|
||||||
@@ -211,7 +216,12 @@ export class LeadFormsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async remove(organizationId: string, id: string): Promise<void> {
|
async remove(organizationId: string, id: string): Promise<void> {
|
||||||
await this.findInOrg(organizationId, id);
|
const row = await this.findInOrg(organizationId, id);
|
||||||
|
if (row.coverStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(row.coverStorageKey);
|
||||||
|
await this.files.remove(row.coverStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.prisma.leadForm.delete({ where: { id } });
|
await this.prisma.leadForm.delete({ where: { id } });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,7 +461,10 @@ export class LeadFormsService {
|
|||||||
? await this.prisma.person.findFirst({
|
? await this.prisma.person.findFirst({
|
||||||
where: {
|
where: {
|
||||||
organizationId: form.organizationId,
|
organizationId: form.organizationId,
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
OR: [
|
||||||
|
{ mobile: { in: phoneIdentityKeys(mobile) } },
|
||||||
|
{ phone: { in: phoneIdentityKeys(mobile) } },
|
||||||
|
],
|
||||||
},
|
},
|
||||||
select: { id: true, firstName: true, lastName: true },
|
select: { id: true, firstName: true, lastName: true },
|
||||||
})
|
})
|
||||||
@@ -634,13 +647,16 @@ export class LeadFormsService {
|
|||||||
ownerId: string,
|
ownerId: string,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const email = normalizeEmail(mapped.email);
|
const email = normalizeEmail(mapped.email);
|
||||||
const mobile = normalizePhone(mapped.mobile);
|
const mobile = storedPhoneNumber(mapped.mobile);
|
||||||
const phone = normalizePhone(mapped.phone);
|
const phone = storedPhoneNumber(mapped.phone);
|
||||||
|
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (email) or.push({ email });
|
if (email) or.push({ email });
|
||||||
if (mobile) or.push({ mobile });
|
|
||||||
|
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
const existing = or.length
|
const existing = or.length
|
||||||
? await this.prisma.person.findFirst({
|
? await this.prisma.person.findFirst({
|
||||||
where: { organizationId, OR: or },
|
where: { organizationId, OR: or },
|
||||||
@@ -835,6 +851,9 @@ export class LeadFormsService {
|
|||||||
throw new BadRequestException('فرمت تصویر کاور باید PNG، JPG یا WEBP باشد');
|
throw new BadRequestException('فرمت تصویر کاور باید PNG، JPG یا WEBP باشد');
|
||||||
}
|
}
|
||||||
const key = `lead-forms/${id}/cover.${ext}`;
|
const key = `lead-forms/${id}/cover.${ext}`;
|
||||||
|
const prevBytes = row.coverStorageKey ? await this.files.sizeOf(row.coverStorageKey) : 0;
|
||||||
|
const delta = file.buffer.length - prevBytes;
|
||||||
|
if (delta > 0) await this.storage.assertCanAdd(organizationId, delta);
|
||||||
await this.files.save(key, file.buffer);
|
await this.files.save(key, file.buffer);
|
||||||
if (row.coverStorageKey && row.coverStorageKey !== key) {
|
if (row.coverStorageKey && row.coverStorageKey !== key) {
|
||||||
await this.files.remove(row.coverStorageKey);
|
await this.files.remove(row.coverStorageKey);
|
||||||
@@ -843,12 +862,17 @@ export class LeadFormsService {
|
|||||||
where: { id },
|
where: { id },
|
||||||
data: { coverStorageKey: key },
|
data: { coverStorageKey: key },
|
||||||
});
|
});
|
||||||
|
if (delta) await this.storage.addLocal(organizationId, delta);
|
||||||
return this.get(organizationId, id);
|
return this.get(organizationId, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeCover(organizationId: string, id: string) {
|
async removeCover(organizationId: string, id: string) {
|
||||||
const row = await this.findInOrg(organizationId, id);
|
const row = await this.findInOrg(organizationId, id);
|
||||||
if (row.coverStorageKey) await this.files.remove(row.coverStorageKey);
|
if (row.coverStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(row.coverStorageKey);
|
||||||
|
await this.files.remove(row.coverStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.prisma.leadForm.update({
|
await this.prisma.leadForm.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { coverStorageKey: null },
|
data: { coverStorageKey: null },
|
||||||
@@ -1100,13 +1124,12 @@ function slugKey(label: string): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mobileKey(raw: string | null | undefined): string | null {
|
function mobileKey(raw: string | null | undefined): string | null {
|
||||||
|
const canon = canonicalIranMobile(raw);
|
||||||
|
if (canon) return canon;
|
||||||
const n = normalizePhone(raw);
|
const n = normalizePhone(raw);
|
||||||
if (!n) return null;
|
if (!n) return null;
|
||||||
const d = n.replace(/\D/g, '');
|
const d = n.replace(/\D/g, '');
|
||||||
if (!d) return null;
|
return d || null;
|
||||||
if (d.startsWith('98') && d.length >= 12) return `0${d.slice(2)}`;
|
|
||||||
if (d.length === 10 && d.startsWith('9')) return `0${d}`;
|
|
||||||
return d.startsWith('0') ? d : d;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeDuplicateMode(raw?: string | null): string {
|
function normalizeDuplicateMode(raw?: string | null): string {
|
||||||
|
|||||||
@@ -302,8 +302,6 @@ export class LeadsController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post('assign')
|
@Post('assign')
|
||||||
@UseGuards(RolesGuard)
|
|
||||||
@Roles('owner', 'admin')
|
|
||||||
assign(@CurrentUser() user: Actor, @Body() dto: AssignLeadsDto) {
|
assign(@CurrentUser() user: Actor, @Body() dto: AssignLeadsDto) {
|
||||||
return this.leads
|
return this.leads
|
||||||
.assign(user, dto.leadIds, dto.assigneeId)
|
.assign(user, dto.leadIds, dto.assigneeId)
|
||||||
|
|||||||
@@ -31,13 +31,21 @@ import {
|
|||||||
elevated,
|
elevated,
|
||||||
forScope,
|
forScope,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import {
|
import {
|
||||||
asAddresses,
|
asAddresses,
|
||||||
collectAddresses,
|
collectAddresses,
|
||||||
toJsonAddresses,
|
toJsonAddresses,
|
||||||
} from '../common/custom-fields';
|
} from '../common/custom-fields';
|
||||||
import { emptyToNull, normalizePhone } from '../contacts/normalize';
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
|
emptyToNull,
|
||||||
|
normalizePhone,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
} from '../contacts/normalize';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { LeadStagesService } from './lead-stages.service';
|
import { LeadStagesService } from './lead-stages.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
@@ -52,13 +60,20 @@ const LOGO_EXT: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function mobileKey(raw: string | null | undefined): string | null {
|
function mobileKey(raw: string | null | undefined): string | null {
|
||||||
|
const canon = canonicalIranMobile(raw);
|
||||||
|
if (canon) return canon;
|
||||||
const n = normalizePhone(raw);
|
const n = normalizePhone(raw);
|
||||||
if (!n) return null;
|
if (!n) return null;
|
||||||
const d = n.replace(/\D/g, '');
|
const d = n.replace(/\D/g, '');
|
||||||
if (!d) return null;
|
return d || null;
|
||||||
if (d.startsWith('98') && d.length >= 12) return `0${d.slice(2)}`;
|
}
|
||||||
if (d.length === 10 && d.startsWith('9')) return `0${d}`;
|
|
||||||
return d.startsWith('0') ? d : d;
|
function personWithMobile(organizationId: string, mobile: string): Prisma.PersonWhereInput {
|
||||||
|
const keys = phoneIdentityKeys(mobile);
|
||||||
|
return {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: keys } }, { phone: { in: keys } }],
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function leadAccessWhere(actor: Actor): Prisma.LeadWhereInput {
|
function leadAccessWhere(actor: Actor): Prisma.LeadWhereInput {
|
||||||
@@ -91,6 +106,7 @@ export class LeadsService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly stages: LeadStagesService,
|
private readonly stages: LeadStagesService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
private readonly sms: SmsGatewayService,
|
private readonly sms: SmsGatewayService,
|
||||||
private readonly outboundSms: OutboundSmsLogService,
|
private readonly outboundSms: OutboundSmsLogService,
|
||||||
@@ -319,10 +335,7 @@ export class LeadsService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
const person = await this.prisma.person.findFirst({
|
const person = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(actor.organizationId, mobile),
|
||||||
organizationId: actor.organizationId,
|
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
|
||||||
},
|
|
||||||
select: { id: true, firstName: true, lastName: true },
|
select: { id: true, firstName: true, lastName: true },
|
||||||
});
|
});
|
||||||
if (person) {
|
if (person) {
|
||||||
@@ -377,10 +390,11 @@ export class LeadsService {
|
|||||||
const stageId = dto.stageId || stages[0]?.id;
|
const stageId = dto.stageId || stages[0]?.id;
|
||||||
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
||||||
|
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, actor, 'leads');
|
||||||
let assigneeId: string | null = null;
|
let assigneeId: string | null = null;
|
||||||
if (elevated(actor.role) && dto.assigneeId) {
|
if (allowOthers && dto.assigneeId) {
|
||||||
assigneeId = dto.assigneeId;
|
assigneeId = dto.assigneeId;
|
||||||
} else if (!elevated(actor.role)) {
|
} else if (!allowOthers) {
|
||||||
assigneeId = actor.userId;
|
assigneeId = actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -568,8 +582,9 @@ export class LeadsService {
|
|||||||
if (typeof dto.stageId === 'string' && dto.stageId !== existing.stageId) {
|
if (typeof dto.stageId === 'string' && dto.stageId !== existing.stageId) {
|
||||||
data.stage = { connect: { id: dto.stageId } };
|
data.stage = { connect: { id: dto.stageId } };
|
||||||
}
|
}
|
||||||
if (elevated(actor.role) && dto.assigneeId !== undefined) {
|
if (dto.assigneeId !== undefined) {
|
||||||
const aid = dto.assigneeId ? String(dto.assigneeId) : null;
|
const aid = dto.assigneeId ? String(dto.assigneeId) : null;
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'leads', [aid], [existing.assigneeId]);
|
||||||
data.assignee = aid
|
data.assignee = aid
|
||||||
? { connect: { id: aid } }
|
? { connect: { id: aid } }
|
||||||
: { disconnect: true };
|
: { disconnect: true };
|
||||||
@@ -608,24 +623,43 @@ export class LeadsService {
|
|||||||
});
|
});
|
||||||
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
||||||
|
|
||||||
|
let placedIds: string[] | null = null;
|
||||||
|
let nextPosition = position ?? 0;
|
||||||
|
if (position != null) {
|
||||||
|
const rows = await this.prisma.lead.findMany({
|
||||||
|
where: { organizationId: actor.organizationId, stageId, archivedAt: null },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, id, position);
|
||||||
|
nextPosition = Math.max(0, placedIds.indexOf(id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.lead.update({
|
const row = await this.prisma.lead.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: {
|
data: {
|
||||||
stageId,
|
stageId,
|
||||||
position: position ?? 0,
|
position: nextPosition,
|
||||||
...(stage.isConverted
|
|
||||||
? {}
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
include: leadInclude,
|
include: leadInclude,
|
||||||
});
|
});
|
||||||
|
if (placedIds) {
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placedIds,
|
||||||
|
(leadId, leadPosition) =>
|
||||||
|
this.prisma.lead.update({ where: { id: leadId }, data: { position: leadPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (before.stageId !== stageId) {
|
||||||
await this.addEvent(
|
await this.addEvent(
|
||||||
actor,
|
actor,
|
||||||
id,
|
id,
|
||||||
'stage_changed',
|
'stage_changed',
|
||||||
`به مرحله «${stage.name}» منتقل شد`,
|
`به مرحله «${stage.name}» منتقل شد`,
|
||||||
);
|
);
|
||||||
if (before.stageId !== stageId) {
|
|
||||||
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
||||||
eventKey: `${id}:${stageId}`,
|
eventKey: `${id}:${stageId}`,
|
||||||
facts: { stageName: stage.name, source: row.source },
|
facts: { stageName: stage.name, source: row.source },
|
||||||
@@ -639,9 +673,7 @@ export class LeadsService {
|
|||||||
leadIds: string[],
|
leadIds: string[],
|
||||||
assigneeId: string,
|
assigneeId: string,
|
||||||
): Promise<number> {
|
): Promise<number> {
|
||||||
if (!elevated(actor.role)) {
|
await assertAssigneeSet(this.prisma, actor, 'leads', [assigneeId]);
|
||||||
throw new BadRequestException('فقط مدیر میتواند تخصیص دهد');
|
|
||||||
}
|
|
||||||
const user = await this.prisma.user.findFirst({
|
const user = await this.prisma.user.findFirst({
|
||||||
where: {
|
where: {
|
||||||
id: assigneeId,
|
id: assigneeId,
|
||||||
@@ -807,14 +839,14 @@ export class LeadsService {
|
|||||||
? `تماس ثبت شد — ${dto.outcome}`
|
? `تماس ثبت شد — ${dto.outcome}`
|
||||||
: 'تماس ثبت شد';
|
: 'تماس ثبت شد';
|
||||||
await this.addEvent(actor, id, 'call', title, dto.body ?? null);
|
await this.addEvent(actor, id, 'call', title, dto.body ?? null);
|
||||||
|
const followAt = this.parseFollowUpAt(dto.nextFollowUpAt);
|
||||||
|
if (followAt) {
|
||||||
|
await this.createLeadFollowUpActivity(actor, before, followAt, dto.body);
|
||||||
|
}
|
||||||
const data: Prisma.LeadUpdateInput = {
|
const data: Prisma.LeadUpdateInput = {
|
||||||
lastContactAt: new Date(),
|
lastContactAt: new Date(),
|
||||||
...(dto.nextFollowUpAt !== undefined
|
...(dto.nextFollowUpAt !== undefined
|
||||||
? {
|
? { nextFollowUpAt: followAt }
|
||||||
nextFollowUpAt: dto.nextFollowUpAt
|
|
||||||
? new Date(dto.nextFollowUpAt)
|
|
||||||
: null,
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
};
|
};
|
||||||
if (dto.stageId) data.stage = { connect: { id: dto.stageId } };
|
if (dto.stageId) data.stage = { connect: { id: dto.stageId } };
|
||||||
@@ -853,8 +885,10 @@ export class LeadsService {
|
|||||||
nextFollowUpAt: string,
|
nextFollowUpAt: string,
|
||||||
body?: string,
|
body?: string,
|
||||||
): Promise<LeadDto> {
|
): Promise<LeadDto> {
|
||||||
await this.findAccessible(actor, id);
|
const lead = await this.findAccessible(actor, id);
|
||||||
const at = new Date(nextFollowUpAt);
|
const at = this.parseFollowUpAt(nextFollowUpAt);
|
||||||
|
if (!at) throw new BadRequestException('زمان پیگیری نامعتبر است');
|
||||||
|
await this.createLeadFollowUpActivity(actor, lead, at, body);
|
||||||
await this.addEvent(
|
await this.addEvent(
|
||||||
actor,
|
actor,
|
||||||
id,
|
id,
|
||||||
@@ -875,6 +909,39 @@ export class LeadsService {
|
|||||||
return this.toDto(row);
|
return this.toDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** پیگیری آینده باید خودش یک فعالیت باز و متصل به لید باشد، نه فقط یک تاریخ. */
|
||||||
|
private parseFollowUpAt(value?: string | null): Date | null {
|
||||||
|
if (!value) return null;
|
||||||
|
const at = new Date(value);
|
||||||
|
if (Number.isNaN(at.getTime())) {
|
||||||
|
throw new BadRequestException('زمان پیگیری نامعتبر است');
|
||||||
|
}
|
||||||
|
return at;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async createLeadFollowUpActivity(
|
||||||
|
actor: Actor,
|
||||||
|
lead: { id: string; title: string; assigneeId: string | null },
|
||||||
|
dueAt: Date,
|
||||||
|
body?: string | null,
|
||||||
|
) {
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, actor, 'activities');
|
||||||
|
const assigneeId = allowOthers && lead.assigneeId ? lead.assigneeId : actor.userId;
|
||||||
|
await this.prisma.activity.create({
|
||||||
|
data: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
type: 'task',
|
||||||
|
title: `پیگیری: ${lead.title}`.slice(0, 200),
|
||||||
|
description: body?.trim() || null,
|
||||||
|
dueAt,
|
||||||
|
leadId: lead.id,
|
||||||
|
assigneeId,
|
||||||
|
assignees: { connect: [{ id: assigneeId }] },
|
||||||
|
createdById: actor.userId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async archive(actor: Actor, ids: string[]): Promise<number> {
|
async archive(actor: Actor, ids: string[]): Promise<number> {
|
||||||
if (!elevated(actor.role) && ids.length > 1) {
|
if (!elevated(actor.role) && ids.length > 1) {
|
||||||
throw new BadRequestException('حذف گروهی فقط برای مدیر');
|
throw new BadRequestException('حذف گروهی فقط برای مدیر');
|
||||||
@@ -908,10 +975,7 @@ export class LeadsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let person = await this.prisma.person.findFirst({
|
let person = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(actor.organizationId, lead.mobile),
|
||||||
organizationId: actor.organizationId,
|
|
||||||
OR: [{ mobile: lead.mobile }, { phone: lead.mobile }],
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
let createdPerson = false;
|
let createdPerson = false;
|
||||||
|
|
||||||
@@ -938,7 +1002,7 @@ export class LeadsService {
|
|||||||
lastName: named.lastName,
|
lastName: named.lastName,
|
||||||
gender: named.gender,
|
gender: named.gender,
|
||||||
showGenderInName: named.showGenderInName,
|
showGenderInName: named.showGenderInName,
|
||||||
mobile: lead.mobile,
|
mobile: canonicalIranMobile(lead.mobile) ?? lead.mobile,
|
||||||
phone: lead.phone,
|
phone: lead.phone,
|
||||||
instagram: lead.instagram,
|
instagram: lead.instagram,
|
||||||
birthDate: lead.birthDate,
|
birthDate: lead.birthDate,
|
||||||
@@ -1112,6 +1176,95 @@ export class LeadsService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async createFromExternal(input: {
|
||||||
|
organizationId: string;
|
||||||
|
siteName: string;
|
||||||
|
firstName?: string | null;
|
||||||
|
lastName?: string | null;
|
||||||
|
mobile: string;
|
||||||
|
storeName?: string | null;
|
||||||
|
source?: string | null;
|
||||||
|
}): Promise<{
|
||||||
|
ok: true;
|
||||||
|
created: boolean;
|
||||||
|
duplicate: boolean;
|
||||||
|
leadId: string | null;
|
||||||
|
}> {
|
||||||
|
const mobile = mobileKey(input.mobile);
|
||||||
|
if (!mobile || !/^09\d{9}$/.test(mobile)) {
|
||||||
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
|
}
|
||||||
|
|
||||||
|
const contactName =
|
||||||
|
`${input.firstName?.trim() ?? ''} ${input.lastName?.trim() ?? ''}`.trim() || null;
|
||||||
|
const storeName = input.storeName?.trim() ?? '';
|
||||||
|
const source = emptyToNull(input.source);
|
||||||
|
const title = storeName || contactName || mobile;
|
||||||
|
const siteName = input.siteName.trim() || 'سایت بیرونی';
|
||||||
|
|
||||||
|
const existing = await this.prisma.lead.findFirst({
|
||||||
|
where: { organizationId: input.organizationId, mobile, archivedAt: null },
|
||||||
|
select: { id: true, source: true, contactName: true },
|
||||||
|
});
|
||||||
|
if (existing) {
|
||||||
|
const patch: Prisma.LeadUpdateInput = {};
|
||||||
|
if (!existing.source && source) patch.source = source;
|
||||||
|
if (!existing.contactName && contactName) patch.contactName = contactName;
|
||||||
|
if (Object.keys(patch).length) {
|
||||||
|
await this.prisma.lead.update({ where: { id: existing.id }, data: patch });
|
||||||
|
}
|
||||||
|
await this.prisma.leadEvent.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
leadId: existing.id,
|
||||||
|
type: 'note',
|
||||||
|
title: 'درخواست دوباره از سایت',
|
||||||
|
body: [`سایت: ${siteName}`, source ? `منبع: ${source}` : null]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('\n'),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { ok: true, created: false, duplicate: true, leadId: existing.id };
|
||||||
|
}
|
||||||
|
|
||||||
|
const person = await this.prisma.person.findFirst({
|
||||||
|
where: personWithMobile(input.organizationId, mobile),
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (person) {
|
||||||
|
return { ok: true, created: false, duplicate: true, leadId: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.stages.ensureDefaults(input.organizationId);
|
||||||
|
const stages = await this.stages.list(input.organizationId);
|
||||||
|
const stageId = stages[0]?.id;
|
||||||
|
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
||||||
|
|
||||||
|
const lead = await this.prisma.lead.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
title,
|
||||||
|
contactName,
|
||||||
|
mobile,
|
||||||
|
source,
|
||||||
|
notes: `ثبت از سایت: ${siteName}`,
|
||||||
|
stageId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await this.prisma.leadEvent.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
leadId: lead.id,
|
||||||
|
type: 'created',
|
||||||
|
title: 'لید از سایت ثبت شد',
|
||||||
|
body: [`سایت: ${siteName}`, source ? `منبع: ${source}` : null]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('\n'),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { ok: true, created: true, duplicate: false, leadId: lead.id };
|
||||||
|
}
|
||||||
|
|
||||||
async createFromImportRow(
|
async createFromImportRow(
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
createdById: string | null,
|
createdById: string | null,
|
||||||
@@ -1154,10 +1307,7 @@ export class LeadsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const existingPerson = await this.prisma.person.findFirst({
|
const existingPerson = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(organizationId, mobile),
|
||||||
organizationId,
|
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
|
||||||
},
|
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (existingPerson) {
|
if (existingPerson) {
|
||||||
@@ -1308,6 +1458,9 @@ export class LeadsService {
|
|||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(actor.organizationId, 'leads', id, `logo.${ext}`)
|
.join(actor.organizationId, 'leads', id, `logo.${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
const prevBytes = prevKey ? await this.files.sizeOf(prevKey) : 0;
|
||||||
|
const delta = file.size - prevBytes;
|
||||||
|
if (delta > 0) await this.storage.assertCanAdd(actor.organizationId, delta);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
if (prevKey && prevKey !== storageKey) {
|
if (prevKey && prevKey !== storageKey) {
|
||||||
await this.files.remove(prevKey);
|
await this.files.remove(prevKey);
|
||||||
@@ -1318,13 +1471,16 @@ export class LeadsService {
|
|||||||
include: leadInclude,
|
include: leadInclude,
|
||||||
});
|
});
|
||||||
await this.addEvent(actor, id, 'note', 'لوگو بهروز شد', null);
|
await this.addEvent(actor, id, 'note', 'لوگو بهروز شد', null);
|
||||||
|
if (delta) await this.storage.addLocal(actor.organizationId, delta);
|
||||||
return this.toDto(row);
|
return this.toDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeLogo(actor: Actor, id: string): Promise<LeadDto> {
|
async removeLogo(actor: Actor, id: string): Promise<LeadDto> {
|
||||||
const existing = await this.findAccessible(actor, id);
|
const existing = await this.findAccessible(actor, id);
|
||||||
if (existing.logoStorageKey) {
|
if (existing.logoStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(existing.logoStorageKey);
|
||||||
await this.files.remove(existing.logoStorageKey);
|
await this.files.remove(existing.logoStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(actor.organizationId, -bytes);
|
||||||
}
|
}
|
||||||
const row = await this.prisma.lead.update({
|
const row = await this.prisma.lead.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import * as path from 'path';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
||||||
import {
|
import {
|
||||||
@@ -114,6 +115,7 @@ export class NotesService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list(
|
async list(
|
||||||
@@ -444,10 +446,12 @@ export class NotesService {
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const note = await this.prisma.note.findFirst({
|
const note = await this.prisma.note.findFirst({
|
||||||
where: { id, organizationId, ...noteAccessWhere(actor) },
|
where: { id, organizationId, ...noteAccessWhere(actor) },
|
||||||
include: { attachments: { select: { storageKey: true } } },
|
include: { attachments: { select: { storageKey: true, sizeBytes: true } } },
|
||||||
});
|
});
|
||||||
if (!note) throw new NotFoundException('یادداشت پیدا نشد');
|
if (!note) throw new NotFoundException('یادداشت پیدا نشد');
|
||||||
|
|
||||||
|
const bytes = note.attachments.reduce((sum, file) => sum + file.sizeBytes, 0);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
for (const att of note.attachments) {
|
for (const att of note.attachments) {
|
||||||
await this.files.remove(att.storageKey);
|
await this.files.remove(att.storageKey);
|
||||||
}
|
}
|
||||||
@@ -491,6 +495,7 @@ export class NotesService {
|
|||||||
.join(organizationId, 'notes', noteId, `${attachmentId}${ext}`)
|
.join(organizationId, 'notes', noteId, `${attachmentId}${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
|
||||||
|
await this.storage.assertCanAdd(organizationId, file.size);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -506,6 +511,7 @@ export class NotesService {
|
|||||||
uploadedById: userId,
|
uploadedById: userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await this.storage.addLocal(organizationId, file.size);
|
||||||
return this.toAttachmentDto(row);
|
return this.toAttachmentDto(row);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
await this.files.remove(storageKey);
|
await this.files.remove(storageKey);
|
||||||
@@ -526,6 +532,7 @@ export class NotesService {
|
|||||||
if (!row) throw new NotFoundException('پیوست پیدا نشد');
|
if (!row) throw new NotFoundException('پیوست پیدا نشد');
|
||||||
await this.files.remove(row.storageKey);
|
await this.files.remove(row.storageKey);
|
||||||
await this.prisma.noteAttachment.delete({ where: { id: row.id } });
|
await this.prisma.noteAttachment.delete({ where: { id: row.id } });
|
||||||
|
await this.storage.addLocal(organizationId, -row.sizeBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
async openAttachmentDownload(
|
async openAttachmentDownload(
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Type } from 'class-transformer';
|
|||||||
import {
|
import {
|
||||||
ArrayUnique,
|
ArrayUnique,
|
||||||
IsArray,
|
IsArray,
|
||||||
|
IsBoolean,
|
||||||
IsIn,
|
IsIn,
|
||||||
IsObject,
|
IsObject,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
@@ -45,6 +46,16 @@ export class CreateOrgRoleDto {
|
|||||||
@ValidateIf((_, v) => v !== null)
|
@ValidateIf((_, v) => v !== null)
|
||||||
@IsString()
|
@IsString()
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayUnique()
|
||||||
|
@IsString({ each: true })
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateOrgRoleDto {
|
export class UpdateOrgRoleDto {
|
||||||
@@ -77,6 +88,16 @@ export class UpdateOrgRoleDto {
|
|||||||
@ValidateIf((_, v) => v !== null)
|
@ValidateIf((_, v) => v !== null)
|
||||||
@IsString()
|
@IsString()
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayUnique()
|
||||||
|
@IsString({ each: true })
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class RolePermissionPatchItemDto {
|
export class RolePermissionPatchItemDto {
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ type RoleRow = {
|
|||||||
color: string;
|
color: string;
|
||||||
permissions: string[];
|
permissions: string[];
|
||||||
dataAccessPolicy?: unknown;
|
dataAccessPolicy?: unknown;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
systemKey: string | null;
|
systemKey: string | null;
|
||||||
parentId: string | null;
|
parentId: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
@@ -79,6 +81,8 @@ export class OrgRolesService {
|
|||||||
permissions?: RolePermissionKey[];
|
permissions?: RolePermissionKey[];
|
||||||
dataAccessPolicy?: DataAccessPolicy;
|
dataAccessPolicy?: DataAccessPolicy;
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
},
|
},
|
||||||
): Promise<OrgRoleDto> {
|
): Promise<OrgRoleDto> {
|
||||||
this.assertManager(actorRole);
|
this.assertManager(actorRole);
|
||||||
@@ -108,6 +112,8 @@ export class OrgRolesService {
|
|||||||
description: (dto.description ?? '').trim(),
|
description: (dto.description ?? '').trim(),
|
||||||
color: dto.color ?? parent?.color ?? 'teal',
|
color: dto.color ?? parent?.color ?? 'teal',
|
||||||
permissions,
|
permissions,
|
||||||
|
treasuryAccountIds: dto.treasuryAccountIds ?? [],
|
||||||
|
treasuryOwnAccounts: dto.treasuryOwnAccounts ?? false,
|
||||||
parentId,
|
parentId,
|
||||||
...(dto.dataAccessPolicy
|
...(dto.dataAccessPolicy
|
||||||
? { dataAccessPolicy: parseDataAccessPolicy(dto.dataAccessPolicy) }
|
? { dataAccessPolicy: parseDataAccessPolicy(dto.dataAccessPolicy) }
|
||||||
@@ -135,6 +141,8 @@ export class OrgRolesService {
|
|||||||
permissions?: RolePermissionKey[];
|
permissions?: RolePermissionKey[];
|
||||||
dataAccessPolicy?: DataAccessPolicy;
|
dataAccessPolicy?: DataAccessPolicy;
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
},
|
},
|
||||||
): Promise<OrgRoleDto> {
|
): Promise<OrgRoleDto> {
|
||||||
this.assertManager(actorRole);
|
this.assertManager(actorRole);
|
||||||
@@ -159,6 +167,12 @@ export class OrgRolesService {
|
|||||||
if (dto.dataAccessPolicy !== undefined) {
|
if (dto.dataAccessPolicy !== undefined) {
|
||||||
data.dataAccessPolicy = parseDataAccessPolicy(dto.dataAccessPolicy);
|
data.dataAccessPolicy = parseDataAccessPolicy(dto.dataAccessPolicy);
|
||||||
}
|
}
|
||||||
|
if (dto.treasuryAccountIds !== undefined) {
|
||||||
|
data.treasuryAccountIds = [...new Set(dto.treasuryAccountIds.map((id) => id.trim()).filter(Boolean))];
|
||||||
|
}
|
||||||
|
if (dto.treasuryOwnAccounts !== undefined) {
|
||||||
|
data.treasuryOwnAccounts = dto.treasuryOwnAccounts;
|
||||||
|
}
|
||||||
|
|
||||||
if (dto.parentId !== undefined) {
|
if (dto.parentId !== undefined) {
|
||||||
const nextParentId =
|
const nextParentId =
|
||||||
@@ -426,6 +440,8 @@ export class OrgRolesService {
|
|||||||
color: row.color,
|
color: row.color,
|
||||||
permissions: sanitizePermissions(row.permissions),
|
permissions: sanitizePermissions(row.permissions),
|
||||||
dataAccessPolicy: parseDataAccessPolicy(row.dataAccessPolicy),
|
dataAccessPolicy: parseDataAccessPolicy(row.dataAccessPolicy),
|
||||||
|
treasuryAccountIds: row.treasuryAccountIds ?? [],
|
||||||
|
treasuryOwnAccounts: row.treasuryOwnAccounts ?? false,
|
||||||
systemKey,
|
systemKey,
|
||||||
parentId: row.parentId,
|
parentId: row.parentId,
|
||||||
parentName: row.parentId ? (nameById.get(row.parentId) ?? null) : null,
|
parentName: row.parentId ? (nameById.get(row.parentId) ?? null) : null,
|
||||||
|
|||||||
@@ -41,7 +41,9 @@ export const SYSTEM_ROLE_SEEDS: Array<{
|
|||||||
name: 'کارشناس فروش',
|
name: 'کارشناس فروش',
|
||||||
description: 'امکان دسترسی به بخشهای فروش و مشتریان برای انجام فعالیتهای روزمره.',
|
description: 'امکان دسترسی به بخشهای فروش و مشتریان برای انجام فعالیتهای روزمره.',
|
||||||
color: 'teal',
|
color: 'teal',
|
||||||
permissions: ALL_ROLE_PERMISSIONS.filter((key) => key !== 'audit'),
|
permissions: ALL_ROLE_PERMISSIONS.filter(
|
||||||
|
(key) => key !== 'audit' && !key.startsWith('assign_'),
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
systemKey: 'support',
|
systemKey: 'support',
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import type { Actor } from '../common/record-scope';
|
|||||||
import { dealAccessWhere, resolveOwnerId } from '../common/record-scope';
|
import { dealAccessWhere, resolveOwnerId } from '../common/record-scope';
|
||||||
import { dealPriorWhere } from '../common/prior-archive';
|
import { dealPriorWhere } from '../common/prior-archive';
|
||||||
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatJalaliDate,
|
formatJalaliDate,
|
||||||
@@ -708,9 +708,9 @@ export class DealsExcelService {
|
|||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const orgId = actor.organizationId;
|
const orgId = actor.organizationId;
|
||||||
const code = cleanCode(row.personCode);
|
const code = cleanCode(row.personCode);
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobile = storedPhoneNumber(row.personMobile);
|
||||||
const mobileCore = mobile ? mobile.replace(/^\+98|^98|^0/, '') : '';
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const validMobile = mobileCore.length >= 8 ? mobile : null;
|
const validMobile = (mobile ?? '').replace(/\D/g, '').length >= 8 ? mobile : null;
|
||||||
const first = (row.personFirstName ?? '').trim();
|
const first = (row.personFirstName ?? '').trim();
|
||||||
const last = (row.personName ?? '').trim();
|
const last = (row.personName ?? '').trim();
|
||||||
const fullName = [first, last].filter(Boolean).join(' ');
|
const fullName = [first, last].filter(Boolean).join(' ');
|
||||||
@@ -731,7 +731,10 @@ export class DealsExcelService {
|
|||||||
}
|
}
|
||||||
if (!found && validMobile) {
|
if (!found && validMobile) {
|
||||||
found = await this.prisma.person.findFirst({
|
found = await this.prisma.person.findFirst({
|
||||||
where: { organizationId: orgId, mobile: { contains: mobileCore } },
|
where: {
|
||||||
|
organizationId: orgId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,11 +22,12 @@ import { WebhooksService } from '../public-api/webhooks.service';
|
|||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
|
|
||||||
const dealInclude = {
|
const dealInclude = {
|
||||||
person: { select: { id: true, firstName: true, lastName: true } },
|
person: { select: { id: true, firstName: true, lastName: true } },
|
||||||
@@ -106,6 +107,10 @@ export class DealsService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
dto.assigneeIds,
|
dto.assigneeIds,
|
||||||
);
|
);
|
||||||
|
const assignActor = { userId: actor.userId, role: actor.role, organizationId };
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, assignActor, 'sales');
|
||||||
|
const ownerId = resolveOwnerId(actor, dto.ownerId, allowOthers);
|
||||||
|
await assertAssigneeSet(this.prisma, assignActor, 'sales', [ownerId, ...assigneeIds]);
|
||||||
|
|
||||||
const maxPos = await this.prisma.deal.aggregate({
|
const maxPos = await this.prisma.deal.aggregate({
|
||||||
where: { organizationId, stageId: stage.id },
|
where: { organizationId, stageId: stage.id },
|
||||||
@@ -156,7 +161,7 @@ export class DealsService {
|
|||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
personId: emptyToNull(dto.personId ?? null),
|
personId: emptyToNull(dto.personId ?? null),
|
||||||
companyId: emptyToNull(dto.companyId ?? null),
|
companyId: emptyToNull(dto.companyId ?? null),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId,
|
||||||
position: (maxPos._max.position ?? -1) + 1,
|
position: (maxPos._max.position ?? -1) + 1,
|
||||||
...(assigneeIds.length
|
...(assigneeIds.length
|
||||||
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
||||||
@@ -259,18 +264,39 @@ export class DealsService {
|
|||||||
}
|
}
|
||||||
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
|
||||||
}
|
|
||||||
|
|
||||||
let assigneeConnect: { id: string }[] | undefined;
|
let assigneeConnect: { id: string }[] | undefined;
|
||||||
|
if (dto.ownerId !== undefined || dto.assigneeIds !== undefined) {
|
||||||
|
const current = await this.prisma.deal.findFirst({
|
||||||
|
where: { id, organizationId },
|
||||||
|
select: { ownerId: true, assignees: { select: { id: true } } },
|
||||||
|
});
|
||||||
|
const assignActor = { userId: actor.userId, role: actor.role, organizationId };
|
||||||
|
if (dto.ownerId !== undefined) {
|
||||||
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
assignActor,
|
||||||
|
'sales',
|
||||||
|
[nextOwner],
|
||||||
|
[current?.ownerId],
|
||||||
|
);
|
||||||
|
data.ownerId = nextOwner ?? actor.userId;
|
||||||
|
}
|
||||||
if (dto.assigneeIds !== undefined) {
|
if (dto.assigneeIds !== undefined) {
|
||||||
const assigneeIds = await this.normalizeAssigneeIds(
|
const assigneeIds = await this.normalizeAssigneeIds(
|
||||||
organizationId,
|
organizationId,
|
||||||
dto.assigneeIds,
|
dto.assigneeIds,
|
||||||
);
|
);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
assignActor,
|
||||||
|
'sales',
|
||||||
|
assigneeIds,
|
||||||
|
current?.assignees.map((item) => item.id) ?? [],
|
||||||
|
);
|
||||||
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (pricedFromLines && dto.lineItems) {
|
if (pricedFromLines && dto.lineItems) {
|
||||||
const total = sumLineItems(dto.lineItems);
|
const total = sumLineItems(dto.lineItems);
|
||||||
@@ -354,7 +380,8 @@ export class DealsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
||||||
const position =
|
let placedIds: string[] | null = null;
|
||||||
|
let position =
|
||||||
dto.position ??
|
dto.position ??
|
||||||
((
|
((
|
||||||
await this.prisma.deal.aggregate({
|
await this.prisma.deal.aggregate({
|
||||||
@@ -362,6 +389,17 @@ export class DealsService {
|
|||||||
_max: { position: true },
|
_max: { position: true },
|
||||||
})
|
})
|
||||||
)._max.position ?? -1) + 1;
|
)._max.position ?? -1) + 1;
|
||||||
|
if (dto.position != null) {
|
||||||
|
const rows = await this.prisma.deal.findMany({
|
||||||
|
where: { organizationId, stageId: stage.id },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, deal.id, dto.position);
|
||||||
|
position = Math.max(0, placedIds.indexOf(deal.id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.deal.update({
|
const row = await this.prisma.deal.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
@@ -377,6 +415,15 @@ export class DealsService {
|
|||||||
include: dealInclude,
|
include: dealInclude,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (placedIds) {
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placedIds,
|
||||||
|
(dealId, nextPosition) =>
|
||||||
|
this.prisma.deal.update({ where: { id: dealId }, data: { position: nextPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (deal.ownerId && deal.stageId !== stage.id) {
|
if (deal.ownerId && deal.stageId !== stage.id) {
|
||||||
await this.notifications.create({
|
await this.notifications.create({
|
||||||
organizationId,
|
organizationId,
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ import {
|
|||||||
IsEmail,
|
IsEmail,
|
||||||
IsIn,
|
IsIn,
|
||||||
IsInt,
|
IsInt,
|
||||||
|
IsNumber,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
|
Max,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
Min,
|
Min,
|
||||||
MinLength,
|
MinLength,
|
||||||
@@ -52,6 +54,31 @@ export class ResetPlatformAdminPasswordDto {
|
|||||||
password!: string;
|
password!: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class UpdatePlatformAdminDto {
|
||||||
|
@IsString()
|
||||||
|
@MinLength(2)
|
||||||
|
@MaxLength(120)
|
||||||
|
fullName!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(40)
|
||||||
|
mobile!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, value) => value !== null && value !== '')
|
||||||
|
@IsEmail()
|
||||||
|
email?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SetMasterPasswordDto {
|
||||||
|
@ValidateIf((_, value) => value !== null)
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(120)
|
||||||
|
password!: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
export class UpdatePlatformStatusDto {
|
export class UpdatePlatformStatusDto {
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
isActive!: boolean;
|
isActive!: boolean;
|
||||||
@@ -146,6 +173,22 @@ export class ApplyBillingPlanDto {
|
|||||||
status?: 'active' | 'expired' | 'suspended';
|
status?: 'active' | 'expired' | 'suspended';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SetUserCapDto {
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@Max(100_000)
|
||||||
|
maxUsers!: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SetStorageQuotaDto {
|
||||||
|
/** گیگابایت؛ null = بدون سقف */
|
||||||
|
@IsNumber()
|
||||||
|
@Min(0)
|
||||||
|
@Max(100_000)
|
||||||
|
@ValidateIf((_, value) => value !== null)
|
||||||
|
quotaGb!: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
export class UpdateOrgModulesDto {
|
export class UpdateOrgModulesDto {
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@IsString({ each: true })
|
@IsString({ each: true })
|
||||||
|
|||||||
@@ -1,19 +1,25 @@
|
|||||||
import {
|
import {
|
||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
|
Delete,
|
||||||
Get,
|
Get,
|
||||||
Param,
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
|
Put,
|
||||||
Query,
|
Query,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { CurrentUser } from '../auth/current-user.decorator';
|
import { CurrentUser } from '../auth/current-user.decorator';
|
||||||
import {
|
import {
|
||||||
ApplyBillingPlanDto,
|
ApplyBillingPlanDto,
|
||||||
|
SetStorageQuotaDto,
|
||||||
|
SetUserCapDto,
|
||||||
CreatePlatformAdminDto,
|
CreatePlatformAdminDto,
|
||||||
CreatePlatformOrganizationDto,
|
CreatePlatformOrganizationDto,
|
||||||
ResetPlatformAdminPasswordDto,
|
ResetPlatformAdminPasswordDto,
|
||||||
|
SetMasterPasswordDto,
|
||||||
|
UpdatePlatformAdminDto,
|
||||||
ResetPlatformUserPasswordDto,
|
ResetPlatformUserPasswordDto,
|
||||||
UpdateOrgModulesDto,
|
UpdateOrgModulesDto,
|
||||||
UpdatePlatformMembershipRoleDto,
|
UpdatePlatformMembershipRoleDto,
|
||||||
@@ -71,6 +77,26 @@ export class PlatformController {
|
|||||||
return this.platform.resetAdminPassword(id, dto);
|
return this.platform.resetAdminPassword(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('admins/:id/profile')
|
||||||
|
updateAdmin(@Param('id') id: string, @Body() dto: UpdatePlatformAdminDto) {
|
||||||
|
return this.platform.updateAdmin(id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete('admins/:id')
|
||||||
|
deleteAdmin(@Param('id') id: string, @CurrentUser() actor: PlatformActor) {
|
||||||
|
return this.platform.deleteAdmin(id, actor.platformAdminId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('master-password')
|
||||||
|
masterPasswordStatus() {
|
||||||
|
return this.platform.masterPasswordStatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('master-password')
|
||||||
|
setMasterPassword(@Body() dto: SetMasterPasswordDto) {
|
||||||
|
return this.platform.setMasterPassword(dto.password);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('organizations')
|
@Get('organizations')
|
||||||
listOrganizations(@Query('q') q?: string) {
|
listOrganizations(@Query('q') q?: string) {
|
||||||
return this.platform.listOrganizations(q);
|
return this.platform.listOrganizations(q);
|
||||||
@@ -122,6 +148,26 @@ export class PlatformController {
|
|||||||
return this.platform.applyBillingPlan(id, dto);
|
return this.platform.applyBillingPlan(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('users/:id/storage')
|
||||||
|
storageUsage(@Param('id') id: string, @Query('refresh') refresh?: string) {
|
||||||
|
return this.platform.storageUsage(id, refresh === '1' || refresh === 'true');
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch('users/:id/billing/storage')
|
||||||
|
setStorageQuota(@Param('id') id: string, @Body() dto: SetStorageQuotaDto) {
|
||||||
|
return this.platform.setStorageQuota(id, dto.quotaGb);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('users/:id/seats')
|
||||||
|
seatUsage(@Param('id') id: string) {
|
||||||
|
return this.platform.seatUsage(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch('users/:id/billing/users')
|
||||||
|
setUserCap(@Param('id') id: string, @Body() dto: SetUserCapDto) {
|
||||||
|
return this.platform.setUserCap(id, dto.maxUsers);
|
||||||
|
}
|
||||||
|
|
||||||
@Patch('organizations/:id/modules')
|
@Patch('organizations/:id/modules')
|
||||||
updateOrganizationModules(
|
updateOrganizationModules(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { MembershipsService } from '../memberships/memberships.service';
|
|||||||
import { OrgRolesService } from '../org-roles/org-roles.service';
|
import { OrgRolesService } from '../org-roles/org-roles.service';
|
||||||
import { PipelinesService } from '../pipelines/pipelines.service';
|
import { PipelinesService } from '../pipelines/pipelines.service';
|
||||||
import { BillingService, toSummary } from '../billing/billing.service';
|
import { BillingService, toSummary } from '../billing/billing.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
@@ -51,6 +52,7 @@ export class PlatformService {
|
|||||||
private readonly orgRoles: OrgRolesService,
|
private readonly orgRoles: OrgRolesService,
|
||||||
private readonly pipelines: PipelinesService,
|
private readonly pipelines: PipelinesService,
|
||||||
private readonly billing: BillingService,
|
private readonly billing: BillingService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly adminAlerts: PlatformAdminAlertService,
|
private readonly adminAlerts: PlatformAdminAlertService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -109,15 +111,23 @@ export class PlatformService {
|
|||||||
where: { role: 'owner', isActive: true },
|
where: { role: 'owner', isActive: true },
|
||||||
orderBy: { createdAt: 'asc' },
|
orderBy: { createdAt: 'asc' },
|
||||||
take: 1,
|
take: 1,
|
||||||
select: { user: { select: { billingAccount: true } } },
|
select: {
|
||||||
|
userId: true,
|
||||||
|
user: { select: { fullName: true, billingAccount: true } },
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
conversationSettings: { select: { organizationId: true } },
|
||||||
|
},
|
||||||
});
|
});
|
||||||
return rows.map((row) => {
|
return rows.map((row) => {
|
||||||
const account = row.memberships[0]?.user.billingAccount;
|
const owner = row.memberships[0];
|
||||||
|
const account = owner?.user.billingAccount;
|
||||||
return {
|
return {
|
||||||
...this.orgToDto(row),
|
...this.orgToDto(row),
|
||||||
subscription: account ? toSummary(account) : null,
|
subscription: account ? toSummary(account) : null,
|
||||||
|
ownerUserId: owner?.userId ?? null,
|
||||||
|
ownerName: owner?.user.fullName ?? null,
|
||||||
|
chatConfigured: Boolean(row.conversationSettings),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -408,6 +418,50 @@ export class PlatformService {
|
|||||||
return this.userToDto(row);
|
return this.userToDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async storageUsage(userId: string, refresh = false) {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, role: 'owner', isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!owner) {
|
||||||
|
throw new BadRequestException('حجم فایل فقط برای مالک محیط معنی دارد');
|
||||||
|
}
|
||||||
|
const account = await this.billing.getByOwnerUserId(userId);
|
||||||
|
if (!account) {
|
||||||
|
throw new BadRequestException('اول برای این مالک یک پلن اعمال کنید');
|
||||||
|
}
|
||||||
|
return this.storage.usageForOwner(userId, refresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
async seatUsage(userId: string) {
|
||||||
|
await this.requireBillingOwner(userId);
|
||||||
|
return this.billing.seatUsage(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setUserCap(userId: string, maxUsers: number) {
|
||||||
|
await this.requireBillingOwner(userId);
|
||||||
|
return this.billing.setMaxUsers(userId, maxUsers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async requireBillingOwner(userId: string) {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, role: 'owner', isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!owner) {
|
||||||
|
throw new BadRequestException('سقف کاربر فقط برای مالک محیط معنی دارد');
|
||||||
|
}
|
||||||
|
const account = await this.billing.getByOwnerUserId(userId);
|
||||||
|
if (!account) {
|
||||||
|
throw new BadRequestException('اول برای این مالک یک پلن اعمال کنید');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async setStorageQuota(userId: string, quotaGb: number | null) {
|
||||||
|
await this.storageUsage(userId, false);
|
||||||
|
return this.storage.setQuotaGb(userId, quotaGb);
|
||||||
|
}
|
||||||
|
|
||||||
async applyBillingPlan(userId: string, dto: ApplyBillingPlanDto) {
|
async applyBillingPlan(userId: string, dto: ApplyBillingPlanDto) {
|
||||||
const existing = await this.prisma.user.findUnique({
|
const existing = await this.prisma.user.findUnique({
|
||||||
where: { id: userId },
|
where: { id: userId },
|
||||||
@@ -473,9 +527,13 @@ export class PlatformService {
|
|||||||
userId: true,
|
userId: true,
|
||||||
organizationId: true,
|
organizationId: true,
|
||||||
role: true,
|
role: true,
|
||||||
|
isActive: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عضویت پیدا نشد');
|
if (!row) throw new NotFoundException('عضویت پیدا نشد');
|
||||||
|
if (isActive && !row.isActive) {
|
||||||
|
await this.billing.assertSeatAvailable(row.organizationId, row.userId);
|
||||||
|
}
|
||||||
if (!isActive && row.role === 'owner') {
|
if (!isActive && row.role === 'owner') {
|
||||||
const activeOwners = await this.memberships.countActiveOwners(
|
const activeOwners = await this.memberships.countActiveOwners(
|
||||||
row.organizationId,
|
row.organizationId,
|
||||||
@@ -648,6 +706,104 @@ export class PlatformService {
|
|||||||
return { ok: true };
|
return { ok: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateAdmin(
|
||||||
|
id: string,
|
||||||
|
dto: { fullName: string; mobile: string; email?: string | null },
|
||||||
|
): Promise<PlatformAdminDto> {
|
||||||
|
const existing = await this.prisma.platformAdmin.findUnique({
|
||||||
|
where: { id },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!existing) throw new NotFoundException('ادمین پیدا نشد');
|
||||||
|
const fullName = dto.fullName.trim();
|
||||||
|
if (fullName.length < 2) {
|
||||||
|
throw new BadRequestException('نام معتبر نیست');
|
||||||
|
}
|
||||||
|
const mobile = normalizeMobile(dto.mobile);
|
||||||
|
if (!mobile) {
|
||||||
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
|
}
|
||||||
|
const email = dto.email?.trim().toLowerCase() || null;
|
||||||
|
const mobileTaken = await this.prisma.platformAdmin.findFirst({
|
||||||
|
where: { mobile, id: { not: id } },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (mobileTaken) {
|
||||||
|
throw new ConflictException('این شماره موبایل قبلاً ثبت شده است');
|
||||||
|
}
|
||||||
|
if (email) {
|
||||||
|
const emailTaken = await this.prisma.platformAdmin.findFirst({
|
||||||
|
where: { email, id: { not: id } },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (emailTaken) {
|
||||||
|
throw new ConflictException('این ایمیل قبلاً ثبت شده است');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const updated = await this.prisma.platformAdmin.update({
|
||||||
|
where: { id },
|
||||||
|
data: { fullName, mobile, email },
|
||||||
|
});
|
||||||
|
return this.adminToDto(updated);
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new ConflictException('موبایل یا ایمیل تکراری است');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteAdmin(id: string, actorId: string): Promise<{ ok: true }> {
|
||||||
|
const existing = await this.prisma.platformAdmin.findUnique({
|
||||||
|
where: { id },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!existing) throw new NotFoundException('ادمین پیدا نشد');
|
||||||
|
if (id === actorId) {
|
||||||
|
throw new BadRequestException('نمیتوانید حساب خودتان را حذف کنید');
|
||||||
|
}
|
||||||
|
const others = await this.prisma.platformAdmin.count({
|
||||||
|
where: { id: { not: id } },
|
||||||
|
});
|
||||||
|
if (others < 1) {
|
||||||
|
throw new BadRequestException('حداقل یک سوپرادمین باید بماند');
|
||||||
|
}
|
||||||
|
await this.prisma.platformAdmin.delete({ where: { id } });
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
async masterPasswordStatus(): Promise<{ enabled: boolean; updatedAt: string | null }> {
|
||||||
|
const row = await this.prisma.platformMasterPassword.findUnique({
|
||||||
|
where: { id: 'default' },
|
||||||
|
select: { updatedAt: true },
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
enabled: Boolean(row),
|
||||||
|
updatedAt: row?.updatedAt.toISOString() ?? null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async setMasterPassword(
|
||||||
|
password: string | null,
|
||||||
|
): Promise<{ enabled: boolean; updatedAt: string | null }> {
|
||||||
|
const trimmed = password?.trim() ?? '';
|
||||||
|
if (!trimmed) {
|
||||||
|
await this.prisma.platformMasterPassword.deleteMany({ where: { id: 'default' } });
|
||||||
|
return { enabled: false, updatedAt: null };
|
||||||
|
}
|
||||||
|
if (trimmed.length < 8) {
|
||||||
|
throw new BadRequestException('رمز کلی حداقل ۸ کاراکتر لازم است');
|
||||||
|
}
|
||||||
|
const passwordHash = await bcrypt.hash(trimmed, 10);
|
||||||
|
const row = await this.prisma.platformMasterPassword.upsert({
|
||||||
|
where: { id: 'default' },
|
||||||
|
create: { id: 'default', passwordHash },
|
||||||
|
update: { passwordHash },
|
||||||
|
});
|
||||||
|
return { enabled: true, updatedAt: row.updatedAt.toISOString() };
|
||||||
|
}
|
||||||
|
|
||||||
private adminToDto(row: {
|
private adminToDto(row: {
|
||||||
id: string;
|
id: string;
|
||||||
mobile: string | null;
|
mobile: string | null;
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { TICKET_SLA_HOURS } from '@mento/shared';
|
import { TICKET_SLA_HOURS } from '@mento/shared';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { canonicalIranMobile, phoneIdentityKeys } from '../contacts/normalize';
|
||||||
import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
||||||
import type { PortalActor } from './portal-auth';
|
import type { PortalActor } from './portal-auth';
|
||||||
|
|
||||||
@@ -62,7 +63,7 @@ export class PortalService {
|
|||||||
mobileRaw: string,
|
mobileRaw: string,
|
||||||
): Promise<PortalRequestOtpResponse> {
|
): Promise<PortalRequestOtpResponse> {
|
||||||
const org = await this.findOrg(slug);
|
const org = await this.findOrg(slug);
|
||||||
const mobile = normalizeMobile(mobileRaw);
|
const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
|
||||||
if (!mobile) {
|
if (!mobile) {
|
||||||
throw new BadRequestException('شماره موبایل معتبر نیست');
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
}
|
}
|
||||||
@@ -123,7 +124,8 @@ export class PortalService {
|
|||||||
codeRaw: string,
|
codeRaw: string,
|
||||||
): Promise<PortalLoginResponse> {
|
): Promise<PortalLoginResponse> {
|
||||||
const org = await this.findOrg(slug);
|
const org = await this.findOrg(slug);
|
||||||
const mobile = normalizeMobile(mobileRaw);
|
const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const code = codeRaw.trim();
|
const code = codeRaw.trim();
|
||||||
if (!mobile || !code) {
|
if (!mobile || !code) {
|
||||||
throw new BadRequestException('موبایل یا کد ناقص است');
|
throw new BadRequestException('موبایل یا کد ناقص است');
|
||||||
@@ -148,10 +150,15 @@ export class PortalService {
|
|||||||
data: { consumedAt: new Date() },
|
data: { consumedAt: new Date() },
|
||||||
});
|
});
|
||||||
|
|
||||||
let person = await this.prisma.person.findFirst({
|
let person = mobileKeys.length
|
||||||
where: { organizationId: org.id, mobile },
|
? await this.prisma.person.findFirst({
|
||||||
|
where: {
|
||||||
|
organizationId: org.id,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
orderBy: { createdAt: 'asc' },
|
orderBy: { createdAt: 'asc' },
|
||||||
});
|
})
|
||||||
|
: null;
|
||||||
if (!person) {
|
if (!person) {
|
||||||
person = await this.prisma.person.create({
|
person = await this.prisma.person.create({
|
||||||
data: {
|
data: {
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
projectCardAccessWhere,
|
projectCardAccessWhere,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
|
|
||||||
const DEFAULT_STAGES = ['صف', 'در حال انجام', 'بازبینی', 'انجامشده'] as const;
|
const DEFAULT_STAGES = ['صف', 'در حال انجام', 'بازبینی', 'انجامشده'] as const;
|
||||||
@@ -206,6 +206,13 @@ export class ProjectBoardsService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const assigneeIds = [...new Set((dto.assigneeIds ?? []).map((id) => id.trim()).filter(Boolean))];
|
const assigneeIds = [...new Set((dto.assigneeIds ?? []).map((id) => id.trim()).filter(Boolean))];
|
||||||
|
const assignActor = { userId: actor.userId, role: actor.role, organizationId };
|
||||||
|
const ownerId = resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, assignActor, 'projects'),
|
||||||
|
);
|
||||||
|
await assertAssigneeSet(this.prisma, assignActor, 'projects', [ownerId, ...assigneeIds]);
|
||||||
const created = await this.prisma.projectCard.create({
|
const created = await this.prisma.projectCard.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -217,7 +224,7 @@ export class ProjectBoardsService {
|
|||||||
personId: emptyToNull(dto.personId),
|
personId: emptyToNull(dto.personId),
|
||||||
companyId: emptyToNull(dto.companyId),
|
companyId: emptyToNull(dto.companyId),
|
||||||
dealId: emptyToNull(dto.dealId),
|
dealId: emptyToNull(dto.dealId),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId,
|
||||||
position: (maxPos._max.position ?? -1) + 1,
|
position: (maxPos._max.position ?? -1) + 1,
|
||||||
...(assigneeIds.length
|
...(assigneeIds.length
|
||||||
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
||||||
@@ -257,24 +264,40 @@ export class ProjectBoardsService {
|
|||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
||||||
if ('ownerId' in dto) {
|
if ('ownerId' in dto) {
|
||||||
if (!canReassignOwner(actor.role) && dto.ownerId !== existing.ownerId) {
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
throw new BadRequestException('تغییر مسئول مجاز نیست');
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'projects',
|
||||||
|
[nextOwner],
|
||||||
|
[existing.ownerId],
|
||||||
|
);
|
||||||
|
data.ownerId = nextOwner;
|
||||||
}
|
}
|
||||||
data.ownerId = emptyToNull(dto.ownerId ?? null);
|
|
||||||
|
const nextAssigneeIds = dto.assigneeIds
|
||||||
|
? [...new Set(dto.assigneeIds.map((x) => x.trim()).filter(Boolean))]
|
||||||
|
: undefined;
|
||||||
|
if (nextAssigneeIds) {
|
||||||
|
const currentAssignees = await this.prisma.projectCard.findFirst({
|
||||||
|
where: { id },
|
||||||
|
select: { assignees: { select: { id: true } } },
|
||||||
|
});
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'projects',
|
||||||
|
nextAssigneeIds,
|
||||||
|
currentAssignees?.assignees.map((item) => item.id) ?? [],
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const row = await this.prisma.projectCard.update({
|
const row = await this.prisma.projectCard.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: {
|
data: {
|
||||||
...data,
|
...data,
|
||||||
...(dto.assigneeIds
|
...(nextAssigneeIds
|
||||||
? {
|
? { assignees: { set: nextAssigneeIds.map((uid) => ({ id: uid })) } }
|
||||||
assignees: {
|
|
||||||
set: [...new Set(dto.assigneeIds.map((x) => x.trim()).filter(Boolean))].map(
|
|
||||||
(uid) => ({ id: uid }),
|
|
||||||
),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
},
|
},
|
||||||
include: cardInclude,
|
include: cardInclude,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import type { ImportContactsResult } from '@mento/shared';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { projectCardAccessWhere } from '../common/record-scope';
|
import { projectCardAccessWhere } from '../common/record-scope';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatJalaliDate,
|
formatJalaliDate,
|
||||||
@@ -256,11 +256,13 @@ export class ProjectCardsExcelService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
|
||||||
if (mobile) {
|
if (mobileKeys.length) {
|
||||||
const needle = mobile.replace(/^\+98|^98|^0/, '');
|
|
||||||
const byMobile = await this.prisma.person.findFirst({
|
const byMobile = await this.prisma.person.findFirst({
|
||||||
where: { organizationId, mobile: { contains: needle } },
|
where: {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (byMobile) return byMobile.id;
|
if (byMobile) return byMobile.id;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export class ApiKeyAuthGuard implements CanActivate {
|
|||||||
organizationId: string;
|
organizationId: string;
|
||||||
role: string;
|
role: string;
|
||||||
apiKeyId?: string;
|
apiKeyId?: string;
|
||||||
|
apiKeyName?: string;
|
||||||
};
|
};
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
@@ -44,6 +45,7 @@ export class ApiKeyAuthGuard implements CanActivate {
|
|||||||
organizationId: auth.organizationId,
|
organizationId: auth.organizationId,
|
||||||
role: auth.role,
|
role: auth.role,
|
||||||
apiKeyId: auth.apiKeyId,
|
apiKeyId: auth.apiKeyId,
|
||||||
|
apiKeyName: auth.name,
|
||||||
};
|
};
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export class ApiKeysService {
|
|||||||
|
|
||||||
async authenticate(
|
async authenticate(
|
||||||
rawKey: string,
|
rawKey: string,
|
||||||
): Promise<{ organizationId: string; apiKeyId: string; role: 'owner' }> {
|
): Promise<{ organizationId: string; apiKeyId: string; name: string; role: 'owner' }> {
|
||||||
const key = rawKey.trim();
|
const key = rawKey.trim();
|
||||||
if (!key.startsWith('mk_') || key.length < 20) {
|
if (!key.startsWith('mk_') || key.length < 20) {
|
||||||
throw new UnauthorizedException('کلید API نامعتبر است');
|
throw new UnauthorizedException('کلید API نامعتبر است');
|
||||||
@@ -71,7 +71,7 @@ export class ApiKeysService {
|
|||||||
const keyHash = this.hashKey(key);
|
const keyHash = this.hashKey(key);
|
||||||
const row = await this.prisma.organizationApiKey.findFirst({
|
const row = await this.prisma.organizationApiKey.findFirst({
|
||||||
where: { keyHash, revokedAt: null },
|
where: { keyHash, revokedAt: null },
|
||||||
select: { id: true, organizationId: true },
|
select: { id: true, organizationId: true, name: true },
|
||||||
});
|
});
|
||||||
if (!row) throw new UnauthorizedException('کلید API نامعتبر است');
|
if (!row) throw new UnauthorizedException('کلید API نامعتبر است');
|
||||||
|
|
||||||
@@ -83,6 +83,7 @@ export class ApiKeysService {
|
|||||||
return {
|
return {
|
||||||
organizationId: row.organizationId,
|
organizationId: row.organizationId,
|
||||||
apiKeyId: row.id,
|
apiKeyId: row.id,
|
||||||
|
name: row.name,
|
||||||
role: 'owner',
|
role: 'owner',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,55 @@
|
|||||||
import {
|
import {
|
||||||
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
|
HttpCode,
|
||||||
|
HttpException,
|
||||||
|
HttpStatus,
|
||||||
Param,
|
Param,
|
||||||
|
Post,
|
||||||
Query,
|
Query,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
|
import { IsInt, IsOptional, IsString, Max, MaxLength, Min, MinLength } from 'class-validator';
|
||||||
import { Type } from 'class-transformer';
|
import { Type } from 'class-transformer';
|
||||||
import { CurrentUser } from '../auth/current-user.decorator';
|
import { CurrentUser } from '../auth/current-user.decorator';
|
||||||
import type { Prisma } from '@prisma/client';
|
import type { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
|
import { LeadsService } from '../leads/leads.service';
|
||||||
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
||||||
|
|
||||||
|
class CreateExternalLeadDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(80)
|
||||||
|
firstName?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(80)
|
||||||
|
lastName?: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(20)
|
||||||
|
mobile!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
storeName?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
source?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const LEAD_RATE_WINDOW_MS = 60_000;
|
||||||
|
const LEAD_RATE_MAX = 60;
|
||||||
|
const leadHits = new Map<string, number[]>();
|
||||||
|
|
||||||
class ListQueryDto {
|
class ListQueryDto {
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@@ -35,7 +72,36 @@ class ListQueryDto {
|
|||||||
@Controller('public/v1')
|
@Controller('public/v1')
|
||||||
@UseGuards(ApiKeyAuthGuard)
|
@UseGuards(ApiKeyAuthGuard)
|
||||||
export class PublicApiV1Controller {
|
export class PublicApiV1Controller {
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly leads: LeadsService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Post('leads')
|
||||||
|
@HttpCode(200)
|
||||||
|
createLead(
|
||||||
|
@CurrentUser()
|
||||||
|
user: { organizationId: string; apiKeyId?: string; apiKeyName?: string },
|
||||||
|
@Body() body: CreateExternalLeadDto,
|
||||||
|
) {
|
||||||
|
const bucket = user.apiKeyId || user.organizationId;
|
||||||
|
const now = Date.now();
|
||||||
|
const prev = (leadHits.get(bucket) ?? []).filter((t) => now - t < LEAD_RATE_WINDOW_MS);
|
||||||
|
if (prev.length >= LEAD_RATE_MAX) {
|
||||||
|
throw new HttpException('تعداد ارسال بیش از حد مجاز است. کمی بعد دوباره تلاش کنید.', HttpStatus.TOO_MANY_REQUESTS);
|
||||||
|
}
|
||||||
|
prev.push(now);
|
||||||
|
leadHits.set(bucket, prev);
|
||||||
|
return this.leads.createFromExternal({
|
||||||
|
organizationId: user.organizationId,
|
||||||
|
siteName: user.apiKeyName?.trim() || 'سایت بیرونی',
|
||||||
|
firstName: body.firstName,
|
||||||
|
lastName: body.lastName,
|
||||||
|
mobile: body.mobile,
|
||||||
|
storeName: body.storeName,
|
||||||
|
source: body.source,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Get('people')
|
@Get('people')
|
||||||
async listPeople(
|
async listPeople(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
import { BillingModule } from '../billing/billing.module';
|
import { BillingModule } from '../billing/billing.module';
|
||||||
|
import { LeadsModule } from '../leads/leads.module';
|
||||||
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
||||||
import { ApiKeysController } from './api-keys.controller';
|
import { ApiKeysController } from './api-keys.controller';
|
||||||
import { ApiKeysService } from './api-keys.service';
|
import { ApiKeysService } from './api-keys.service';
|
||||||
@@ -9,7 +10,7 @@ import { WebhooksController } from './webhooks.controller';
|
|||||||
import { WebhooksService } from './webhooks.service';
|
import { WebhooksService } from './webhooks.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuthModule, BillingModule],
|
imports: [AuthModule, BillingModule, LeadsModule],
|
||||||
controllers: [ApiKeysController, WebhooksController, PublicApiV1Controller],
|
controllers: [ApiKeysController, WebhooksController, PublicApiV1Controller],
|
||||||
providers: [ApiKeysService, ApiKeyAuthGuard, WebhooksService],
|
providers: [ApiKeysService, ApiKeyAuthGuard, WebhooksService],
|
||||||
exports: [ApiKeysService, WebhooksService],
|
exports: [ApiKeysService, WebhooksService],
|
||||||
|
|||||||
@@ -1533,6 +1533,7 @@ export class ReportsService {
|
|||||||
async home(actor: Actor): Promise<HomeDashboardDto> {
|
async home(actor: Actor): Promise<HomeDashboardDto> {
|
||||||
const orgId = actor.organizationId;
|
const orgId = actor.organizationId;
|
||||||
const dealScope = ownerWhere(actor, 'deals');
|
const dealScope = ownerWhere(actor, 'deals');
|
||||||
|
const invoiceScope = ownerWhere(actor, 'finance');
|
||||||
const activityScope = assigneeWhere(actor);
|
const activityScope = assigneeWhere(actor);
|
||||||
const personScope = elevated(actor.role) ? {} : { ownerId: actor.userId };
|
const personScope = elevated(actor.role) ? {} : { ownerId: actor.userId };
|
||||||
const rates = await loadOrgRates(this.prisma, orgId);
|
const rates = await loadOrgRates(this.prisma, orgId);
|
||||||
@@ -1543,6 +1544,7 @@ export class ReportsService {
|
|||||||
const prev = addJalaliMonths(jy, jm, -1);
|
const prev = addJalaliMonths(jy, jm, -1);
|
||||||
const prevMonthStart = startOfJalaliMonth(prev.jy, prev.jm);
|
const prevMonthStart = startOfJalaliMonth(prev.jy, prev.jm);
|
||||||
const prevMonthEnd = endOfJalaliMonth(prev.jy, prev.jm);
|
const prevMonthEnd = endOfJalaliMonth(prev.jy, prev.jm);
|
||||||
|
const trendWindowStart = addMonthsStart(now, -12);
|
||||||
|
|
||||||
const todayStart = startOfDay(now);
|
const todayStart = startOfDay(now);
|
||||||
const todayEnd = endOfDay(now);
|
const todayEnd = endOfDay(now);
|
||||||
@@ -1555,17 +1557,25 @@ export class ReportsService {
|
|||||||
const dealsPrior = dealPriorWhere(actor.priorLens, actor.priorCutoff);
|
const dealsPrior = dealPriorWhere(actor.priorLens, actor.priorCutoff);
|
||||||
const activitiesPrior = activityPriorWhere(actor.priorLens, actor.priorCutoff);
|
const activitiesPrior = activityPriorWhere(actor.priorLens, actor.priorCutoff);
|
||||||
|
|
||||||
|
const invoiceStatuses: Array<'issued' | 'partially_paid' | 'paid'> = [
|
||||||
|
'issued',
|
||||||
|
'partially_paid',
|
||||||
|
'paid',
|
||||||
|
];
|
||||||
|
|
||||||
const [
|
const [
|
||||||
wonDeals,
|
wonDeals,
|
||||||
openDeals,
|
openDealRows,
|
||||||
|
lostDeals,
|
||||||
staleDeals,
|
staleDeals,
|
||||||
peopleCur,
|
peopleRecent,
|
||||||
peoplePrev,
|
|
||||||
openActivitiesToday,
|
openActivitiesToday,
|
||||||
openActivitiesYesterday,
|
openActivitiesYesterday,
|
||||||
openDealsWeekAgo,
|
openDealsWeekAgo,
|
||||||
goals,
|
goals,
|
||||||
overdueCount,
|
overdueCount,
|
||||||
|
invoices,
|
||||||
|
activityTypeGroups,
|
||||||
] = await Promise.all([
|
] = await Promise.all([
|
||||||
this.prisma.deal.findMany({
|
this.prisma.deal.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -1573,7 +1583,7 @@ export class ReportsService {
|
|||||||
{
|
{
|
||||||
organizationId: orgId,
|
organizationId: orgId,
|
||||||
status: 'won',
|
status: 'won',
|
||||||
updatedAt: { gte: addMonthsStart(now, -5) },
|
updatedAt: { gte: trendWindowStart },
|
||||||
},
|
},
|
||||||
dealScope,
|
dealScope,
|
||||||
dealsPrior,
|
dealsPrior,
|
||||||
@@ -1590,7 +1600,7 @@ export class ReportsService {
|
|||||||
person: { select: { id: true, firstName: true, lastName: true } },
|
person: { select: { id: true, firstName: true, lastName: true } },
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
this.prisma.deal.count({
|
this.prisma.deal.findMany({
|
||||||
where: {
|
where: {
|
||||||
AND: [
|
AND: [
|
||||||
{ organizationId: orgId, status: 'open' },
|
{ organizationId: orgId, status: 'open' },
|
||||||
@@ -1598,6 +1608,30 @@ export class ReportsService {
|
|||||||
dealsPrior,
|
dealsPrior,
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
select: {
|
||||||
|
amount: true,
|
||||||
|
currency: true,
|
||||||
|
stageId: true,
|
||||||
|
stage: { select: { id: true, name: true, position: true } },
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
this.prisma.deal.findMany({
|
||||||
|
where: {
|
||||||
|
AND: [
|
||||||
|
{
|
||||||
|
organizationId: orgId,
|
||||||
|
status: 'lost',
|
||||||
|
updatedAt: { gte: trendWindowStart },
|
||||||
|
},
|
||||||
|
dealScope,
|
||||||
|
dealsPrior,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
select: {
|
||||||
|
amount: true,
|
||||||
|
currency: true,
|
||||||
|
lostReason: true,
|
||||||
|
},
|
||||||
}),
|
}),
|
||||||
this.prisma.deal.findMany({
|
this.prisma.deal.findMany({
|
||||||
where: {
|
where: {
|
||||||
@@ -1624,19 +1658,13 @@ export class ReportsService {
|
|||||||
orderBy: { updatedAt: 'asc' },
|
orderBy: { updatedAt: 'asc' },
|
||||||
take: 5,
|
take: 5,
|
||||||
}),
|
}),
|
||||||
this.prisma.person.count({
|
this.prisma.person.findMany({
|
||||||
where: {
|
where: {
|
||||||
organizationId: orgId,
|
organizationId: orgId,
|
||||||
...personScope,
|
...personScope,
|
||||||
createdAt: { gte: curMonthStart, lte: curMonthEnd },
|
createdAt: { gte: trendWindowStart, lte: curMonthEnd },
|
||||||
},
|
|
||||||
}),
|
|
||||||
this.prisma.person.count({
|
|
||||||
where: {
|
|
||||||
organizationId: orgId,
|
|
||||||
...personScope,
|
|
||||||
createdAt: { gte: prevMonthStart, lte: prevMonthEnd },
|
|
||||||
},
|
},
|
||||||
|
select: { createdAt: true, importSource: true },
|
||||||
}),
|
}),
|
||||||
this.prisma.activity.count({
|
this.prisma.activity.count({
|
||||||
where: {
|
where: {
|
||||||
@@ -1656,6 +1684,7 @@ export class ReportsService {
|
|||||||
AND: [
|
AND: [
|
||||||
{
|
{
|
||||||
organizationId: orgId,
|
organizationId: orgId,
|
||||||
|
status: 'open',
|
||||||
dueAt: { gte: yesterdayStart, lte: yesterdayEnd },
|
dueAt: { gte: yesterdayStart, lte: yesterdayEnd },
|
||||||
},
|
},
|
||||||
activityScope,
|
activityScope,
|
||||||
@@ -1697,8 +1726,67 @@ export class ReportsService {
|
|||||||
],
|
],
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
|
this.prisma.invoice.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: orgId,
|
||||||
|
...invoiceScope,
|
||||||
|
status: { in: invoiceStatuses },
|
||||||
|
OR: [
|
||||||
|
{ issuedAt: { gte: trendWindowStart, lte: curMonthEnd } },
|
||||||
|
{ createdAt: { gte: trendWindowStart, lte: curMonthEnd } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
select: {
|
||||||
|
issuedAt: true,
|
||||||
|
createdAt: true,
|
||||||
|
lineItems: {
|
||||||
|
select: {
|
||||||
|
quantity: true,
|
||||||
|
unitPrice: true,
|
||||||
|
currency: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
this.prisma.activity.groupBy({
|
||||||
|
by: ['type'],
|
||||||
|
where: {
|
||||||
|
AND: [
|
||||||
|
{
|
||||||
|
organizationId: orgId,
|
||||||
|
status: 'open',
|
||||||
|
},
|
||||||
|
activityScope,
|
||||||
|
activitiesPrior,
|
||||||
|
],
|
||||||
|
},
|
||||||
|
_count: { _all: true },
|
||||||
|
}),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
const openDeals = openDealRows.length;
|
||||||
|
|
||||||
|
const invoiceInRange = (
|
||||||
|
inv: { issuedAt: Date | null; createdAt: Date },
|
||||||
|
from: Date,
|
||||||
|
to: Date,
|
||||||
|
) => {
|
||||||
|
const anchor = inv.issuedAt ?? inv.createdAt;
|
||||||
|
return anchor >= from && anchor <= to;
|
||||||
|
};
|
||||||
|
|
||||||
|
const sumInvoiceInRange = (from: Date, to: Date) => {
|
||||||
|
let amount = 0;
|
||||||
|
for (const inv of invoices) {
|
||||||
|
if (!invoiceInRange(inv, from, to)) continue;
|
||||||
|
for (const line of inv.lineItems) {
|
||||||
|
const lineTotal = Number(line.quantity) * Number(line.unitPrice);
|
||||||
|
amount += toBaseAmount(lineTotal, line.currency, rates);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return amount;
|
||||||
|
};
|
||||||
|
|
||||||
const sumWonInRange = (start: Date, end: Date) =>
|
const sumWonInRange = (start: Date, end: Date) =>
|
||||||
wonDeals
|
wonDeals
|
||||||
.filter((d) => d.updatedAt >= start && d.updatedAt <= end)
|
.filter((d) => d.updatedAt >= start && d.updatedAt <= end)
|
||||||
@@ -1707,8 +1795,21 @@ export class ReportsService {
|
|||||||
0,
|
0,
|
||||||
);
|
);
|
||||||
|
|
||||||
const salesCur = sumWonInRange(curMonthStart, curMonthEnd);
|
const salesInRange = (start: Date, end: Date) => {
|
||||||
const salesPrev = sumWonInRange(prevMonthStart, prevMonthEnd);
|
const inv = sumInvoiceInRange(start, end);
|
||||||
|
const won = sumWonInRange(start, end);
|
||||||
|
return Math.round(inv > 0 ? inv : won);
|
||||||
|
};
|
||||||
|
|
||||||
|
const peopleCur = peopleRecent.filter(
|
||||||
|
(p) => p.createdAt >= curMonthStart && p.createdAt <= curMonthEnd,
|
||||||
|
).length;
|
||||||
|
const peoplePrev = peopleRecent.filter(
|
||||||
|
(p) => p.createdAt >= prevMonthStart && p.createdAt <= prevMonthEnd,
|
||||||
|
).length;
|
||||||
|
|
||||||
|
const salesCur = salesInRange(curMonthStart, curMonthEnd);
|
||||||
|
const salesPrev = salesInRange(prevMonthStart, prevMonthEnd);
|
||||||
const targetAmount = goals.reduce(
|
const targetAmount = goals.reduce(
|
||||||
(acc, g) => acc + Number(g.targetAmount),
|
(acc, g) => acc + Number(g.targetAmount),
|
||||||
0,
|
0,
|
||||||
@@ -1716,7 +1817,7 @@ export class ReportsService {
|
|||||||
|
|
||||||
const trendMonths: Array<{ key: string; label: string; start: Date; end: Date }> =
|
const trendMonths: Array<{ key: string; label: string; start: Date; end: Date }> =
|
||||||
[];
|
[];
|
||||||
for (let i = 4; i >= 0; i -= 1) {
|
for (let i = 11; i >= 0; i -= 1) {
|
||||||
const m = addJalaliMonths(jy, jm, -i);
|
const m = addJalaliMonths(jy, jm, -i);
|
||||||
trendMonths.push({
|
trendMonths.push({
|
||||||
key: `${m.jy}-${String(m.jm).padStart(2, '0')}`,
|
key: `${m.jy}-${String(m.jm).padStart(2, '0')}`,
|
||||||
@@ -1729,14 +1830,28 @@ export class ReportsService {
|
|||||||
const salesTrend = trendMonths.map((m) => ({
|
const salesTrend = trendMonths.map((m) => ({
|
||||||
monthKey: m.key,
|
monthKey: m.key,
|
||||||
monthLabel: m.label,
|
monthLabel: m.label,
|
||||||
amount: Math.round(sumWonInRange(m.start, m.end)),
|
amount: salesInRange(m.start, m.end),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const customerGrowth = trendMonths.map((m) => ({
|
||||||
|
monthKey: m.key,
|
||||||
|
monthLabel: m.label,
|
||||||
|
value: peopleRecent.filter(
|
||||||
|
(p) => p.createdAt >= m.start && p.createdAt <= m.end,
|
||||||
|
).length,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
const sourceMap = new Map<string, number>();
|
const sourceMap = new Map<string, number>();
|
||||||
|
for (const p of peopleRecent) {
|
||||||
|
const label = normalizeImportSource(p.importSource);
|
||||||
|
sourceMap.set(label, (sourceMap.get(label) ?? 0) + 1);
|
||||||
|
}
|
||||||
|
if (sourceMap.size === 0) {
|
||||||
for (const d of wonDeals) {
|
for (const d of wonDeals) {
|
||||||
const label = normalizeSource(d.source);
|
const label = normalizeSource(d.source);
|
||||||
sourceMap.set(label, (sourceMap.get(label) ?? 0) + 1);
|
sourceMap.set(label, (sourceMap.get(label) ?? 0) + 1);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
const sourceTotal = [...sourceMap.values()].reduce((a, b) => a + b, 0) || 1;
|
const sourceTotal = [...sourceMap.values()].reduce((a, b) => a + b, 0) || 1;
|
||||||
const sources = [...sourceMap.entries()]
|
const sources = [...sourceMap.entries()]
|
||||||
.map(([label, count]) => ({
|
.map(([label, count]) => ({
|
||||||
@@ -1780,6 +1895,101 @@ export class ReportsService {
|
|||||||
.slice(0, 5)
|
.slice(0, 5)
|
||||||
.map((row, index) => ({ ...row, rank: index + 1 }));
|
.map((row, index) => ({ ...row, rank: index + 1 }));
|
||||||
|
|
||||||
|
const wonAmountAll = Math.round(
|
||||||
|
wonDeals.reduce(
|
||||||
|
(acc, d) => acc + decimalToBase(d.amount, d.currency, rates),
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const lostAmountAll = Math.round(
|
||||||
|
lostDeals.reduce(
|
||||||
|
(acc, d) => acc + decimalToBase(d.amount, d.currency, rates),
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const openAmountAll = Math.round(
|
||||||
|
openDealRows.reduce(
|
||||||
|
(acc, d) => acc + decimalToBase(d.amount, d.currency, rates),
|
||||||
|
0,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
const closedCount = wonDeals.length + lostDeals.length;
|
||||||
|
const winRate = closedCount
|
||||||
|
? Math.round((wonDeals.length / closedCount) * 1000) / 10
|
||||||
|
: 0;
|
||||||
|
const salesSummary: HomeDashboardDto['salesSummary'] = {
|
||||||
|
openCount: openDeals,
|
||||||
|
wonCount: wonDeals.length,
|
||||||
|
lostCount: lostDeals.length,
|
||||||
|
openAmount: openAmountAll,
|
||||||
|
wonAmount: wonAmountAll,
|
||||||
|
lostAmount: lostAmountAll,
|
||||||
|
winRate,
|
||||||
|
};
|
||||||
|
|
||||||
|
const funnelMap = new Map<
|
||||||
|
string,
|
||||||
|
{ stageId: string; stageName: string; position: number; count: number; amount: number }
|
||||||
|
>();
|
||||||
|
for (const d of openDealRows) {
|
||||||
|
const stageId = d.stage?.id ?? d.stageId ?? 'unknown';
|
||||||
|
const stageName = d.stage?.name ?? 'بدون مرحله';
|
||||||
|
const position = d.stage?.position ?? 999;
|
||||||
|
const cur = funnelMap.get(stageId) ?? {
|
||||||
|
stageId,
|
||||||
|
stageName,
|
||||||
|
position,
|
||||||
|
count: 0,
|
||||||
|
amount: 0,
|
||||||
|
};
|
||||||
|
cur.count += 1;
|
||||||
|
cur.amount += decimalToBase(d.amount, d.currency, rates);
|
||||||
|
funnelMap.set(stageId, cur);
|
||||||
|
}
|
||||||
|
const funnel = [...funnelMap.values()]
|
||||||
|
.sort((a, b) => a.position - b.position)
|
||||||
|
.slice(0, 8)
|
||||||
|
.map((row) => ({
|
||||||
|
stageId: row.stageId,
|
||||||
|
stageName: row.stageName,
|
||||||
|
count: row.count,
|
||||||
|
amount: Math.round(row.amount),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const lostReasonMap = new Map<string, { count: number; amount: number }>();
|
||||||
|
for (const d of lostDeals) {
|
||||||
|
const label = normalizeLostReason(d.lostReason);
|
||||||
|
const prevRow = lostReasonMap.get(label) ?? { count: 0, amount: 0 };
|
||||||
|
prevRow.count += 1;
|
||||||
|
prevRow.amount += decimalToBase(d.amount, d.currency, rates);
|
||||||
|
lostReasonMap.set(label, prevRow);
|
||||||
|
}
|
||||||
|
const lostReasonTotal =
|
||||||
|
[...lostReasonMap.values()].reduce((a, b) => a + b.count, 0) || 1;
|
||||||
|
const lostReasons = [...lostReasonMap.entries()]
|
||||||
|
.map(([label, row]) => ({
|
||||||
|
label,
|
||||||
|
count: row.count,
|
||||||
|
amount: Math.round(row.amount),
|
||||||
|
percent: Math.round((row.count / lostReasonTotal) * 1000) / 10,
|
||||||
|
}))
|
||||||
|
.sort((a, b) => b.count - a.count)
|
||||||
|
.slice(0, 6);
|
||||||
|
|
||||||
|
const activityTypeLabel: Record<string, string> = {
|
||||||
|
call: 'تماس',
|
||||||
|
meeting: 'جلسه',
|
||||||
|
task: 'کار',
|
||||||
|
note: 'یادداشت',
|
||||||
|
};
|
||||||
|
const activityByType = activityTypeGroups
|
||||||
|
.map((row) => ({
|
||||||
|
type: row.type,
|
||||||
|
label: activityTypeLabel[row.type] ?? row.type,
|
||||||
|
count: row._count._all,
|
||||||
|
}))
|
||||||
|
.sort((a, b) => b.count - a.count);
|
||||||
|
|
||||||
const alerts: HomeDashboardDto['alerts'] = [];
|
const alerts: HomeDashboardDto['alerts'] = [];
|
||||||
if (staleDeals.length) {
|
if (staleDeals.length) {
|
||||||
const first = staleDeals[0]!;
|
const first = staleDeals[0]!;
|
||||||
@@ -1857,11 +2067,30 @@ export class ReportsService {
|
|||||||
changePercent: pctChange(openActivitiesToday, openActivitiesYesterday),
|
changePercent: pctChange(openActivitiesToday, openActivitiesYesterday),
|
||||||
changeLabel: 'نسبت به دیروز',
|
changeLabel: 'نسبت به دیروز',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
key: 'win-rate',
|
||||||
|
label: 'نرخ برد',
|
||||||
|
value: winRate,
|
||||||
|
changePercent: null,
|
||||||
|
changeLabel: '۱۲ ماه اخیر',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
key: 'overdue',
|
||||||
|
label: 'عقبافتاده',
|
||||||
|
value: overdueCount,
|
||||||
|
changePercent: null,
|
||||||
|
changeLabel: 'فعالیت باز',
|
||||||
|
},
|
||||||
],
|
],
|
||||||
alerts,
|
alerts,
|
||||||
salesTrend,
|
salesTrend,
|
||||||
|
customerGrowth,
|
||||||
sources,
|
sources,
|
||||||
topCustomers,
|
topCustomers,
|
||||||
|
salesSummary,
|
||||||
|
funnel,
|
||||||
|
lostReasons,
|
||||||
|
activityByType,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1919,6 +2148,21 @@ function normalizeSource(raw: string | null | undefined): string {
|
|||||||
return map[value.toLowerCase()] ?? value;
|
return map[value.toLowerCase()] ?? value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function normalizeImportSource(raw: string | null | undefined): string {
|
||||||
|
const value = raw?.trim().toLowerCase();
|
||||||
|
if (!value) return 'سایر';
|
||||||
|
const map: Record<string, string> = {
|
||||||
|
manual: 'دستی',
|
||||||
|
tahesab: 'تهحساب',
|
||||||
|
didar: 'دیدار',
|
||||||
|
excel: 'اکسل',
|
||||||
|
phone: 'تلفن',
|
||||||
|
lead_form: 'فرم لید',
|
||||||
|
other: 'سایر',
|
||||||
|
};
|
||||||
|
return map[value] ?? normalizeSource(raw);
|
||||||
|
}
|
||||||
|
|
||||||
function normalizeLostReason(raw: string | null | undefined): string {
|
function normalizeLostReason(raw: string | null | undefined): string {
|
||||||
const value = raw?.trim();
|
const value = raw?.trim();
|
||||||
if (!value) return 'بدون دلیل ثبتشده';
|
if (!value) return 'بدون دلیل ثبتشده';
|
||||||
|
|||||||
@@ -185,6 +185,7 @@ export function toRoutineDto(
|
|||||||
entityLink: normalizeEntityLink(row.entityLink),
|
entityLink: normalizeEntityLink(row.entityLink),
|
||||||
reminderMinutesBefore: row.reminderMinutesBefore,
|
reminderMinutesBefore: row.reminderMinutesBefore,
|
||||||
isActive: row.isActive,
|
isActive: row.isActive,
|
||||||
|
createdById: row.createdById,
|
||||||
recurrenceLabel: describeRecurrence(rule),
|
recurrenceLabel: describeRecurrence(rule),
|
||||||
executionRate: execution.total ? Math.round((execution.done / execution.total) * 100) : null,
|
executionRate: execution.total ? Math.round((execution.done / execution.total) * 100) : null,
|
||||||
executionTotal: execution.total,
|
executionTotal: execution.total,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { elevated } from '../common/record-scope';
|
import { elevated } from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assignOthersDeniedMessage } from '../common/assign-access';
|
||||||
import {
|
import {
|
||||||
ChangeRoutineAssigneeDto,
|
ChangeRoutineAssigneeDto,
|
||||||
ListRoutinesQueryDto,
|
ListRoutinesQueryDto,
|
||||||
@@ -199,8 +200,7 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async create(actor: Actor, dto: SaveRoutineDto): Promise<RoutineDto> {
|
async create(actor: Actor, dto: SaveRoutineDto): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
const data = await this.buildData(actor, scope, this.ownRoutineInput(actor, scope, dto));
|
||||||
const data = await this.buildData(actor, scope, dto);
|
|
||||||
const row = await this.prisma.routine.create({
|
const row = await this.prisma.routine.create({
|
||||||
data: {
|
data: {
|
||||||
...data,
|
...data,
|
||||||
@@ -215,10 +215,9 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async update(actor: Actor, id: string, dto: SaveRoutineDto): Promise<RoutineDto> {
|
async update(actor: Actor, id: string, dto: SaveRoutineDto): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const data = await this.buildData(actor, scope, dto);
|
const data = await this.buildData(actor, scope, this.ownRoutineInput(actor, scope, dto));
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: data as Prisma.RoutineUncheckedUpdateInput,
|
data: data as Prisma.RoutineUncheckedUpdateInput,
|
||||||
@@ -231,9 +230,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async toggle(actor: Actor, id: string, isActive: boolean): Promise<RoutineDto> {
|
async toggle(actor: Actor, id: string, isActive: boolean): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { isActive },
|
data: { isActive },
|
||||||
@@ -250,9 +248,8 @@ export class RoutinesService {
|
|||||||
dto: ChangeRoutineAssigneeDto,
|
dto: ChangeRoutineAssigneeDto,
|
||||||
): Promise<RoutineDto> {
|
): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const target = await this.resolveTarget(actor, scope, dto.assigneeId, dto.teamId);
|
const target = await this.resolveTarget(actor, scope, dto.assigneeId, dto.teamId);
|
||||||
await this.cancelTodayPending(id, 'تغییر مسئول روتین');
|
await this.cancelTodayPending(id, 'تغییر مسئول روتین');
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
@@ -267,9 +264,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async duplicate(actor: Actor, id: string): Promise<RoutineDto> {
|
async duplicate(actor: Actor, id: string): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const src = await this.findRoutine(actor.organizationId, id);
|
const src = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, src);
|
this.assertCanWriteRoutine(scope, src);
|
||||||
const {
|
const {
|
||||||
id: _id,
|
id: _id,
|
||||||
createdAt: _c,
|
createdAt: _c,
|
||||||
@@ -294,9 +290,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async remove(actor: Actor, id: string) {
|
async remove(actor: Actor, id: string) {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
await this.prisma.routine.update({
|
await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { deletedAt: new Date(), isActive: false },
|
data: { deletedAt: new Date(), isActive: false },
|
||||||
@@ -344,6 +339,27 @@ export class RoutinesService {
|
|||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** عضو عادی فقط روتینی را مینویسد که خودش برای خودش ساخته است. */
|
||||||
|
private ownRoutineInput(actor: Actor, scope: RoutineScope, dto: SaveRoutineDto): SaveRoutineDto {
|
||||||
|
if (scope.isManager) return dto;
|
||||||
|
if (dto.teamId || (dto.assigneeId && dto.assigneeId !== actor.userId)) {
|
||||||
|
throw new ForbiddenException('فقط میتوانید برای خودتان روتین بسازید');
|
||||||
|
}
|
||||||
|
return { ...dto, assigneeId: actor.userId, teamId: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertCanWriteRoutine(
|
||||||
|
scope: RoutineScope,
|
||||||
|
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
||||||
|
) {
|
||||||
|
if (scope.isManager) {
|
||||||
|
this.assertCanManageRoutine(scope, row);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (row.createdById === scope.userId && row.assigneeId === scope.userId && !row.teamId) return;
|
||||||
|
throw new ForbiddenException('فقط روتینی که برای خودتان ساختهاید را میتوانید تغییر دهید');
|
||||||
|
}
|
||||||
|
|
||||||
private assertCanManageRoutine(
|
private assertCanManageRoutine(
|
||||||
scope: RoutineScope,
|
scope: RoutineScope,
|
||||||
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
||||||
@@ -360,6 +376,11 @@ export class RoutinesService {
|
|||||||
assigneeId?: string | null,
|
assigneeId?: string | null,
|
||||||
teamId?: string | null,
|
teamId?: string | null,
|
||||||
): Promise<{ assigneeId: string | null; teamId: string | null }> {
|
): Promise<{ assigneeId: string | null; teamId: string | null }> {
|
||||||
|
if ((assigneeId && assigneeId !== actor.userId) || teamId) {
|
||||||
|
if (!(await actorCanAssignToOthers(this.prisma, actor, 'routines'))) {
|
||||||
|
throw new ForbiddenException(assignOthersDeniedMessage('routines'));
|
||||||
|
}
|
||||||
|
}
|
||||||
if (assigneeId) {
|
if (assigneeId) {
|
||||||
if (!canManage(scope, assigneeId)) {
|
if (!canManage(scope, assigneeId)) {
|
||||||
throw new ForbiddenException('اجازه تعریف روتین برای این کاربر را ندارید');
|
throw new ForbiddenException('اجازه تعریف روتین برای این کاربر را ندارید');
|
||||||
|
|||||||
@@ -32,6 +32,15 @@ export class LocalFileStorage implements OnModuleInit {
|
|||||||
await fs.writeFile(abs, buffer);
|
await fs.writeFile(abs, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async sizeOf(storageKey: string): Promise<number> {
|
||||||
|
try {
|
||||||
|
const stat = await fs.stat(this.absolutePath(storageKey));
|
||||||
|
return stat.size;
|
||||||
|
} catch {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async remove(storageKey: string): Promise<void> {
|
async remove(storageKey: string): Promise<void> {
|
||||||
const abs = this.absolutePath(storageKey);
|
const abs = this.absolutePath(storageKey);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {
|
|||||||
elevated,
|
elevated,
|
||||||
ticketAccessWhere,
|
ticketAccessWhere,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { assertAssigneeSet } from '../common/assign-access';
|
||||||
import { NotificationsService } from '../notifications/notifications.service';
|
import { NotificationsService } from '../notifications/notifications.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
@@ -136,9 +137,7 @@ export class TicketsService {
|
|||||||
if (assigneeId) {
|
if (assigneeId) {
|
||||||
await this.assertUser(actor.organizationId, assigneeId);
|
await this.assertUser(actor.organizationId, assigneeId);
|
||||||
}
|
}
|
||||||
if (!elevated(actor.role) && assigneeId && assigneeId !== actor.userId) {
|
await assertAssigneeSet(this.prisma, actor, 'tickets', [assigneeId]);
|
||||||
assigneeId = actor.userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const number = await this.nextNumber(actor.organizationId);
|
const number = await this.nextNumber(actor.organizationId);
|
||||||
const status = (dto.status as never) || 'open';
|
const status = (dto.status as never) || 'open';
|
||||||
@@ -270,9 +269,7 @@ export class TicketsService {
|
|||||||
if ('assigneeId' in dto) {
|
if ('assigneeId' in dto) {
|
||||||
const next = emptyToNull(dto.assigneeId ?? null);
|
const next = emptyToNull(dto.assigneeId ?? null);
|
||||||
if (next) await this.assertUser(actor.organizationId, next);
|
if (next) await this.assertUser(actor.organizationId, next);
|
||||||
if (!elevated(actor.role) && next && next !== actor.userId) {
|
await assertAssigneeSet(this.prisma, actor, 'tickets', [next], [existing.assigneeId]);
|
||||||
throw new BadRequestException('فقط میتوانید تیکت را به خودتان ارجاع دهید');
|
|
||||||
}
|
|
||||||
data.assigneeId = next;
|
data.assigneeId = next;
|
||||||
if (next && next !== existing.assigneeId && next !== actor.userId) {
|
if (next && next !== existing.assigneeId && next !== actor.userId) {
|
||||||
await this.notifications.create({
|
await this.notifications.create({
|
||||||
|
|||||||
@@ -1,7 +1,16 @@
|
|||||||
import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from '@nestjs/common';
|
import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from '@nestjs/common';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import {
|
||||||
|
parseUserTreasuryAccess,
|
||||||
|
treasurySectionAllowed,
|
||||||
|
type TreasurySectionKey,
|
||||||
|
} from '@mento/shared';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* حقوق فقط با treasury_payroll.
|
||||||
|
* بقیه مسیرها با treasury باز میشوند؛ اگر بخش ریز انتخاب شده باشد فقط همانها.
|
||||||
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class TreasuryAccessGuard implements CanActivate {
|
export class TreasuryAccessGuard implements CanActivate {
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
@@ -10,20 +19,56 @@ export class TreasuryAccessGuard implements CanActivate {
|
|||||||
const req = context.switchToHttp().getRequest<{ user?: Actor; originalUrl?: string; url?: string }>();
|
const req = context.switchToHttp().getRequest<{ user?: Actor; originalUrl?: string; url?: string }>();
|
||||||
const actor = req.user;
|
const actor = req.user;
|
||||||
if (!actor) throw new ForbiddenException('دسترسی مالی مجاز نیست.');
|
if (!actor) throw new ForbiddenException('دسترسی مالی مجاز نیست.');
|
||||||
const url = req.originalUrl || req.url || '';
|
|
||||||
const payroll = url.includes('/treasury/payroll');
|
|
||||||
if (actor.role === 'owner' || actor.role === 'admin') return true;
|
if (actor.role === 'owner' || actor.role === 'admin') return true;
|
||||||
const membership = await this.prisma.membership.findFirst({
|
const membership = await this.prisma.membership.findFirst({
|
||||||
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
||||||
select: { orgRole: { select: { permissions: true } } },
|
select: {
|
||||||
|
orgRole: { select: { permissions: true } },
|
||||||
|
treasuryAccessOverride: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const permissions = Array.isArray(membership?.orgRole?.permissions)
|
const rolePermissions = Array.isArray(membership?.orgRole?.permissions)
|
||||||
? membership.orgRole.permissions.map(String)
|
? membership.orgRole.permissions.map(String)
|
||||||
: [];
|
: [];
|
||||||
const allowed = payroll
|
const permissions = permissionsForTreasury(
|
||||||
? permissions.includes('treasury_payroll')
|
rolePermissions,
|
||||||
: permissions.includes('treasury') || permissions.includes('treasury_payroll');
|
parseUserTreasuryAccess(membership?.treasuryAccessOverride),
|
||||||
if (!allowed) throw new ForbiddenException('دسترسی مالی برای نقش شما مجاز نیست.');
|
);
|
||||||
|
const url = req.originalUrl || req.url || '';
|
||||||
|
if (!treasurySectionAllowed(actor.role, permissions, sectionForUrl(url))) {
|
||||||
|
throw new ForbiddenException('به این بخش مدیریت مالی دسترسی ندارید.');
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function permissionsForTreasury(
|
||||||
|
rolePermissions: string[],
|
||||||
|
override: ReturnType<typeof parseUserTreasuryAccess>,
|
||||||
|
): string[] {
|
||||||
|
if (!override) return rolePermissions;
|
||||||
|
const rest = rolePermissions.filter((key) => key !== 'treasury' && !key.startsWith('treasury_'));
|
||||||
|
if (!override.enabled) return rest;
|
||||||
|
return ['treasury', ...override.sections, ...rest];
|
||||||
|
}
|
||||||
|
|
||||||
|
function sectionForUrl(url: string): TreasurySectionKey | 'treasury_documents' {
|
||||||
|
if (url.includes('/treasury/payroll')) return 'treasury_payroll';
|
||||||
|
if (url.includes('/treasury/receivables') || url.includes('/treasury/installments')) {
|
||||||
|
return 'treasury_receivables';
|
||||||
|
}
|
||||||
|
if (url.includes('/treasury/recurring')) return 'treasury_recurring';
|
||||||
|
if (url.includes('/treasury/reports')) return 'treasury_reports';
|
||||||
|
if (url.includes('/treasury/audit')) return 'treasury_audit';
|
||||||
|
if (url.includes('/treasury/categories')) return 'treasury_categories';
|
||||||
|
if (
|
||||||
|
url.includes('/treasury/accounts') ||
|
||||||
|
url.includes('/treasury/transfers') ||
|
||||||
|
url.includes('/treasury/reconciliations') ||
|
||||||
|
url.includes('/treasury/adjustments')
|
||||||
|
) {
|
||||||
|
return 'treasury_accounts';
|
||||||
|
}
|
||||||
|
if (url.includes('/treasury/dashboard')) return 'treasury_dashboard';
|
||||||
|
return 'treasury_documents';
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { BadRequestException, Injectable, Logger, NotFoundException } from '@nes
|
|||||||
import { Cron } from '@nestjs/schedule';
|
import { Cron } from '@nestjs/schedule';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import ExcelJS from 'exceljs';
|
import ExcelJS from 'exceljs';
|
||||||
|
import type { TreasuryPartyBalanceDto } from '@mento/shared';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
|
|
||||||
@@ -314,7 +315,12 @@ export class TreasuryOpsService {
|
|||||||
return { from: from.toISOString(), to: to.toISOString(), current, previous, ...breakdown };
|
return { from: from.toISOString(), to: to.toISOString(), current, previous, ...breakdown };
|
||||||
}
|
}
|
||||||
|
|
||||||
async reportExcel(actor: Actor, from?: string, to?: string) {
|
async reportExcel(
|
||||||
|
actor: Actor,
|
||||||
|
from?: string,
|
||||||
|
to?: string,
|
||||||
|
parties?: { debtors: TreasuryPartyBalanceDto[]; creditors: TreasuryPartyBalanceDto[] },
|
||||||
|
) {
|
||||||
const data = await this.report(actor, from, to);
|
const data = await this.report(actor, from, to);
|
||||||
const book = new ExcelJS.Workbook();
|
const book = new ExcelJS.Workbook();
|
||||||
const sheet = book.addWorksheet('گزارش مالی');
|
const sheet = book.addWorksheet('گزارش مالی');
|
||||||
@@ -331,10 +337,41 @@ export class TreasuryOpsService {
|
|||||||
sheet.addRow([]);
|
sheet.addRow([]);
|
||||||
sheet.addRow(['دسته هزینه', 'مبلغ', 'سهم']);
|
sheet.addRow(['دسته هزینه', 'مبلغ', 'سهم']);
|
||||||
data.current.expenseCategories.forEach((row) => sheet.addRow([row.name, row.amount, row.share]));
|
data.current.expenseCategories.forEach((row) => sheet.addRow([row.name, row.amount, row.share]));
|
||||||
|
if (parties) {
|
||||||
|
this.addPartySheet(book, 'بدهکاران', parties.debtors, 'دریافتشده');
|
||||||
|
this.addPartySheet(book, 'بستانکاران', parties.creditors, 'پرداختشده');
|
||||||
|
}
|
||||||
const buffer = await book.xlsx.writeBuffer();
|
const buffer = await book.xlsx.writeBuffer();
|
||||||
return Buffer.from(buffer);
|
return Buffer.from(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private addPartySheet(
|
||||||
|
book: ExcelJS.Workbook,
|
||||||
|
title: string,
|
||||||
|
rows: TreasuryPartyBalanceDto[],
|
||||||
|
settledLabel: string,
|
||||||
|
) {
|
||||||
|
const sheet = book.addWorksheet(title);
|
||||||
|
const kindLabel: Record<string, string> = { person: 'مشتری', company: 'شرکت', user: 'کاربر' };
|
||||||
|
sheet.addRow(['طرف حساب', 'نوع', 'مبلغ کل', settledLabel, 'مانده']);
|
||||||
|
let amount = new Prisma.Decimal(0);
|
||||||
|
let settled = new Prisma.Decimal(0);
|
||||||
|
let remaining = new Prisma.Decimal(0);
|
||||||
|
for (const row of rows) {
|
||||||
|
sheet.addRow([
|
||||||
|
row.partyName,
|
||||||
|
(row.partyKind && kindLabel[row.partyKind]) || 'ثبت قبلی',
|
||||||
|
row.amount,
|
||||||
|
row.settledAmount,
|
||||||
|
row.remaining,
|
||||||
|
]);
|
||||||
|
amount = amount.plus(row.amount);
|
||||||
|
settled = settled.plus(row.settledAmount);
|
||||||
|
remaining = remaining.plus(row.remaining);
|
||||||
|
}
|
||||||
|
sheet.addRow(['جمع', '', money(amount), money(settled), money(remaining)]);
|
||||||
|
}
|
||||||
|
|
||||||
private async period(organizationId: string, from: Date, to: Date) {
|
private async period(organizationId: string, from: Date, to: Date) {
|
||||||
const docs = await this.prisma.financialDocument.findMany({
|
const docs = await this.prisma.financialDocument.findMany({
|
||||||
where: {
|
where: {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Body, Controller, Get, Param, Patch, Post, Query, StreamableFile, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common';
|
import { Body, Controller, Delete, Get, Param, Patch, Post, Query, StreamableFile, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common';
|
||||||
import { FileInterceptor } from '@nestjs/platform-express';
|
import { FileInterceptor } from '@nestjs/platform-express';
|
||||||
import { memoryStorage } from 'multer';
|
import { memoryStorage } from 'multer';
|
||||||
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
@@ -43,6 +43,20 @@ export class TreasuryController {
|
|||||||
return this.treasury.createCategory(user, body);
|
return this.treasury.createCategory(user, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('categories/:id')
|
||||||
|
updateCategory(
|
||||||
|
@CurrentUser() user: Actor,
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() body: { name?: string; isActive?: boolean },
|
||||||
|
) {
|
||||||
|
return this.treasury.updateCategory(user, id, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete('categories/:id')
|
||||||
|
deleteCategory(@CurrentUser() user: Actor, @Param('id') id: string) {
|
||||||
|
return this.treasury.deleteCategory(user, id);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('accounts')
|
@Get('accounts')
|
||||||
accounts(
|
accounts(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -61,7 +75,18 @@ export class TreasuryController {
|
|||||||
updateAccount(
|
updateAccount(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Body() body: { name?: string; notes?: string | null; isActive?: boolean; responsibleName?: string | null },
|
@Body()
|
||||||
|
body: {
|
||||||
|
name?: string;
|
||||||
|
type?: 'bank' | 'cash' | 'petty';
|
||||||
|
bankName?: string | null;
|
||||||
|
accountRef?: string | null;
|
||||||
|
notes?: string | null;
|
||||||
|
isActive?: boolean;
|
||||||
|
responsibleName?: string | null;
|
||||||
|
openingBalance?: string | number;
|
||||||
|
openingDate?: string;
|
||||||
|
},
|
||||||
) {
|
) {
|
||||||
return this.treasury.updateAccount(user, id, body);
|
return this.treasury.updateAccount(user, id, body);
|
||||||
}
|
}
|
||||||
@@ -81,6 +106,29 @@ export class TreasuryController {
|
|||||||
return this.treasury.transfer(user, body);
|
return this.treasury.transfer(user, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('parties')
|
||||||
|
parties(@CurrentUser() user: Actor, @Query('q') q?: string) {
|
||||||
|
return this.treasury.searchParties(user, q);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('parties/person')
|
||||||
|
createPartyPerson(
|
||||||
|
@CurrentUser() user: Actor,
|
||||||
|
@Body() body: { firstName?: string; lastName?: string },
|
||||||
|
) {
|
||||||
|
return this.treasury.createPartyPerson(user, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('parties/company')
|
||||||
|
createPartyCompany(@CurrentUser() user: Actor, @Body() body: { name?: string }) {
|
||||||
|
return this.treasury.createPartyCompany(user, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('party-balances')
|
||||||
|
partyBalances(@CurrentUser() user: Actor, @Query('kind') kind?: string) {
|
||||||
|
return this.treasury.partyBalances(user, kind === 'expense' ? 'expense' : 'income');
|
||||||
|
}
|
||||||
|
|
||||||
@Get('documents')
|
@Get('documents')
|
||||||
documents(
|
documents(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -221,7 +269,11 @@ export class TreasuryController {
|
|||||||
@Query('from') from?: string,
|
@Query('from') from?: string,
|
||||||
@Query('to') to?: string,
|
@Query('to') to?: string,
|
||||||
) {
|
) {
|
||||||
const buffer = await this.ops.reportExcel(user, from, to);
|
const [debtors, creditors] = await Promise.all([
|
||||||
|
this.treasury.partyBalances(user, 'income'),
|
||||||
|
this.treasury.partyBalances(user, 'expense'),
|
||||||
|
]);
|
||||||
|
const buffer = await this.ops.reportExcel(user, from, to, { debtors, creditors });
|
||||||
return new StreamableFile(buffer, {
|
return new StreamableFile(buffer, {
|
||||||
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
disposition: 'attachment; filename="treasury-report.xlsx"',
|
disposition: 'attachment; filename="treasury-report.xlsx"',
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
import { ContactsModule } from '../contacts/contacts.module';
|
||||||
import { NotificationsModule } from '../notifications/notifications.module';
|
import { NotificationsModule } from '../notifications/notifications.module';
|
||||||
import { TreasuryController } from './treasury.controller';
|
import { TreasuryController } from './treasury.controller';
|
||||||
import { TreasuryAccessGuard } from './treasury-access.guard';
|
import { TreasuryAccessGuard } from './treasury-access.guard';
|
||||||
@@ -9,7 +10,7 @@ import { TreasuryReceivablesService } from './treasury-receivables.service';
|
|||||||
import { TreasuryService } from './treasury.service';
|
import { TreasuryService } from './treasury.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuthModule, NotificationsModule],
|
imports: [AuthModule, NotificationsModule, ContactsModule],
|
||||||
controllers: [TreasuryController],
|
controllers: [TreasuryController],
|
||||||
providers: [
|
providers: [
|
||||||
TreasuryService,
|
TreasuryService,
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import {
|
import {
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
import { parseUserTreasuryAccess } from '@mento/shared';
|
||||||
import { randomUUID } from 'node:crypto';
|
import { randomUUID } from 'node:crypto';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import ExcelJS from 'exceljs';
|
import ExcelJS from 'exceljs';
|
||||||
@@ -11,10 +13,17 @@ import type {
|
|||||||
FinancialCategoryDto,
|
FinancialCategoryDto,
|
||||||
FinancialDocumentDto,
|
FinancialDocumentDto,
|
||||||
FinancialMovementDto,
|
FinancialMovementDto,
|
||||||
|
FinancialPartyKind,
|
||||||
TreasuryDashboardDto,
|
TreasuryDashboardDto,
|
||||||
|
TreasuryPartyBalanceDto,
|
||||||
|
TreasuryPartySearchDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
|
import { CompaniesService } from '../contacts/companies.service';
|
||||||
|
import { PeopleService } from '../contacts/people.service';
|
||||||
|
import { dateToJalali } from '../common/jalali';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { TreasuryReceivablesService } from './treasury-receivables.service';
|
import { TreasuryReceivablesService } from './treasury-receivables.service';
|
||||||
|
|
||||||
@@ -61,6 +70,9 @@ export class TreasuryService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly receivables: TreasuryReceivablesService,
|
private readonly receivables: TreasuryReceivablesService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
|
private readonly people: PeopleService,
|
||||||
|
private readonly companies: CompaniesService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async ensureCategories(organizationId: string) {
|
async ensureCategories(organizationId: string) {
|
||||||
@@ -108,6 +120,7 @@ export class TreasuryService {
|
|||||||
): Promise<FinancialCategoryDto> {
|
): Promise<FinancialCategoryDto> {
|
||||||
const name = input.name.trim();
|
const name = input.name.trim();
|
||||||
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
||||||
|
try {
|
||||||
const row = await this.prisma.financialCategory.create({
|
const row = await this.prisma.financialCategory.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
@@ -121,14 +134,66 @@ export class TreasuryService {
|
|||||||
kind: row.kind as FinancialCategoryDto['kind'],
|
kind: row.kind as FinancialCategoryDto['kind'],
|
||||||
isActive: row.isActive,
|
isActive: row.isActive,
|
||||||
};
|
};
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new BadRequestException('این نام برای همین نوع دسته قبلاً ثبت شده است.');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateCategory(
|
||||||
|
actor: Actor,
|
||||||
|
id: string,
|
||||||
|
input: { name?: string; isActive?: boolean },
|
||||||
|
): Promise<FinancialCategoryDto> {
|
||||||
|
const current = await this.prisma.financialCategory.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
});
|
||||||
|
if (!current) throw new NotFoundException('دستهبندی پیدا نشد.');
|
||||||
|
const name = input.name == null ? current.name : input.name.trim();
|
||||||
|
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
||||||
|
try {
|
||||||
|
const row = await this.prisma.financialCategory.update({
|
||||||
|
where: { id: current.id },
|
||||||
|
data: {
|
||||||
|
name,
|
||||||
|
...(input.isActive == null ? {} : { isActive: input.isActive }),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
name: row.name,
|
||||||
|
kind: row.kind as FinancialCategoryDto['kind'],
|
||||||
|
isActive: row.isActive,
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new BadRequestException('این نام برای همین نوع دسته قبلاً ثبت شده است.');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteCategory(actor: Actor, id: string): Promise<{ ok: true }> {
|
||||||
|
const current = await this.prisma.financialCategory.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
});
|
||||||
|
if (!current) throw new NotFoundException('دستهبندی پیدا نشد.');
|
||||||
|
await this.prisma.financialCategory.delete({ where: { id: current.id } });
|
||||||
|
return { ok: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
async listAccounts(
|
async listAccounts(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
range?: { from?: string; to?: string },
|
range?: { from?: string; to?: string },
|
||||||
): Promise<FinancialAccountDto[]> {
|
): Promise<FinancialAccountDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
const accounts = await this.prisma.financialAccount.findMany({
|
const accounts = await this.prisma.financialAccount.findMany({
|
||||||
where: { organizationId: actor.organizationId },
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(scope ? { id: { in: scope } } : {}),
|
||||||
|
},
|
||||||
orderBy: [{ isActive: 'desc' }, { name: 'asc' }],
|
orderBy: [{ isActive: 'desc' }, { name: 'asc' }],
|
||||||
});
|
});
|
||||||
return Promise.all(accounts.map((account) => this.toAccountDto(account, range)));
|
return Promise.all(accounts.map((account) => this.toAccountDto(account, range)));
|
||||||
@@ -194,20 +259,90 @@ export class TreasuryService {
|
|||||||
async updateAccount(
|
async updateAccount(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
id: string,
|
id: string,
|
||||||
input: { name?: string; notes?: string | null; isActive?: boolean; responsibleName?: string | null },
|
input: {
|
||||||
|
name?: string;
|
||||||
|
type?: 'bank' | 'cash' | 'petty';
|
||||||
|
bankName?: string | null;
|
||||||
|
accountRef?: string | null;
|
||||||
|
notes?: string | null;
|
||||||
|
isActive?: boolean;
|
||||||
|
responsibleName?: string | null;
|
||||||
|
openingBalance?: string | number;
|
||||||
|
openingDate?: string;
|
||||||
|
},
|
||||||
): Promise<FinancialAccountDto> {
|
): Promise<FinancialAccountDto> {
|
||||||
const existing = await this.requireAccount(actor.organizationId, id);
|
const existing = await this.requireAccount(actor.organizationId, id, actor);
|
||||||
const row = await this.prisma.financialAccount.update({
|
if (input.type && !['bank', 'cash', 'petty'].includes(input.type)) {
|
||||||
|
throw new BadRequestException('نوع حساب نامعتبر است.');
|
||||||
|
}
|
||||||
|
const opening = input.openingBalance !== undefined ? dec(input.openingBalance) : null;
|
||||||
|
if (opening?.isNegative()) {
|
||||||
|
throw new BadRequestException('موجودی اولیه نمیتواند منفی باشد.');
|
||||||
|
}
|
||||||
|
const openingDate =
|
||||||
|
input.openingDate !== undefined
|
||||||
|
? (startOfDay(input.openingDate) ?? existing.openingDate)
|
||||||
|
: null;
|
||||||
|
const row = await this.prisma.$transaction(async (tx) => {
|
||||||
|
const updated = await tx.financialAccount.update({
|
||||||
where: { id: existing.id },
|
where: { id: existing.id },
|
||||||
data: {
|
data: {
|
||||||
...(input.name?.trim() ? { name: input.name.trim() } : {}),
|
...(input.name?.trim() ? { name: input.name.trim() } : {}),
|
||||||
|
...(input.type ? { type: input.type } : {}),
|
||||||
|
...(input.bankName !== undefined ? { bankName: input.bankName?.trim() || null } : {}),
|
||||||
|
...(input.accountRef !== undefined ? { accountRef: input.accountRef?.trim() || null } : {}),
|
||||||
...(input.notes !== undefined ? { notes: input.notes?.trim() || null } : {}),
|
...(input.notes !== undefined ? { notes: input.notes?.trim() || null } : {}),
|
||||||
...(input.responsibleName !== undefined
|
...(input.responsibleName !== undefined
|
||||||
? { responsibleName: input.responsibleName?.trim() || null }
|
? { responsibleName: input.responsibleName?.trim() || null }
|
||||||
: {}),
|
: {}),
|
||||||
...(input.isActive !== undefined ? { isActive: input.isActive } : {}),
|
...(input.isActive !== undefined ? { isActive: input.isActive } : {}),
|
||||||
|
...(opening ? { openingBalance: opening } : {}),
|
||||||
|
...(openingDate ? { openingDate } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
if (opening || openingDate) {
|
||||||
|
const nextAmount = opening ?? existing.openingBalance;
|
||||||
|
const nextDate = openingDate ?? existing.openingDate;
|
||||||
|
const openings = await tx.financialMovement.findMany({
|
||||||
|
where: { accountId: existing.id, kind: 'opening', voidedAt: null },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
});
|
||||||
|
if (nextAmount.isZero()) {
|
||||||
|
if (openings.length) {
|
||||||
|
await tx.financialMovement.updateMany({
|
||||||
|
where: { id: { in: openings.map((row) => row.id) } },
|
||||||
|
data: { voidedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (openings[0]) {
|
||||||
|
await tx.financialMovement.update({
|
||||||
|
where: { id: openings[0].id },
|
||||||
|
data: { amount: nextAmount, occurredAt: nextDate, direction: 'in' },
|
||||||
|
});
|
||||||
|
const extra = openings.slice(1).map((row) => row.id);
|
||||||
|
if (extra.length) {
|
||||||
|
await tx.financialMovement.updateMany({
|
||||||
|
where: { id: { in: extra } },
|
||||||
|
data: { voidedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await tx.financialMovement.create({
|
||||||
|
data: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
accountId: existing.id,
|
||||||
|
direction: 'in',
|
||||||
|
amount: nextAmount,
|
||||||
|
kind: 'opening',
|
||||||
|
occurredAt: nextDate,
|
||||||
|
memo: 'مانده افتتاحیه',
|
||||||
|
createdById: actor.userId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return updated;
|
||||||
|
});
|
||||||
return this.toAccountDto(row);
|
return this.toAccountDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -216,7 +351,7 @@ export class TreasuryService {
|
|||||||
accountId: string,
|
accountId: string,
|
||||||
range?: { from?: string; to?: string },
|
range?: { from?: string; to?: string },
|
||||||
): Promise<{ account: FinancialAccountDto; items: FinancialMovementDto[] }> {
|
): Promise<{ account: FinancialAccountDto; items: FinancialMovementDto[] }> {
|
||||||
const account = await this.requireAccount(actor.organizationId, accountId);
|
const account = await this.requireAccount(actor.organizationId, accountId, actor);
|
||||||
const from = startOfDay(range?.from);
|
const from = startOfDay(range?.from);
|
||||||
const to = startOfDay(range?.to);
|
const to = startOfDay(range?.to);
|
||||||
const rows = await this.prisma.financialMovement.findMany({
|
const rows = await this.prisma.financialMovement.findMany({
|
||||||
@@ -301,8 +436,8 @@ export class TreasuryService {
|
|||||||
if (dup) throw new BadRequestException('این انتقال قبلاً ثبت شده است.');
|
if (dup) throw new BadRequestException('این انتقال قبلاً ثبت شده است.');
|
||||||
}
|
}
|
||||||
const [source, target] = await Promise.all([
|
const [source, target] = await Promise.all([
|
||||||
this.requireAccount(actor.organizationId, input.fromAccountId),
|
this.requireAccount(actor.organizationId, input.fromAccountId, actor),
|
||||||
this.requireAccount(actor.organizationId, input.toAccountId),
|
this.requireAccount(actor.organizationId, input.toAccountId, actor),
|
||||||
]);
|
]);
|
||||||
if (!source.isActive || !target.isActive) {
|
if (!source.isActive || !target.isActive) {
|
||||||
throw new BadRequestException('حساب غیرفعال در انتقال قابل استفاده نیست.');
|
throw new BadRequestException('حساب غیرفعال در انتقال قابل استفاده نیست.');
|
||||||
@@ -352,10 +487,12 @@ export class TreasuryService {
|
|||||||
kind: 'income' | 'expense',
|
kind: 'income' | 'expense',
|
||||||
q?: string,
|
q?: string,
|
||||||
): Promise<FinancialDocumentDto[]> {
|
): Promise<FinancialDocumentDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
const rows = await this.prisma.financialDocument.findMany({
|
const rows = await this.prisma.financialDocument.findMany({
|
||||||
where: {
|
where: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
kind,
|
kind,
|
||||||
|
...(scope ? { OR: [{ accountId: null }, { accountId: { in: scope } }] } : {}),
|
||||||
...(q?.trim()
|
...(q?.trim()
|
||||||
? {
|
? {
|
||||||
OR: [
|
OR: [
|
||||||
@@ -382,7 +519,10 @@ export class TreasuryService {
|
|||||||
bookedAt?: string;
|
bookedAt?: string;
|
||||||
dueAt?: string | null;
|
dueAt?: string | null;
|
||||||
categoryId?: string | null;
|
categoryId?: string | null;
|
||||||
|
partyKind?: FinancialPartyKind | null;
|
||||||
personId?: string | null;
|
personId?: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
partyName?: string | null;
|
partyName?: string | null;
|
||||||
method?: string | null;
|
method?: string | null;
|
||||||
reference?: string | null;
|
reference?: string | null;
|
||||||
@@ -396,9 +536,13 @@ export class TreasuryService {
|
|||||||
const amount = dec(input.amount);
|
const amount = dec(input.amount);
|
||||||
if (title.length < 2) throw new BadRequestException('عنوان را وارد کنید.');
|
if (title.length < 2) throw new BadRequestException('عنوان را وارد کنید.');
|
||||||
if (!amount.greaterThan(0)) throw new BadRequestException('مبلغ باید بزرگتر از صفر باشد.');
|
if (!amount.greaterThan(0)) throw new BadRequestException('مبلغ باید بزرگتر از صفر باشد.');
|
||||||
|
const party = await this.resolveParty(actor, input);
|
||||||
const settle = input.settleAmount == null || input.settleAmount === ''
|
const settle = input.settleAmount == null || input.settleAmount === ''
|
||||||
? new Prisma.Decimal(0)
|
? new Prisma.Decimal(0)
|
||||||
: dec(input.settleAmount);
|
: dec(input.settleAmount);
|
||||||
|
if (party.partyKind === 'other' && !settle.equals(amount)) {
|
||||||
|
throw new BadRequestException('برای سایر، مبلغ دریافت یا پرداخت باید با مبلغ کل یکی باشد.');
|
||||||
|
}
|
||||||
if (settle.isNegative() || settle.greaterThan(amount)) {
|
if (settle.isNegative() || settle.greaterThan(amount)) {
|
||||||
throw new BadRequestException('مبلغ دریافت/پرداخت از مبلغ سند بیشتر است.');
|
throw new BadRequestException('مبلغ دریافت/پرداخت از مبلغ سند بیشتر است.');
|
||||||
}
|
}
|
||||||
@@ -406,7 +550,7 @@ export class TreasuryService {
|
|||||||
throw new BadRequestException('برای ثبت وجه قطعی، حساب را انتخاب کنید.');
|
throw new BadRequestException('برای ثبت وجه قطعی، حساب را انتخاب کنید.');
|
||||||
}
|
}
|
||||||
if (input.accountId) {
|
if (input.accountId) {
|
||||||
const account = await this.requireAccount(actor.organizationId, input.accountId);
|
const account = await this.requireAccount(actor.organizationId, input.accountId, actor);
|
||||||
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
||||||
if (input.kind === 'expense' && settle.greaterThan(0)) {
|
if (input.kind === 'expense' && settle.greaterThan(0)) {
|
||||||
const balance = await this.accountBalance(account.id);
|
const balance = await this.accountBalance(account.id);
|
||||||
@@ -417,6 +561,13 @@ export class TreasuryService {
|
|||||||
}
|
}
|
||||||
const bookedAt = startOfDay(input.bookedAt) ?? new Date();
|
const bookedAt = startOfDay(input.bookedAt) ?? new Date();
|
||||||
const doc = await this.prisma.$transaction(async (tx) => {
|
const doc = await this.prisma.$transaction(async (tx) => {
|
||||||
|
const reference = await this.nextDocumentReference(
|
||||||
|
tx,
|
||||||
|
actor.organizationId,
|
||||||
|
input.kind,
|
||||||
|
input.bookedAt,
|
||||||
|
bookedAt,
|
||||||
|
);
|
||||||
const created = await tx.financialDocument.create({
|
const created = await tx.financialDocument.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
@@ -426,12 +577,15 @@ export class TreasuryService {
|
|||||||
bookedAt,
|
bookedAt,
|
||||||
dueAt: input.dueAt ? startOfDay(input.dueAt) : null,
|
dueAt: input.dueAt ? startOfDay(input.dueAt) : null,
|
||||||
categoryId: input.categoryId || null,
|
categoryId: input.categoryId || null,
|
||||||
personId: input.personId || null,
|
personId: party.personId,
|
||||||
partyName: input.partyName?.trim() || null,
|
companyId: party.companyId,
|
||||||
|
userId: party.userId,
|
||||||
|
partyKind: party.partyKind,
|
||||||
|
partyName: party.partyName,
|
||||||
accountId: input.accountId || null,
|
accountId: input.accountId || null,
|
||||||
method: input.method || null,
|
method: input.method || null,
|
||||||
status: settle.equals(0) ? 'open' : settle.equals(amount) ? 'settled' : 'partial',
|
status: settle.equals(0) ? 'open' : settle.equals(amount) ? 'settled' : 'partial',
|
||||||
reference: input.reference?.trim() || null,
|
reference,
|
||||||
notes: input.notes?.trim() || null,
|
notes: input.notes?.trim() || null,
|
||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
},
|
},
|
||||||
@@ -447,7 +601,7 @@ export class TreasuryService {
|
|||||||
kind: input.kind === 'income' ? 'receipt' : 'payment',
|
kind: input.kind === 'income' ? 'receipt' : 'payment',
|
||||||
occurredAt: startOfDay(input.settledAt ?? undefined) ?? bookedAt,
|
occurredAt: startOfDay(input.settledAt ?? undefined) ?? bookedAt,
|
||||||
memo: title,
|
memo: title,
|
||||||
reference: input.reference?.trim() || null,
|
reference,
|
||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -460,6 +614,221 @@ export class TreasuryService {
|
|||||||
return this.toDocumentDto(doc);
|
return this.toDocumentDto(doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** شماره پیگیری روزانه: DR-14050813-0001 برای درآمد و PD-… برای هزینه. */
|
||||||
|
private async nextDocumentReference(
|
||||||
|
tx: Prisma.TransactionClient,
|
||||||
|
organizationId: string,
|
||||||
|
kind: 'income' | 'expense',
|
||||||
|
bookedAtInput: string | undefined,
|
||||||
|
bookedAt: Date,
|
||||||
|
) {
|
||||||
|
const match = bookedAtInput?.match(/^(\d{4})-(\d{2})-(\d{2})/);
|
||||||
|
const when = match
|
||||||
|
? new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]))
|
||||||
|
: bookedAt;
|
||||||
|
const { jy, jm, jd } = dateToJalali(when);
|
||||||
|
const ymd = `${jy}${String(jm).padStart(2, '0')}${String(jd).padStart(2, '0')}`;
|
||||||
|
const prefix = `${kind === 'income' ? 'DR' : 'PD'}-${ymd}-`;
|
||||||
|
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${`finref:${organizationId}:${prefix}`})::bigint)`;
|
||||||
|
const latest = await tx.financialDocument.findFirst({
|
||||||
|
where: { organizationId, reference: { startsWith: prefix } },
|
||||||
|
orderBy: { reference: 'desc' },
|
||||||
|
select: { reference: true },
|
||||||
|
});
|
||||||
|
const current = Number(latest?.reference?.slice(prefix.length));
|
||||||
|
const next = Number.isFinite(current) && current > 0 ? current + 1 : 1;
|
||||||
|
return `${prefix}${String(next).padStart(4, '0')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async searchParties(actor: Actor, q?: string): Promise<TreasuryPartySearchDto> {
|
||||||
|
const term = q?.trim() ?? '';
|
||||||
|
const contains = term ? { contains: term, mode: 'insensitive' as const } : undefined;
|
||||||
|
const [people, companies, users] = await Promise.all([
|
||||||
|
this.prisma.person.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(contains ? { OR: [{ firstName: contains }, { lastName: contains }] } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, firstName: true, lastName: true },
|
||||||
|
orderBy: { updatedAt: 'desc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
this.prisma.company.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(contains ? { name: contains } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, name: true },
|
||||||
|
orderBy: { updatedAt: 'desc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
this.prisma.user.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
isActive: true,
|
||||||
|
...(contains ? { fullName: contains } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, fullName: true },
|
||||||
|
orderBy: { fullName: 'asc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
return {
|
||||||
|
people: people.map((row) => ({
|
||||||
|
id: row.id,
|
||||||
|
name: `${row.firstName} ${row.lastName}`.trim() || 'مشتری',
|
||||||
|
})),
|
||||||
|
companies,
|
||||||
|
users: users.map((row) => ({ id: row.id, name: row.fullName })),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async createPartyPerson(actor: Actor, input: { firstName?: string; lastName?: string }) {
|
||||||
|
const firstName = input.firstName?.trim() ?? '';
|
||||||
|
const lastName = input.lastName?.trim() ?? '';
|
||||||
|
if (`${firstName} ${lastName}`.trim().length < 2) {
|
||||||
|
throw new BadRequestException('نام شخص را وارد کنید.');
|
||||||
|
}
|
||||||
|
const person = await this.people.create(actor, { firstName, lastName });
|
||||||
|
return { id: person.id, name: person.fullName, kind: 'person' as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
async createPartyCompany(actor: Actor, input: { name?: string }) {
|
||||||
|
const name = input.name?.trim() ?? '';
|
||||||
|
if (name.length < 2) throw new BadRequestException('نام شرکت را وارد کنید.');
|
||||||
|
const company = await this.companies.create(actor, { name });
|
||||||
|
return { id: company.id, name: company.name, kind: 'company' as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
async partyBalances(actor: Actor, kind: 'income' | 'expense'): Promise<TreasuryPartyBalanceDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
const rows = await this.prisma.financialDocument.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
kind,
|
||||||
|
voidedAt: null,
|
||||||
|
status: { in: ['open', 'partial'] },
|
||||||
|
...(scope ? { OR: [{ accountId: null }, { accountId: { in: scope } }] } : {}),
|
||||||
|
},
|
||||||
|
select: {
|
||||||
|
amount: true,
|
||||||
|
partyKind: true,
|
||||||
|
personId: true,
|
||||||
|
companyId: true,
|
||||||
|
userId: true,
|
||||||
|
partyName: true,
|
||||||
|
movements: { select: { amount: true, voidedAt: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const buckets = new Map<string, {
|
||||||
|
key: string;
|
||||||
|
partyKind: FinancialPartyKind | null;
|
||||||
|
partyName: string;
|
||||||
|
amount: Prisma.Decimal;
|
||||||
|
settled: Prisma.Decimal;
|
||||||
|
remaining: Prisma.Decimal;
|
||||||
|
}>();
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.partyKind === 'other') continue;
|
||||||
|
const settled = this.settledOf(row.movements);
|
||||||
|
const rawRemaining = row.amount.minus(settled);
|
||||||
|
if (!rawRemaining.greaterThan(0)) continue;
|
||||||
|
const linkedId = row.personId || row.companyId || row.userId;
|
||||||
|
const partyKind = row.partyKind === 'person' || row.partyKind === 'company' || row.partyKind === 'user'
|
||||||
|
? row.partyKind
|
||||||
|
: null;
|
||||||
|
const key = partyKind && linkedId
|
||||||
|
? `${partyKind}:${linkedId}`
|
||||||
|
: `legacy:${(row.partyName || '').trim() || 'بدون طرف حساب'}`;
|
||||||
|
const current = buckets.get(key) ?? {
|
||||||
|
key,
|
||||||
|
partyKind,
|
||||||
|
partyName: row.partyName?.trim() || 'بدون طرف حساب',
|
||||||
|
amount: new Prisma.Decimal(0),
|
||||||
|
settled: new Prisma.Decimal(0),
|
||||||
|
remaining: new Prisma.Decimal(0),
|
||||||
|
};
|
||||||
|
current.amount = current.amount.plus(row.amount);
|
||||||
|
current.settled = current.settled.plus(settled);
|
||||||
|
current.remaining = current.remaining.plus(rawRemaining);
|
||||||
|
buckets.set(key, current);
|
||||||
|
}
|
||||||
|
return [...buckets.values()]
|
||||||
|
.sort((a, b) => b.remaining.comparedTo(a.remaining))
|
||||||
|
.map((row) => ({
|
||||||
|
key: row.key,
|
||||||
|
partyKind: row.partyKind,
|
||||||
|
partyName: row.partyName,
|
||||||
|
amount: money(row.amount),
|
||||||
|
settledAmount: money(row.settled),
|
||||||
|
remaining: money(row.remaining),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveParty(
|
||||||
|
actor: Actor,
|
||||||
|
input: {
|
||||||
|
partyKind?: FinancialPartyKind | null;
|
||||||
|
personId?: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
const kind = input.partyKind;
|
||||||
|
if (kind === 'other') {
|
||||||
|
return { partyKind: 'other' as const, personId: null, companyId: null, userId: null, partyName: 'سایر' };
|
||||||
|
}
|
||||||
|
if (kind === 'person') {
|
||||||
|
const id = input.personId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('مشتری را انتخاب کنید.');
|
||||||
|
const person = await this.prisma.person.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, firstName: true, lastName: true },
|
||||||
|
});
|
||||||
|
if (!person) throw new BadRequestException('مشتری پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'person' as const,
|
||||||
|
personId: person.id,
|
||||||
|
companyId: null,
|
||||||
|
userId: null,
|
||||||
|
partyName: `${person.firstName} ${person.lastName}`.trim() || 'مشتری',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'company') {
|
||||||
|
const id = input.companyId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('شرکت را انتخاب کنید.');
|
||||||
|
const company = await this.prisma.company.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, name: true },
|
||||||
|
});
|
||||||
|
if (!company) throw new BadRequestException('شرکت پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'company' as const,
|
||||||
|
personId: null,
|
||||||
|
companyId: company.id,
|
||||||
|
userId: null,
|
||||||
|
partyName: company.name,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'user') {
|
||||||
|
const id = input.userId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('کاربر را انتخاب کنید.');
|
||||||
|
const user = await this.prisma.user.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, fullName: true },
|
||||||
|
});
|
||||||
|
if (!user) throw new BadRequestException('کاربر پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'user' as const,
|
||||||
|
personId: null,
|
||||||
|
companyId: null,
|
||||||
|
userId: user.id,
|
||||||
|
partyName: user.fullName,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
throw new BadRequestException('طرف حساب را انتخاب کنید.');
|
||||||
|
}
|
||||||
|
|
||||||
async settleDocument(
|
async settleDocument(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
id: string,
|
id: string,
|
||||||
@@ -480,7 +849,7 @@ export class TreasuryService {
|
|||||||
if (amount.greaterThan(remaining)) {
|
if (amount.greaterThan(remaining)) {
|
||||||
throw new BadRequestException('مبلغ از مانده سند بیشتر است.');
|
throw new BadRequestException('مبلغ از مانده سند بیشتر است.');
|
||||||
}
|
}
|
||||||
const account = await this.requireAccount(actor.organizationId, input.accountId);
|
const account = await this.requireAccount(actor.organizationId, input.accountId, actor);
|
||||||
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
||||||
if (doc.kind === 'expense') {
|
if (doc.kind === 'expense') {
|
||||||
const balance = await this.accountBalance(account.id);
|
const balance = await this.accountBalance(account.id);
|
||||||
@@ -613,8 +982,11 @@ export class TreasuryService {
|
|||||||
if (!doc) throw new NotFoundException('سند پیدا نشد.');
|
if (!doc) throw new NotFoundException('سند پیدا نشد.');
|
||||||
const safeName = file.originalname.replace(/[^\w.\-\u0600-\u06FF]+/g, '_').slice(0, 80);
|
const safeName = file.originalname.replace(/[^\w.\-\u0600-\u06FF]+/g, '_').slice(0, 80);
|
||||||
const storageKey = `treasury/${actor.organizationId}/${doc.id}/${randomUUID()}-${safeName || 'file'}`;
|
const storageKey = `treasury/${actor.organizationId}/${doc.id}/${randomUUID()}-${safeName || 'file'}`;
|
||||||
|
const bytes = file.buffer.length;
|
||||||
|
await this.storage.assertCanAdd(actor.organizationId, bytes);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
return this.prisma.financialAttachment.create({
|
try {
|
||||||
|
const row = await this.prisma.financialAttachment.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
documentId: doc.id,
|
documentId: doc.id,
|
||||||
@@ -625,6 +997,12 @@ export class TreasuryService {
|
|||||||
},
|
},
|
||||||
select: { id: true, fileName: true, createdAt: true },
|
select: { id: true, fileName: true, createdAt: true },
|
||||||
});
|
});
|
||||||
|
await this.storage.addLocal(actor.organizationId, bytes);
|
||||||
|
return row;
|
||||||
|
} catch (err) {
|
||||||
|
await this.files.remove(storageKey);
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async dashboard(
|
async dashboard(
|
||||||
@@ -633,9 +1011,14 @@ export class TreasuryService {
|
|||||||
): Promise<TreasuryDashboardDto> {
|
): Promise<TreasuryDashboardDto> {
|
||||||
const from = startOfDay(range?.from);
|
const from = startOfDay(range?.from);
|
||||||
const to = startOfDay(range?.to);
|
const to = startOfDay(range?.to);
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
const accountFilter = scope
|
||||||
|
? { OR: [{ accountId: null }, { accountId: { in: scope } }] }
|
||||||
|
: {};
|
||||||
const bookedWhere = {
|
const bookedWhere = {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
status: { not: 'void' },
|
status: { not: 'void' },
|
||||||
|
...accountFilter,
|
||||||
...(from || to
|
...(from || to
|
||||||
? { bookedAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
? { bookedAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
||||||
: {}),
|
: {}),
|
||||||
@@ -643,6 +1026,7 @@ export class TreasuryService {
|
|||||||
const cashWhere = {
|
const cashWhere = {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
voidedAt: null,
|
voidedAt: null,
|
||||||
|
...(scope ? { accountId: { in: scope } } : {}),
|
||||||
...(from || to
|
...(from || to
|
||||||
? { occurredAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
? { occurredAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
||||||
: {}),
|
: {}),
|
||||||
@@ -669,12 +1053,13 @@ export class TreasuryService {
|
|||||||
where: {
|
where: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
status: { in: ['open', 'partial'] },
|
status: { in: ['open', 'partial'] },
|
||||||
|
...accountFilter,
|
||||||
},
|
},
|
||||||
include: { movements: true },
|
include: { movements: true },
|
||||||
}),
|
}),
|
||||||
this.listAccounts(actor),
|
this.listAccounts(actor),
|
||||||
this.prisma.financialDocument.findMany({
|
this.prisma.financialDocument.findMany({
|
||||||
where: { organizationId: actor.organizationId },
|
where: { organizationId: actor.organizationId, ...accountFilter },
|
||||||
include: { category: true, account: true, movements: true },
|
include: { category: true, account: true, movements: true },
|
||||||
orderBy: { createdAt: 'desc' },
|
orderBy: { createdAt: 'desc' },
|
||||||
take: 8,
|
take: 8,
|
||||||
@@ -743,11 +1128,50 @@ export class TreasuryService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async requireAccount(organizationId: string, id: string) {
|
private async accountScope(actor: Actor): Promise<string[] | null> {
|
||||||
|
if (actor.role === 'owner' || actor.role === 'admin') return null;
|
||||||
|
const membership = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
||||||
|
select: {
|
||||||
|
user: { select: { fullName: true } },
|
||||||
|
orgRole: { select: { treasuryAccountIds: true, treasuryOwnAccounts: true } },
|
||||||
|
treasuryAccessOverride: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const override = parseUserTreasuryAccess(membership?.treasuryAccessOverride);
|
||||||
|
if (override && !override.enabled) return [];
|
||||||
|
const extra = override
|
||||||
|
? override.accountIds
|
||||||
|
: (membership?.orgRole?.treasuryAccountIds ?? []);
|
||||||
|
const own = override
|
||||||
|
? override.ownAccounts
|
||||||
|
: Boolean(membership?.orgRole?.treasuryOwnAccounts);
|
||||||
|
if (!own && extra.length === 0) return null;
|
||||||
|
const ids = new Set(extra);
|
||||||
|
const name = membership?.user.fullName?.trim();
|
||||||
|
if (own && name) {
|
||||||
|
const rows = await this.prisma.financialAccount.findMany({
|
||||||
|
where: { organizationId: actor.organizationId, responsibleName: { not: null } },
|
||||||
|
select: { id: true, responsibleName: true },
|
||||||
|
});
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.responsibleName?.trim() === name) ids.add(row.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return [...ids];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async requireAccount(organizationId: string, id: string, actor?: Actor) {
|
||||||
const row = await this.prisma.financialAccount.findFirst({
|
const row = await this.prisma.financialAccount.findFirst({
|
||||||
where: { id, organizationId },
|
where: { id, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('حساب پیدا نشد.');
|
if (!row) throw new NotFoundException('حساب پیدا نشد.');
|
||||||
|
if (actor) {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
if (scope && !scope.includes(row.id)) {
|
||||||
|
throw new ForbiddenException('به این حساب دسترسی ندارید.');
|
||||||
|
}
|
||||||
|
}
|
||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -813,7 +1237,10 @@ export class TreasuryService {
|
|||||||
bookedAt: Date;
|
bookedAt: Date;
|
||||||
dueAt: Date | null;
|
dueAt: Date | null;
|
||||||
categoryId: string | null;
|
categoryId: string | null;
|
||||||
|
partyKind?: string | null;
|
||||||
personId: string | null;
|
personId: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
partyName: string | null;
|
partyName: string | null;
|
||||||
accountId: string | null;
|
accountId: string | null;
|
||||||
method: string | null;
|
method: string | null;
|
||||||
@@ -840,7 +1267,10 @@ export class TreasuryService {
|
|||||||
dueAt: row.dueAt ? row.dueAt.toISOString() : null,
|
dueAt: row.dueAt ? row.dueAt.toISOString() : null,
|
||||||
categoryId: row.categoryId,
|
categoryId: row.categoryId,
|
||||||
categoryName: row.category?.name ?? null,
|
categoryName: row.category?.name ?? null,
|
||||||
|
partyKind: (row.partyKind as FinancialDocumentDto['partyKind']) ?? null,
|
||||||
personId: row.personId,
|
personId: row.personId,
|
||||||
|
companyId: row.companyId ?? null,
|
||||||
|
userId: row.userId ?? null,
|
||||||
partyName: row.partyName,
|
partyName: row.partyName,
|
||||||
accountId: row.accountId,
|
accountId: row.accountId,
|
||||||
accountName: row.account?.name ?? null,
|
accountName: row.account?.name ?? null,
|
||||||
|
|||||||
@@ -128,4 +128,10 @@ export class UpdateUserDataAccessDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsObject()
|
@IsObject()
|
||||||
dataAccessOverride?: Record<string, unknown> | null;
|
dataAccessOverride?: Record<string, unknown> | null;
|
||||||
|
|
||||||
|
/** null = ارث از نقش */
|
||||||
|
@ValidateIf((_, v) => v !== null)
|
||||||
|
@IsOptional()
|
||||||
|
@IsObject()
|
||||||
|
treasuryAccessOverride?: Record<string, unknown> | null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,12 @@ import type {
|
|||||||
UpdateUserVisibilityRequest,
|
UpdateUserVisibilityRequest,
|
||||||
UserRole,
|
UserRole,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { DATA_SCOPES, DATA_VISIBILITIES, parseDataAccessPolicy } from '@mento/shared';
|
import {
|
||||||
|
DATA_SCOPES,
|
||||||
|
DATA_VISIBILITIES,
|
||||||
|
parseDataAccessPolicy,
|
||||||
|
parseUserTreasuryAccess,
|
||||||
|
} from '@mento/shared';
|
||||||
import { resolveAllSectionAccess } from '../common/data-access';
|
import { resolveAllSectionAccess } from '../common/data-access';
|
||||||
import { parseVisibilityScopes } from '../common/record-scope';
|
import { parseVisibilityScopes } from '../common/record-scope';
|
||||||
import * as bcrypt from 'bcryptjs';
|
import * as bcrypt from 'bcryptjs';
|
||||||
@@ -23,6 +28,7 @@ import { normalizeMobile } from '../auth/auth.service';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { OrgRolesService } from '../org-roles/org-roles.service';
|
import { OrgRolesService } from '../org-roles/org-roles.service';
|
||||||
import { MembershipsService } from '../memberships/memberships.service';
|
import { MembershipsService } from '../memberships/memberships.service';
|
||||||
|
import { BillingService } from '../billing/billing.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
|
||||||
@@ -46,6 +52,7 @@ type MembershipRow = {
|
|||||||
dataVisibility?: string | null;
|
dataVisibility?: string | null;
|
||||||
dataVisibilityScopes?: unknown;
|
dataVisibilityScopes?: unknown;
|
||||||
dataAccessOverride?: unknown;
|
dataAccessOverride?: unknown;
|
||||||
|
treasuryAccessOverride?: unknown;
|
||||||
priorArchiveEnabled?: boolean;
|
priorArchiveEnabled?: boolean;
|
||||||
logoutTime?: string | null;
|
logoutTime?: string | null;
|
||||||
blockLoginAfterLogout?: boolean;
|
blockLoginAfterLogout?: boolean;
|
||||||
@@ -70,6 +77,7 @@ export class UsersService {
|
|||||||
private readonly orgRoles: OrgRolesService,
|
private readonly orgRoles: OrgRolesService,
|
||||||
private readonly memberships: MembershipsService,
|
private readonly memberships: MembershipsService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly billing: BillingService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list(organizationId: string): Promise<OrgUserDto[]> {
|
async list(organizationId: string): Promise<OrgUserDto[]> {
|
||||||
@@ -105,6 +113,7 @@ export class UsersService {
|
|||||||
return this.addExistingUser(organizationId, existingUser.id, resolved);
|
return this.addExistingUser(organizationId, existingUser.id, resolved);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, null);
|
||||||
const password = dto.password?.trim() ?? '';
|
const password = dto.password?.trim() ?? '';
|
||||||
if (password.length < 8) {
|
if (password.length < 8) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
@@ -367,23 +376,35 @@ export class UsersService {
|
|||||||
organizationId: string,
|
organizationId: string,
|
||||||
actorRole: UserRole,
|
actorRole: UserRole,
|
||||||
targetId: string,
|
targetId: string,
|
||||||
dto: { dataAccessOverride?: Record<string, unknown> | null },
|
dto: {
|
||||||
|
dataAccessOverride?: Record<string, unknown> | null;
|
||||||
|
treasuryAccessOverride?: Record<string, unknown> | null;
|
||||||
|
},
|
||||||
): Promise<OrgUserDto> {
|
): Promise<OrgUserDto> {
|
||||||
if (actorRole !== 'owner' && actorRole !== 'admin') {
|
if (actorRole !== 'owner' && actorRole !== 'admin') {
|
||||||
throw new ForbiddenException('اجازه تغییر محدوده داده را ندارید');
|
throw new ForbiddenException('اجازه تغییر محدوده داده را ندارید');
|
||||||
}
|
}
|
||||||
if (dto.dataAccessOverride === undefined) {
|
if (dto.dataAccessOverride === undefined && dto.treasuryAccessOverride === undefined) {
|
||||||
throw new BadRequestException('تغییری ارسال نشده است');
|
throw new BadRequestException('تغییری ارسال نشده است');
|
||||||
}
|
}
|
||||||
const target = await this.memberships.findUserInOrgById(organizationId, targetId);
|
const target = await this.memberships.findUserInOrgById(organizationId, targetId);
|
||||||
if (target.role === 'owner' || target.role === 'admin') {
|
if (target.role === 'owner' || target.role === 'admin') {
|
||||||
throw new BadRequestException('مالک و مدیر محدودیت عمق داده ندارند');
|
throw new BadRequestException('مالک و مدیر محدودیت عمق داده ندارند');
|
||||||
}
|
}
|
||||||
const next =
|
const data: Prisma.MembershipUpdateInput = {};
|
||||||
|
if (dto.dataAccessOverride !== undefined) {
|
||||||
|
data.dataAccessOverride =
|
||||||
dto.dataAccessOverride === null ? {} : parseDataAccessPolicy(dto.dataAccessOverride);
|
dto.dataAccessOverride === null ? {} : parseDataAccessPolicy(dto.dataAccessOverride);
|
||||||
|
}
|
||||||
|
if (dto.treasuryAccessOverride !== undefined) {
|
||||||
|
data.treasuryAccessOverride =
|
||||||
|
dto.treasuryAccessOverride === null
|
||||||
|
? Prisma.DbNull
|
||||||
|
: (parseUserTreasuryAccess(dto.treasuryAccessOverride) ?? Prisma.DbNull);
|
||||||
|
}
|
||||||
await this.prisma.membership.update({
|
await this.prisma.membership.update({
|
||||||
where: { id: target.id },
|
where: { id: target.id },
|
||||||
data: { dataAccessOverride: next },
|
data,
|
||||||
});
|
});
|
||||||
return this.dtoOf(organizationId, targetId);
|
return this.dtoOf(organizationId, targetId);
|
||||||
}
|
}
|
||||||
@@ -506,6 +527,9 @@ export class UsersService {
|
|||||||
throw new BadRequestException('حداقل یک مالک فعال لازم است');
|
throw new BadRequestException('حداقل یک مالک فعال لازم است');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (isActive && !target.isActive) {
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, targetId);
|
||||||
|
}
|
||||||
await this.prisma.membership.update({
|
await this.prisma.membership.update({
|
||||||
where: { id: target.id },
|
where: { id: target.id },
|
||||||
data: { isActive },
|
data: { isActive },
|
||||||
@@ -533,6 +557,7 @@ export class UsersService {
|
|||||||
userId: string,
|
userId: string,
|
||||||
resolved: { role: UserRole; orgRoleId: string },
|
resolved: { role: UserRole; orgRoleId: string },
|
||||||
): Promise<OrgUserDto> {
|
): Promise<OrgUserDto> {
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, userId);
|
||||||
const existing = await this.prisma.membership.findFirst({
|
const existing = await this.prisma.membership.findFirst({
|
||||||
where: { userId, organizationId },
|
where: { userId, organizationId },
|
||||||
});
|
});
|
||||||
@@ -599,6 +624,10 @@ export class UsersService {
|
|||||||
row.role === 'owner' || row.role === 'admin'
|
row.role === 'owner' || row.role === 'admin'
|
||||||
? {}
|
? {}
|
||||||
: parseDataAccessPolicy(row.dataAccessOverride),
|
: parseDataAccessPolicy(row.dataAccessOverride),
|
||||||
|
treasuryAccessOverride:
|
||||||
|
row.role === 'owner' || row.role === 'admin'
|
||||||
|
? null
|
||||||
|
: parseUserTreasuryAccess(row.treasuryAccessOverride),
|
||||||
...(() => {
|
...(() => {
|
||||||
const effectiveDataAccess = resolveAllSectionAccess({
|
const effectiveDataAccess = resolveAllSectionAccess({
|
||||||
role: row.role,
|
role: row.role,
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ describe('promote from prior', () => {
|
|||||||
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
|
{} as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
const dto = await service.promoteFromPrior(actor, 'act1');
|
const dto = await service.promoteFromPrior(actor, 'act1');
|
||||||
@@ -193,6 +194,7 @@ describe('promote from prior', () => {
|
|||||||
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
|
{} as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
await assert.rejects(service.promoteFromPrior({ ...actor, priorLens: 'off' }, 'act1'), ForbiddenException);
|
await assert.rejects(service.promoteFromPrior({ ...actor, priorLens: 'off' }, 'act1'), ForbiddenException);
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||||
<title>منتکت | Montact CRM</title>
|
<title>منتکت | Montact CRM</title>
|
||||||
<link rel="icon" type="image/png" href="/brand/logo.png" />
|
<link rel="icon" type="image/svg+xml" href="/brand/logo.svg" />
|
||||||
<style>
|
<style>
|
||||||
/* چیدمان اولیه؛ استایل کامپوننت بعداً همین را دقیقتر میکند */
|
/* چیدمان اولیه؛ استایل کامپوننت بعداً همین را دقیقتر میکند */
|
||||||
.app-frame {
|
.app-frame {
|
||||||
|
|||||||
@@ -22,7 +22,9 @@
|
|||||||
"xlsx": "^0.18.5"
|
"xlsx": "^0.18.5"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"@tailwindcss/vite": "^4.3.3",
|
||||||
"@vitejs/plugin-vue": "^5.2.3",
|
"@vitejs/plugin-vue": "^5.2.3",
|
||||||
|
"tailwindcss": "^4.3.3",
|
||||||
"typescript": "^5.8.2",
|
"typescript": "^5.8.2",
|
||||||
"vite": "^6.2.2",
|
"vite": "^6.2.2",
|
||||||
"vue-tsc": "^2.2.8"
|
"vue-tsc": "^2.2.8"
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 197.7 151.02">
|
||||||
|
<defs>
|
||||||
|
<style>
|
||||||
|
.cls-1 {
|
||||||
|
fill: #10897d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-2 {
|
||||||
|
fill: #16c1a8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-3 {
|
||||||
|
fill: #43f7dd;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</defs>
|
||||||
|
<g id="Layer_1-2" data-name="Layer 1">
|
||||||
|
<path class="cls-1" d="M43.57,77.15v64.37c0,4.79-3.88,8.67-8.67,8.67H8.67c-4.79,0-8.67-3.88-8.67-8.67V51.62c0-2.96,1.51-5.71,3.99-7.3l41.67-26.69c3.67-2.35,8.52-1.61,11.32,1.73l35.74,42.59c.57.68,1.6.72,2.22.09l26.07-26.6c3.38-3.45,8.92-3.47,12.33-.06l19.42,19.42c3.39,3.39,3.39,8.88,0,12.26l-55.06,55.06c-3.58,3.58-9.45,3.35-12.73-.5l-38.76-45.42c-.9-1.06-2.64-.42-2.64.97Z"/>
|
||||||
|
<circle class="cls-3" cx="167.06" cy="21.02" r="21.02"/>
|
||||||
|
<rect class="cls-3" x="172.68" y="52.7" width="25.02" height="98.32" rx="12.51" ry="12.51"/>
|
||||||
|
<rect class="cls-2" x="142.38" y="83.17" width="25.02" height="67.85" rx="12.51" ry="12.51"/>
|
||||||
|
<rect class="cls-1" x="111.4" y="114.24" width="25.02" height="36.78" rx="12.51" ry="12.51"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
@@ -0,0 +1,37 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<svg id="Layer_2" data-name="Layer 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 246.7 46.59">
|
||||||
|
<defs>
|
||||||
|
<style>
|
||||||
|
.cls-1 {
|
||||||
|
fill: #10897d;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-2 {
|
||||||
|
fill: #16c1a8;
|
||||||
|
}
|
||||||
|
|
||||||
|
.cls-3 {
|
||||||
|
fill: #43f7dd;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
</defs>
|
||||||
|
<g id="Layer_1-2" data-name="Layer 1">
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M199.15,23.8v19.86c0,1.48-1.2,2.67-2.67,2.67h-8.09c-1.48,0-2.67-1.2-2.67-2.67V15.92c0-.91.47-1.76,1.23-2.25l12.85-8.23c1.13-.72,2.63-.5,3.49.53l11.02,13.14c.18.21.49.22.68.03l8.04-8.21c1.04-1.06,2.75-1.07,3.8-.02l5.99,5.99c1.05,1.05,1.05,2.74,0,3.78l-16.98,16.98c-1.1,1.1-2.92,1.03-3.93-.15l-11.96-14.01c-.28-.33-.81-.13-.81.3h0Z"/>
|
||||||
|
<circle class="cls-3" cx="237.24" cy="6.48" r="6.48"/>
|
||||||
|
<path class="cls-3" d="M242.84,16.26h0c2.13,0,3.86,1.73,3.86,3.86v22.61c0,2.13-1.73,3.86-3.86,3.86h0c-2.13,0-3.86-1.73-3.86-3.86v-22.61c0-2.13,1.73-3.86,3.86-3.86Z"/>
|
||||||
|
<path class="cls-2" d="M233.49,25.66h0c2.13,0,3.86,1.73,3.86,3.86v13.21c0,2.13-1.73,3.86-3.86,3.86h0c-2.13,0-3.86-1.73-3.86-3.86v-13.21c0-2.13,1.73-3.86,3.86-3.86Z"/>
|
||||||
|
<rect class="cls-1" x="220.08" y="35.24" width="7.72" height="11.35" rx="3.86" ry="3.86"/>
|
||||||
|
</g>
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M132.19,17.19v2.66c0,1.27,1.03,2.29,2.29,2.29h2.66c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-2.66c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<path class="cls-1" d="M102.53,17.19v2.66c0,1.27,1.03,2.29,2.29,2.29h12.91c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-12.91c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<path class="cls-1" d="M13.73,20.2v2.66c0,1.27,1.03,2.29,2.29,2.29h12.91c1.27,0,2.29-1.03,2.29-2.29v-2.66c0-1.27-1.03-2.29-2.29-2.29h-12.91c-1.27,0-2.29,1.03-2.29,2.29Z"/>
|
||||||
|
<g>
|
||||||
|
<path class="cls-1" d="M173.05,30.25c-.52-1.2-1.24-2.25-2.14-3.16-.91-.9-1.96-1.62-3.16-2.14-1.2-.52-2.49-.78-3.88-.78h-3.25c-1.12,0-2.2.19-3.24.58-1.04.39-1.98.92-2.81,1.59-.83.68-1.54,1.49-2.11,2.43-.58.95-.97,1.98-1.16,3.1l-1.16,5.97c-.16.66-.47,1.18-.96,1.56-.48.39-1.05.58-1.71.58h-6.49c-.74,0-1.31-.26-1.74-.78-.43-.52-.56-1.15-.41-1.88l1.35-6.87c.25-1.25-.58-2.47-1.84-2.69l-2.52-.46c-1.22-.22-2.4.57-2.65,1.79l-1.81,8.7c-.12.66-.43,1.19-.93,1.59-.5.4-1.08.61-1.74.61h-10.08c-.74,0-1.31-.26-1.74-.78-.43-.52-.56-1.15-.41-1.88l1.35-6.87c.25-1.25-.58-2.47-1.84-2.69l-2.52-.46c-1.22-.22-2.4.57-2.65,1.79l-1.81,8.7c-.12.66-.43,1.19-.93,1.59-.5.4-1.08.61-1.74.61h-9.5c-.66,0-1.22-.22-1.68-.67-.46-.44-.69-.99-.69-1.65v-3.53c0-1.39-.26-2.69-.78-3.91-.52-1.22-1.24-2.28-2.14-3.19-.91-.91-1.96-1.62-3.16-2.14-1.2-.52-2.49-.78-3.88-.78h-21.78l9.58-11.3c.79-.94.71-2.33-.19-3.17l-1.79-1.65c-.96-.88-2.45-.79-3.29.2l-14.66,17.17c-.79.92-.72,2.3.16,3.14l3.59,3.43h29.14c.54,0,1.02.2,1.45.61.43.4.64.9.64,1.48v4.11c0,.54-.19.99-.58,1.33-.39.35-.79.52-1.22.52h-38.23c-.66,0-1.21-.22-1.65-.67-.44-.44-.67-.99-.67-1.65v-8.54c0-1.27-1.03-2.29-2.29-2.29h-2.6c-1.27,0-2.29,1.03-2.29,2.29v8.6c0,.66-.22,1.2-.67,1.62-.44.43-.99.64-1.65.64H11.53c-1.2,0-2.22-.4-3.07-1.21-.85-.81-1.27-1.83-1.27-3.07v-8.25c0-1.27-1.03-2.29-2.29-2.29h-2.6c-1.27,0-2.29,1.03-2.29,2.29v6.47c0,1.66.32,3.24.96,4.72.64,1.49,1.51,2.79,2.61,3.91,1.1,1.12,2.39,2,3.88,2.63,1.49.64,3.06.96,4.72.96h22.01c1.39,0,2.69-.25,3.91-.75,1.22-.5,2.33-1.33,3.33-2.49,1.93,2.16,4.29,3.24,7.07,3.24h35.8c1.24,0,2.44-.23,3.62-.69,1.18-.46,2.25-1.08,3.22-1.85.93.77,1.98,1.39,3.16,1.85,1.18.46,2.44.69,3.79.69h7.59c1.23,0,2.48-.29,3.74-.87,1.25-.58,2.25-1.37,2.98-2.38.58,1,1.46,1.8,2.64,2.38,1.18.58,2.36.87,3.56.87h9.44c1.23,0,2.48-.29,3.74-.87,1.25-.58,2.25-1.37,2.98-2.38.58,1,1.46,1.8,2.64,2.38,1.18.58,2.37.87,3.56.87h6.03c1.24,0,2.39-.23,3.47-.69,1.08-.46,2.07-1.29,2.95-2.49.89,1.24,1.86,2.08,2.93,2.52,1.06.44,2.15.67,3.27.67h6.6c1.04,0,2.03-.2,2.95-.61.93-.4,1.74-.96,2.43-1.65s1.24-1.51,1.65-2.43c.4-.93.61-1.91.61-2.95v-4.36c0-1.39-.26-2.68-.78-3.88ZM166.65,39.98h-7.99c-.43,0-.77-.15-1.04-.46-.27-.31-.37-.67-.29-1.1l.93-4.64c.08-.42.27-.77.58-1.04.31-.27.67-.4,1.1-.4h4.98c.5,0,.92.17,1.24.52.33.35.49.75.49,1.22v5.91Z"/>
|
||||||
|
<path class="cls-3" d="M166.7,16.1c-.65.12-1.24.25-1.77.37-.53.12-1.12.26-1.79.4-.67.14-1.34.29-2.02.44-1.3.29-2.73.61-4.28.94-.68.15-1.34-.31-1.45-1l-.24-1.57c-.1-.63.31-1.23.94-1.36l4.01-.88c-.09-.34-.16-.61-.21-.81-.05-.2-.09-.38-.12-.54-.03-.15-.07-.33-.12-.54-.05-.2-.09-.47-.12-.81-.06-.59,0-1.13.21-1.63.2-.5.48-.95.84-1.35.36-.4.78-.73,1.26-.98.48-.25.95-.4,1.42-.47l2.42-.42c.56-.09,1.11-.05,1.65.14.54.19,1.02.46,1.44.81s.78.78,1.07,1.28c.29.5.49,1.01.58,1.54l.23,1.4c.12.62.09,1.21-.09,1.77-.19.56-.47,1.05-.84,1.49-.37.43-.82.81-1.35,1.12-.53.31-1.09.53-1.68.65ZM166.79,11.54s-.02-.1-.05-.21c-.03-.11-.06-.24-.09-.4-.06-.16-.12-.34-.19-.56-.16-.31-.39-.42-.7-.33l-1.44.37c-.37.06-.53.26-.47.6l.51,1.63,1.86-.47c.5-.09.68-.31.56-.65Z"/>
|
||||||
|
<path class="cls-3" d="M105.49,6.57l11.59-2.48c.64-.14,1.28.27,1.43.91l.27,1.15c.15.66-.26,1.31-.93,1.45l-11.66,2.46c-.67.14-1.32-.3-1.44-.97l-.2-1.13c-.11-.64.3-1.25.94-1.39Z"/>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 4.9 KiB |
@@ -4,8 +4,20 @@ import { RouterLink } from 'vue-router';
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import { rewriteGregorianDates } from '@/lib/jalali';
|
import { rewriteGregorianDates } from '@/lib/jalali';
|
||||||
import UiIcon from '@/components/UiIcon.vue';
|
|
||||||
import { brand, type AskMentoResponse, type AskMentoSourceDto } from '@mento/shared';
|
import { brand, type AskMentoResponse, type AskMentoSourceDto } from '@mento/shared';
|
||||||
|
import {
|
||||||
|
Alert as AAlert,
|
||||||
|
Button as AButton,
|
||||||
|
Card as ACard,
|
||||||
|
Flex as AFlex,
|
||||||
|
Input as AInput,
|
||||||
|
Space as ASpace,
|
||||||
|
Tag as ATag,
|
||||||
|
Typography,
|
||||||
|
} from 'ant-design-vue';
|
||||||
|
import { ThunderboltOutlined } from '@/icons/ant-bridge';
|
||||||
|
|
||||||
|
const { Paragraph: ATypographyParagraph } = Typography;
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
personId?: string;
|
personId?: string;
|
||||||
@@ -65,127 +77,53 @@ function insertAnswer() {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<section class="ask">
|
<a-flex vertical :gap="8" :style="{ minWidth: 0 }">
|
||||||
<form @submit.prevent="submit">
|
<a-flex :gap="8" align="center" :style="{ width: '100%' }">
|
||||||
<UiIcon name="sparkle" :size="16" class="ico" />
|
<a-input
|
||||||
<input
|
v-model:value="question"
|
||||||
v-model="question"
|
allow-clear
|
||||||
type="search"
|
|
||||||
:placeholder="placeholder || brand.askPlaceholderFa"
|
:placeholder="placeholder || brand.askPlaceholderFa"
|
||||||
/>
|
:style="{ flex: 1, minWidth: 0 }"
|
||||||
<button type="submit" :disabled="asking || question.trim().length < 2">
|
@pressEnter="submit"
|
||||||
{{ asking ? '…' : 'بپرس' }}
|
>
|
||||||
</button>
|
<template #prefix>
|
||||||
</form>
|
<ThunderboltOutlined />
|
||||||
<p v-if="error" class="error">{{ error }}</p>
|
</template>
|
||||||
<div v-else-if="result" class="answer">
|
</a-input>
|
||||||
<p>{{ result.answer }}</p>
|
<a-button
|
||||||
<div v-if="result.sources.length" class="sources">
|
type="primary"
|
||||||
|
:disabled="asking || question.trim().length < 2"
|
||||||
|
:loading="asking"
|
||||||
|
@click="submit"
|
||||||
|
>
|
||||||
|
بپرس
|
||||||
|
</a-button>
|
||||||
|
</a-flex>
|
||||||
|
|
||||||
|
<a-alert v-if="error" type="error" show-icon :message="error" />
|
||||||
|
|
||||||
|
<a-card v-else-if="result" :bordered="false">
|
||||||
|
<a-typography-paragraph :style="{ marginBottom: 0 }">
|
||||||
|
{{ result.answer }}
|
||||||
|
</a-typography-paragraph>
|
||||||
|
<a-space v-if="result.sources.length" wrap :size="6" :style="{ marginTop: '8px' }">
|
||||||
<RouterLink
|
<RouterLink
|
||||||
v-for="source in result.sources"
|
v-for="source in result.sources"
|
||||||
:key="`${source.type}-${source.id}`"
|
:key="`${source.type}-${source.id}`"
|
||||||
:to="sourceTo(source)"
|
:to="sourceTo(source)"
|
||||||
>
|
>
|
||||||
{{ source.label }}
|
<a-tag color="cyan" :bordered="false">{{ source.label }}</a-tag>
|
||||||
</RouterLink>
|
</RouterLink>
|
||||||
</div>
|
</a-space>
|
||||||
<button
|
<a-button
|
||||||
v-if="allowInsert && result.answer.trim()"
|
v-if="allowInsert && result.answer.trim()"
|
||||||
type="button"
|
type="primary"
|
||||||
class="insert-btn"
|
block
|
||||||
|
:style="{ marginTop: '8px' }"
|
||||||
@click="insertAnswer"
|
@click="insertAnswer"
|
||||||
>
|
>
|
||||||
درج در پیام
|
درج در پیام
|
||||||
</button>
|
</a-button>
|
||||||
</div>
|
</a-card>
|
||||||
</section>
|
</a-flex>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.ask {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.55rem;
|
|
||||||
min-width: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
form {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.45rem;
|
|
||||||
background: #fff;
|
|
||||||
border: 1px solid #e2e8f0;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 0.35rem 0.4rem 0.35rem 0.7rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ico {
|
|
||||||
color: #0f766e;
|
|
||||||
flex-shrink: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
input {
|
|
||||||
flex: 1;
|
|
||||||
min-width: 0;
|
|
||||||
border: 0;
|
|
||||||
background: transparent;
|
|
||||||
font: inherit;
|
|
||||||
padding: 0.45rem 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
button {
|
|
||||||
border: 0;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
background: #14b8a6;
|
|
||||||
color: #fff;
|
|
||||||
font: inherit;
|
|
||||||
font-weight: 700;
|
|
||||||
padding: 0.45rem 0.8rem;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
button:disabled {
|
|
||||||
opacity: 0.55;
|
|
||||||
cursor: wait;
|
|
||||||
}
|
|
||||||
|
|
||||||
.answer {
|
|
||||||
background: #f0fdfa;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 0.7rem 0.85rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.answer p {
|
|
||||||
margin: 0;
|
|
||||||
color: #134e4a;
|
|
||||||
font-size: 0.88rem;
|
|
||||||
line-height: 1.7;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sources {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 0.35rem;
|
|
||||||
margin-top: 0.55rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.sources a {
|
|
||||||
font-size: 0.74rem;
|
|
||||||
font-weight: 700;
|
|
||||||
color: #0f766e;
|
|
||||||
background: #fff;
|
|
||||||
border-radius: 999px;
|
|
||||||
padding: 0.18rem 0.55rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.insert-btn {
|
|
||||||
margin-top: 0.65rem;
|
|
||||||
width: 100%;
|
|
||||||
background: #0f766e;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error {
|
|
||||||
margin: 0;
|
|
||||||
color: #b91c1c;
|
|
||||||
font-size: 0.84rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ import {
|
|||||||
InputNumber as AInputNumber,
|
InputNumber as AInputNumber,
|
||||||
Row as ARow,
|
Row as ARow,
|
||||||
Select as ASelect,
|
Select as ASelect,
|
||||||
Spin as ASpin,
|
|
||||||
Typography,
|
Typography,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
||||||
|
import { CrmSkeleton, CrmSkeletonCard } from '@/components/skeleton';
|
||||||
import type {
|
import type {
|
||||||
CustomFieldDefinitionDto,
|
CustomFieldDefinitionDto,
|
||||||
CustomFieldEntity,
|
CustomFieldEntity,
|
||||||
@@ -73,7 +73,8 @@ onMounted(load);
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<a-spin v-if="loading" />
|
<CrmSkeleton :loading="loading">
|
||||||
|
<CrmSkeletonCard v-if="loading" :rows="3" :min-height="120" />
|
||||||
<template v-else-if="fields.length">
|
<template v-else-if="fields.length">
|
||||||
<a-typography-title :level="5" :style="{ marginTop: '16px' }">
|
<a-typography-title :level="5" :style="{ marginTop: '16px' }">
|
||||||
فیلدهای سفارشی
|
فیلدهای سفارشی
|
||||||
@@ -130,4 +131,5 @@ onMounted(load);
|
|||||||
</a-col>
|
</a-col>
|
||||||
</a-row>
|
</a-row>
|
||||||
</template>
|
</template>
|
||||||
|
</CrmSkeleton>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -1,6 +1,17 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, watch } from 'vue';
|
import { computed, watch } from 'vue';
|
||||||
import { Select as ASelect } from 'ant-design-vue';
|
import {
|
||||||
|
Alert as AAlert,
|
||||||
|
Card as ACard,
|
||||||
|
Checkbox as ACheckbox,
|
||||||
|
Flex as AFlex,
|
||||||
|
FormItem as AFormItem,
|
||||||
|
Radio as ARadio,
|
||||||
|
RadioGroup as ARadioGroup,
|
||||||
|
Select as ASelect,
|
||||||
|
Space as ASpace,
|
||||||
|
Typography,
|
||||||
|
} from 'ant-design-vue';
|
||||||
import type {
|
import type {
|
||||||
DataAccessOwnerKind,
|
DataAccessOwnerKind,
|
||||||
DataAccessRule,
|
DataAccessRule,
|
||||||
@@ -15,9 +26,12 @@ import {
|
|||||||
PERSON_MOODS,
|
PERSON_MOODS,
|
||||||
sectionHasDataAccessLimits,
|
sectionHasDataAccessLimits,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
|
|
||||||
export type IdOption = { id: string; name: string };
|
export type IdOption = { id: string; name: string };
|
||||||
type Choice = { value: string; label: string };
|
type Choice = { value: string; label: string };
|
||||||
|
|
||||||
|
const { Text: ATypographyText } = Typography;
|
||||||
|
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
modelValue: SectionDataAccess;
|
modelValue: SectionDataAccess;
|
||||||
@@ -429,53 +443,59 @@ const filterSummary = computed(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="dae" :class="{ compact }">
|
<a-flex vertical :gap="compact ? 8 : 12">
|
||||||
<div class="dae-mode">
|
<a-radio-group v-model:value="mode" :disabled="disabled">
|
||||||
<label>
|
<a-flex vertical :gap="4">
|
||||||
<input v-model="mode" type="radio" value="all" :disabled="disabled" />
|
<a-radio value="all">همهٔ {{ sectionLabel }}</a-radio>
|
||||||
همهٔ {{ sectionLabel }}
|
<a-radio value="rules">محدود با فیلتر</a-radio>
|
||||||
</label>
|
</a-flex>
|
||||||
<label>
|
</a-radio-group>
|
||||||
<input v-model="mode" type="radio" value="rules" :disabled="disabled" />
|
|
||||||
محدود با فیلتر
|
|
||||||
</label>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<template v-if="mode === 'rules'">
|
<template v-if="mode === 'rules'">
|
||||||
<p class="hint">
|
<a-typography-text type="secondary">
|
||||||
فقط رکوردهایی دیده میشوند که با
|
فقط رکوردهایی دیده میشوند که با
|
||||||
<strong>همهٔ فیلترهای پرشده</strong>
|
<strong>همهٔ فیلترهای پرشده</strong>
|
||||||
جور باشند. در هر فهرست، چند انتخاب یعنی هر کدام کافی است. خالی یعنی بدون محدودیت.
|
جور باشند. در هر فهرست، چند انتخاب یعنی هر کدام کافی است. خالی یعنی بدون محدودیت.
|
||||||
</p>
|
</a-typography-text>
|
||||||
<p v-if="hadMultipleRules" class="hint warn">
|
<a-alert
|
||||||
تنظیم قبلی چندتکه بود؛ اینجا در یک فیلتر ادغام شده. با ذخیره به همین شکل ساده ثبت میشود.
|
v-if="hadMultipleRules"
|
||||||
</p>
|
type="warning"
|
||||||
<p class="summary">{{ filterSummary }}</p>
|
show-icon
|
||||||
|
message="تنظیم قبلی چندتکه بود؛ اینجا در یک فیلتر ادغام شده. با ذخیره به همین شکل ساده ثبت میشود."
|
||||||
|
/>
|
||||||
|
<a-typography-text strong>{{ filterSummary }}</a-typography-text>
|
||||||
|
|
||||||
<fieldset :disabled="disabled">
|
<a-card size="small" title="مالک / مسئول" :bordered="true">
|
||||||
<legend>مالک / مسئول</legend>
|
<a-flex vertical :gap="8">
|
||||||
<p class="muted">خالی = بدون محدودیت مالک</p>
|
<a-typography-text type="secondary">خالی = بدون محدودیت مالک</a-typography-text>
|
||||||
<label class="chip">
|
<a-space wrap :size="8">
|
||||||
<input
|
<a-checkbox
|
||||||
type="checkbox"
|
|
||||||
:checked="filter.owners?.includes('self')"
|
:checked="filter.owners?.includes('self')"
|
||||||
|
:disabled="disabled"
|
||||||
@change="toggleOwner('self')"
|
@change="toggleOwner('self')"
|
||||||
/>
|
>
|
||||||
{{ ownerSelfLabel }}
|
{{ ownerSelfLabel }}
|
||||||
</label>
|
</a-checkbox>
|
||||||
<label class="chip">
|
<a-checkbox
|
||||||
<input
|
|
||||||
type="checkbox"
|
|
||||||
:checked="filter.owners?.includes('team')"
|
:checked="filter.owners?.includes('team')"
|
||||||
|
:disabled="disabled"
|
||||||
@change="toggleOwner('team')"
|
@change="toggleOwner('team')"
|
||||||
/>
|
>
|
||||||
تیمهای عضو
|
تیمهای عضو
|
||||||
</label>
|
</a-checkbox>
|
||||||
</fieldset>
|
</a-space>
|
||||||
|
</a-flex>
|
||||||
|
</a-card>
|
||||||
|
|
||||||
<label v-for="picker in pickers" :key="picker.legend" class="pick">
|
<a-form-item
|
||||||
<span>{{ picker.legend }}</span>
|
v-for="picker in pickers"
|
||||||
<p v-if="picker.loading" class="muted">در حال بارگذاری منبعها…</p>
|
:key="picker.legend"
|
||||||
|
:label="picker.legend"
|
||||||
|
:style="{ marginBottom: 0 }"
|
||||||
|
>
|
||||||
|
<a-typography-text v-if="picker.loading" type="secondary">
|
||||||
|
در حال بارگذاری منبعها…
|
||||||
|
</a-typography-text>
|
||||||
<a-select
|
<a-select
|
||||||
v-else
|
v-else
|
||||||
:value="pickerValue(picker)"
|
:value="pickerValue(picker)"
|
||||||
@@ -490,70 +510,14 @@ const filterSummary = computed(() => {
|
|||||||
style="width: 100%"
|
style="width: 100%"
|
||||||
@update:value="setList(picker.key, $event)"
|
@update:value="setList(picker.key, $event)"
|
||||||
/>
|
/>
|
||||||
<p v-if="picker.hint" class="muted">{{ picker.hint }}</p>
|
<a-typography-text v-if="picker.hint" type="secondary">
|
||||||
</label>
|
{{ picker.hint }}
|
||||||
|
</a-typography-text>
|
||||||
|
</a-form-item>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<p v-else-if="!hasLimits" class="hint">
|
<a-typography-text v-else-if="!hasLimits" type="secondary">
|
||||||
بدون محدودیت — همهٔ {{ sectionLabel }} قابل مشاهدهاند.
|
بدون محدودیت — همهٔ {{ sectionLabel }} قابل مشاهدهاند.
|
||||||
</p>
|
</a-typography-text>
|
||||||
</div>
|
</a-flex>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.dae {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
.dae-mode {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.35rem;
|
|
||||||
}
|
|
||||||
.dae-mode label,
|
|
||||||
.chip {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.4rem;
|
|
||||||
font-size: 0.88rem;
|
|
||||||
margin-inline-end: 0.55rem;
|
|
||||||
margin-bottom: 0.25rem;
|
|
||||||
}
|
|
||||||
.hint,
|
|
||||||
.muted,
|
|
||||||
.summary {
|
|
||||||
color: #64748b;
|
|
||||||
font-size: 0.82rem;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
.hint.warn {
|
|
||||||
color: #b45309;
|
|
||||||
}
|
|
||||||
.summary {
|
|
||||||
font-weight: 600;
|
|
||||||
color: #334155;
|
|
||||||
}
|
|
||||||
fieldset {
|
|
||||||
border: 1px dashed #e2e8f0;
|
|
||||||
border-radius: 8px;
|
|
||||||
padding: 0.5rem 0.65rem;
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
legend {
|
|
||||||
padding-inline: 0.25rem;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
color: #475569;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
.pick {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.35rem;
|
|
||||||
}
|
|
||||||
.pick > span {
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-weight: 600;
|
|
||||||
color: #475569;
|
|
||||||
}
|
|
||||||
.compact fieldset {
|
|
||||||
padding: 0.45rem 0.55rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -1,31 +1,51 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref, watch } from 'vue';
|
import { computed, onMounted, ref, watch } from 'vue';
|
||||||
|
import {
|
||||||
|
Tabs as ATabs,
|
||||||
|
TabPane as ATabPane,
|
||||||
|
Typography,
|
||||||
|
Radio as ARadio,
|
||||||
|
RadioGroup as ARadioGroup,
|
||||||
|
Checkbox as ACheckbox,
|
||||||
|
Space as ASpace,
|
||||||
|
Input as AInput,
|
||||||
|
} from 'ant-design-vue';
|
||||||
import type {
|
import type {
|
||||||
DataAccessPolicy,
|
DataAccessPolicy,
|
||||||
DataAccessSection,
|
DataAccessSection,
|
||||||
|
FinancialAccountDto,
|
||||||
PersonImportSourceStatDto,
|
PersonImportSourceStatDto,
|
||||||
RolePermissionKey,
|
RolePermissionKey,
|
||||||
SectionDataAccess,
|
SectionDataAccess,
|
||||||
|
UserTreasuryAccess,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import {
|
import {
|
||||||
DATA_ACCESS_SECTION_LABELS,
|
DATA_ACCESS_SECTION_LABELS,
|
||||||
DATA_ACCESS_SECTIONS,
|
DATA_ACCESS_SECTIONS,
|
||||||
|
ROLE_PERMISSION_ITEMS,
|
||||||
emptySectionDataAccess,
|
emptySectionDataAccess,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import { useCustomerGroups } from '@/lib/customer-groups';
|
import { useCustomerGroups } from '@/lib/customer-groups';
|
||||||
import DataAccessEditor, { type IdOption } from '@/components/DataAccessEditor.vue';
|
import DataAccessEditor, { type IdOption } from '@/components/DataAccessEditor.vue';
|
||||||
|
|
||||||
|
const { Text: ATypographyText } = Typography;
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
modelValue: DataAccessPolicy;
|
modelValue: DataAccessPolicy;
|
||||||
/** فقط بخشهایی که این مجوزها را دارند نشان بده؛ خالی = همه */
|
/** فقط بخشهایی که این مجوزها را دارند نشان بده؛ خالی = همه */
|
||||||
enabledPermissions?: RolePermissionKey[];
|
enabledPermissions?: RolePermissionKey[];
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
/** تبهای عمق داده قفل شوند؛ تب مدیریت مالی جدا میماند */
|
||||||
|
dataLocked?: boolean;
|
||||||
|
showTreasury?: boolean;
|
||||||
|
treasuryAccess?: UserTreasuryAccess | null;
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
'update:modelValue': [DataAccessPolicy];
|
'update:modelValue': [DataAccessPolicy];
|
||||||
|
'update:treasuryAccess': [UserTreasuryAccess | null];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
/** بخشهایی که به RolePermissionKey وصلاند؛ بقیه (روتین/پروژه/تیکت) همیشه دیده میشوند */
|
/** بخشهایی که به RolePermissionKey وصلاند؛ بقیه (روتین/پروژه/تیکت) همیشه دیده میشوند */
|
||||||
@@ -47,12 +67,13 @@ const visibleSections = computed(() => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const active = ref<DataAccessSection>('customers');
|
const treasurySections = ROLE_PERMISSION_ITEMS.filter((item) => item.key.startsWith('treasury_'));
|
||||||
|
const active = ref<DataAccessSection | 'treasury'>('customers');
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
visibleSections,
|
visibleSections,
|
||||||
(list) => {
|
(list) => {
|
||||||
if (!list.includes(active.value) && list[0]) active.value = list[0];
|
if (active.value !== 'treasury' && !list.includes(active.value) && list[0]) active.value = list[0];
|
||||||
},
|
},
|
||||||
{ immediate: true },
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
@@ -89,6 +110,52 @@ const activityTypes = ref<IdOption[]>([]);
|
|||||||
const projectBoards = ref<IdOption[]>([]);
|
const projectBoards = ref<IdOption[]>([]);
|
||||||
const projectStages = ref<IdOption[]>([]);
|
const projectStages = ref<IdOption[]>([]);
|
||||||
const routineCategories = ref<IdOption[]>([]);
|
const routineCategories = ref<IdOption[]>([]);
|
||||||
|
const treasuryAccounts = ref<FinancialAccountDto[]>([]);
|
||||||
|
const treasuryAccountQuery = ref('');
|
||||||
|
|
||||||
|
const filteredTreasuryAccounts = computed(() => {
|
||||||
|
const query = treasuryAccountQuery.value.trim();
|
||||||
|
if (!query) return treasuryAccounts.value;
|
||||||
|
return treasuryAccounts.value.filter((account) => account.name.includes(query));
|
||||||
|
});
|
||||||
|
|
||||||
|
function emptyTreasuryAccess(): UserTreasuryAccess {
|
||||||
|
return { enabled: true, sections: [], ownAccounts: false, accountIds: [] };
|
||||||
|
}
|
||||||
|
|
||||||
|
function patchTreasury(next: UserTreasuryAccess | null) {
|
||||||
|
emit('update:treasuryAccess', next);
|
||||||
|
}
|
||||||
|
|
||||||
|
function onTreasuryModeChange(e: { target: { value?: unknown } }) {
|
||||||
|
patchTreasury(e.target.value === 'role' ? null : (props.treasuryAccess ?? emptyTreasuryAccess()));
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTreasurySection(key: RolePermissionKey) {
|
||||||
|
const current = props.treasuryAccess ?? emptyTreasuryAccess();
|
||||||
|
const sections = current.sections.includes(key)
|
||||||
|
? current.sections.filter((item) => item !== key)
|
||||||
|
: [...current.sections, key];
|
||||||
|
patchTreasury({ ...current, enabled: true, sections });
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTreasuryAccount(id: string) {
|
||||||
|
const current = props.treasuryAccess ?? emptyTreasuryAccess();
|
||||||
|
const accountIds = current.accountIds.includes(id)
|
||||||
|
? current.accountIds.filter((item) => item !== id)
|
||||||
|
: [...current.accountIds, id];
|
||||||
|
patchTreasury({ ...current, enabled: true, accountIds });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTreasuryAccounts() {
|
||||||
|
if (!props.showTreasury) return;
|
||||||
|
try {
|
||||||
|
const { data } = await api.get<FinancialAccountDto[]>('/treasury/accounts');
|
||||||
|
treasuryAccounts.value = data;
|
||||||
|
} catch {
|
||||||
|
treasuryAccounts.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadOptions() {
|
async function loadOptions() {
|
||||||
await loadCustomerGroups().catch(() => undefined);
|
await loadCustomerGroups().catch(() => undefined);
|
||||||
@@ -176,96 +243,107 @@ async function loadOptions() {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
void loadOptions();
|
void loadOptions();
|
||||||
});
|
void loadTreasuryAccounts();
|
||||||
|
|
||||||
const stagesForActive = computed(() => {
|
|
||||||
if (active.value === 'leads') return leadStages.value;
|
|
||||||
if (active.value === 'sales') return dealStages.value;
|
|
||||||
if (active.value === 'activities') return activityStages.value;
|
|
||||||
if (active.value === 'projects') return projectStages.value;
|
|
||||||
return [];
|
|
||||||
});
|
|
||||||
|
|
||||||
const boardsForActive = computed(() => {
|
|
||||||
if (active.value === 'activities') return activityBoards.value;
|
|
||||||
if (active.value === 'projects') return projectBoards.value;
|
|
||||||
return [];
|
|
||||||
});
|
|
||||||
|
|
||||||
const typesForActive = computed(() => {
|
|
||||||
if (active.value === 'activities') return activityTypes.value;
|
|
||||||
if (active.value === 'routines') return routineCategories.value;
|
|
||||||
return [];
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div class="dap">
|
<div>
|
||||||
<p v-if="!visibleSections.length" class="muted">
|
<a-typography-text v-if="!visibleSections.length" type="secondary">
|
||||||
برای تنظیم محدوده، ابتدا مجوز بخش مربوط را روشن کنید.
|
برای تنظیم محدوده، ابتدا مجوز بخش مربوط را روشن کنید.
|
||||||
</p>
|
</a-typography-text>
|
||||||
<template v-else>
|
<a-tabs v-else v-model:activeKey="active">
|
||||||
<div class="tabs" role="tablist">
|
<a-tab-pane
|
||||||
<button
|
|
||||||
v-for="s in visibleSections"
|
v-for="s in visibleSections"
|
||||||
:key="s"
|
:key="s"
|
||||||
type="button"
|
:tab="DATA_ACCESS_SECTION_LABELS[s]"
|
||||||
class="tab"
|
|
||||||
:class="{ on: active === s }"
|
|
||||||
role="tab"
|
|
||||||
:aria-selected="active === s"
|
|
||||||
@click="active = s"
|
|
||||||
>
|
>
|
||||||
{{ DATA_ACCESS_SECTION_LABELS[s] }}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
<DataAccessEditor
|
<DataAccessEditor
|
||||||
:key="active"
|
:section="s"
|
||||||
:section="active"
|
:model-value="sectionValue(s)"
|
||||||
:model-value="sectionValue(active)"
|
|
||||||
:groups="customerGroups"
|
:groups="customerGroups"
|
||||||
:stages="stagesForActive"
|
:stages="s === 'leads' ? leadStages : s === 'sales' ? dealStages : s === 'activities' ? activityStages : s === 'projects' ? projectStages : []"
|
||||||
:pipelines="pipelines"
|
:pipelines="pipelines"
|
||||||
:boards="boardsForActive"
|
:boards="s === 'activities' ? activityBoards : s === 'projects' ? projectBoards : []"
|
||||||
:activity-types="typesForActive"
|
:activity-types="s === 'activities' ? activityTypes : s === 'routines' ? routineCategories : []"
|
||||||
:import-sources="importSources"
|
:import-sources="importSources"
|
||||||
:import-sources-ready="importSourcesReady"
|
:import-sources-ready="importSourcesReady"
|
||||||
:import-sources-failed="importSourcesFailed"
|
:import-sources-failed="importSourcesFailed"
|
||||||
:disabled="disabled"
|
:disabled="disabled || dataLocked"
|
||||||
:compact="compact"
|
:compact="compact"
|
||||||
@update:model-value="setSection(active, $event)"
|
@update:model-value="setSection(s, $event)"
|
||||||
/>
|
/>
|
||||||
|
</a-tab-pane>
|
||||||
|
<a-tab-pane v-if="showTreasury" key="treasury" tab="مدیریت مالی">
|
||||||
|
<a-space direction="vertical">
|
||||||
|
<a-typography-text type="secondary">
|
||||||
|
این برگه فقط برای همین کاربر است. «مثل نقش» یعنی همان دسترسی مالی نقش بماند.
|
||||||
|
در حالت سفارشی، اگر هیچ بخش ریزی تیک نخورد همه بخشها بهجز حقوق باز میمانند و حقوق جداست.
|
||||||
|
اگر هیچ حسابی انتخاب نشود همه حسابها باز است.
|
||||||
|
</a-typography-text>
|
||||||
|
<a-radio-group
|
||||||
|
:value="treasuryAccess == null ? 'role' : 'custom'"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="onTreasuryModeChange"
|
||||||
|
>
|
||||||
|
<a-space direction="vertical">
|
||||||
|
<a-radio value="role">مثل نقش</a-radio>
|
||||||
|
<a-radio value="custom">سفارشی برای این کاربر</a-radio>
|
||||||
|
</a-space>
|
||||||
|
</a-radio-group>
|
||||||
|
<template v-if="treasuryAccess">
|
||||||
|
<a-checkbox
|
||||||
|
:checked="treasuryAccess.enabled"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury({ ...treasuryAccess, enabled: !treasuryAccess.enabled })"
|
||||||
|
>
|
||||||
|
دسترسی به مدیریت مالی
|
||||||
|
</a-checkbox>
|
||||||
|
<template v-if="treasuryAccess.enabled">
|
||||||
|
<a-space direction="vertical">
|
||||||
|
<a-checkbox
|
||||||
|
v-for="perm in treasurySections"
|
||||||
|
:key="perm.key"
|
||||||
|
:checked="treasuryAccess.sections.includes(perm.key)"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="toggleTreasurySection(perm.key)"
|
||||||
|
>
|
||||||
|
{{ perm.label }}
|
||||||
|
</a-checkbox>
|
||||||
|
</a-space>
|
||||||
|
<a-checkbox
|
||||||
|
:checked="treasuryAccess.ownAccounts"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury({ ...treasuryAccess, ownAccounts: !treasuryAccess.ownAccounts })"
|
||||||
|
>
|
||||||
|
حسابهایی که خودش مسئول آنهاست
|
||||||
|
</a-checkbox>
|
||||||
|
<a-typography-text type="secondary">حسابهای دیگر</a-typography-text>
|
||||||
|
<a-input
|
||||||
|
v-model:value="treasuryAccountQuery"
|
||||||
|
placeholder="جستجوی حساب"
|
||||||
|
:disabled="disabled"
|
||||||
|
allow-clear
|
||||||
|
/>
|
||||||
|
<a-space direction="vertical">
|
||||||
|
<a-checkbox
|
||||||
|
v-for="account in filteredTreasuryAccounts"
|
||||||
|
:key="account.id"
|
||||||
|
:checked="treasuryAccess.accountIds.includes(account.id)"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="toggleTreasuryAccount(account.id)"
|
||||||
|
>
|
||||||
|
{{ account.name }}
|
||||||
|
<template v-if="account.responsibleName"> — مسئول: {{ account.responsibleName }}</template>
|
||||||
|
</a-checkbox>
|
||||||
|
</a-space>
|
||||||
|
<a-typography-text v-if="!treasuryAccounts.length" type="secondary">
|
||||||
|
حسابی برای انتخاب نیست.
|
||||||
|
</a-typography-text>
|
||||||
</template>
|
</template>
|
||||||
|
</template>
|
||||||
|
</a-space>
|
||||||
|
</a-tab-pane>
|
||||||
|
</a-tabs>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.dap {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
.tabs {
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 0.35rem;
|
|
||||||
}
|
|
||||||
.tab {
|
|
||||||
font: inherit;
|
|
||||||
border: 1px solid #e2e8f0;
|
|
||||||
background: #fff;
|
|
||||||
border-radius: 999px;
|
|
||||||
padding: 0.3rem 0.7rem;
|
|
||||||
cursor: pointer;
|
|
||||||
color: #475569;
|
|
||||||
}
|
|
||||||
.tab.on {
|
|
||||||
border-color: #0f766e;
|
|
||||||
background: #f0fdfa;
|
|
||||||
color: #0f766e;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
.muted {
|
|
||||||
color: #64748b;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -10,11 +10,11 @@ import {
|
|||||||
Input as AInput,
|
Input as AInput,
|
||||||
List as AList,
|
List as AList,
|
||||||
Space as ASpace,
|
Space as ASpace,
|
||||||
Spin as ASpin,
|
|
||||||
Tag as ATag,
|
Tag as ATag,
|
||||||
Textarea as ATextarea,
|
Textarea as ATextarea,
|
||||||
Typography,
|
Typography,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
|
import { CrmSkeleton, CrmSkeletonList } from '@/components/skeleton';
|
||||||
|
|
||||||
const ASpaceCompact = ASpace.Compact;
|
const ASpaceCompact = ASpace.Compact;
|
||||||
const AListItem = AList.Item;
|
const AListItem = AList.Item;
|
||||||
@@ -259,7 +259,8 @@ onMounted(load);
|
|||||||
:style="{ marginTop: '12px' }"
|
:style="{ marginTop: '12px' }"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<a-spin :spinning="loading">
|
<CrmSkeleton :loading="loading">
|
||||||
|
<CrmSkeletonList :rows="5">
|
||||||
<a-list
|
<a-list
|
||||||
v-if="items.length"
|
v-if="items.length"
|
||||||
item-layout="horizontal"
|
item-layout="horizontal"
|
||||||
@@ -304,6 +305,7 @@ onMounted(load);
|
|||||||
description="هنوز چیزی در تایملاین نیست. یک یادداشت یا فعالیت ثبت کنید."
|
description="هنوز چیزی در تایملاین نیست. یک یادداشت یا فعالیت ثبت کنید."
|
||||||
:style="{ marginTop: '16px' }"
|
:style="{ marginTop: '16px' }"
|
||||||
/>
|
/>
|
||||||
</a-spin>
|
</CrmSkeletonList>
|
||||||
|
</CrmSkeleton>
|
||||||
</a-card>
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -0,0 +1,568 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, reactive, ref } from 'vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
import { api } from '@/lib/api';
|
||||||
|
import type {
|
||||||
|
ExcelFieldOption,
|
||||||
|
ExcelImportPrepareStatus,
|
||||||
|
ExcelPreviewResult,
|
||||||
|
ImportContactsResult,
|
||||||
|
} from '@mento/shared';
|
||||||
|
import {
|
||||||
|
previewExcelClient,
|
||||||
|
readMappedRowsClient,
|
||||||
|
type ClientExcelReadOptions,
|
||||||
|
} from '@/lib/excel-client';
|
||||||
|
import { UiBusyOverlay, UiButton, UiModal, UiSelect } from '@/components/ui';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
previewPath: string;
|
||||||
|
importPath: string;
|
||||||
|
/** اگر باشد: ابتدا فقط فایل خوانده میشود، بعد تکهتکه وارد میشود (برای فایلهای خیلی بزرگ) */
|
||||||
|
preparePath?: string;
|
||||||
|
/**
|
||||||
|
* ایمپورت مرورگرگرا: اکسل در مرورگر خوانده میشود و فقط JSON کوچک به API میرود.
|
||||||
|
* برای فایلهای دهها هزار ردیفی (جلوگیری از ۵۰۲ nginx).
|
||||||
|
*/
|
||||||
|
rowsImportPath?: string;
|
||||||
|
clientAliases?: Record<string, string>;
|
||||||
|
clientFields?: ExcelFieldOption[];
|
||||||
|
/** تشخیص خروجی بدونهدر (مثل فعالیت دیدار) */
|
||||||
|
clientReadOptions?: ClientExcelReadOptions;
|
||||||
|
disabled?: boolean;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const useClientImport = computed(
|
||||||
|
() =>
|
||||||
|
Boolean(
|
||||||
|
props.rowsImportPath &&
|
||||||
|
props.clientAliases &&
|
||||||
|
props.clientFields?.length,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
start: [];
|
||||||
|
done: [result: ImportContactsResult];
|
||||||
|
fail: [message: string];
|
||||||
|
settled: [];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const input = ref<HTMLInputElement | null>(null);
|
||||||
|
const pending = ref<File | null>(null);
|
||||||
|
const preview = ref<ExcelPreviewResult | null>(null);
|
||||||
|
const mapping = reactive<Record<string, string>>({});
|
||||||
|
const submitting = ref(false);
|
||||||
|
const phase = ref<'idle' | 'preview' | 'import'>('idle');
|
||||||
|
const progressLabel = ref('');
|
||||||
|
/** درصد ۰–۱۰۰؛ در مرحلهٔ خواندن فایل null */
|
||||||
|
const progressPct = ref<number | null>(null);
|
||||||
|
|
||||||
|
const requiredKeys = computed(
|
||||||
|
() => preview.value?.fields.filter((f) => f.required).map((f) => f.key) ?? [],
|
||||||
|
);
|
||||||
|
|
||||||
|
const mappedFields = computed(() => new Set(Object.values(mapping).filter(Boolean)));
|
||||||
|
|
||||||
|
const canImport = computed(() => requiredKeys.value.every((key) => mappedFields.value.has(key)));
|
||||||
|
|
||||||
|
const busyOpen = computed(() => submitting.value && phase.value !== 'idle');
|
||||||
|
const busyMessage = computed(() => {
|
||||||
|
if (phase.value === 'import') {
|
||||||
|
return progressLabel.value || 'در حال ورود اطلاعات از اکسل…';
|
||||||
|
}
|
||||||
|
return 'در حال خواندن و بررسی فایل اکسل…';
|
||||||
|
});
|
||||||
|
const busyProgress = computed(() =>
|
||||||
|
phase.value === 'import' ? progressPct.value : null,
|
||||||
|
);
|
||||||
|
|
||||||
|
function pick() {
|
||||||
|
if (props.disabled || submitting.value) return;
|
||||||
|
input.value?.click();
|
||||||
|
}
|
||||||
|
|
||||||
|
function reset() {
|
||||||
|
pending.value = null;
|
||||||
|
preview.value = null;
|
||||||
|
submitting.value = false;
|
||||||
|
phase.value = 'idle';
|
||||||
|
progressLabel.value = '';
|
||||||
|
progressPct.value = null;
|
||||||
|
for (const key of Object.keys(mapping)) delete mapping[key];
|
||||||
|
}
|
||||||
|
|
||||||
|
function closeMapper() {
|
||||||
|
if (submitting.value) return;
|
||||||
|
reset();
|
||||||
|
emit('settled');
|
||||||
|
}
|
||||||
|
|
||||||
|
function setColumnField(header: string, field: string) {
|
||||||
|
if (field) {
|
||||||
|
for (const [col, current] of Object.entries(mapping)) {
|
||||||
|
if (col !== header && current === field) mapping[col] = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
mapping[header] = field;
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergeImportResults(
|
||||||
|
acc: ImportContactsResult,
|
||||||
|
part: ImportContactsResult,
|
||||||
|
): ImportContactsResult {
|
||||||
|
const errors = [...acc.errors, ...(part.errors ?? [])];
|
||||||
|
return {
|
||||||
|
created: acc.created + (part.created ?? 0),
|
||||||
|
skipped: acc.skipped + (part.skipped ?? 0),
|
||||||
|
errors: errors.slice(0, 200),
|
||||||
|
boardId: part.boardId ?? acc.boardId,
|
||||||
|
boards: part.boards?.length ? part.boards : acc.boards,
|
||||||
|
sessionId: part.sessionId,
|
||||||
|
total: part.total ?? acc.total,
|
||||||
|
processed: part.processed ?? acc.processed,
|
||||||
|
hasMore: part.hasMore,
|
||||||
|
nextOffset: part.nextOffset,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function postImportChunk(opts: {
|
||||||
|
file?: File;
|
||||||
|
map?: Record<string, string>;
|
||||||
|
sessionId?: string;
|
||||||
|
offset?: number;
|
||||||
|
}) {
|
||||||
|
const form = new FormData();
|
||||||
|
if (opts.file) form.append('file', opts.file);
|
||||||
|
if (opts.map && Object.values(opts.map).some(Boolean)) {
|
||||||
|
form.append('mapping', JSON.stringify(opts.map));
|
||||||
|
}
|
||||||
|
if (opts.sessionId) form.append('sessionId', opts.sessionId);
|
||||||
|
if (opts.offset != null) form.append('offset', String(opts.offset));
|
||||||
|
form.append('limit', '250');
|
||||||
|
const { data } = await api.post<ImportContactsResult>(props.importPath, form, {
|
||||||
|
headers: { 'Content-Type': undefined },
|
||||||
|
// خواندن فایلهای خیلی بزرگ در مرحلهٔ اول ممکن است طول بکشد
|
||||||
|
timeout: opts.file ? 10 * 60 * 1000 : 3 * 60 * 1000,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
function updateImportProgress(processed: number, total: number) {
|
||||||
|
if (total <= 0) {
|
||||||
|
progressPct.value = null;
|
||||||
|
progressLabel.value = 'در حال ورود اطلاعات از اکسل…';
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const pct = Math.max(0, Math.min(100, Math.round((processed / total) * 100)));
|
||||||
|
progressPct.value = pct;
|
||||||
|
progressLabel.value = `ورود فایل: ${processed.toLocaleString('fa-IR')} از ${total.toLocaleString('fa-IR')} ردیف`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function sleep(ms: number) {
|
||||||
|
return new Promise((r) => setTimeout(r, ms));
|
||||||
|
}
|
||||||
|
|
||||||
|
async function postPrepare(file: File, map?: Record<string, string>) {
|
||||||
|
if (!props.preparePath) {
|
||||||
|
throw new Error('preparePath تنظیم نشده');
|
||||||
|
}
|
||||||
|
const form = new FormData();
|
||||||
|
form.append('file', file);
|
||||||
|
if (map && Object.values(map).some(Boolean)) {
|
||||||
|
form.append('mapping', JSON.stringify(map));
|
||||||
|
}
|
||||||
|
// فقط آپلود — پارس روی سرور ناهمگام است؛ تایماوت کوتاه کافی است
|
||||||
|
const { data } = await api.post<ImportContactsResult>(props.preparePath, form, {
|
||||||
|
headers: { 'Content-Type': undefined },
|
||||||
|
timeout: 3 * 60 * 1000,
|
||||||
|
});
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function waitPrepareReady(sessionId: string) {
|
||||||
|
if (!props.preparePath) throw new Error('preparePath تنظیم نشده');
|
||||||
|
const statusUrl = `${props.preparePath}/${sessionId}`;
|
||||||
|
const started = Date.now();
|
||||||
|
const maxMs = 15 * 60 * 1000;
|
||||||
|
while (Date.now() - started < maxMs) {
|
||||||
|
const { data } = await api.get<ExcelImportPrepareStatus>(statusUrl, {
|
||||||
|
timeout: 30_000,
|
||||||
|
});
|
||||||
|
if (data.status === 'ready') {
|
||||||
|
progressLabel.value = `فایل آماده شد — ${data.total.toLocaleString('fa-IR')} ردیف`;
|
||||||
|
return data;
|
||||||
|
}
|
||||||
|
if (data.status === 'error') {
|
||||||
|
throw new Error(data.error || 'آمادهسازی فایل اکسل ناموفق بود');
|
||||||
|
}
|
||||||
|
const parsed = data.parsed || 0;
|
||||||
|
progressPct.value = null;
|
||||||
|
progressLabel.value = parsed
|
||||||
|
? `در حال خواندن فایل روی سرور… ${parsed.toLocaleString('fa-IR')} ردیف`
|
||||||
|
: 'در حال خواندن فایل روی سرور… لطفاً صبر کنید';
|
||||||
|
await sleep(1200);
|
||||||
|
}
|
||||||
|
throw new Error('آمادهسازی فایل بیش از حد طول کشید. دوباره تلاش کنید.');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runClientRowsImport(file: File, map?: Record<string, string>) {
|
||||||
|
if (!props.rowsImportPath || !props.clientAliases) {
|
||||||
|
throw new Error('پیکربندی ایمپورت مرورگر ناقص است');
|
||||||
|
}
|
||||||
|
phase.value = 'import';
|
||||||
|
progressLabel.value = 'در حال خواندن فایل در مرورگر…';
|
||||||
|
progressPct.value = 0;
|
||||||
|
|
||||||
|
const rows = await readMappedRowsClient(
|
||||||
|
file,
|
||||||
|
props.clientAliases,
|
||||||
|
map,
|
||||||
|
props.clientReadOptions,
|
||||||
|
);
|
||||||
|
const total = rows.length;
|
||||||
|
if (total > 100_000) {
|
||||||
|
return {
|
||||||
|
created: 0,
|
||||||
|
skipped: 0,
|
||||||
|
errors: [{ row: 1, message: 'فایل بیش از ۱۰۰۰۰۰ ردیف دارد. فایل را تقسیم کنید.' }],
|
||||||
|
total,
|
||||||
|
processed: 0,
|
||||||
|
hasMore: false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
updateImportProgress(0, total);
|
||||||
|
let acc: ImportContactsResult = { created: 0, skipped: 0, errors: [] };
|
||||||
|
let sessionId: string | undefined;
|
||||||
|
const chunkSize = 60;
|
||||||
|
|
||||||
|
for (let offset = 0; offset < total; offset += chunkSize) {
|
||||||
|
const slice = rows.slice(offset, offset + chunkSize);
|
||||||
|
const { data: part } = await api.post<ImportContactsResult>(
|
||||||
|
props.rowsImportPath,
|
||||||
|
{
|
||||||
|
rows: slice,
|
||||||
|
offset,
|
||||||
|
total,
|
||||||
|
sessionId,
|
||||||
|
},
|
||||||
|
{ timeout: 120_000 },
|
||||||
|
);
|
||||||
|
acc = mergeImportResults(acc, part);
|
||||||
|
updateImportProgress(part.processed ?? offset + slice.length, total);
|
||||||
|
if (part.errors?.some((e) => e.row === 1 && /حداکثر|بیش از/.test(e.message))) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
sessionId = part.sessionId;
|
||||||
|
if (!part.hasMore) break;
|
||||||
|
}
|
||||||
|
|
||||||
|
updateImportProgress(total, total);
|
||||||
|
return acc;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function runChunkedImport(file: File, map?: Record<string, string>) {
|
||||||
|
if (useClientImport.value) {
|
||||||
|
return runClientRowsImport(file, map);
|
||||||
|
}
|
||||||
|
|
||||||
|
phase.value = 'import';
|
||||||
|
progressLabel.value = 'در حال ارسال فایل…';
|
||||||
|
progressPct.value = 0;
|
||||||
|
|
||||||
|
let acc: ImportContactsResult = { created: 0, skipped: 0, errors: [] };
|
||||||
|
let sessionId: string | undefined;
|
||||||
|
let offset = 0;
|
||||||
|
let guard = 0;
|
||||||
|
const maxChunks = 2000;
|
||||||
|
|
||||||
|
if (props.preparePath) {
|
||||||
|
const prep = await postPrepare(file, map);
|
||||||
|
if (!prep.sessionId) {
|
||||||
|
throw new Error(prep.errors[0]?.message || 'آمادهسازی فایل ناموفق بود');
|
||||||
|
}
|
||||||
|
sessionId = prep.sessionId;
|
||||||
|
progressLabel.value = 'در حال خواندن فایل روی سرور…';
|
||||||
|
const ready = await waitPrepareReady(sessionId);
|
||||||
|
if (!ready.total) {
|
||||||
|
return {
|
||||||
|
...acc,
|
||||||
|
total: 0,
|
||||||
|
processed: 0,
|
||||||
|
hasMore: false,
|
||||||
|
errors: ready.error
|
||||||
|
? [{ row: 1, message: ready.error }]
|
||||||
|
: [{ row: 1, message: 'هیچ ردیف دادهای در فایل نیست' }],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
updateImportProgress(0, ready.total);
|
||||||
|
}
|
||||||
|
|
||||||
|
while (guard < maxChunks) {
|
||||||
|
guard += 1;
|
||||||
|
const part = await postImportChunk({
|
||||||
|
file: sessionId ? undefined : file,
|
||||||
|
map: sessionId ? undefined : map,
|
||||||
|
sessionId,
|
||||||
|
offset: sessionId ? offset : undefined,
|
||||||
|
});
|
||||||
|
acc = mergeImportResults(acc, part);
|
||||||
|
|
||||||
|
const total = part.total ?? 0;
|
||||||
|
const processed = part.processed ?? 0;
|
||||||
|
updateImportProgress(processed, total);
|
||||||
|
|
||||||
|
if (
|
||||||
|
part.errors?.some((e) => e.row === 1 && /بیش از .* ردیف/.test(e.message))
|
||||||
|
) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!part.hasMore || !part.sessionId) {
|
||||||
|
if (total > 0) updateImportProgress(total, total);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
sessionId = part.sessionId;
|
||||||
|
offset = part.nextOffset ?? processed;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (guard >= maxChunks && acc.hasMore) {
|
||||||
|
acc.errors = [
|
||||||
|
...acc.errors,
|
||||||
|
{
|
||||||
|
row: 1,
|
||||||
|
message: 'ورود بهخاطر تعداد مراحل زیاد متوقف شد. از جایی که مانده ادامه دهید یا فایل را تقسیم کنید.',
|
||||||
|
},
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return acc;
|
||||||
|
}
|
||||||
|
|
||||||
|
function apiMessage(e: unknown, fallback: string) {
|
||||||
|
if (!axios.isAxiosError(e)) {
|
||||||
|
return e instanceof Error && e.message ? e.message : fallback;
|
||||||
|
}
|
||||||
|
if (e.code === 'ECONNABORTED' || /timeout/i.test(e.message)) {
|
||||||
|
return 'مهلت درخواست تمام شد — فایل خیلی بزرگ است یا سرور دیر جواب داد. دوباره تلاش کنید.';
|
||||||
|
}
|
||||||
|
if (!e.response) {
|
||||||
|
return 'ارتباط با سرور برقرار نشد. اتصال را بررسی کنید و دوباره تلاش کنید.';
|
||||||
|
}
|
||||||
|
const status = e.response.status;
|
||||||
|
const data = e.response.data as { message?: string | string[] } | string | undefined;
|
||||||
|
let msg: string | undefined;
|
||||||
|
if (typeof data === 'string' && data.trim() && !data.trim().startsWith('<')) {
|
||||||
|
msg = data.trim().slice(0, 280);
|
||||||
|
} else if (data && typeof data === 'object') {
|
||||||
|
const m = data.message;
|
||||||
|
msg = Array.isArray(m) ? m.join('، ') : m;
|
||||||
|
}
|
||||||
|
if (msg) return msg;
|
||||||
|
if (status === 413) return 'حجم فایل بیش از حد مجاز سرور است.';
|
||||||
|
if (status === 502 || status === 504) {
|
||||||
|
return 'سرور میانی قطع شد (معمولاً بهخاطر حجم/زمان فایل). چند دقیقه بعد دوباره تلاش کنید.';
|
||||||
|
}
|
||||||
|
return `${fallback} (کد ${status})`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async function onFile(ev: Event) {
|
||||||
|
const el = ev.target as HTMLInputElement;
|
||||||
|
const file = el.files?.[0];
|
||||||
|
el.value = '';
|
||||||
|
if (!file) return;
|
||||||
|
emit('start');
|
||||||
|
submitting.value = true;
|
||||||
|
phase.value = 'preview';
|
||||||
|
try {
|
||||||
|
let data: ExcelPreviewResult;
|
||||||
|
if (useClientImport.value && props.clientAliases && props.clientFields) {
|
||||||
|
progressLabel.value = 'در حال خواندن فایل در مرورگر…';
|
||||||
|
data = await previewExcelClient(
|
||||||
|
file,
|
||||||
|
props.clientAliases,
|
||||||
|
props.clientFields,
|
||||||
|
props.clientReadOptions,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
const form = new FormData();
|
||||||
|
form.append('file', file);
|
||||||
|
const res = await api.post<ExcelPreviewResult>(props.previewPath, form, {
|
||||||
|
headers: { 'Content-Type': undefined },
|
||||||
|
timeout: 5 * 60 * 1000,
|
||||||
|
});
|
||||||
|
data = res.data;
|
||||||
|
}
|
||||||
|
if (!data.needsMapping) {
|
||||||
|
try {
|
||||||
|
emit('done', await runChunkedImport(file));
|
||||||
|
reset();
|
||||||
|
emit('settled');
|
||||||
|
} catch (impErr) {
|
||||||
|
emit('fail', apiMessage(impErr, 'ایمپورت ناموفق بود'));
|
||||||
|
reset();
|
||||||
|
emit('settled');
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
pending.value = file;
|
||||||
|
preview.value = data;
|
||||||
|
for (const col of data.columns) {
|
||||||
|
mapping[col.header] = data.suggested[col.header] ?? '';
|
||||||
|
}
|
||||||
|
phase.value = 'idle';
|
||||||
|
submitting.value = false;
|
||||||
|
// Allow parent toolbar while user maps columns.
|
||||||
|
emit('settled');
|
||||||
|
} catch (e) {
|
||||||
|
emit('fail', apiMessage(e, 'خواندن فایل اکسل ناموفق بود'));
|
||||||
|
reset();
|
||||||
|
emit('settled');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function confirmMapping() {
|
||||||
|
if (!pending.value || !canImport.value || submitting.value) return;
|
||||||
|
emit('start');
|
||||||
|
submitting.value = true;
|
||||||
|
phase.value = 'import';
|
||||||
|
try {
|
||||||
|
emit('done', await runChunkedImport(pending.value, { ...mapping }));
|
||||||
|
reset();
|
||||||
|
emit('settled');
|
||||||
|
} catch (e) {
|
||||||
|
emit('fail', apiMessage(e, 'ایمپورت ناموفق بود'));
|
||||||
|
phase.value = 'idle';
|
||||||
|
submitting.value = false;
|
||||||
|
progressLabel.value = '';
|
||||||
|
progressPct.value = null;
|
||||||
|
emit('settled');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<span class="excel-import" :class="{ isBusy: submitting }" @click.stop="pick">
|
||||||
|
<slot :loading="submitting" :disabled="disabled || submitting" />
|
||||||
|
<input
|
||||||
|
ref="input"
|
||||||
|
type="file"
|
||||||
|
accept=".xlsx,application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
|
||||||
|
hidden
|
||||||
|
:disabled="disabled || submitting"
|
||||||
|
@change="onFile"
|
||||||
|
@click.stop
|
||||||
|
/>
|
||||||
|
</span>
|
||||||
|
|
||||||
|
<UiBusyOverlay
|
||||||
|
:open="busyOpen"
|
||||||
|
:message="busyMessage"
|
||||||
|
:progress="busyProgress"
|
||||||
|
nest
|
||||||
|
/>
|
||||||
|
|
||||||
|
<UiModal :open="!!preview" title="تطبیق ستونهای اکسل" @close="closeMapper">
|
||||||
|
<p class="lead">
|
||||||
|
ستونهای این فایل با قالب سیستم یکی نیست. مشخص کنید هر ستون فایل در کدام فیلد ریخته شود.
|
||||||
|
</p>
|
||||||
|
<p v-if="preview?.largeFile" class="large-hint">
|
||||||
|
فایل بزرگ است ({{ (preview.rowCount ?? 0).toLocaleString('fa-IR') }} ردیف) — ورود بهصورت چندمرحلهای انجام میشود.
|
||||||
|
</p>
|
||||||
|
<div class="rows">
|
||||||
|
<div v-for="col in preview?.columns ?? []" :key="col.header" class="row">
|
||||||
|
<div class="source">
|
||||||
|
<strong>{{ col.header }}</strong>
|
||||||
|
<small v-if="col.samples.length">نمونه: {{ col.samples.join('، ') }}</small>
|
||||||
|
</div>
|
||||||
|
<UiSelect
|
||||||
|
:model-value="mapping[col.header] ?? ''"
|
||||||
|
:disabled="submitting"
|
||||||
|
@update:model-value="setColumnField(col.header, $event)"
|
||||||
|
>
|
||||||
|
<option value="">نادیده بگیر</option>
|
||||||
|
<option v-for="field in preview?.fields ?? []" :key="field.key" :value="field.key">
|
||||||
|
{{ field.label }}{{ field.required ? ' *' : '' }}
|
||||||
|
</option>
|
||||||
|
</UiSelect>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<p v-if="!canImport" class="hint">فیلدهای ستارهدار را حتماً به یک ستون وصل کنید.</p>
|
||||||
|
<template #footer>
|
||||||
|
<UiButton variant="ghost" :disabled="submitting" @click="closeMapper">انصراف</UiButton>
|
||||||
|
<UiButton :disabled="!canImport" :loading="submitting" @click="confirmMapping">
|
||||||
|
ورود فایل
|
||||||
|
</UiButton>
|
||||||
|
</template>
|
||||||
|
</UiModal>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.excel-import {
|
||||||
|
display: inline-flex;
|
||||||
|
}
|
||||||
|
|
||||||
|
.excel-import.isBusy {
|
||||||
|
pointer-events: none;
|
||||||
|
opacity: 0.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.lead {
|
||||||
|
margin: 0 0 1rem;
|
||||||
|
color: var(--muted);
|
||||||
|
line-height: 1.7;
|
||||||
|
}
|
||||||
|
|
||||||
|
.large-hint {
|
||||||
|
margin: -0.35rem 0 1rem;
|
||||||
|
padding: 0.55rem 0.75rem;
|
||||||
|
border-radius: 10px;
|
||||||
|
background: color-mix(in srgb, var(--accent, #2563eb) 12%, transparent);
|
||||||
|
color: var(--fg, inherit);
|
||||||
|
font-size: 0.88rem;
|
||||||
|
line-height: 1.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rows {
|
||||||
|
display: grid;
|
||||||
|
gap: 0.75rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1.1fr) minmax(0, 0.9fr);
|
||||||
|
gap: 0.75rem;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source {
|
||||||
|
display: grid;
|
||||||
|
gap: 0.2rem;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source strong {
|
||||||
|
font-size: 0.95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.source small {
|
||||||
|
color: var(--muted);
|
||||||
|
font-size: 0.78rem;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.hint {
|
||||||
|
margin: 0.85rem 0 0;
|
||||||
|
color: var(--danger);
|
||||||
|
font-size: 0.85rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (max-width: 700px) {
|
||||||
|
.row {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
Space as ASpace,
|
Space as ASpace,
|
||||||
Typography,
|
Typography,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
import { PrinterOutlined } from '@ant-design/icons-vue';
|
import { PrinterOutlined } from '@/icons/ant-bridge';
|
||||||
import { brand } from '@mento/shared';
|
import { brand } from '@mento/shared';
|
||||||
import { formatJalaliNumeric, toFaDigits } from '@/lib/jalali';
|
import { formatJalaliNumeric, toFaDigits } from '@/lib/jalali';
|
||||||
import { formatMoney, currencySuffix } from '@/lib/money';
|
import { formatMoney, currencySuffix } from '@/lib/money';
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import {
|
|||||||
ClockCircleOutlined,
|
ClockCircleOutlined,
|
||||||
LeftOutlined,
|
LeftOutlined,
|
||||||
RightOutlined,
|
RightOutlined,
|
||||||
} from '@ant-design/icons-vue';
|
} from '@/icons/ant-bridge';
|
||||||
import {
|
import {
|
||||||
addJalaliMonths,
|
addJalaliMonths,
|
||||||
dateToJalali,
|
dateToJalali,
|
||||||
@@ -52,8 +52,6 @@ const hourColRef = ref<HTMLElement | null>(null);
|
|||||||
const minuteColRef = ref<HTMLElement | null>(null);
|
const minuteColRef = ref<HTMLElement | null>(null);
|
||||||
const top = ref(0);
|
const top = ref(0);
|
||||||
const left = ref(0);
|
const left = ref(0);
|
||||||
/** بالای مودال Ant (حدود ۱۰۰۰) تا تقویم پشت پنجره نماند */
|
|
||||||
const popupZ = ref(120);
|
|
||||||
const todayJ = dateToJalali(new Date());
|
const todayJ = dateToJalali(new Date());
|
||||||
const cursor = ref<{ jy: number; jm: number }>({ jy: todayJ.jy, jm: todayJ.jm });
|
const cursor = ref<{ jy: number; jm: number }>({ jy: todayJ.jy, jm: todayJ.jm });
|
||||||
const draftHour = ref(9);
|
const draftHour = ref(9);
|
||||||
@@ -320,46 +318,21 @@ function place() {
|
|||||||
const panel = panelRef.value;
|
const panel = panelRef.value;
|
||||||
if (!trigger) return;
|
if (!trigger) return;
|
||||||
const rect = trigger.getBoundingClientRect();
|
const rect = trigger.getBoundingClientRect();
|
||||||
const width =
|
const width = panel?.offsetWidth || (props.mode === 'time' ? (isMobile.value ? 340 : 280) : 320);
|
||||||
panel?.offsetWidth ||
|
const height = panel?.offsetHeight || (props.mode === 'time' ? (isMobile.value ? 460 : 320) : 360);
|
||||||
(props.mode === 'time' ? (isMobile.value ? 340 : 280) : 328);
|
|
||||||
const height =
|
|
||||||
panel?.offsetHeight ||
|
|
||||||
(props.mode === 'time' ? (isMobile.value ? 460 : 320) : 340);
|
|
||||||
const margin = 8;
|
|
||||||
let nextLeft = rect.left;
|
let nextLeft = rect.left;
|
||||||
if (getComputedStyle(document.documentElement).direction === 'rtl') {
|
if (getComputedStyle(document.documentElement).direction === 'rtl') {
|
||||||
nextLeft = rect.right - width;
|
nextLeft = rect.right - width;
|
||||||
}
|
}
|
||||||
nextLeft = Math.min(
|
nextLeft = Math.min(Math.max(8, nextLeft), window.innerWidth - width - 8);
|
||||||
Math.max(margin, nextLeft),
|
let nextTop = rect.bottom + 8;
|
||||||
Math.max(margin, window.innerWidth - width - margin),
|
if (nextTop + height > window.innerHeight - 8) {
|
||||||
);
|
nextTop = Math.max(8, rect.top - height - 8);
|
||||||
const spaceBelow = window.innerHeight - rect.bottom - margin * 2;
|
|
||||||
const spaceAbove = rect.top - margin * 2;
|
|
||||||
let nextTop: number;
|
|
||||||
if (height <= spaceBelow) {
|
|
||||||
nextTop = rect.bottom + margin;
|
|
||||||
} else if (height <= spaceAbove) {
|
|
||||||
nextTop = rect.top - height - margin;
|
|
||||||
} else if (spaceBelow >= spaceAbove) {
|
|
||||||
nextTop = Math.max(margin, window.innerHeight - height - margin);
|
|
||||||
} else {
|
|
||||||
nextTop = margin;
|
|
||||||
}
|
}
|
||||||
left.value = nextLeft;
|
left.value = nextLeft;
|
||||||
top.value = nextTop;
|
top.value = nextTop;
|
||||||
}
|
}
|
||||||
|
|
||||||
function liftAboveOverlays() {
|
|
||||||
let z = 120;
|
|
||||||
for (const el of document.querySelectorAll('.ant-modal-wrap, .ant-drawer')) {
|
|
||||||
const zi = Number.parseInt(window.getComputedStyle(el).zIndex, 10);
|
|
||||||
if (Number.isFinite(zi)) z = Math.max(z, zi + 20);
|
|
||||||
}
|
|
||||||
popupZ.value = z;
|
|
||||||
}
|
|
||||||
|
|
||||||
function onWindowChange() {
|
function onWindowChange() {
|
||||||
syncViewport();
|
syncViewport();
|
||||||
if (open.value) place();
|
if (open.value) place();
|
||||||
@@ -371,7 +344,6 @@ async function show() {
|
|||||||
calView.value = 'days';
|
calView.value = 'days';
|
||||||
clockFace.value = 'hour';
|
clockFace.value = 'hour';
|
||||||
syncViewport();
|
syncViewport();
|
||||||
liftAboveOverlays();
|
|
||||||
open.value = true;
|
open.value = true;
|
||||||
await nextTick();
|
await nextTick();
|
||||||
place();
|
place();
|
||||||
@@ -566,7 +538,7 @@ onBeforeUnmount(() => {
|
|||||||
'is-desktop': !isMobile,
|
'is-desktop': !isMobile,
|
||||||
}"
|
}"
|
||||||
role="dialog"
|
role="dialog"
|
||||||
:style="{ top: `${top}px`, left: `${left}px`, zIndex: popupZ }"
|
:style="{ top: `${top}px`, left: `${left}px` }"
|
||||||
>
|
>
|
||||||
<header v-if="mode !== 'time'" class="nav">
|
<header v-if="mode !== 'time'" class="nav">
|
||||||
<a-button type="text" class="nav-btn" :aria-label="navLabels.forward" @click="navStep(1)">
|
<a-button type="text" class="nav-btn" :aria-label="navLabels.forward" @click="navStep(1)">
|
||||||
@@ -754,7 +726,7 @@ onBeforeUnmount(() => {
|
|||||||
>
|
>
|
||||||
پاک کردن
|
پاک کردن
|
||||||
</a-button>
|
</a-button>
|
||||||
<a-button type="primary" @click="hide">تأیید</a-button>
|
<a-button type="primary" class="done" @click="hide">تأیید</a-button>
|
||||||
</footer>
|
</footer>
|
||||||
</div>
|
</div>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
@@ -879,11 +851,10 @@ onBeforeUnmount(() => {
|
|||||||
.panel {
|
.panel {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 120;
|
z-index: 120;
|
||||||
box-sizing: border-box;
|
|
||||||
width: min(20.5rem, calc(100vw - 16px));
|
width: min(20.5rem, calc(100vw - 16px));
|
||||||
/* تقویم باید یکجا دیده شود؛ اسکرول داخل پنل گیجکننده است */
|
max-height: calc(100vh - 16px);
|
||||||
max-height: none;
|
overflow-x: hidden;
|
||||||
overflow: hidden;
|
overflow-y: auto;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
box-shadow: 0 18px 48px rgba(15, 23, 42, 0.18);
|
box-shadow: 0 18px 48px rgba(15, 23, 42, 0.18);
|
||||||
@@ -891,13 +862,6 @@ onBeforeUnmount(() => {
|
|||||||
font-family: IRANSans, Tahoma, sans-serif;
|
font-family: IRANSans, Tahoma, sans-serif;
|
||||||
}
|
}
|
||||||
|
|
||||||
@media (max-height: 420px) {
|
|
||||||
.panel {
|
|
||||||
max-height: calc(100vh - 16px);
|
|
||||||
overflow: auto;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel-time {
|
.panel-time {
|
||||||
width: min(22.5rem, calc(100vw - 16px));
|
width: min(22.5rem, calc(100vw - 16px));
|
||||||
}
|
}
|
||||||
@@ -929,40 +893,45 @@ onBeforeUnmount(() => {
|
|||||||
|
|
||||||
.pick-grid {
|
.pick-grid {
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(3, 1fr);
|
grid-template-columns: repeat(3, minmax(0, 1fr));
|
||||||
gap: 0.35rem;
|
gap: 0.35rem;
|
||||||
padding: 0.25rem 0;
|
padding: 0.25rem 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.pick-cell.ant-btn) {
|
.panel :deep(.ant-btn.pick-cell) {
|
||||||
width: 100% !important;
|
width: 100%;
|
||||||
min-width: 0 !important;
|
min-width: 0;
|
||||||
height: 44px !important;
|
height: 44px;
|
||||||
padding-inline: 0 !important;
|
margin: 0;
|
||||||
|
padding: 0 4px;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
color: #0f172a;
|
color: #0f172a;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.pick-cell.today) {
|
.panel :deep(.ant-btn.pick-cell.today) {
|
||||||
box-shadow: inset 0 0 0 1px #99f6e4;
|
box-shadow: inset 0 0 0 1px #99f6e4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.pick-cell.on),
|
.panel :deep(.ant-btn.pick-cell.on),
|
||||||
.panel :deep(.pick-cell.ant-btn:hover) {
|
.panel :deep(.ant-btn.pick-cell:hover) {
|
||||||
background: #0d9488;
|
background: #0d9488;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.nav-btn {
|
.panel :deep(.ant-btn.nav-btn) {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
|
min-width: 32px;
|
||||||
height: 32px;
|
height: 32px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
background: #f1f5f9;
|
background: #f1f5f9;
|
||||||
color: #0f766e;
|
color: #0f766e;
|
||||||
display: grid;
|
display: inline-flex;
|
||||||
place-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -975,7 +944,6 @@ onBeforeUnmount(() => {
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(7, minmax(0, 1fr));
|
grid-template-columns: repeat(7, minmax(0, 1fr));
|
||||||
gap: 0.15rem;
|
gap: 0.15rem;
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -986,43 +954,40 @@ onBeforeUnmount(() => {
|
|||||||
padding-bottom: 0.25rem;
|
padding-bottom: 0.25rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.day.ant-btn) {
|
.panel :deep(.ant-btn.day) {
|
||||||
width: 100% !important;
|
display: inline-flex;
|
||||||
min-width: 0 !important;
|
align-items: center;
|
||||||
height: 34px !important;
|
justify-content: center;
|
||||||
padding: 0 !important;
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
|
height: 34px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
line-height: 1;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
background: none;
|
background: none;
|
||||||
color: #0f172a;
|
color: #0f172a;
|
||||||
font: inherit;
|
font: inherit;
|
||||||
font-size: 0.82rem;
|
|
||||||
line-height: 1;
|
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
box-shadow: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.day.ant-btn > span) {
|
.panel :deep(.ant-btn.day.mute) {
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel :deep(.day.mute) {
|
|
||||||
color: #cbd5e1;
|
color: #cbd5e1;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.day.today) {
|
.panel :deep(.ant-btn.day.today) {
|
||||||
box-shadow: inset 0 0 0 1px #99f6e4;
|
box-shadow: inset 0 0 0 1px #99f6e4;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.day.on),
|
.panel :deep(.ant-btn.day.on),
|
||||||
.panel :deep(.day.ant-btn:hover) {
|
.panel :deep(.ant-btn.day:hover) {
|
||||||
background: #0d9488;
|
background: #0d9488;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel :deep(.day.mute:hover) {
|
.panel :deep(.ant-btn.day.mute:hover) {
|
||||||
background: #f1f5f9;
|
background: #f1f5f9;
|
||||||
color: #64748b;
|
color: #64748b;
|
||||||
}
|
}
|
||||||
@@ -1052,9 +1017,11 @@ onBeforeUnmount(() => {
|
|||||||
margin-bottom: 0.85rem;
|
margin-bottom: 0.85rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.md-chip {
|
.panel :deep(.ant-btn.md-chip) {
|
||||||
min-width: 5.1rem;
|
min-width: 5.1rem;
|
||||||
height: 4.1rem;
|
height: 4.1rem;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
background: #f1f5f9;
|
background: #f1f5f9;
|
||||||
@@ -1067,7 +1034,7 @@ onBeforeUnmount(() => {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.md-chip.on {
|
.panel :deep(.ant-btn.md-chip.on) {
|
||||||
background: #ccfbf1;
|
background: #ccfbf1;
|
||||||
color: #0f766e;
|
color: #0f766e;
|
||||||
box-shadow: inset 0 0 0 2px #99f6e4;
|
box-shadow: inset 0 0 0 2px #99f6e4;
|
||||||
@@ -1141,10 +1108,11 @@ onBeforeUnmount(() => {
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.md-tick {
|
.panel :deep(.ant-btn.md-tick) {
|
||||||
position: absolute;
|
position: absolute;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
width: 36px;
|
width: 36px;
|
||||||
|
min-width: 36px;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
@@ -1161,12 +1129,12 @@ onBeforeUnmount(() => {
|
|||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.md-tick.inner {
|
.panel :deep(.ant-btn.md-tick.inner) {
|
||||||
font-size: 0.74rem;
|
font-size: 0.74rem;
|
||||||
color: #64748b;
|
color: #64748b;
|
||||||
}
|
}
|
||||||
|
|
||||||
.md-tick.on {
|
.panel :deep(.ant-btn.md-tick.on) {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
@@ -1215,9 +1183,12 @@ onBeforeUnmount(() => {
|
|||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
}
|
}
|
||||||
|
|
||||||
.col-item {
|
.panel :deep(.ant-btn.col-item) {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
min-width: 0;
|
||||||
height: 36px;
|
height: 36px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
background: transparent;
|
background: transparent;
|
||||||
@@ -1228,11 +1199,11 @@ onBeforeUnmount(() => {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.col-item:hover {
|
.panel :deep(.ant-btn.col-item:hover) {
|
||||||
background: #e2e8f0;
|
background: #e2e8f0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.col-item.on {
|
.panel :deep(.ant-btn.col-item.on) {
|
||||||
background: #0d9488;
|
background: #0d9488;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
@@ -1244,28 +1215,8 @@ onBeforeUnmount(() => {
|
|||||||
margin-top: 0.7rem;
|
margin-top: 0.7rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.link,
|
.panel :deep(.ant-btn.done) {
|
||||||
.done {
|
|
||||||
border: 0;
|
|
||||||
background: none;
|
|
||||||
font: inherit;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link {
|
|
||||||
color: #0f766e;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
|
|
||||||
.done {
|
|
||||||
margin-inline-start: auto;
|
margin-inline-start: auto;
|
||||||
background: #14b8a6;
|
|
||||||
color: #fff;
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 0.4rem 0.8rem;
|
|
||||||
font-weight: 600;
|
|
||||||
font-size: 0.8rem;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel.is-mobile .time-box {
|
.panel.is-mobile .time-box {
|
||||||
|
|||||||
@@ -9,10 +9,10 @@ import {
|
|||||||
List as AList,
|
List as AList,
|
||||||
Modal,
|
Modal,
|
||||||
Space as ASpace,
|
Space as ASpace,
|
||||||
Spin as ASpin,
|
|
||||||
Textarea as ATextarea,
|
Textarea as ATextarea,
|
||||||
Typography,
|
Typography,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
|
import { CrmSkeleton, CrmSkeletonList } from '@/components/skeleton';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
import { brand, type MemoryItemDto, type PaginatedResponse } from '@mento/shared';
|
import { brand, type MemoryItemDto, type PaginatedResponse } from '@mento/shared';
|
||||||
import { formatJalaliDateTime } from '@/lib/jalali';
|
import { formatJalaliDateTime } from '@/lib/jalali';
|
||||||
@@ -163,7 +163,8 @@ onMounted(load);
|
|||||||
|
|
||||||
<a-alert v-if="error" type="error" show-icon :message="error" :style="{ marginBottom: '12px' }" />
|
<a-alert v-if="error" type="error" show-icon :message="error" :style="{ marginBottom: '12px' }" />
|
||||||
|
|
||||||
<a-spin :spinning="loading">
|
<CrmSkeleton :loading="loading">
|
||||||
|
<CrmSkeletonList :rows="4">
|
||||||
<a-typography-text v-if="!loading && !hasItems" type="secondary">
|
<a-typography-text v-if="!loading && !hasItems" type="secondary">
|
||||||
هنوز موردی در حافظه ثبت نشده.
|
هنوز موردی در حافظه ثبت نشده.
|
||||||
</a-typography-text>
|
</a-typography-text>
|
||||||
@@ -201,6 +202,7 @@ onMounted(load);
|
|||||||
</a-list-item>
|
</a-list-item>
|
||||||
</template>
|
</template>
|
||||||
</a-list>
|
</a-list>
|
||||||
</a-spin>
|
</CrmSkeletonList>
|
||||||
|
</CrmSkeleton>
|
||||||
</a-card>
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -5,6 +5,20 @@ import { api } from '@/lib/api';
|
|||||||
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
||||||
import { brand, type NoteAiPayloadDto, type NoteAiSuggestionDto } from '@mento/shared';
|
import { brand, type NoteAiPayloadDto, type NoteAiSuggestionDto } from '@mento/shared';
|
||||||
import { rewriteGregorianDates } from '@/lib/jalali';
|
import { rewriteGregorianDates } from '@/lib/jalali';
|
||||||
|
import {
|
||||||
|
Alert as AAlert,
|
||||||
|
Button as AButton,
|
||||||
|
Card as ACard,
|
||||||
|
Checkbox as ACheckbox,
|
||||||
|
Flex as AFlex,
|
||||||
|
Input as AInput,
|
||||||
|
Space as ASpace,
|
||||||
|
Textarea as ATextarea,
|
||||||
|
Typography,
|
||||||
|
} from 'ant-design-vue';
|
||||||
|
|
||||||
|
const { Text: ATypographyText, Paragraph: ATypographyParagraph, Title: ATypographyTitle } =
|
||||||
|
Typography;
|
||||||
|
|
||||||
const props = defineProps<{
|
const props = defineProps<{
|
||||||
noteId: string;
|
noteId: string;
|
||||||
@@ -148,193 +162,108 @@ function formatPayloadSummary(value: NoteAiPayloadDto | null) {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<section class="ai-panel">
|
<a-card :bordered="true" :style="{ marginTop: '12px' }">
|
||||||
<header>
|
<a-flex justify="space-between" align="center" wrap="wrap" :gap="8">
|
||||||
<strong>پیشنهاد {{ brand.aiName }}</strong>
|
<a-typography-text strong>پیشنهاد {{ brand.aiName }}</a-typography-text>
|
||||||
<button
|
<a-button
|
||||||
v-if="!isPending"
|
v-if="!isPending"
|
||||||
type="button"
|
type="link"
|
||||||
class="link"
|
|
||||||
:disabled="loading"
|
:disabled="loading"
|
||||||
@click="analyze"
|
@click="analyze"
|
||||||
>
|
>
|
||||||
{{ loading ? '…' : 'تحلیل مجدد' }}
|
{{ loading ? '…' : 'تحلیل مجدد' }}
|
||||||
</button>
|
</a-button>
|
||||||
<button
|
<a-button
|
||||||
v-else-if="!suggestion"
|
v-else-if="!suggestion"
|
||||||
type="button"
|
type="link"
|
||||||
class="link"
|
|
||||||
:disabled="loading"
|
:disabled="loading"
|
||||||
@click="analyze"
|
@click="analyze"
|
||||||
>
|
>
|
||||||
{{ loading ? 'در حال تحلیل…' : 'تحلیل با AI' }}
|
{{ loading ? 'در حال تحلیل…' : 'تحلیل با AI' }}
|
||||||
</button>
|
</a-button>
|
||||||
</header>
|
</a-flex>
|
||||||
|
|
||||||
<p v-if="error" class="error">{{ error }}</p>
|
<a-alert v-if="error" type="error" show-icon :message="error" :style="{ marginTop: '8px' }" />
|
||||||
<p v-else-if="loading && !suggestion" class="muted">در حال تحلیل یادداشت…</p>
|
<a-typography-text v-else-if="loading && !suggestion" type="secondary">
|
||||||
<p v-else-if="suggestion?.status === 'failed'" class="error">
|
در حال تحلیل یادداشت…
|
||||||
{{ suggestion.errorMessage || 'تحلیل ناموفق بود' }}
|
</a-typography-text>
|
||||||
<button type="button" class="link" @click="analyze">تلاش دوباره</button>
|
<a-flex v-else-if="suggestion?.status === 'failed'" vertical :gap="4">
|
||||||
</p>
|
<a-alert
|
||||||
<p v-else-if="!suggestion" class="muted">
|
type="error"
|
||||||
<button type="button" class="link" :disabled="loading" @click="analyze">
|
show-icon
|
||||||
|
:message="suggestion.errorMessage || 'تحلیل ناموفق بود'"
|
||||||
|
/>
|
||||||
|
<a-button type="link" @click="analyze">تلاش دوباره</a-button>
|
||||||
|
</a-flex>
|
||||||
|
<a-button
|
||||||
|
v-else-if="!suggestion"
|
||||||
|
type="link"
|
||||||
|
:disabled="loading"
|
||||||
|
@click="analyze"
|
||||||
|
>
|
||||||
تحلیل این یادداشت با AI
|
تحلیل این یادداشت با AI
|
||||||
</button>
|
</a-button>
|
||||||
</p>
|
|
||||||
|
|
||||||
<template v-else-if="isPending && payload">
|
<template v-else-if="isPending && payload">
|
||||||
<p v-if="formatPayloadSummary(payload)" class="summary">{{ formatPayloadSummary(payload) }}</p>
|
<a-typography-paragraph
|
||||||
|
v-if="formatPayloadSummary(payload)"
|
||||||
|
type="secondary"
|
||||||
|
:style="{ marginTop: '8px' }"
|
||||||
|
>
|
||||||
|
{{ formatPayloadSummary(payload) }}
|
||||||
|
</a-typography-paragraph>
|
||||||
|
|
||||||
<div v-if="payload.nextAction" class="block">
|
<a-flex v-if="payload.nextAction" vertical :gap="8" :style="{ marginTop: '8px' }">
|
||||||
<label class="check">
|
<a-checkbox v-model:checked="applyNextAction">کار بعدی</a-checkbox>
|
||||||
<input v-model="applyNextAction" type="checkbox" />
|
<a-input v-model:value="nextTitle" placeholder="عنوان کار بعدی" style="width: 100%" />
|
||||||
کار بعدی
|
<JalaliDateInput v-model="nextDueAt" mode="datetime" style="width: 100%" />
|
||||||
</label>
|
</a-flex>
|
||||||
<input v-model="nextTitle" type="text" placeholder="عنوان کار بعدی" />
|
|
||||||
<JalaliDateInput v-model="nextDueAt" mode="datetime" />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div v-if="memoryItems.length" class="block">
|
<a-flex v-if="memoryItems.length" vertical :gap="8" :style="{ marginTop: '12px' }">
|
||||||
<p class="block-title">حافظه مشتری (با تأیید شما ذخیره میشود)</p>
|
<a-typography-title :level="5" :style="{ margin: 0 }">
|
||||||
<p v-if="!hasPerson" class="warn">برای ذخیره حافظه، یادداشت باید به یک شخص متصل باشد.</p>
|
حافظه مشتری (با تأیید شما ذخیره میشود)
|
||||||
<label
|
</a-typography-title>
|
||||||
|
<a-alert
|
||||||
|
v-if="!hasPerson"
|
||||||
|
type="warning"
|
||||||
|
show-icon
|
||||||
|
message="برای ذخیره حافظه، یادداشت باید به یک شخص متصل باشد."
|
||||||
|
/>
|
||||||
|
<a-flex
|
||||||
v-for="(_, index) in memoryItems"
|
v-for="(_, index) in memoryItems"
|
||||||
:key="index"
|
:key="index"
|
||||||
class="memory-row"
|
:gap="8"
|
||||||
|
align="flex-start"
|
||||||
>
|
>
|
||||||
<input
|
<a-checkbox
|
||||||
v-model="selectedMemory[index]"
|
v-model:checked="selectedMemory[index]"
|
||||||
type="checkbox"
|
|
||||||
:disabled="!hasPerson"
|
:disabled="!hasPerson"
|
||||||
/>
|
/>
|
||||||
<textarea v-model="memoryEdits[index]" rows="2" />
|
<a-textarea v-model:value="memoryEdits[index]" :rows="2" style="width: 100%" />
|
||||||
</label>
|
</a-flex>
|
||||||
</div>
|
</a-flex>
|
||||||
|
|
||||||
<div class="actions">
|
<a-space :size="8" wrap :style="{ marginTop: '12px' }">
|
||||||
<button type="button" class="btn" :disabled="applying" @click="apply">
|
<a-button type="primary" :disabled="applying" :loading="applying" @click="apply">
|
||||||
{{ applying ? '…' : 'اعمال انتخابشده' }}
|
اعمال انتخابشده
|
||||||
</button>
|
</a-button>
|
||||||
<button type="button" class="btn btn-ghost" :disabled="applying" @click="dismiss">
|
<a-button :disabled="applying" @click="dismiss">رد کردن</a-button>
|
||||||
رد کردن
|
</a-space>
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<p v-else-if="suggestion?.status === 'applied'" class="muted ok">پیشنهاد اعمال شد.</p>
|
<a-typography-text
|
||||||
<p v-else-if="suggestion?.status === 'dismissed'" class="muted">پیشنهاد رد شد.</p>
|
v-else-if="suggestion?.status === 'applied'"
|
||||||
</section>
|
type="success"
|
||||||
|
:style="{ display: 'block', marginTop: '8px' }"
|
||||||
|
>
|
||||||
|
پیشنهاد اعمال شد.
|
||||||
|
</a-typography-text>
|
||||||
|
<a-typography-text
|
||||||
|
v-else-if="suggestion?.status === 'dismissed'"
|
||||||
|
type="secondary"
|
||||||
|
:style="{ display: 'block', marginTop: '8px' }"
|
||||||
|
>
|
||||||
|
پیشنهاد رد شد.
|
||||||
|
</a-typography-text>
|
||||||
|
</a-card>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped>
|
|
||||||
.ai-panel {
|
|
||||||
margin-top: 0.75rem;
|
|
||||||
padding: 0.75rem 0.85rem;
|
|
||||||
border: 1px dashed var(--accent);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
background: rgba(255, 255, 255, 0.65);
|
|
||||||
display: grid;
|
|
||||||
gap: 0.6rem;
|
|
||||||
min-width: 0;
|
|
||||||
overflow-wrap: anywhere;
|
|
||||||
}
|
|
||||||
|
|
||||||
header {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 0.5rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.link {
|
|
||||||
border: none;
|
|
||||||
background: transparent;
|
|
||||||
color: var(--accent);
|
|
||||||
cursor: pointer;
|
|
||||||
font: inherit;
|
|
||||||
}
|
|
||||||
|
|
||||||
.block {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.45rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.block-title {
|
|
||||||
margin: 0;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
|
|
||||||
.check {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 0.4rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.memory-row {
|
|
||||||
display: grid;
|
|
||||||
grid-template-columns: auto 1fr;
|
|
||||||
gap: 0.45rem;
|
|
||||||
align-items: start;
|
|
||||||
}
|
|
||||||
|
|
||||||
input[type='text'],
|
|
||||||
textarea {
|
|
||||||
border: 1px solid var(--line);
|
|
||||||
border-radius: var(--radius);
|
|
||||||
padding: 0.55rem 0.7rem;
|
|
||||||
font: inherit;
|
|
||||||
width: 100%;
|
|
||||||
min-width: 0;
|
|
||||||
max-width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 0.5rem;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions .btn {
|
|
||||||
min-width: 0;
|
|
||||||
flex: 1 1 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
@media (max-width: 520px) {
|
|
||||||
.actions {
|
|
||||||
flex-direction: column;
|
|
||||||
}
|
|
||||||
|
|
||||||
.actions .btn,
|
|
||||||
.actions .btn-ghost {
|
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
.summary {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 0.92rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.muted {
|
|
||||||
margin: 0;
|
|
||||||
color: var(--muted);
|
|
||||||
}
|
|
||||||
|
|
||||||
.ok {
|
|
||||||
color: #067647;
|
|
||||||
}
|
|
||||||
|
|
||||||
.warn {
|
|
||||||
margin: 0;
|
|
||||||
color: #b54708;
|
|
||||||
font-size: 0.88rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.error {
|
|
||||||
margin: 0;
|
|
||||||
color: #b42318;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
@@ -3,35 +3,59 @@ import { computed, nextTick, onMounted, onUnmounted, ref } from 'vue';
|
|||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import { useAuthStore } from '@/stores/auth';
|
import { useAuthStore } from '@/stores/auth';
|
||||||
import { USER_ROLE_LABELS } from '@/lib/roles';
|
import { USER_ROLE_LABELS } from '@/lib/roles';
|
||||||
import { BUSINESS_FIELDS, BUSINESS_FIELD_LABELS } from '@/lib/business-fields';
|
import type { OrganizationMembershipDto } from '@mento/shared';
|
||||||
import type { BusinessField, OrganizationMembershipDto } from '@mento/shared';
|
|
||||||
import UiIcon from '@/components/UiIcon.vue';
|
import UiIcon from '@/components/UiIcon.vue';
|
||||||
import UiModal from '@/components/ui/UiModal.vue';
|
|
||||||
|
|
||||||
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
|
variant?: 'default' | 'workspace';
|
||||||
|
}>(),
|
||||||
|
{
|
||||||
|
compact: false,
|
||||||
|
variant: 'default',
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
open: [];
|
||||||
|
close: [];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const auth = useAuthStore();
|
const auth = useAuthStore();
|
||||||
|
|
||||||
const orgs = ref<OrganizationMembershipDto[]>([]);
|
const orgs = ref<OrganizationMembershipDto[]>([]);
|
||||||
const open = ref(false);
|
const open = ref(false);
|
||||||
const createOpen = ref(false);
|
|
||||||
const loading = ref(false);
|
const loading = ref(false);
|
||||||
const creating = ref(false);
|
|
||||||
const error = ref('');
|
const error = ref('');
|
||||||
const newName = ref('');
|
|
||||||
const newField = ref<BusinessField>('personal');
|
|
||||||
const rootEl = ref<HTMLElement | null>(null);
|
const rootEl = ref<HTMLElement | null>(null);
|
||||||
const menuEl = ref<HTMLElement | null>(null);
|
const menuEl = ref<HTMLElement | null>(null);
|
||||||
const menuStyle = ref<Record<string, string>>({});
|
const menuStyle = ref<Record<string, string>>({});
|
||||||
let ignoreDocClickUntil = 0;
|
let ignoreDocClickUntil = 0;
|
||||||
|
|
||||||
const currentName = computed(
|
const currentName = computed(
|
||||||
() => auth.user?.organizationName || orgs.value.find((o) => o.id === auth.user?.organizationId)?.name || 'محیط کاری',
|
() =>
|
||||||
|
auth.user?.organizationName ||
|
||||||
|
orgs.value.find((o) => o.id === auth.user?.organizationId)?.name ||
|
||||||
|
'محیط کاری',
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const currentSubtitle = computed(() => {
|
||||||
|
const current = orgs.value.find((o) => o.id === auth.user?.organizationId);
|
||||||
|
if (current?.orgRoleName) return current.orgRoleName;
|
||||||
|
if (auth.user?.role) return USER_ROLE_LABELS[auth.user.role];
|
||||||
|
return 'محیط کاری';
|
||||||
|
});
|
||||||
|
|
||||||
|
const currentInitial = computed(() => {
|
||||||
|
const name = currentName.value.trim();
|
||||||
|
return name ? name.charAt(0) : 'م';
|
||||||
|
});
|
||||||
|
|
||||||
const canSwitch = computed(() => orgs.value.length > 1);
|
const canSwitch = computed(() => orgs.value.length > 1);
|
||||||
|
const isWorkspace = computed(() => props.variant === 'workspace');
|
||||||
|
/** در حالت workspace منو همیشه باز میشود؛ در حالت پیشفرض فقط وقتی بیش از یکی باشد */
|
||||||
|
const menuEnabled = computed(() => isWorkspace.value || canSwitch.value);
|
||||||
|
|
||||||
function apiError(e: unknown, fallback: string) {
|
function apiError(e: unknown, fallback: string) {
|
||||||
if (axios.isAxiosError(e)) {
|
if (axios.isAxiosError(e)) {
|
||||||
@@ -49,34 +73,62 @@ async function loadOrgs() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function closeMenu() {
|
||||||
|
if (!open.value) return;
|
||||||
|
open.value = false;
|
||||||
|
emit('close');
|
||||||
|
}
|
||||||
|
|
||||||
async function toggle() {
|
async function toggle() {
|
||||||
if (!canSwitch.value) return;
|
if (!menuEnabled.value) return;
|
||||||
error.value = '';
|
error.value = '';
|
||||||
if (open.value) {
|
if (open.value) {
|
||||||
open.value = false;
|
closeMenu();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
ignoreDocClickUntil = Date.now() + 400;
|
ignoreDocClickUntil = Date.now() + 400;
|
||||||
open.value = true;
|
open.value = true;
|
||||||
|
emit('open');
|
||||||
await nextTick();
|
await nextTick();
|
||||||
placeMenu();
|
placeMenu();
|
||||||
await loadOrgs();
|
await loadOrgs();
|
||||||
|
await nextTick();
|
||||||
|
placeMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
function placeMenu() {
|
function placeMenu() {
|
||||||
const btn = rootEl.value?.querySelector('button');
|
const btn = rootEl.value?.querySelector('button');
|
||||||
if (!(btn instanceof HTMLElement)) return;
|
if (!(btn instanceof HTMLElement)) return;
|
||||||
const box = btn.getBoundingClientRect();
|
const box = btn.getBoundingClientRect();
|
||||||
|
const minWidth = Math.round(Math.max(box.width, isWorkspace.value ? 240 : 200));
|
||||||
|
const sidebar = document.getElementById('app-sidebar');
|
||||||
|
const rail = sidebar?.getBoundingClientRect();
|
||||||
|
// لبهٔ راست منو = لبهٔ چپ سایدبار − ۴px
|
||||||
|
const edge = rail?.left ?? box.left;
|
||||||
|
const beside = {
|
||||||
|
right: 'auto',
|
||||||
|
left: `${Math.round(edge - 4)}px`,
|
||||||
|
transform: 'translateX(-100%)',
|
||||||
|
minWidth: `${minWidth}px`,
|
||||||
|
};
|
||||||
|
if (isWorkspace.value) {
|
||||||
menuStyle.value = {
|
menuStyle.value = {
|
||||||
bottom: `${Math.round(window.innerHeight - box.top + 6)}px`,
|
...beside,
|
||||||
right: `${Math.round(window.innerWidth - box.right)}px`,
|
top: `${Math.round(box.top)}px`,
|
||||||
minWidth: `${Math.round(Math.max(box.width, 200))}px`,
|
bottom: 'auto',
|
||||||
|
};
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
menuStyle.value = {
|
||||||
|
...beside,
|
||||||
|
top: 'auto',
|
||||||
|
bottom: `${Math.round(window.innerHeight - box.bottom)}px`,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async function choose(org: OrganizationMembershipDto) {
|
async function choose(org: OrganizationMembershipDto) {
|
||||||
if (org.id === auth.user?.organizationId) {
|
if (org.id === auth.user?.organizationId) {
|
||||||
open.value = false;
|
closeMenu();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
loading.value = true;
|
loading.value = true;
|
||||||
@@ -90,42 +142,16 @@ async function choose(org: OrganizationMembershipDto) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function openCreate() {
|
|
||||||
open.value = false;
|
|
||||||
newName.value = '';
|
|
||||||
newField.value = 'personal';
|
|
||||||
error.value = '';
|
|
||||||
createOpen.value = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submitCreate() {
|
|
||||||
const name = newName.value.trim();
|
|
||||||
if (name.length < 2) {
|
|
||||||
error.value = 'نام محیط باید حداقل دو حرف باشد.';
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
creating.value = true;
|
|
||||||
error.value = '';
|
|
||||||
try {
|
|
||||||
await auth.createOrganization({
|
|
||||||
name,
|
|
||||||
businessField: newField.value,
|
|
||||||
});
|
|
||||||
window.location.assign('/');
|
|
||||||
} catch (e) {
|
|
||||||
error.value = apiError(e, 'ساخت محیط ناموفق بود');
|
|
||||||
creating.value = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function onDocClick(event: MouseEvent) {
|
function onDocClick(event: MouseEvent) {
|
||||||
if (!open.value || Date.now() < ignoreDocClickUntil) return;
|
if (!open.value || Date.now() < ignoreDocClickUntil) return;
|
||||||
const target = event.target;
|
const target = event.target;
|
||||||
if (!(target instanceof Node)) return;
|
if (!(target instanceof Node)) return;
|
||||||
if (rootEl.value?.contains(target) || menuEl.value?.contains(target)) return;
|
if (rootEl.value?.contains(target) || menuEl.value?.contains(target)) return;
|
||||||
open.value = false;
|
closeMenu();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
defineExpose({ close: closeMenu });
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
void loadOrgs();
|
void loadOrgs();
|
||||||
document.addEventListener('click', onDocClick);
|
document.addEventListener('click', onDocClick);
|
||||||
@@ -137,27 +163,46 @@ onUnmounted(() => {
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<div ref="rootEl" class="org-switch">
|
<div ref="rootEl" class="org-switch" :class="{ 'org-ws': isWorkspace, compact }">
|
||||||
<button
|
<button
|
||||||
class="org-btn"
|
class="org-btn"
|
||||||
:class="{ compact, static: !canSwitch }"
|
:class="{
|
||||||
|
compact,
|
||||||
|
static: !menuEnabled,
|
||||||
|
'org-ws': isWorkspace,
|
||||||
|
open,
|
||||||
|
}"
|
||||||
type="button"
|
type="button"
|
||||||
:title="currentName"
|
:title="currentName"
|
||||||
:aria-disabled="!canSwitch"
|
:aria-expanded="open"
|
||||||
|
:aria-haspopup="menuEnabled ? 'listbox' : undefined"
|
||||||
|
:aria-disabled="!menuEnabled"
|
||||||
@click.stop="toggle"
|
@click.stop="toggle"
|
||||||
>
|
>
|
||||||
|
<template v-if="isWorkspace">
|
||||||
|
<span class="org-mark" aria-hidden="true">{{ currentInitial }}</span>
|
||||||
|
<span class="org-copy">
|
||||||
|
<strong>{{ currentName }}</strong>
|
||||||
|
<small>{{ currentSubtitle }}</small>
|
||||||
|
</span>
|
||||||
|
<i class="org-chev" :class="{ open }" aria-hidden="true" />
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
<UiIcon name="building" :size="18" />
|
<UiIcon name="building" :size="18" />
|
||||||
<span>{{ currentName }}</span>
|
<span>{{ currentName }}</span>
|
||||||
|
</template>
|
||||||
</button>
|
</button>
|
||||||
<Teleport to="body">
|
<Teleport to="body">
|
||||||
<div
|
<div
|
||||||
v-if="open && canSwitch"
|
v-if="open && menuEnabled"
|
||||||
ref="menuEl"
|
ref="menuEl"
|
||||||
class="menu"
|
class="menu"
|
||||||
|
:class="{ 'org-ws': isWorkspace }"
|
||||||
:style="menuStyle"
|
:style="menuStyle"
|
||||||
role="listbox"
|
role="listbox"
|
||||||
|
aria-label="محیطهای کاری"
|
||||||
>
|
>
|
||||||
<p class="hint">ورود به محیط</p>
|
<p class="hint">{{ canSwitch ? 'تعویض محیط کاری' : 'محیط کاری' }}</p>
|
||||||
<button
|
<button
|
||||||
v-for="org in orgs"
|
v-for="org in orgs"
|
||||||
:key="org.id"
|
:key="org.id"
|
||||||
@@ -165,41 +210,25 @@ onUnmounted(() => {
|
|||||||
class="org-item"
|
class="org-item"
|
||||||
:class="{ on: org.id === auth.user?.organizationId }"
|
:class="{ on: org.id === auth.user?.organizationId }"
|
||||||
:disabled="loading"
|
:disabled="loading"
|
||||||
|
role="option"
|
||||||
|
:aria-selected="org.id === auth.user?.organizationId"
|
||||||
@click="choose(org)"
|
@click="choose(org)"
|
||||||
>
|
>
|
||||||
|
<span class="org-item-mark" aria-hidden="true">{{ org.name.trim().charAt(0) || 'م' }}</span>
|
||||||
|
<span class="org-item-copy">
|
||||||
<strong>{{ org.name }}</strong>
|
<strong>{{ org.name }}</strong>
|
||||||
<span>{{ org.orgRoleName || USER_ROLE_LABELS[org.role] }}</span>
|
<span>{{ org.orgRoleName || USER_ROLE_LABELS[org.role] }}</span>
|
||||||
|
</span>
|
||||||
|
<UiIcon
|
||||||
|
v-if="org.id === auth.user?.organizationId"
|
||||||
|
class="org-check"
|
||||||
|
name="check"
|
||||||
|
:size="16"
|
||||||
|
/>
|
||||||
</button>
|
</button>
|
||||||
<button type="button" class="create" :disabled="loading" @click="openCreate">
|
<p v-if="error" class="err">{{ error }}</p>
|
||||||
محیط جدید
|
|
||||||
</button>
|
|
||||||
<p v-if="error && !createOpen" class="err">{{ error }}</p>
|
|
||||||
</div>
|
</div>
|
||||||
</Teleport>
|
</Teleport>
|
||||||
|
|
||||||
<UiModal :open="createOpen" title="محیط جدید" @close="createOpen = false">
|
|
||||||
<form class="form" @submit.prevent="submitCreate">
|
|
||||||
<label>
|
|
||||||
نام محیط
|
|
||||||
<input v-model="newName" required minlength="2" placeholder="مثلاً شرکت یا کار روزمره" />
|
|
||||||
</label>
|
|
||||||
<label>
|
|
||||||
زمینه فعالیت
|
|
||||||
<select v-model="newField">
|
|
||||||
<option v-for="field in BUSINESS_FIELDS" :key="field" :value="field">
|
|
||||||
{{ BUSINESS_FIELD_LABELS[field] }}
|
|
||||||
</option>
|
|
||||||
</select>
|
|
||||||
</label>
|
|
||||||
<p v-if="error" class="err">{{ error }}</p>
|
|
||||||
</form>
|
|
||||||
<template #footer>
|
|
||||||
<button type="button" class="ghost" @click="createOpen = false">انصراف</button>
|
|
||||||
<button type="button" class="primary" :disabled="creating" @click="submitCreate">
|
|
||||||
{{ creating ? 'در حال ساخت…' : 'ساخت و ورود' }}
|
|
||||||
</button>
|
|
||||||
</template>
|
|
||||||
</UiModal>
|
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -212,9 +241,11 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
.org-btn {
|
.org-btn {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: flex-start;
|
||||||
gap: 0.4rem;
|
gap: 0.35rem;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: #94a3b8;
|
color: #94a3b8;
|
||||||
@@ -223,15 +254,20 @@ onUnmounted(() => {
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding: 0 0.45rem 0.15rem;
|
padding: 0 0.15rem;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn span {
|
.org-btn :deep(.ico) {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-top: 0.05rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn > span {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
overflow: hidden;
|
white-space: normal;
|
||||||
text-overflow: ellipsis;
|
overflow-wrap: anywhere;
|
||||||
white-space: nowrap;
|
line-height: 1.35;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn:hover {
|
.org-btn:hover {
|
||||||
@@ -246,7 +282,7 @@ onUnmounted(() => {
|
|||||||
color: #94a3b8;
|
color: #94a3b8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn.compact {
|
.org-btn.compact:not(.org-ws) {
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
@@ -255,18 +291,113 @@ onUnmounted(() => {
|
|||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn.compact span {
|
.org-btn.compact:not(.org-ws) > span {
|
||||||
display: none;
|
display: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn.compact:hover {
|
.org-btn.compact:not(.org-ws):hover {
|
||||||
background: #f8fafc;
|
background: #f8fafc;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn.compact.static:hover {
|
.org-btn.compact.static:not(.org-ws):hover {
|
||||||
background: transparent;
|
background: transparent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.org-btn.org-ws {
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.7rem;
|
||||||
|
padding: 0.45rem 0.55rem;
|
||||||
|
border-radius: 16px;
|
||||||
|
color: #0f172a;
|
||||||
|
text-align: start;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn.org-ws:hover,
|
||||||
|
.org-btn.org-ws.open {
|
||||||
|
background: #f8fafc;
|
||||||
|
color: #0f172a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn.org-ws.static:hover {
|
||||||
|
background: #f8fafc;
|
||||||
|
color: #0f172a;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-mark {
|
||||||
|
width: 36px;
|
||||||
|
height: 36px;
|
||||||
|
border-radius: 999px;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
flex-shrink: 0;
|
||||||
|
background: color-mix(in srgb, var(--accent-soft) 80%, white);
|
||||||
|
color: var(--accent-deep);
|
||||||
|
font-size: 0.92rem;
|
||||||
|
font-weight: 800;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-copy {
|
||||||
|
min-width: 0;
|
||||||
|
flex: 1;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.08rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-copy strong {
|
||||||
|
font-size: 0.92rem;
|
||||||
|
font-weight: 800;
|
||||||
|
line-height: 1.25;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-copy small {
|
||||||
|
font-size: 0.72rem;
|
||||||
|
font-weight: 600;
|
||||||
|
color: #94a3b8;
|
||||||
|
line-height: 1.2;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-chev {
|
||||||
|
width: 0.42rem;
|
||||||
|
height: 0.42rem;
|
||||||
|
border-right: 1.6px solid #94a3b8;
|
||||||
|
border-bottom: 1.6px solid #94a3b8;
|
||||||
|
/* RTL: اشاره به بیرون (چپ) */
|
||||||
|
transform: rotate(135deg);
|
||||||
|
transition: transform 0.15s ease;
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-inline-start: 0.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-chev.open {
|
||||||
|
transform: rotate(45deg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn.compact.org-ws {
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
width: 100%;
|
||||||
|
min-height: var(--control-h);
|
||||||
|
padding: 0;
|
||||||
|
border-radius: 14px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn.compact.org-ws .org-copy,
|
||||||
|
.org-btn.compact.org-ws .org-chev {
|
||||||
|
display: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-btn.compact.org-ws .org-mark {
|
||||||
|
width: 32px;
|
||||||
|
height: 32px;
|
||||||
|
font-size: 0.82rem;
|
||||||
|
}
|
||||||
|
|
||||||
.menu {
|
.menu {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 90;
|
z-index: 90;
|
||||||
@@ -279,11 +410,21 @@ onUnmounted(() => {
|
|||||||
gap: 0.2rem;
|
gap: 0.2rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.menu.org-ws {
|
||||||
|
padding: 0.5rem;
|
||||||
|
border-radius: 16px;
|
||||||
|
border: 1px solid #e8eef3;
|
||||||
|
box-shadow: 0 16px 40px rgba(15, 23, 42, 0.14);
|
||||||
|
gap: 4px;
|
||||||
|
}
|
||||||
|
|
||||||
.hint {
|
.hint {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0.25rem 0.45rem;
|
padding: 0.35rem 0.65rem 0.45rem;
|
||||||
font-size: 0.72rem;
|
font-size: 0.7rem;
|
||||||
color: var(--muted);
|
font-weight: 700;
|
||||||
|
letter-spacing: 0.02em;
|
||||||
|
color: #94a3b8;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-item,
|
.org-item,
|
||||||
@@ -298,29 +439,89 @@ onUnmounted(() => {
|
|||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-item strong {
|
.menu.org-ws .org-item {
|
||||||
font-size: 0.82rem;
|
grid-template-columns: auto 1fr auto;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.7rem;
|
||||||
|
border-radius: 12px;
|
||||||
|
padding: 0.55rem 0.65rem;
|
||||||
|
color: #0f172a;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-item span {
|
.org-item-mark {
|
||||||
font-size: 0.72rem;
|
width: 36px;
|
||||||
color: var(--muted);
|
height: 36px;
|
||||||
|
border-radius: 999px;
|
||||||
|
display: grid;
|
||||||
|
place-items: center;
|
||||||
|
background: #eef2f7;
|
||||||
|
color: #475569;
|
||||||
|
font-size: 0.85rem;
|
||||||
|
font-weight: 800;
|
||||||
|
flex-shrink: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-item-copy {
|
||||||
|
min-width: 0;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.12rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-item strong {
|
||||||
|
font-size: 0.88rem;
|
||||||
|
font-weight: 700;
|
||||||
|
color: #0f172a;
|
||||||
|
line-height: 1.25;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-item span,
|
||||||
|
.org-item-copy span {
|
||||||
|
font-size: 0.74rem;
|
||||||
|
font-weight: 500;
|
||||||
|
color: #94a3b8;
|
||||||
|
line-height: 1.2;
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
|
.org-check {
|
||||||
|
color: #0f172a;
|
||||||
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-item:hover,
|
.org-item:hover,
|
||||||
.create:hover {
|
.create:hover {
|
||||||
background: color-mix(in srgb, var(--accent-soft) 70%, white);
|
background: #f3f4f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.org-ws .org-item:hover {
|
||||||
|
background: #f3f4f6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.org-ws .org-item:hover .org-item-mark {
|
||||||
|
background: #e2e8f0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-item.on {
|
.org-item.on {
|
||||||
background: var(--accent-soft);
|
background: #f3f4f6;
|
||||||
}
|
}
|
||||||
|
|
||||||
.create {
|
.menu.org-ws .org-item.on {
|
||||||
margin-top: 0.15rem;
|
background: #f3f4f6;
|
||||||
color: var(--accent);
|
}
|
||||||
font-weight: 700;
|
|
||||||
font-size: 0.82rem;
|
.menu.org-ws .org-item.on .org-item-mark {
|
||||||
|
background: color-mix(in srgb, var(--accent-soft) 85%, white);
|
||||||
|
color: var(--accent-deep);
|
||||||
|
}
|
||||||
|
|
||||||
|
.menu.org-ws .org-item.on strong {
|
||||||
|
font-weight: 800;
|
||||||
|
color: #0f172a;
|
||||||
}
|
}
|
||||||
|
|
||||||
.err {
|
.err {
|
||||||
@@ -328,41 +529,4 @@ onUnmounted(() => {
|
|||||||
color: #b91c1c;
|
color: #b91c1c;
|
||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form label {
|
|
||||||
display: grid;
|
|
||||||
gap: 0.35rem;
|
|
||||||
font-size: 0.88rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.form input,
|
|
||||||
.form select {
|
|
||||||
border: 1px solid var(--line);
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 0.65rem 0.75rem;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ghost,
|
|
||||||
.primary {
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 0.55rem 0.9rem;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.ghost {
|
|
||||||
border: 1px solid var(--line);
|
|
||||||
background: #fff;
|
|
||||||
}
|
|
||||||
|
|
||||||
.primary {
|
|
||||||
border: 0;
|
|
||||||
background: var(--accent);
|
|
||||||
color: #fff;
|
|
||||||
font-weight: 700;
|
|
||||||
}
|
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import {
|
|||||||
Upload as AUpload,
|
Upload as AUpload,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
import type { UploadProps } from 'ant-design-vue';
|
import type { UploadProps } from 'ant-design-vue';
|
||||||
import { PhoneOutlined, SearchOutlined, UserAddOutlined } from '@ant-design/icons-vue';
|
import { PhoneOutlined, SearchOutlined, UserAddOutlined } from '@/icons/ant-bridge';
|
||||||
import {
|
import {
|
||||||
filterPhoneContacts,
|
filterPhoneContacts,
|
||||||
isContactPickerSupported,
|
isContactPickerSupported,
|
||||||
|
|||||||
@@ -185,6 +185,13 @@ const fabStyle = computed(() => ({
|
|||||||
bottom: 'auto',
|
bottom: 'auto',
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
const panelPlacement = computed(() => {
|
||||||
|
const edge = 16;
|
||||||
|
const spaceAbove = fabPos.value.top - edge;
|
||||||
|
const spaceBelow = viewport.value.h - (fabPos.value.top + FAB_SIZE) - edge;
|
||||||
|
return spaceAbove >= spaceBelow ? 'above' : 'below';
|
||||||
|
});
|
||||||
|
|
||||||
const panelStyle = computed(() => {
|
const panelStyle = computed(() => {
|
||||||
const gap = 12;
|
const gap = 12;
|
||||||
const edge = 16;
|
const edge = 16;
|
||||||
@@ -193,28 +200,33 @@ const panelStyle = computed(() => {
|
|||||||
left = Math.min(left, viewport.value.w - width - edge);
|
left = Math.min(left, viewport.value.w - width - edge);
|
||||||
left = Math.max(edge, left);
|
left = Math.max(edge, left);
|
||||||
|
|
||||||
const spaceAbove = fabPos.value.top - edge;
|
const placeAbove = panelPlacement.value === 'above';
|
||||||
const spaceBelow = viewport.value.h - (fabPos.value.top + FAB_SIZE) - edge;
|
const maxHeight = Math.max(
|
||||||
const placeAbove = spaceAbove >= spaceBelow;
|
0,
|
||||||
const maxHeight = Math.max(0, (placeAbove ? spaceAbove : spaceBelow) - gap);
|
(placeAbove
|
||||||
|
? fabPos.value.top - edge
|
||||||
|
: viewport.value.h - (fabPos.value.top + FAB_SIZE) - edge) - gap,
|
||||||
|
);
|
||||||
|
|
||||||
|
const shared = {
|
||||||
|
left: `${left}px`,
|
||||||
|
right: 'auto',
|
||||||
|
width: `${width}px`,
|
||||||
|
maxHeight: `${maxHeight}px`,
|
||||||
|
transformOrigin: placeAbove ? 'bottom left' : 'top left',
|
||||||
|
};
|
||||||
|
|
||||||
if (placeAbove) {
|
if (placeAbove) {
|
||||||
return {
|
return {
|
||||||
left: `${left}px`,
|
...shared,
|
||||||
right: 'auto',
|
|
||||||
bottom: `${viewport.value.h - fabPos.value.top + gap}px`,
|
bottom: `${viewport.value.h - fabPos.value.top + gap}px`,
|
||||||
top: 'auto',
|
top: 'auto',
|
||||||
width: `${width}px`,
|
|
||||||
maxHeight: `${maxHeight}px`,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
left: `${left}px`,
|
...shared,
|
||||||
right: 'auto',
|
|
||||||
top: `${fabPos.value.top + FAB_SIZE + gap}px`,
|
top: `${fabPos.value.top + FAB_SIZE + gap}px`,
|
||||||
bottom: 'auto',
|
bottom: 'auto',
|
||||||
width: `${width}px`,
|
|
||||||
maxHeight: `${maxHeight}px`,
|
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -238,10 +250,6 @@ function onKeydown(ev: KeyboardEvent) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
watch(isQuickCreateOpen, (value) => {
|
|
||||||
document.body.style.overflow = value ? 'hidden' : '';
|
|
||||||
});
|
|
||||||
|
|
||||||
watch(hidden, (value) => {
|
watch(hidden, (value) => {
|
||||||
if (value) close();
|
if (value) close();
|
||||||
});
|
});
|
||||||
@@ -264,13 +272,13 @@ onMounted(() => {
|
|||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
window.removeEventListener('resize', onResize);
|
window.removeEventListener('resize', onResize);
|
||||||
window.removeEventListener('keydown', onKeydown);
|
window.removeEventListener('keydown', onKeydown);
|
||||||
document.body.style.overflow = '';
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<template>
|
||||||
<Teleport to="body">
|
<Teleport to="body">
|
||||||
<div v-if="!hidden" class="qc" dir="rtl">
|
<div v-if="!hidden" class="qc" dir="rtl">
|
||||||
|
<Transition name="qc-overlay">
|
||||||
<button
|
<button
|
||||||
v-if="isQuickCreateOpen"
|
v-if="isQuickCreateOpen"
|
||||||
class="overlay"
|
class="overlay"
|
||||||
@@ -278,20 +286,24 @@ onBeforeUnmount(() => {
|
|||||||
aria-label="بستن ایجاد سریع"
|
aria-label="بستن ایجاد سریع"
|
||||||
@click="close"
|
@click="close"
|
||||||
/>
|
/>
|
||||||
|
</Transition>
|
||||||
|
|
||||||
|
<Transition name="qc-panel">
|
||||||
<section
|
<section
|
||||||
v-if="isQuickCreateOpen"
|
v-if="isQuickCreateOpen"
|
||||||
class="panel"
|
class="panel"
|
||||||
|
:data-place="panelPlacement"
|
||||||
aria-labelledby="qc-title"
|
aria-labelledby="qc-title"
|
||||||
:style="panelStyle"
|
:style="panelStyle"
|
||||||
>
|
>
|
||||||
<h2 id="qc-title">ایجاد سریع</h2>
|
<h2 id="qc-title">ایجاد سریع</h2>
|
||||||
<div class="items">
|
<div class="items">
|
||||||
<button
|
<button
|
||||||
v-for="item in items"
|
v-for="(item, index) in items"
|
||||||
:key="item.key"
|
:key="item.key"
|
||||||
class="item"
|
class="item"
|
||||||
type="button"
|
type="button"
|
||||||
|
:style="{ '--qc-i': index }"
|
||||||
@click="go(item.to)"
|
@click="go(item.to)"
|
||||||
>
|
>
|
||||||
<span class="item-ico" :class="item.tone">
|
<span class="item-ico" :class="item.tone">
|
||||||
@@ -304,6 +316,7 @@ onBeforeUnmount(() => {
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
</Transition>
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="ready"
|
v-if="ready"
|
||||||
@@ -319,6 +332,8 @@ onBeforeUnmount(() => {
|
|||||||
@pointerup="onFabPointerUp"
|
@pointerup="onFabPointerUp"
|
||||||
@pointercancel="onFabPointerUp"
|
@pointercancel="onFabPointerUp"
|
||||||
>
|
>
|
||||||
|
<span class="fab-pulse" aria-hidden="true" />
|
||||||
|
<span class="fab-shine" aria-hidden="true" />
|
||||||
<span class="fab-face" aria-hidden="true">
|
<span class="fab-face" aria-hidden="true">
|
||||||
<UiIcon :name="isQuickCreateOpen ? 'x' : 'apps-plus'" :size="20" />
|
<UiIcon :name="isQuickCreateOpen ? 'x' : 'apps-plus'" :size="20" />
|
||||||
</span>
|
</span>
|
||||||
@@ -338,11 +353,12 @@ onBeforeUnmount(() => {
|
|||||||
z-index: 90;
|
z-index: 90;
|
||||||
border: 0;
|
border: 0;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
background: rgba(0, 0, 0, 0.68);
|
background: rgba(15, 23, 42, 0.42);
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel {
|
.panel {
|
||||||
|
--qc-ease: cubic-bezier(0.22, 1, 0.36, 1);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 92;
|
z-index: 92;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
@@ -352,10 +368,90 @@ onBeforeUnmount(() => {
|
|||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border: 1px solid var(--line);
|
border: 1px solid var(--line);
|
||||||
border-radius: var(--radius);
|
border-radius: 14px;
|
||||||
padding: 12px 12px 10px;
|
padding: 12px 12px 10px;
|
||||||
box-shadow: var(--shadow-lg);
|
box-shadow:
|
||||||
|
0 18px 40px -18px rgba(15, 23, 42, 0.35),
|
||||||
|
0 8px 18px -10px rgba(13, 148, 136, 0.18),
|
||||||
|
0 0 0 1px rgba(255, 255, 255, 0.65) inset;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
will-change: transform, opacity;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-overlay-enter-active,
|
||||||
|
.qc-overlay-leave-active {
|
||||||
|
transition: opacity 0.16s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-overlay-enter-from,
|
||||||
|
.qc-overlay-leave-to {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-enter-active {
|
||||||
|
transition:
|
||||||
|
opacity 0.18s var(--qc-ease),
|
||||||
|
transform 0.2s var(--qc-ease);
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-leave-active {
|
||||||
|
transition:
|
||||||
|
opacity 0.14s ease,
|
||||||
|
transform 0.16s ease;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-enter-from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(8px) scale(0.97);
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel[data-place='above'].qc-panel-enter-from {
|
||||||
|
transform: translateY(-8px) scale(0.97);
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-leave-to {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(4px) scale(0.98);
|
||||||
|
}
|
||||||
|
|
||||||
|
.panel[data-place='above'].qc-panel-leave-to {
|
||||||
|
transform: translateY(-4px) scale(0.98);
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-enter-active .items {
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-enter-active .item {
|
||||||
|
animation: qc-item-in 0.2s var(--qc-ease) both;
|
||||||
|
animation-delay: calc(0.02s + var(--qc-i, 0) * 0.02s);
|
||||||
|
}
|
||||||
|
|
||||||
|
.qc-panel-enter-active h2 {
|
||||||
|
animation: qc-item-in 0.16s var(--qc-ease) both;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes qc-item-in {
|
||||||
|
from {
|
||||||
|
opacity: 0;
|
||||||
|
transform: translateY(6px);
|
||||||
|
}
|
||||||
|
to {
|
||||||
|
opacity: 1;
|
||||||
|
transform: translateY(0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.qc-overlay-enter-active,
|
||||||
|
.qc-overlay-leave-active,
|
||||||
|
.qc-panel-enter-active,
|
||||||
|
.qc-panel-leave-active,
|
||||||
|
.qc-panel-enter-active .item,
|
||||||
|
.qc-panel-enter-active h2 {
|
||||||
|
transition: none !important;
|
||||||
|
animation: none !important;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.panel h2 {
|
.panel h2 {
|
||||||
@@ -369,12 +465,20 @@ onBeforeUnmount(() => {
|
|||||||
|
|
||||||
.items {
|
.items {
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
|
overflow-x: hidden;
|
||||||
overflow-y: auto;
|
overflow-y: auto;
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
padding-left: 2px;
|
padding-left: 2px;
|
||||||
overscroll-behavior: contain;
|
overscroll-behavior: contain;
|
||||||
|
scrollbar-width: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.items::-webkit-scrollbar {
|
||||||
|
display: none;
|
||||||
|
width: 0;
|
||||||
|
height: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.item {
|
.item {
|
||||||
@@ -450,6 +554,7 @@ onBeforeUnmount(() => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.fab {
|
.fab {
|
||||||
|
--fab-ease: cubic-bezier(0.22, 1, 0.36, 1);
|
||||||
position: fixed;
|
position: fixed;
|
||||||
z-index: 93;
|
z-index: 93;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
@@ -459,57 +564,226 @@ onBeforeUnmount(() => {
|
|||||||
margin: 0;
|
margin: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
border-radius: var(--radius);
|
border-radius: var(--radius);
|
||||||
overflow: hidden;
|
overflow: visible;
|
||||||
background: linear-gradient(145deg, #0f766e 0%, #14b8a6 100%);
|
background: linear-gradient(145deg, #0f766e 0%, #14b8a6 55%, #2dd4bf 100%);
|
||||||
|
background-size: 140% 140%;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: center;
|
||||||
line-height: 0;
|
line-height: 0;
|
||||||
direction: ltr;
|
direction: ltr;
|
||||||
|
isolation: isolate;
|
||||||
box-shadow:
|
box-shadow:
|
||||||
0 4px 14px rgba(13, 148, 136, 0.35),
|
0 4px 14px rgba(13, 148, 136, 0.35),
|
||||||
inset 0 1px 0 rgba(255, 255, 255, 0.22);
|
0 0 0 0 rgba(45, 212, 191, 0.28),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.28);
|
||||||
cursor: grab;
|
cursor: grab;
|
||||||
touch-action: none;
|
touch-action: none;
|
||||||
user-select: none;
|
user-select: none;
|
||||||
transition:
|
transition:
|
||||||
filter 0.15s ease,
|
filter 0.35s var(--fab-ease),
|
||||||
box-shadow 0.15s ease,
|
box-shadow 0.35s var(--fab-ease),
|
||||||
transform 0.12s ease;
|
transform 0.35s var(--fab-ease),
|
||||||
|
background 0.4s var(--fab-ease);
|
||||||
|
animation:
|
||||||
|
fab-glow 3.4s ease-in-out infinite,
|
||||||
|
fab-gradient 7s ease-in-out infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab-pulse,
|
||||||
|
.fab-shine,
|
||||||
|
.fab-face {
|
||||||
|
grid-area: 1 / 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab-pulse {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border-radius: inherit;
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 0;
|
||||||
|
box-shadow: 0 0 0 0 rgba(45, 212, 191, 0.42);
|
||||||
|
animation: fab-ring 2.8s var(--fab-ease) infinite;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab-shine {
|
||||||
|
position: absolute;
|
||||||
|
inset: 0;
|
||||||
|
border-radius: inherit;
|
||||||
|
overflow: hidden;
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab-shine::after {
|
||||||
|
content: '';
|
||||||
|
position: absolute;
|
||||||
|
top: -20%;
|
||||||
|
bottom: -20%;
|
||||||
|
left: -40%;
|
||||||
|
width: 42%;
|
||||||
|
background: linear-gradient(
|
||||||
|
105deg,
|
||||||
|
transparent 0%,
|
||||||
|
rgba(255, 255, 255, 0.08) 35%,
|
||||||
|
rgba(255, 255, 255, 0.42) 50%,
|
||||||
|
rgba(255, 255, 255, 0.08) 65%,
|
||||||
|
transparent 100%
|
||||||
|
);
|
||||||
|
transform: translateX(-160%) skewX(-18deg);
|
||||||
|
animation: fab-sheen 4.8s var(--fab-ease) infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fab-face {
|
.fab-face {
|
||||||
|
position: relative;
|
||||||
|
z-index: 2;
|
||||||
display: grid;
|
display: grid;
|
||||||
place-items: center;
|
place-items: center;
|
||||||
|
place-content: center;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
transition: transform 0.45s var(--fab-ease);
|
||||||
|
animation: fab-breathe 3.4s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fab :deep(.ico) {
|
.fab :deep(.ico),
|
||||||
|
.fab :deep(svg) {
|
||||||
display: block;
|
display: block;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
max-width: 20px;
|
max-width: 20px;
|
||||||
max-height: 20px;
|
max-height: 20px;
|
||||||
|
margin: 0;
|
||||||
stroke-width: 1.7;
|
stroke-width: 1.7;
|
||||||
|
filter: drop-shadow(0 1px 1px rgba(15, 23, 42, 0.18));
|
||||||
|
transition: transform 0.45s var(--fab-ease), opacity 0.25s ease;
|
||||||
}
|
}
|
||||||
|
|
||||||
.fab:hover {
|
.fab:hover {
|
||||||
filter: brightness(1.06);
|
filter: brightness(1.07) saturate(1.05);
|
||||||
|
transform: translateY(-1px) scale(1.04);
|
||||||
box-shadow:
|
box-shadow:
|
||||||
0 6px 18px rgba(13, 148, 136, 0.42),
|
0 10px 24px rgba(13, 148, 136, 0.42),
|
||||||
inset 0 1px 0 rgba(255, 255, 255, 0.25);
|
0 0 0 5px rgba(45, 212, 191, 0.12),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.32);
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab:hover .fab-face {
|
||||||
|
animation-play-state: paused;
|
||||||
|
transform: scale(1.06);
|
||||||
}
|
}
|
||||||
|
|
||||||
.fab.open {
|
.fab.open {
|
||||||
background: linear-gradient(145deg, #115e59 0%, #0d9488 100%);
|
background: linear-gradient(145deg, #115e59 0%, #0d9488 100%);
|
||||||
box-shadow: 0 6px 20px rgba(15, 23, 42, 0.25);
|
box-shadow:
|
||||||
|
0 8px 22px rgba(15, 23, 42, 0.28),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.18);
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab.open .fab-pulse,
|
||||||
|
.fab.open .fab-shine::after {
|
||||||
|
animation: none;
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab.open .fab-face {
|
||||||
|
animation: none;
|
||||||
|
transform: rotate(90deg) scale(1.02);
|
||||||
}
|
}
|
||||||
|
|
||||||
.fab.dragging {
|
.fab.dragging {
|
||||||
cursor: grabbing;
|
cursor: grabbing;
|
||||||
|
transform: scale(1.08);
|
||||||
|
box-shadow:
|
||||||
|
0 12px 28px rgba(13, 148, 136, 0.48),
|
||||||
|
0 0 0 6px rgba(45, 212, 191, 0.14),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.3);
|
||||||
|
animation: none;
|
||||||
|
transition-duration: 0.12s;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab.dragging .fab-pulse,
|
||||||
|
.fab.dragging .fab-shine::after,
|
||||||
|
.fab.dragging .fab-face {
|
||||||
|
animation: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fab-glow {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
box-shadow:
|
||||||
|
0 4px 14px rgba(13, 148, 136, 0.32),
|
||||||
|
0 0 0 0 rgba(45, 212, 191, 0.22),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.24);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
box-shadow:
|
||||||
|
0 8px 22px rgba(13, 148, 136, 0.48),
|
||||||
|
0 0 18px 2px rgba(45, 212, 191, 0.2),
|
||||||
|
inset 0 1px 0 rgba(255, 255, 255, 0.34);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fab-gradient {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
background-position: 0% 40%;
|
||||||
|
}
|
||||||
|
50% {
|
||||||
|
background-position: 100% 60%;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fab-ring {
|
||||||
|
0% {
|
||||||
|
box-shadow: 0 0 0 0 rgba(45, 212, 191, 0.4);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
70% {
|
||||||
|
box-shadow: 0 0 0 12px rgba(45, 212, 191, 0);
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
100% {
|
||||||
|
opacity: 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fab-sheen {
|
||||||
|
0%,
|
||||||
|
55% {
|
||||||
|
transform: translateX(-160%) skewX(-18deg);
|
||||||
|
}
|
||||||
|
85%,
|
||||||
|
100% {
|
||||||
|
transform: translateX(320%) skewX(-18deg);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@keyframes fab-breathe {
|
||||||
|
0%,
|
||||||
|
100% {
|
||||||
|
transform: scale(1);
|
||||||
|
}
|
||||||
|
50% {
|
||||||
transform: scale(1.05);
|
transform: scale(1.05);
|
||||||
box-shadow: 0 8px 24px rgba(13, 148, 136, 0.45);
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media (prefers-reduced-motion: reduce) {
|
||||||
|
.fab,
|
||||||
|
.fab-pulse,
|
||||||
|
.fab-shine::after,
|
||||||
|
.fab-face {
|
||||||
|
animation: none !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.fab:hover,
|
||||||
|
.fab.open .fab-face {
|
||||||
|
transform: none;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, ref, watch } from 'vue';
|
||||||
|
import { toFaDigits } from '@/lib/jalali';
|
||||||
|
import type { OrgRoleDto, RolePermissionKey } from '@mento/shared';
|
||||||
|
import {
|
||||||
|
Avatar as AAvatar,
|
||||||
|
Descriptions as ADescriptions,
|
||||||
|
DescriptionsItem as ADescriptionsItem,
|
||||||
|
Empty as AEmpty,
|
||||||
|
Flex as AFlex,
|
||||||
|
List as AList,
|
||||||
|
ListItem as AListItem,
|
||||||
|
ListItemMeta as AListItemMeta,
|
||||||
|
Space as ASpace,
|
||||||
|
TabPane as ATabPane,
|
||||||
|
Tabs as ATabs,
|
||||||
|
Tag as ATag,
|
||||||
|
Typography,
|
||||||
|
} from 'ant-design-vue';
|
||||||
|
import { UserOutlined } from '@/icons/ant-bridge';
|
||||||
|
|
||||||
|
const { Text: ATypographyText, Link: ATypographyLink } = Typography;
|
||||||
|
const emptySimple = AEmpty.PRESENTED_IMAGE_SIMPLE;
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
role: OrgRoleDto;
|
||||||
|
childRoles: OrgRoleDto[];
|
||||||
|
permissionItems: Array<{ key: RolePermissionKey; label: string }>;
|
||||||
|
avatarOf: (id: string) => string;
|
||||||
|
tagColor: (color: string | null | undefined) => string;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const emit = defineEmits<{
|
||||||
|
'pick-role': [id: string];
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const innerTab = ref('summary');
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => props.role.id,
|
||||||
|
() => {
|
||||||
|
innerTab.value = 'summary';
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
const grantedPermissions = computed(() =>
|
||||||
|
props.permissionItems.filter((item) => props.role.permissions.includes(item.key)),
|
||||||
|
);
|
||||||
|
|
||||||
|
const permSummary = computed(
|
||||||
|
() =>
|
||||||
|
`${toFaDigits(grantedPermissions.value.length)} از ${toFaDigits(props.permissionItems.length)}`,
|
||||||
|
);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<a-flex vertical :gap="16">
|
||||||
|
<a-space direction="vertical" :size="4">
|
||||||
|
<a-space wrap>
|
||||||
|
<a-tag v-if="role.systemKey" :bordered="false">سیستمی</a-tag>
|
||||||
|
<a-typography-text v-if="role.parentName" type="secondary">
|
||||||
|
زیرمجموعهٔ
|
||||||
|
<a-typography-link @click="emit('pick-role', role.parentId!)">
|
||||||
|
{{ role.parentName }}
|
||||||
|
</a-typography-link>
|
||||||
|
</a-typography-text>
|
||||||
|
</a-space>
|
||||||
|
<a-typography-text v-if="role.description" type="secondary">
|
||||||
|
{{ role.description }}
|
||||||
|
</a-typography-text>
|
||||||
|
</a-space>
|
||||||
|
|
||||||
|
<a-tabs v-model:activeKey="innerTab">
|
||||||
|
<a-tab-pane key="summary" tab="خلاصه">
|
||||||
|
<a-flex vertical :gap="16">
|
||||||
|
<a-descriptions :column="1" bordered>
|
||||||
|
<a-descriptions-item label="کاربران">
|
||||||
|
{{ toFaDigits(role.userCount) }} نفر
|
||||||
|
</a-descriptions-item>
|
||||||
|
<a-descriptions-item label="مجوزها">
|
||||||
|
{{ permSummary }}
|
||||||
|
</a-descriptions-item>
|
||||||
|
<a-descriptions-item label="زیرنقشها">
|
||||||
|
{{ toFaDigits(childRoles.length) }} مورد
|
||||||
|
</a-descriptions-item>
|
||||||
|
</a-descriptions>
|
||||||
|
|
||||||
|
<a-flex vertical :gap="8">
|
||||||
|
<a-typography-text strong>زیرنقشها</a-typography-text>
|
||||||
|
<a-space v-if="childRoles.length" wrap>
|
||||||
|
<a-tag
|
||||||
|
v-for="child in childRoles"
|
||||||
|
:key="child.id"
|
||||||
|
:color="tagColor(child.color)"
|
||||||
|
:bordered="false"
|
||||||
|
style="cursor: pointer"
|
||||||
|
@click="emit('pick-role', child.id)"
|
||||||
|
>
|
||||||
|
{{ child.name }} · {{ toFaDigits(child.userCount) }}
|
||||||
|
</a-tag>
|
||||||
|
</a-space>
|
||||||
|
<a-empty v-else description="زیرنقشی تعریف نشده" :image="emptySimple" />
|
||||||
|
</a-flex>
|
||||||
|
</a-flex>
|
||||||
|
</a-tab-pane>
|
||||||
|
|
||||||
|
<a-tab-pane key="perms" :tab="`مجوزها (${permSummary})`">
|
||||||
|
<a-flex vertical :gap="12">
|
||||||
|
<a-typography-text type="secondary">
|
||||||
|
فقط مجوزهای فعال نمایش داده میشود. برای تغییر، ویرایش نقش را بزنید.
|
||||||
|
</a-typography-text>
|
||||||
|
<a-space v-if="grantedPermissions.length" wrap>
|
||||||
|
<a-tag
|
||||||
|
v-for="perm in grantedPermissions"
|
||||||
|
:key="perm.key"
|
||||||
|
color="success"
|
||||||
|
:bordered="false"
|
||||||
|
>
|
||||||
|
{{ perm.label }}
|
||||||
|
</a-tag>
|
||||||
|
</a-space>
|
||||||
|
<a-empty v-else description="هیچ مجوزی فعال نیست" :image="emptySimple" />
|
||||||
|
</a-flex>
|
||||||
|
</a-tab-pane>
|
||||||
|
|
||||||
|
<a-tab-pane key="members" :tab="`کاربران (${toFaDigits(role.userCount)})`">
|
||||||
|
<a-list v-if="role.members.length" :data-source="role.members">
|
||||||
|
<template #renderItem="{ item }">
|
||||||
|
<a-list-item>
|
||||||
|
<a-list-item-meta :title="item.fullName">
|
||||||
|
<template #avatar>
|
||||||
|
<a-avatar :src="avatarOf(item.id)">
|
||||||
|
<template #icon><UserOutlined /></template>
|
||||||
|
</a-avatar>
|
||||||
|
</template>
|
||||||
|
</a-list-item-meta>
|
||||||
|
</a-list-item>
|
||||||
|
</template>
|
||||||
|
</a-list>
|
||||||
|
<a-empty v-else description="کاربری با این نقش نیست" :image="emptySimple" />
|
||||||
|
</a-tab-pane>
|
||||||
|
</a-tabs>
|
||||||
|
</a-flex>
|
||||||
|
</template>
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref, watch } from 'vue';
|
import { computed, onMounted, ref, watch } from 'vue';
|
||||||
import { DeleteOutlined, FlagOutlined } from '@ant-design/icons-vue';
|
import { DeleteOutlined, FlagOutlined } from '@/icons/ant-bridge';
|
||||||
import {
|
import {
|
||||||
Button as AButton,
|
Button as AButton,
|
||||||
Checkbox as ACheckbox,
|
Checkbox as ACheckbox,
|
||||||
|
|||||||
@@ -118,14 +118,20 @@ defineExpose({ refresh: load });
|
|||||||
<div v-if="visible" class="sms-wallet">
|
<div v-if="visible" class="sms-wallet">
|
||||||
<div
|
<div
|
||||||
class="chip"
|
class="chip"
|
||||||
:class="toneClass"
|
:class="[toneClass, (summary?.balanceRials ?? 0) < 0 ? 'is-debt' : '']"
|
||||||
|
role="button"
|
||||||
|
tabindex="0"
|
||||||
:title="loading ? '…' : `اعتبار پیامک: ${balanceLabel} ریال`"
|
:title="loading ? '…' : `اعتبار پیامک: ${balanceLabel} ریال`"
|
||||||
|
aria-label="شارژ اعتبار پیامک"
|
||||||
|
@click="chargeOpen = true"
|
||||||
|
@keydown.enter.prevent="chargeOpen = true"
|
||||||
|
@keydown.space.prevent="chargeOpen = true"
|
||||||
>
|
>
|
||||||
<span class="label">پیامک</span>
|
<span class="label">پیامک</span>
|
||||||
<span class="amount">{{ balanceLabel }}</span>
|
<span class="amount">{{ balanceLabel }}</span>
|
||||||
<button type="button" class="charge" @click="chargeOpen = true">شارژ</button>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Teleport to="body">
|
||||||
<div v-if="chargeOpen" class="layer">
|
<div v-if="chargeOpen" class="layer">
|
||||||
<div class="backdrop" @click="closeCharge" />
|
<div class="backdrop" @click="closeCharge" />
|
||||||
<div class="modal charge-modal" role="dialog" aria-label="شارژ پیامک">
|
<div class="modal charge-modal" role="dialog" aria-label="شارژ پیامک">
|
||||||
@@ -170,7 +176,9 @@ defineExpose({ refresh: load });
|
|||||||
<p v-else class="muted">اطلاعات واریز در دسترس نیست.</p>
|
<p v-else class="muted">اطلاعات واریز در دسترس نیست.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
|
||||||
|
<Teleport to="body">
|
||||||
<div v-if="warnOpen" class="layer">
|
<div v-if="warnOpen" class="layer">
|
||||||
<div class="backdrop" @click="warnOpen = false" />
|
<div class="backdrop" @click="warnOpen = false" />
|
||||||
<div class="modal warn" role="dialog" aria-label="هشدار موجودی منفی">
|
<div class="modal warn" role="dialog" aria-label="هشدار موجودی منفی">
|
||||||
@@ -186,6 +194,7 @@ defineExpose({ refresh: load });
|
|||||||
<button type="button" class="ok" @click="warnOpen = false">متوجه شدم</button>
|
<button type="button" class="ok" @click="warnOpen = false">متوجه شدم</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</Teleport>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -196,15 +205,15 @@ defineExpose({ refresh: load });
|
|||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* چیپ جمعوجور؛ دکمه شارژ سمت چپ، برچسب سمت راست */
|
/* چیپ جمعوجور؛ کلیک کل سطح، پنجرهٔ شارژ را باز میکند */
|
||||||
.chip {
|
.chip {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
height: 31px;
|
height: var(--control-h);
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 0 4px 0 2px;
|
padding: 0 8px;
|
||||||
border: 1px solid #c3ead6;
|
border: 1px solid #c3ead6;
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
background: #f2fbf6;
|
background: #f2fbf6;
|
||||||
@@ -213,6 +222,7 @@ defineExpose({ refresh: load });
|
|||||||
line-height: 1;
|
line-height: 1;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
|
box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
|
||||||
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
.chip.warning {
|
.chip.warning {
|
||||||
@@ -228,6 +238,17 @@ defineExpose({ refresh: load });
|
|||||||
color: #991b1b;
|
color: #991b1b;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.chip.is-debt {
|
||||||
|
border-color: var(--danger);
|
||||||
|
background: var(--danger);
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
.chip.is-debt .label {
|
||||||
|
color: inherit;
|
||||||
|
opacity: 0.92;
|
||||||
|
}
|
||||||
|
|
||||||
.label {
|
.label {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 0.7rem;
|
font-size: 0.7rem;
|
||||||
@@ -235,49 +256,21 @@ defineExpose({ refresh: load });
|
|||||||
}
|
}
|
||||||
|
|
||||||
.amount {
|
.amount {
|
||||||
font-weight: 800;
|
|
||||||
letter-spacing: -0.01em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.charge {
|
|
||||||
appearance: none;
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
justify-content: center;
|
|
||||||
height: 23px;
|
|
||||||
margin: 0;
|
|
||||||
padding: 0 6px;
|
|
||||||
border: 1px solid #e2e8f0;
|
|
||||||
border-radius: 7px;
|
|
||||||
background: #fff;
|
|
||||||
color: #334155;
|
|
||||||
font: inherit;
|
|
||||||
font-size: 0.7rem;
|
|
||||||
font-weight: 700;
|
font-weight: 700;
|
||||||
line-height: 1;
|
font-variant-numeric: tabular-nums;
|
||||||
cursor: pointer;
|
letter-spacing: -0.01em;
|
||||||
transition:
|
|
||||||
background 0.15s ease,
|
|
||||||
border-color 0.15s ease,
|
|
||||||
color 0.15s ease;
|
|
||||||
}
|
|
||||||
|
|
||||||
.charge:hover {
|
|
||||||
background: #f8fafc;
|
|
||||||
border-color: #cbd5e1;
|
|
||||||
color: #0f172a;
|
|
||||||
}
|
|
||||||
|
|
||||||
.charge:active {
|
|
||||||
background: #f1f5f9;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.layer {
|
.layer {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
z-index: 80;
|
z-index: 120;
|
||||||
display: grid;
|
display: flex;
|
||||||
place-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 1rem;
|
||||||
|
overflow: auto;
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.backdrop {
|
.backdrop {
|
||||||
@@ -289,7 +282,8 @@ defineExpose({ refresh: load });
|
|||||||
.modal {
|
.modal {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: min(420px, calc(100vw - 2rem));
|
width: min(420px, calc(100vw - 2rem));
|
||||||
max-height: min(90vh, 640px);
|
max-height: calc(100vh - 2rem);
|
||||||
|
margin: auto;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
@@ -297,6 +291,7 @@ defineExpose({ refresh: load });
|
|||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.75rem;
|
gap: 0.75rem;
|
||||||
box-shadow: 0 20px 50px rgba(15, 23, 42, 0.18);
|
box-shadow: 0 20px 50px rgba(15, 23, 42, 0.18);
|
||||||
|
box-sizing: border-box;
|
||||||
}
|
}
|
||||||
|
|
||||||
.modal header {
|
.modal header {
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user