fix(web): serve real dashboard data instead of mocks

Drop forced home/treasury/reports mock fallbacks so API and database content drive the UI.
feat(web): refresh Montact brand and sidebar chrome
2026-11-07 09:04:38 +03:30 · 2026-11-05 17:10:03 +03:30 · 2026-11-05 15:34:34 +03:30 · 2026-11-05 15:29:40 +03:30 · 2026-11-05 15:10:48 +03:30 · 2026-11-05 14:46:35 +03:30
328 changed files with 47263 additions and 39188 deletions
@@ -41,11 +41,19 @@ Legacy CRM UI (`components/ui/*`, `.crm-*`, `.btn` / `.field` in `styles/`) rema
 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.

-7. **RTL + locale**  
-   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).
+7. **RTL + locale + StyleProvider**  
+   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**  
-   `<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**  
   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` |
 | Vite plugin | `apps/web/vite.config.ts` — `Components` + `AntDesignVueResolver` |
 | 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 |

+### Mandatory child-control conversion (same pass)
+
+هنگام بازنویسی یک صفحه (View)، ایجنت موظف است علاوه بر خود فایل View، تمام کامپوننت‌های فرزندی را که در آن View ایمپورت شده‌اند و حاوی اینپوت/سلکت/دکمه هستند نیز بازبینی کرده و درون آن‌ها را به کامپوننت‌های رسمی `ant-design-vue` تبدیل کند. هیچ تگ `<input>`, `<select>`, `<textarea>`, `<button>` خامی نباید در صفحه یا کامپوننت‌های فرزندِ مصرفی آن باقی بماند.
+
 ## Migration workflow

 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>
@@ -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>
@@ -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-*)` پاک‌سازی شده است؟
@@ -12,7 +12,7 @@
    "prisma:seed": "tsx prisma/seed.ts",
    "lint": "echo \"api lint placeholder\"",
    "typecheck": "tsc --noEmit -p tsconfig.json && tsc --noEmit -p test/tsconfig.json",
-    "test": "tsx --test test/tahesab-methods.test.ts test/dates.test.ts test/birthdays.test.ts test/message-automation.test.ts test/record-scope.test.ts test/gamification-engine.test.ts test/automation-branches.test.ts test/pipeline-merge.test.ts test/ask-count.test.ts test/prior-archive.test.ts test/organizations.test.ts test/promote-from-prior.test.ts test/behavior.test.ts test/attendance-time.test.ts"
+    "test": "tsx --test test/tahesab-methods.test.ts test/dates.test.ts test/birthdays.test.ts test/message-automation.test.ts test/record-scope.test.ts test/gamification-engine.test.ts test/automation-branches.test.ts test/pipeline-merge.test.ts test/ask-count.test.ts test/prior-archive.test.ts test/organizations.test.ts test/promote-from-prior.test.ts test/behavior.test.ts test/attendance-time.test.ts test/sales-factors.test.ts test/platform-admin-alert.test.ts test/person-name.test.ts"
  },
  "dependencies": {
    "@mento/shared": "*",
@@ -0,0 +1,14 @@
+ALTER TABLE "CustomerGroup" ADD COLUMN IF NOT EXISTS "parentId" TEXT;
+CREATE INDEX IF NOT EXISTS "CustomerGroup_parentId_idx" ON "CustomerGroup"("parentId");
+DO $$ BEGIN
+  ALTER TABLE "CustomerGroup"
+    ADD CONSTRAINT "CustomerGroup_parentId_fkey"
+    FOREIGN KEY ("parentId") REFERENCES "CustomerGroup"("id")
+    ON DELETE SET NULL ON UPDATE CASCADE;
+EXCEPTION
+  WHEN duplicate_object THEN NULL;
+END $$;
+
+ALTER TABLE "AccountingAsnadLine" ADD COLUMN IF NOT EXISTS "darsad" DOUBLE PRECISION;
+ALTER TABLE "AccountingAsnadLine" ADD COLUMN IF NOT EXISTS "darsadTalayee" DOUBLE PRECISION;
+ALTER TABLE "AccountingAsnadLine" ADD COLUMN IF NOT EXISTS "maliatDarsad" DOUBLE PRECISION;
@@ -0,0 +1,32 @@
+-- CreateTable
+CREATE TABLE "ActivityImage" (
+    "id" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+    "activityId" TEXT NOT NULL,
+    "fileName" TEXT NOT NULL,
+    "mimeType" TEXT NOT NULL,
+    "sizeBytes" INTEGER NOT NULL,
+    "storageKey" TEXT NOT NULL,
+    "uploadedById" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    CONSTRAINT "ActivityImage_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE INDEX "ActivityImage_activityId_createdAt_idx" ON "ActivityImage"("activityId", "createdAt");
+
+-- CreateIndex
+CREATE INDEX "ActivityImage_organizationId_idx" ON "ActivityImage"("organizationId");
+
+-- CreateIndex
+CREATE INDEX "ActivityImage_uploadedById_idx" ON "ActivityImage"("uploadedById");
+
+-- AddForeignKey
+ALTER TABLE "ActivityImage" ADD CONSTRAINT "ActivityImage_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ActivityImage" ADD CONSTRAINT "ActivityImage_activityId_fkey" FOREIGN KEY ("activityId") REFERENCES "Activity"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "ActivityImage" ADD CONSTRAINT "ActivityImage_uploadedById_fkey" FOREIGN KEY ("uploadedById") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
@@ -0,0 +1,8 @@
+-- پیامک پایان اشتراک فقط برای انقضاهای بعدی؛ حساب‌های قبلاً تمام‌شده دوباره خبر نمی‌دهند
+ALTER TABLE "BillingAccount" ADD COLUMN "expiryNotifiedAt" TIMESTAMP(3);
+
+UPDATE "BillingAccount"
+SET "expiryNotifiedAt" = CURRENT_TIMESTAMP
+WHERE "planCode" = 'lifetime'
+   OR "status" = 'expired'
+   OR "expiresAt" < CURRENT_TIMESTAMP;
@@ -0,0 +1,12 @@
+CREATE TABLE "ActivityBoardMember" (
+    "boardId" TEXT NOT NULL,
+    "userId" TEXT NOT NULL,
+
+    CONSTRAINT "ActivityBoardMember_pkey" PRIMARY KEY ("boardId","userId")
+);
+
+CREATE INDEX "ActivityBoardMember_userId_idx" ON "ActivityBoardMember"("userId");
+
+ALTER TABLE "ActivityBoardMember" ADD CONSTRAINT "ActivityBoardMember_boardId_fkey" FOREIGN KEY ("boardId") REFERENCES "ActivityBoard"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+ALTER TABLE "ActivityBoardMember" ADD CONSTRAINT "ActivityBoardMember_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -0,0 +1,22 @@
+ALTER TABLE "Person" ADD COLUMN "gender" TEXT NOT NULL DEFAULT 'none';
+ALTER TABLE "Person" ADD COLUMN "showGenderInName" BOOLEAN NOT NULL DEFAULT false;
+
+-- نام‌هایی که از ته‌حساب با عنوان آمده‌اند؛ خود متن نام دست نمی‌خورد
+UPDATE "Person"
+SET "gender" = 'male', "showGenderInName" = true
+WHERE regexp_replace(
+  regexp_replace(btrim("firstName" || ' ' || "lastName"), 'ي', 'ی', 'g'),
+  'ك',
+  'ک',
+  'g'
+) ~ '^جناب[[:space:]]*آقای([[:space:]]|$)';
+
+UPDATE "Person"
+SET "gender" = 'female', "showGenderInName" = true
+WHERE "gender" = 'none'
+  AND regexp_replace(
+    regexp_replace(btrim("firstName" || ' ' || "lastName"), 'ي', 'ی', 'g'),
+    'ك',
+    'ک',
+    'g'
+  ) ~ '^سرکار[[:space:]]*خانم([[:space:]]|$)';
@@ -0,0 +1,32 @@
+ALTER TABLE "Lead" ADD COLUMN "gender" TEXT NOT NULL DEFAULT 'none';
+ALTER TABLE "Lead" ADD COLUMN "showGenderInName" BOOLEAN NOT NULL DEFAULT false;
+
+-- عنوان داخل نام مخاطب، و اگر مخاطب خالی است داخل عنوان لید
+UPDATE "Lead"
+SET "gender" = 'male', "showGenderInName" = true
+WHERE regexp_replace(
+  regexp_replace(
+    btrim(CASE WHEN btrim(coalesce("contactName", '')) <> '' THEN "contactName" ELSE "title" END),
+    'ي',
+    'ی',
+    'g'
+  ),
+  'ك',
+  'ک',
+  'g'
+) ~ '^جناب[[:space:]]*آقای([[:space:]]|$)';
+
+UPDATE "Lead"
+SET "gender" = 'female', "showGenderInName" = true
+WHERE "gender" = 'none'
+  AND regexp_replace(
+    regexp_replace(
+      btrim(CASE WHEN btrim(coalesce("contactName", '')) <> '' THEN "contactName" ELSE "title" END),
+      'ي',
+      'ی',
+      'g'
+    ),
+    'ك',
+    'ک',
+    'g'
+  ) ~ '^سرکار[[:space:]]*خانم([[:space:]]|$)';
@@ -0,0 +1,3 @@
+ALTER TYPE "CustomFieldEntity" ADD VALUE IF NOT EXISTS 'note';
+
+ALTER TABLE "Note" ADD COLUMN IF NOT EXISTS "customFields" JSONB NOT NULL DEFAULT '{}';
@@ -0,0 +1,20 @@
+CREATE TABLE "NoteCategory" (
+    "id" TEXT NOT NULL,
+    "organizationId" TEXT NOT NULL,
+    "key" TEXT NOT NULL,
+    "label" TEXT NOT NULL,
+    "tone" TEXT NOT NULL DEFAULT 'general',
+    "position" INTEGER NOT NULL DEFAULT 0,
+    "isActive" BOOLEAN NOT NULL DEFAULT true,
+    "showInBar" BOOLEAN NOT NULL DEFAULT true,
+    "isSystem" BOOLEAN NOT NULL DEFAULT false,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+
+    CONSTRAINT "NoteCategory_pkey" PRIMARY KEY ("id")
+);
+
+CREATE UNIQUE INDEX "NoteCategory_organizationId_key_key" ON "NoteCategory"("organizationId", "key");
+CREATE INDEX "NoteCategory_organizationId_position_idx" ON "NoteCategory"("organizationId", "position");
+
+ALTER TABLE "NoteCategory" ADD CONSTRAINT "NoteCategory_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
@@ -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;
@@ -52,6 +52,7 @@ enum CustomFieldEntity {
  person
  company
  deal
+  note
 }

 enum CustomFieldType {
@@ -153,6 +154,12 @@ model Organization {
  /// تاریخ قطع بایگانی اطلاعات قبل (شروع روز انتخاب‌شده)؛ null = بدون فیلتر
  priorArchiveEnabledAt        DateTime?
  isActive                     Boolean                       @default(true)
+  /// حجم فایل‌های محلی این محیط، به بایت. متن رکوردها (مشتری، فعالیت، فاکتور) داخلش نیست.
+  fileBytes                    BigInt                        @default(0)
+  /// حجم فایل‌های گفتگو که از این محیط آپلود شده‌اند
+  chatFileBytes                BigInt                        @default(0)
+  /// آخرین باری که fileBytes از روی فایل‌های واقعی محاسبه شده
+  fileBytesSyncedAt            DateTime?
  createdAt                    DateTime                      @default(now())
  updatedAt                    DateTime                      @updatedAt
  users                        User[]
@@ -169,11 +176,13 @@ model Organization {
  deals                        Deal[]
  activities                   Activity[]
  notes                        Note[]
+  noteCategories               NoteCategory[]
  noteRevisions                NoteRevision[]
  customFields                 CustomFieldDefinition[]
  products                     Product[]
  notifications                Notification[]
  noteAttachments              NoteAttachment[]
+  activityImages               ActivityImage[]
  leadForms                    LeadForm[]
  quotes                       Quote[]
  invoices                     Invoice[]
@@ -286,6 +295,7 @@ model User {
  ownedInvoices          Invoice[]                @relation("InvoiceOwner")
  ownedPeople            Person[]                 @relation("PersonOwner")
  ownedCompanies         Company[]                @relation("CompanyOwner")
+  financialPartyDocuments FinancialDocument[]     @relation("FinancialDocumentParty")
  ownedProjectCards      ProjectCard[]            @relation("ProjectCardOwner")
  activities             Activity[]               @relation("ActivityAssignee")
  assignedActivities     Activity[]               @relation("ActivityAssignees")
@@ -293,6 +303,7 @@ model User {
  notes                  Note[]                   @relation("NoteAuthor")
  noteRevisions          NoteRevision[]           @relation("NoteRevisionEditor")
  noteAttachments        NoteAttachment[]         @relation("NoteAttachmentUploader")
+  activityImages         ActivityImage[]          @relation("ActivityImageUploader")
  notifications          Notification[]
  salesGoals             SalesGoal[]              @relation("SalesGoalUser")
  commissionPercent      Decimal                  @default(0) @db.Decimal(8, 2)
@@ -309,6 +320,7 @@ model User {
  tablePreferences       UserTablePreference[]
  assignedProjectCards   ProjectCard[]            @relation("ProjectCardAssignees")
  teamMemberships        TeamMember[]
+  activityBoardMembers   ActivityBoardMember[]
  reservationAssignments ReservationAppointment[] @relation("ReservationAssignee")
  assignedLeads          Lead[]                   @relation("LeadAssignee")
  createdLeads           Lead[]                   @relation("LeadCreator")
@@ -342,6 +354,10 @@ model OrgRole {
  permissions    String[]     @default([])
  /// عمق داده به‌ازای بخش، مثلاً {"customers":{"mode":"rules","rules":[{"owners":["self"]}]}}
  dataAccessPolicy Json       @default("{}")
+  /// حساب‌های مالی اضافی این نقش؛ همراه با حساب‌هایی که خودش مسئول است
+  treasuryAccountIds String[] @default([])
+  /// اعضای نقش، حساب‌هایی را ببینند که نام خودشان مسئول آن است
+  treasuryOwnAccounts Boolean @default(false)
  /// owner | admin | sales | support — نقش‌های سیستمی قابل حذف نیستند
  systemKey      String?
  /// نقش والد برای سلسله‌مراتب زیرنقش‌ها
@@ -376,6 +392,8 @@ model Membership {
  dataVisibilityScopes Json         @default("{}")
  /// Override عمق داده نسبت به نقش؛ کلید غایب = ارث از OrgRole.dataAccessPolicy
  dataAccessOverride   Json         @default("{}")
+  /// null = دسترسی مالی از نقش؛ وگرنه جایگزین بخش‌ها و حساب‌های مالی همین کاربر
+  treasuryAccessOverride Json?
  /// سوئیچ «بایگانی اطلاعات قبل» برای این عضو؛ فقط وقتی ماژول محیط روشن است اثر دارد
  priorArchiveEnabled  Boolean      @default(false)
  /// current | archive
@@ -440,6 +458,13 @@ model PlatformAdmin {
  updatedAt    DateTime  @updatedAt
 }

+/// رمز کلی سوپرادمین: با موبایل هر کاربر و این رمز می‌شود وارد حساب CRM او شد
+model PlatformMasterPassword {
+  id           String   @id @default("default")
+  passwordHash String
+  updatedAt    DateTime @updatedAt
+}
+
 /// اشتراک SaaS روی مالک حساب (نه روی هر عضویت)
 model BillingAccount {
  id                 String   @id @default(cuid())
@@ -452,9 +477,15 @@ model BillingAccount {
  startsAt           DateTime @default(now())
  expiresAt          DateTime
  maxOrganizations   Int      @default(1)
+  /// سقف حجم فایل همهٔ محیط‌های این مالک، به بایت. null = بدون سقف
+  storageQuotaBytes  BigInt?
+  /// سقف کاربر فعال همهٔ محیط‌های این مالک. null = هنوز تعیین نشده
+  maxUsers           Int?
  /// رزرو برای درگاه/لندینگ بعدی
  externalPaymentRef String?
  notes              String?
+  /// پیامک پایان اشتراک برای مدیران پنل؛ خالی یعنی هنوز اطلاع داده نشده
+  expiryNotifiedAt   DateTime?
  createdAt          DateTime @default(now())
  updatedAt          DateTime @updatedAt

@@ -494,6 +525,7 @@ model Company {
  customFields       Json          @default("{}")
  groupLinks         CompanyGroupLink[]
  people             Person[]
+  financialDocuments FinancialDocument[]
  deals              Deal[]
  activities         Activity[]
  smartNotes         Note[]
@@ -527,6 +559,10 @@ model CustomerGroup {
  /// گروه متناظر در ته‌حساب (GID) روی همان اتصال
  tahesabConnectionId String?
  tahesabGid          String?
+  /// گروه اصلی؛ فقط یک سطح (اصلی / فرعی)
+  parentId            String?
+  parent              CustomerGroup?     @relation("CustomerGroupTree", fields: [parentId], references: [id], onDelete: SetNull)
+  children            CustomerGroup[]    @relation("CustomerGroupTree")
  people              PersonGroupLink[]
  companies           CompanyGroupLink[]
  createdAt           DateTime           @default(now())
@@ -535,6 +571,7 @@ model CustomerGroup {
  @@unique([organizationId, name])
  @@index([organizationId, position])
  @@index([tahesabConnectionId, tahesabGid])
+  @@index([parentId])
 }

 model PersonGroupLink {
@@ -569,6 +606,10 @@ model Person {
  company                 Company?                 @relation(fields: [companyId], references: [id], onDelete: SetNull)
  firstName               String
  lastName                String
+  /// male | female | none
+  gender                  String                   @default("none")
+  /// اگر روشن باشد، مرد «جناب آقای» و زن «سرکار خانم» ابتدای نام ذخیره می‌شود
+  showGenderInName        Boolean                  @default(false)
  /// نام قبل از همگام‌سازی مبدأ (مثلاً ته‌حساب)
  previousFirstName       String?
  previousLastName        String?
@@ -757,6 +798,7 @@ model ActivityBoard {
  position       Int             @default(0)
  stages         ActivityStage[]
  activities     Activity[]
+  members        ActivityBoardMember[]
  createdAt      DateTime        @default(now())
  updatedAt      DateTime        @updatedAt

@@ -764,6 +806,17 @@ model ActivityBoard {
  @@index([organizationId, position])
 }

+/// عضو گروه فعالیت؛ اگر گروهی هیچ عضوی نداشته باشد برای همهٔ محیط باز است
+model ActivityBoardMember {
+  boardId String
+  board   ActivityBoard @relation(fields: [boardId], references: [id], onDelete: Cascade)
+  userId  String
+  user    User          @relation(fields: [userId], references: [id], onDelete: Cascade)
+
+  @@id([boardId, userId])
+  @@index([userId])
+}
+
 model ActivityStage {
  id             String         @id @default(cuid())
  organizationId String
@@ -851,6 +904,8 @@ model Activity {
  /// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهم‌نوع با status → اولین مرحلهٔ هم‌نوع
  stageId           String?
  stage             ActivityStage?   @relation(fields: [stageId], references: [id], onDelete: SetNull)
+  /// ترتیب کارت داخل همان ستون کانبان
+  boardPosition     Int              @default(0)
  /// نوع سفارشی؛ null → نوع اصلیِ همان type
  typeDefId         String?
  typeDef           ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
@@ -861,10 +916,12 @@ model Activity {
  /// لید مرتبط (مثلاً فعالیت ساخته‌شده از ارسال فرم)
  leadId            String?
  lead              Lead?            @relation(fields: [leadId], references: [id], onDelete: SetNull)
+  images            ActivityImage[]
  createdAt         DateTime         @default(now())
  updatedAt         DateTime         @updatedAt

  @@index([stageId])
+  @@index([stageId, boardPosition])
  @@index([boardId])
  @@index([typeDefId])
  @@index([leadId])
@@ -879,6 +936,26 @@ model Activity {
  @@index([dealId])
 }

+/// عکس فشرده‌شدهٔ یادداشت فعالیت (حداکثر ۲۰۰ کیلوبایت)
+model ActivityImage {
+  id             String       @id
+  organizationId String
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  activityId     String
+  activity       Activity     @relation(fields: [activityId], references: [id], onDelete: Cascade)
+  fileName       String
+  mimeType       String
+  sizeBytes      Int
+  storageKey     String
+  uploadedById   String?
+  uploadedBy     User?        @relation("ActivityImageUploader", fields: [uploadedById], references: [id], onDelete: SetNull)
+  createdAt      DateTime     @default(now())
+
+  @@index([activityId, createdAt])
+  @@index([organizationId])
+  @@index([uploadedById])
+}
+
 model Note {
  id             String            @id @default(cuid())
  organizationId String
@@ -894,6 +971,8 @@ model Note {
  checklist      Json?
  locationText   String?
  analyzeEnabled Boolean           @default(true)
+  /// مقادیر فیلدهای سفارشی یادداشت
+  customFields   Json              @default("{}")
  personId       String?
  person         Person?           @relation(fields: [personId], references: [id], onDelete: SetNull)
  companyId      String?
@@ -923,6 +1002,26 @@ model Note {
  @@index([authorId])
 }

+/// دسته‌های نوار فیلتر یادداشت؛ برای هر سازمان قابل تغییر است
+model NoteCategory {
+  id             String       @id @default(cuid())
+  organizationId String
+  organization   Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
+  key            String
+  label          String
+  tone           String       @default("general")
+  position       Int          @default(0)
+  isActive       Boolean      @default(true)
+  /// در نوار «همه / معمولی / پیگیری / …» دیده شود
+  showInBar      Boolean      @default(true)
+  isSystem       Boolean      @default(false)
+  createdAt      DateTime     @default(now())
+  updatedAt      DateTime     @updatedAt
+
+  @@unique([organizationId, key])
+  @@index([organizationId, position])
+}
+
 /// اسنپ‌شات متن قبل از هر ویرایش معنادار یادداشت
 model NoteRevision {
  id             String       @id @default(cuid())
@@ -1744,6 +1843,13 @@ model AccountingConnection {
  lastHealthAt     DateTime?
  lastHealthOk     Boolean?
  lastError        String?
+  /// ساعت‌های بروزرسانی خودکار مشتریان (۰ تا ۲۳، وقت تهران). خالی یعنی خاموش.
+  customerSyncHours       Int[]     @default([])
+  /// نوبت claimشده، مثل 2026-11-05-08، تا در همان ساعت دو بار اجرا نشود
+  customerSyncLastSlot    String?
+  customerSyncLastRunAt   DateTime?
+  customerSyncLastSummary String?
+  customerSyncLastError   String?
  createdAt        DateTime                 @default(now())
  updatedAt        DateTime                 @updatedAt
  personLinks      PersonAccountingLink[]
@@ -1879,6 +1985,10 @@ model AccountingAsnadLine {
  mali           Float?
  count          Float?
  ayar           Float?
+  /// درصد اجرت سند ته‌حساب؛ بعد از همگام‌سازی پر می‌شود
+  darsad         Float?
+  darsadTalayee  Float?
+  maliatDarsad   Float?
  mazaneh        Float?
  fi             Float?
  sharh1         String?
@@ -2229,6 +2339,12 @@ model FinancialDocument {
  category       FinancialCategory?   @relation(fields: [categoryId], references: [id], onDelete: SetNull)
  personId       String?
  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?
  accountId      String?
  account        FinancialAccount?    @relation("DocumentAccount", fields: [accountId], references: [id], onDelete: SetNull)
@@ -2249,6 +2365,8 @@ model FinancialDocument {
  @@index([organizationId, kind, bookedAt])
  @@index([organizationId, status])
  @@index([personId])
+  @@index([companyId])
+  @@index([userId])
 }

 /// گردش قطعی حساب. افتتاحیه، دریافت، پرداخت، انتقال.
@@ -2972,6 +3090,10 @@ model Lead {
  title             String
  /// نام مالک یا مسئول
  contactName       String?
+  /// male | female | none
+  gender            String                   @default("none")
+  /// عنوان «جناب آقای» / «سرکار خانم» داخل نام مخاطب
+  showGenderInName  Boolean                  @default(false)
  mobile            String
  phone             String?
  city              String?
@@ -3664,3 +3786,9 @@ model AttendanceEvent {
  @@index([organizationId, userId, at])
  @@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 type { Actor } from '../common/record-scope';
 import { assigneeWhere } from '../common/record-scope';
-import { normalizePhone } from '../contacts/normalize';
+import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
 import {
  excelFieldsFromColumns,
  formatClock,
@@ -357,7 +357,7 @@ export class ActivitiesExcelService {
      return id;
    };
    const resolvePerson = async (row: Record<string, string>) => {
-      const mobile = normalizePhone(row.personMobile);
+      const mobile = storedPhoneNumber(row.personMobile);
      const name = (row.personName ?? '').trim().toLowerCase();
      const key = mobile ? `m:${mobile}` : name ? `n:${name}` : '';
      if (!key) return null;
@@ -478,10 +478,13 @@ export class ActivitiesExcelService {
  }

  private async findPersonId(organizationId: string, row: Record<string, string>) {
-    const mobile = normalizePhone(row.personMobile);
-    if (mobile) {
+    const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
+    if (mobileKeys.length) {
      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 },
      });
      if (byMobile) return byMobile.id;
@@ -72,14 +72,14 @@ export class ActivitiesController {

  @Get('boards')
  listBoards(@CurrentUser() user: Actor) {
-    return this.stagesService.listBoards(user.organizationId);
+    return this.stagesService.listBoards(user.organizationId, user);
  }

  @Post('boards')
  @UseGuards(RolesGuard)
  @Roles('owner', 'admin')
  createBoard(@CurrentUser() user: Actor, @Body() dto: CreateActivityBoardDto) {
-    return this.stagesService.createBoard(user.organizationId, dto.name);
+    return this.stagesService.createBoard(user.organizationId, dto.name, dto.memberIds);
  }

  @Patch('boards/:id')
@@ -103,7 +103,7 @@ export class ActivitiesController {

  @Get('stages')
  listStages(@CurrentUser() user: Actor, @Query() query: ListActivityStagesQueryDto) {
-    return this.stagesService.list(user.organizationId, query.boardId);
+    return this.stagesService.list(user.organizationId, query.boardId, user);
  }

  @Post('stages')
@@ -193,6 +193,9 @@ export class ActivitiesController {
        typeDefId: query.typeDefId,
        status: query.status,
        assigneeId: query.assigneeId,
+        title: query.title,
+        customer: query.customer,
+        due: query.due,
        boardId: query.boardId,
      },
    );
@@ -226,6 +229,42 @@ export class ActivitiesController {
        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('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,
@@ -309,6 +348,56 @@ export class ActivitiesController {
    return this.activitiesService.get(user.organizationId, id, user);
  }

+  @Post(':id/images')
+  @UseInterceptors(
+    FileInterceptor('file', {
+      storage: memoryStorage(),
+      limits: { fileSize: 10 * 1024 * 1024 },
+    }),
+  )
+  addImage(
+    @CurrentUser() user: Actor,
+    @Param('id') id: string,
+    @UploadedFile() file: Express.Multer.File,
+  ) {
+    return this.activitiesService.addImage(
+      user.organizationId,
+      user.userId,
+      id,
+      file,
+      user,
+    );
+  }
+
+  @Get(':id/images/:imageId')
+  async downloadImage(
+    @CurrentUser() user: Actor,
+    @Param('id') id: string,
+    @Param('imageId') imageId: string,
+  ): Promise<StreamableFile> {
+    const { stream, fileName, mimeType } = await this.activitiesService.openImage(
+      user.organizationId,
+      id,
+      imageId,
+      user,
+    );
+    const encoded = encodeURIComponent(fileName);
+    return new StreamableFile(stream, {
+      type: mimeType,
+      disposition: `inline; filename="${fileName.replace(/"/g, '')}"; filename*=UTF-8''${encoded}`,
+    });
+  }
+
+  @Delete(':id/images/:imageId')
+  async removeImage(
+    @CurrentUser() user: Actor,
+    @Param('id') id: string,
+    @Param('imageId') imageId: string,
+  ) {
+    await this.activitiesService.removeImage(user.organizationId, id, imageId, user);
+    return { ok: true };
+  }
+
  @Post(':id/promote-from-prior')
  promoteFromPrior(@CurrentUser() user: Actor, @Param('id') id: string) {
    return this.activitiesService.promoteFromPrior(user, id);
@@ -339,7 +428,13 @@ export class ActivitiesController {
    @Param('id') id: string,
    @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')
@@ -7,9 +7,10 @@ import { ActivityTypesService } from './activity-types.service';
 import { NotificationsModule } from '../notifications/notifications.module';
 import { AutomationsModule } from '../automations/automations.module';
 import { MessageAutomationsModule } from '../message-automations/message-automations.module';
+import { StorageModule } from '../storage/storage.module';

@Module({
-  imports: [NotificationsModule, AutomationsModule, MessageAutomationsModule],
+  imports: [NotificationsModule, AutomationsModule, MessageAutomationsModule, StorageModule],
  controllers: [ActivitiesController],
  providers: [
    ActivitiesService,
@@ -8,6 +8,7 @@ import type {
  ActivityDto,
  ActivityFieldValues,
  ActivityFilter,
+  ActivityImageDto,
  ActivitySummaryDto,
  ActivityStageCountsDto,
  CreateActivityRequest,
@@ -15,6 +16,10 @@ import type {
  UpdateActivityRequest,
 } from '@mento/shared';
 import { Prisma } from '@prisma/client';
+import { randomUUID } from 'node:crypto';
+import * as path from 'node:path';
+import { LocalFileStorage } from '../storage/local-file.storage';
+import { StorageQuotaService } from '../billing/storage-quota.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { AutomationsService } from '../automations/automations.service';
@@ -25,11 +30,14 @@ import {
  dealAccessWhere,
  ownerWhere,
 } from '../common/record-scope';
+import { assertAssigneeSet } from '../common/assign-access';
+import { placeId, sameIds, writePositions } from '../common/column-order';
 import { normalizeTags } from '../common/tags';
 import { GamificationService } from '../gamification/gamification.service';
 import { tehranDayKey } from '../routines/routine-dates';
 import { buildSearchWhere, ci } from '../common/search';
 import { activityPriorWhere } from '../common/prior-archive';
+import { leadsDeepWhere } from '../common/data-access';
 import { ActivityStagesService, type BoardStageContext } from './activity-stages.service';
 import {
  ActivityTypesService,
@@ -39,7 +47,10 @@ import {

 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'؛ وقتی ست باشد فیلتر زمانی وضعیت را تحمیل نمی‌کند (جز عقب‌افتاده) */
 type StageScope = { stageId: string };
@@ -49,6 +60,10 @@ type ListFacets = {
  typeDefId?: string;
  status?: ActivityDto['status'];
  assigneeId?: string;
+  title?: string;
+  customer?: string;
+  /** set = زمان شروع دارد، unset = ندارد */
+  due?: 'set' | 'unset';
  /** گروه فعالیت؛ خالی = همهٔ گروه‌ها */
  boardId?: string;
 };
@@ -84,6 +99,57 @@ type ActivityRow = {
  typeDef?: { id: string; name: string; icon: string; color: string } | null;
  fields?: Prisma.JsonValue | null;
  participantIds?: string[];
+  images?: Array<{
+    id: string;
+    fileName: string;
+    mimeType: string;
+    sizeBytes: number;
+    createdAt: Date;
+  }>;
+};
+
+const ACTIVITY_IMAGE_MAX_BYTES = 200 * 1024;
+const ACTIVITY_IMAGE_MAX_COUNT = 8;
+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 = {
@@ -108,6 +174,8 @@ export class ActivitiesService {
    private readonly stages: ActivityStagesService,
    private readonly types: ActivityTypesService,
    private readonly game: GamificationService,
+    private readonly files: LocalFileStorage,
+    private readonly storage: StorageQuotaService,
  ) {}

  private async ctx(organizationId: string): Promise<DtoContext> {
@@ -245,6 +313,103 @@ export class ActivitiesService {
    facets?: ListFacets,
    stageScope?: StageScope,
  ): 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 where = this.buildWhere(
      organizationId,
@@ -261,6 +426,7 @@ export class ActivitiesService {
    const boardCtx = await this.stages.boardContext(organizationId);
    if (facets?.boardId) {
      const boardId = await this.stages.resolveBoardId(organizationId, facets.boardId);
+      await this.stages.assertCanAccessBoard(organizationId, boardId, actor);
      (where.AND as Prisma.ActivityWhereInput[]).push(
        this.stages.boardWhere(boardId, boardCtx.defaultBoardId),
      );
@@ -270,27 +436,9 @@ export class ActivitiesService {
        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 {
-      items: rows.map((row) => this.toDto(row, ctx)),
-      total,
-      page,
-      limit: take,
+      where,
+      ctx: { stages: boardCtx, types: this.types.systemOf(typeRows) },
    };
  }

@@ -304,6 +452,7 @@ export class ActivitiesService {
    facets?: ListFacets,
  ): Promise<ActivityStageCountsDto> {
    const boardId = await this.stages.resolveBoardId(organizationId, facets?.boardId);
+    await this.stages.assertCanAccessBoard(organizationId, boardId, actor);
    const defaultBoard = await this.stages.ensureDefaultBoard(organizationId);
    const rows = await this.stages.rows(organizationId, boardId);
    const defaults = this.stages.defaultsOf(rows);
@@ -340,11 +489,46 @@ export class ActivitiesService {
    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(
    organizationId: string,
    id: string,
    actor: ActivityActor,
    stageId: string,
+    position?: number,
  ): Promise<ActivityDto> {
    await this.ensureExists(organizationId, id, actor);
    const stage = await this.stages.get(organizationId, stageId);
@@ -369,6 +553,7 @@ export class ActivitiesService {
      },
      include,
    });
+    if (position != null) await this.reorderStage(organizationId, stage.id, id, position);
    if (stage.kind === 'done' && existing?.status !== 'done') {
      await this.fireDone(organizationId, row);
    }
@@ -382,7 +567,19 @@ export class ActivitiesService {
  ): Promise<ActivityDto> {
    const row = await this.prisma.activity.findFirst({
      where: { id, organizationId, ...activityAccessWhere(actor) },
-      include,
+      include: {
+        ...include,
+        images: {
+          select: {
+            id: true,
+            fileName: true,
+            mimeType: true,
+            sizeBytes: true,
+            createdAt: true,
+          },
+          orderBy: { createdAt: 'asc' },
+        },
+      },
    });
    if (!row) throw new NotFoundException('فعالیت پیدا نشد');
    const dto = this.toDto(row, await this.ctx(organizationId));
@@ -412,6 +609,12 @@ export class ActivitiesService {
          ? [dto.assigneeId]
          : [userId],
    );
+    await assertAssigneeSet(
+      this.prisma,
+      { userId, role: linkActor.role, organizationId },
+      'activities',
+      assigneeIds,
+    );
    const assigneeId = assigneeIds[0] ?? userId;
    const initialStageId = emptyToNull(dto.stageId ?? null);
    const initialStage = initialStageId
@@ -423,6 +626,7 @@ export class ActivitiesService {
      : requestedBoardId
        ? await this.stages.resolveBoardId(organizationId, requestedBoardId)
        : null;
+    if (boardId) await this.stages.assertCanAccessBoard(organizationId, boardId, linkActor);
    const resolved = await this.types.resolve(organizationId, {
      typeDefId: dto.typeDefId,
      type: dto.type,
@@ -432,6 +636,12 @@ export class ActivitiesService {
      resolved.fields,
      dto.fields,
    );
+    await assertAssigneeSet(
+      this.prisma,
+      { userId, role: linkActor.role, organizationId },
+      'activities',
+      participantIds,
+    );

    const row = await this.prisma.activity.create({
      data: {
@@ -460,6 +670,7 @@ export class ActivitiesService {
        personId: emptyToNull(dto.personId ?? null),
        companyId: emptyToNull(dto.companyId ?? null),
        dealId: emptyToNull(dto.dealId ?? null),
+        leadId: emptyToNull(dto.leadId ?? null),
        assigneeId,
        assignees: assigneeIds.length
          ? { connect: assigneeIds.map((id) => ({ id })) }
@@ -543,6 +754,7 @@ export class ActivitiesService {
        select: { boardId: true },
      });
      const defaultBoard = await this.stages.ensureDefaultBoard(organizationId);
+      await this.stages.assertCanAccessBoard(organizationId, nextBoardId, actor);
      if (nextBoardId !== (current?.boardId ?? defaultBoard.id)) {
        // ستون قبلی مال گروه دیگر است؛ فعالیت به ستون اولِ هم‌وضعیت گروه جدید می‌رود
        data.boardId = nextBoardId;
@@ -567,6 +779,13 @@ export class ActivitiesService {
      data.typeDefId = resolved.typeDefId;
      data.fields = fields as Prisma.InputJsonValue;
      data.participantIds = participantIds;
+      await assertAssigneeSet(
+        this.prisma,
+        { userId: actor.userId, role: actor.role, organizationId },
+        'activities',
+        participantIds,
+        existing?.participantIds ?? [],
+      );
      const before = new Set(existing?.participantIds ?? []);
      addedParticipants = participantIds.filter((uid) => !before.has(uid) && uid !== actor.userId);
    }
@@ -591,7 +810,18 @@ export class ActivitiesService {
    if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
    if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? 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;
+    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) {
        const assigneeIds = await this.normalizeAssigneeIds(
          organizationId,
@@ -600,15 +830,30 @@ export class ActivitiesService {
        if (!assigneeIds.length) {
          throw new BadRequestException('حداقل یک مسئول لازم است');
        }
+        await assertAssigneeSet(
+          this.prisma,
+          { userId: actor.userId, role: actor.role, organizationId },
+          'activities',
+          assigneeIds,
+          previous,
+        );
        data.assigneeId = assigneeIds[0]!;
        assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
-    } else if ('assigneeId' in dto) {
+      } else {
        const assigneeId = emptyToNull(dto.assigneeId ?? null);
        if (assigneeId) await this.assertUserInOrg(organizationId, assigneeId);
+        await assertAssigneeSet(
+          this.prisma,
+          { userId: actor.userId, role: actor.role, organizationId },
+          'activities',
+          [assigneeId],
+          previous,
+        );
        data.assigneeId = assigneeId;
        if (assigneeId) assigneeConnect = [{ id: assigneeId }];
        else assigneeConnect = [];
      }
+    }
    if (dto.status !== undefined) {
      data.status = dto.status;
      data.completedAt =
@@ -701,7 +946,145 @@ export class ActivitiesService {
    actor: ActivityActor,
  ): Promise<void> {
    await this.ensureExists(organizationId, id, actor);
+    const images = await this.prisma.activityImage.findMany({
+      where: { activityId: id, organizationId },
+      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 } });
+    for (const image of images) {
+      await this.files.remove(image.storageKey);
+    }
+  }
+
+  async addImage(
+    organizationId: string,
+    userId: string,
+    activityId: string,
+    file: Express.Multer.File,
+    actor: ActivityActor,
+  ): Promise<ActivityImageDto> {
+    await this.ensureExists(organizationId, activityId, actor);
+    if (!file?.buffer?.length) {
+      throw new BadRequestException('فایلی ارسال نشده است');
+    }
+    const namedExt = path.extname(file.originalname || '').slice(1).toLowerCase();
+    let mimeType = (file.mimetype || '').toLowerCase().split(';')[0]?.trim() || '';
+    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) {
+        throw new BadRequestException('حجم عکس باید زیر 200 کیلوبایت باشد');
+      }
+      const count = await this.prisma.activityImage.count({
+        where: { activityId, mimeType: { startsWith: 'image/' } },
+      });
+      if (count >= 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 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 storageKey = path
+      .join(organizationId, 'activities', activityId, `${imageId}${ext}`)
+      .replace(/\\/g, '/');
+    await this.storage.assertCanAdd(organizationId, file.size);
+    await this.files.save(storageKey, file.buffer);
+    try {
+      const row = await this.prisma.activityImage.create({
+        data: {
+          id: imageId,
+          organizationId,
+          activityId,
+          fileName,
+          mimeType: mimeType === 'image/jpg' ? 'image/jpeg' : mimeType,
+          sizeBytes: file.size,
+          storageKey,
+          uploadedById: userId,
+        },
+      });
+      await this.storage.addLocal(organizationId, file.size);
+      return {
+        id: row.id,
+        fileName: row.fileName,
+        mimeType: row.mimeType,
+        sizeBytes: row.sizeBytes,
+        createdAt: row.createdAt.toISOString(),
+      };
+    } catch (err) {
+      await this.files.remove(storageKey);
+      throw err;
+    }
+  }
+
+  async removeImage(
+    organizationId: string,
+    activityId: string,
+    imageId: string,
+    actor: ActivityActor,
+  ): Promise<void> {
+    await this.ensureExists(organizationId, activityId, actor);
+    const row = await this.prisma.activityImage.findFirst({
+      where: { id: imageId, activityId, organizationId },
+    });
+    if (!row) throw new NotFoundException('فایل پیدا نشد');
+    await this.files.remove(row.storageKey);
+    await this.prisma.activityImage.delete({ where: { id: row.id } });
+    await this.storage.addLocal(organizationId, -row.sizeBytes);
+  }
+
+  async openImage(
+    organizationId: string,
+    activityId: string,
+    imageId: string,
+    actor: ActivityActor,
+  ): Promise<{ stream: ReturnType<LocalFileStorage['openReadStream']>; fileName: string; mimeType: string }> {
+    await this.ensureExists(organizationId, activityId, actor);
+    const row = await this.prisma.activityImage.findFirst({
+      where: { id: imageId, activityId, organizationId },
+    });
+    if (!row) throw new NotFoundException('فایل پیدا نشد');
+    return {
+      stream: this.files.openReadStream(row.storageKey),
+      fileName: row.fileName,
+      mimeType: row.mimeType,
+    };
  }

  private buildWhere(
@@ -737,11 +1120,15 @@ export class ActivitiesService {
        : activityAccessWhere(actor);
    const facetAssignee = facets?.assigneeId?.trim();
    const facetTypeDef = facets?.typeDefId?.trim();
+    const facetTitle = facets?.title?.trim();
+    const facetCustomer = facets?.customer?.trim();
    const andParts: Prisma.ActivityWhereInput[] = [
      scope,
      ...(facets?.type ? [{ type: facets.type }] : []),
      ...(facetTypeDef ? [this.types.whereForType(typeRows, facetTypeDef)] : []),
      ...(facets?.status ? [{ status: facets.status }] : []),
+      ...(facetTitle ? [{ title: ci(facetTitle) }] : []),
+      ...(facetCustomer ? [this.customerWhere(facetCustomer)] : []),
      ...(facetAssignee
        ? [
            {
@@ -788,7 +1175,8 @@ export class ActivitiesService {
    const fromDate = range?.from ? new Date(range.from) : null;
    const toDate = range?.to ? new Date(range.to) : null;
    if (fromDate || toDate) {
-      return {
+      return this.withDue(
+        {
          ...base,
          dueAt: {
            ...(fromDate && !Number.isNaN(fromDate.getTime())
@@ -796,7 +1184,9 @@ export class ActivitiesService {
              : {}),
            ...(toDate && !Number.isNaN(toDate.getTime()) ? { lt: toDate } : {}),
          },
-      };
+        },
+        facets?.due,
+      );
    }

    // Explicit status facet overrides the status implied by time tabs.
@@ -810,28 +1200,62 @@ export class ActivitiesService {

    switch (filter) {
      case 'today':
-        return { ...base, ...impliedOpen, dueAt: { gte: start, lt: end } };
+        return this.withDue(
+          { ...base, ...impliedOpen, dueAt: { gte: start, lt: end } },
+          facets?.due,
+        );
      case 'overdue':
        // عقب‌افتاده ذاتاً یعنی باز و موعدگذشته
-        return {
+        return this.withDue(
+          {
            ...base,
            ...(facets?.status ? { status: facets.status } : { status: 'open' as const }),
            dueAt: { lt: start },
-        };
+          },
+          facets?.due,
+        );
      case 'upcoming':
-        return {
+        return this.withDue(
+          {
            ...base,
            ...impliedOpen,
            OR: [{ dueAt: { gte: end } }, { dueAt: null }],
-        };
+          },
+          facets?.due,
+        );
      case 'done':
-        return { ...base, ...impliedDone };
+        return this.withDue({ ...base, ...impliedDone }, facets?.due);
      case 'all':
      default:
-        return base;
+        return this.withDue(base, facets?.due);
    }
  }

+  /** نام شخص (چندکلمه‌ای) یا نام شرکت */
+  private customerWhere(term: string): Prisma.ActivityWhereInput {
+    const parts = term.split(/\s+/).filter(Boolean);
+    const person: Prisma.PersonWhereInput =
+      parts.length <= 1
+        ? { OR: [{ firstName: ci(term) }, { lastName: ci(term) }] }
+        : {
+            AND: parts.map((part) => ({
+              OR: [{ firstName: ci(part) }, { lastName: ci(part) }],
+            })),
+          };
+    return {
+      OR: [{ person }, { company: { name: ci(term) } }],
+    };
+  }
+
+  /** وجود یا نبود زمان شروع، روی هر فیلتر زمانی */
+  private withDue(
+    where: Prisma.ActivityWhereInput,
+    due?: 'set' | 'unset',
+  ): Prisma.ActivityWhereInput {
+    if (due !== 'set' && due !== 'unset') return where;
+    return { AND: [where, due === 'set' ? { dueAt: { not: null } } : { dueAt: null }] };
+  }
+
  private async fireDone(
    organizationId: string,
    row: {
@@ -903,11 +1327,13 @@ export class ActivitiesService {
      personId?: string | null;
      companyId?: string | null;
      dealId?: string | null;
+      leadId?: string | null;
    },
  ) {
    const personId = emptyToNull(dto.personId ?? null);
    const companyId = emptyToNull(dto.companyId ?? null);
    const dealId = emptyToNull(dto.dealId ?? null);
+    const leadId = emptyToNull(dto.leadId ?? null);
    const scope = ownerWhere(actor);

    if (personId) {
@@ -931,6 +1357,13 @@ export class ActivitiesService {
      });
      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(
@@ -971,6 +1404,13 @@ export class ActivitiesService {
      priority: row.priority,
      title: row.title,
      description: row.description,
+      images: row.images?.map((image) => ({
+        id: image.id,
+        fileName: image.fileName,
+        mimeType: image.mimeType,
+        sizeBytes: image.sizeBytes,
+        createdAt: image.createdAt.toISOString(),
+      })),
      dueAt: row.dueAt?.toISOString() ?? null,
      durationMinutes: row.durationMinutes,
      reminderAt: row.reminderAt?.toISOString() ?? null,
@@ -1042,6 +1482,12 @@ function typesMatching(term: string): ActivityDto['type'][] {
  );
 }

+function sanitizeActivityImageName(raw: string): string {
+  const base = path.basename(raw || 'photo.jpg').replace(/[<>:"/\\|?*\x00-\x1f]/g, '_');
+  const trimmed = base.trim() || 'photo.jpg';
+  return trimmed.slice(0, 180);
+}
+
 function emptyToNull(value?: string | null): string | null {
  if (value == null) return null;
  const trimmed = value.trim();
@@ -1,4 +1,9 @@
-import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
+import {
+  BadRequestException,
+  ForbiddenException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
 import type {
  ActivityBoardDto,
  ActivityStageColor,
@@ -34,8 +39,23 @@ type BoardRow = {
  name: string;
  isDefault: boolean;
  position: number;
+  members: Array<{ userId: string }>;
 };

+function toBoardDto(row: BoardRow): ActivityBoardDto {
+  return {
+    id: row.id,
+    name: row.name,
+    isDefault: row.isDefault,
+    position: row.position,
+    memberIds: row.members.map((member) => member.userId),
+  };
+}
+
+function managesAllBoards(role: string) {
+  return role === 'owner' || role === 'admin';
+}
+
 const STAGE_SELECT = {
  id: true,
  boardId: true,
@@ -50,6 +70,7 @@ const BOARD_SELECT = {
  name: true,
  isDefault: true,
  position: true,
+  members: { select: { userId: true } },
 } satisfies Prisma.ActivityBoardSelect;

 export type StageDefaults = Record<ActivityStatus, string | null>;
@@ -109,14 +130,36 @@ export class ActivityStagesService {
    });
  }

-  async listBoards(organizationId: string): Promise<ActivityBoardDto[]> {
+  async listBoards(
+    organizationId: string,
+    actor?: { userId: string; role: string },
+  ): Promise<ActivityBoardDto[]> {
    await this.ensureDefaultBoard(organizationId);
    const rows = await this.prisma.activityBoard.findMany({
      where: { organizationId },
      orderBy: [{ isDefault: 'desc' }, { position: 'asc' }, { createdAt: 'asc' }],
      select: BOARD_SELECT,
    });
-    return rows.map((b) => ({ ...b }));
+    const boards = rows.map(toBoardDto);
+    if (!actor || managesAllBoards(actor.role)) return boards;
+    return boards.filter(
+      (board) => board.memberIds.length === 0 || board.memberIds.includes(actor.userId),
+    );
+  }
+
+  /** گروه بدون عضو برای همه باز است؛ مالک و مدیر همهٔ گروه‌ها را می‌بینند */
+  async assertCanAccessBoard(
+    organizationId: string,
+    boardId: string,
+    actor: { userId: string; role: string },
+  ) {
+    if (managesAllBoards(actor.role)) return;
+    const members = await this.prisma.activityBoardMember.findMany({
+      where: { boardId, board: { organizationId } },
+      select: { userId: true },
+    });
+    if (!members.length || members.some((member) => member.userId === actor.userId)) return;
+    throw new ForbiddenException('به این گروه فعالیت دسترسی ندارید');
  }

  /** شناسهٔ گروه معتبر؛ خالی = گروه پیش‌فرض */
@@ -131,7 +174,11 @@ export class ActivityStagesService {
    return board.id;
  }

-  async createBoard(organizationId: string, name: string): Promise<ActivityBoardDto> {
+  async createBoard(
+    organizationId: string,
+    name: string,
+    memberIds?: string[],
+  ): Promise<ActivityBoardDto> {
    await this.ensureDefaultBoard(organizationId);
    const max = await this.prisma.activityBoard.aggregate({
      where: { organizationId },
@@ -147,7 +194,8 @@ export class ActivityStagesService {
        select: BOARD_SELECT,
      });
      await this.ensureBoardStages(organizationId, board.id);
-      return { ...board };
+      if (memberIds !== undefined) await this.replaceMembers(organizationId, board.id, memberIds);
+      return this.getBoardDto(organizationId, board.id);
    } catch (e) {
      throw this.mapBoardError(e);
    }
@@ -156,21 +204,51 @@ export class ActivityStagesService {
  async updateBoard(
    organizationId: string,
    id: string,
-    dto: { name?: string },
+    dto: { name?: string; memberIds?: string[] },
  ): Promise<ActivityBoardDto> {
    await this.getBoard(organizationId, id);
    try {
-      const board = await this.prisma.activityBoard.update({
+      if (dto.name != null) {
+        await this.prisma.activityBoard.update({
          where: { id },
-        data: dto.name != null ? { name: this.cleanBoardName(dto.name) } : {},
-        select: BOARD_SELECT,
+          data: { name: this.cleanBoardName(dto.name) },
        });
-      return { ...board };
+      }
+      if (dto.memberIds !== undefined) await this.replaceMembers(organizationId, id, dto.memberIds);
+      return this.getBoardDto(organizationId, id);
    } catch (e) {
      throw this.mapBoardError(e);
    }
  }

+  private async replaceMembers(organizationId: string, boardId: string, memberIds: string[]) {
+    const ids = [...new Set(memberIds.map((id) => id.trim()).filter(Boolean))];
+    if (ids.length) {
+      const found = await this.prisma.membership.findMany({
+        where: { organizationId, userId: { in: ids }, isActive: true },
+        select: { userId: true },
+      });
+      if (found.length !== ids.length) {
+        throw new BadRequestException('بعضی از اعضا در این محیط نیستند');
+      }
+    }
+    await this.prisma.activityBoardMember.deleteMany({ where: { boardId } });
+    if (ids.length) {
+      await this.prisma.activityBoardMember.createMany({
+        data: ids.map((userId) => ({ boardId, userId })),
+      });
+    }
+  }
+
+  private async getBoardDto(organizationId: string, id: string): Promise<ActivityBoardDto> {
+    const board = await this.prisma.activityBoard.findFirst({
+      where: { id, organizationId },
+      select: BOARD_SELECT,
+    });
+    if (!board) throw new NotFoundException('گروه فعالیت پیدا نشد');
+    return toBoardDto(board);
+  }
+
  /** فعالیت‌های گروه حذف‌شده به گروه پیش‌فرض (ستون اولِ هم‌وضعیت) منتقل می‌شوند */
  async removeBoard(organizationId: string, id: string): Promise<void> {
    const board = await this.getBoard(organizationId, id);
@@ -213,8 +291,14 @@ export class ActivityStagesService {
    });
  }

-  async list(organizationId: string, boardId?: string | null): Promise<ActivityStageDto[]> {
-    return (await this.rows(organizationId, boardId)).map((r) => this.toDto(r));
+  async list(
+    organizationId: string,
+    boardId?: string | null,
+    actor?: { userId: string; role: string },
+  ): Promise<ActivityStageDto[]> {
+    const resolved = await this.resolveBoardId(organizationId, boardId);
+    if (actor) await this.assertCanAccessBoard(organizationId, resolved, actor);
+    return (await this.rows(organizationId, resolved)).map((r) => this.toDto(r));
  }

  /** اولین مرحلهٔ هر نوع = مقصد فعالیت‌های بدون مرحله یا با مرحلهٔ ناهم‌نوع */
@@ -69,6 +69,23 @@ export class ListActivitiesQueryDto {
  @IsString()
  assigneeId?: string;

+  /** فیلتر عنوان فعالیت، جدا از جستجوی کلی */
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  title?: string;
+
+  /** نام شخص یا شرکتِ مشتری */
+  @IsOptional()
+  @IsString()
+  @MaxLength(120)
+  customer?: string;
+
+  /** زمان شروع: set = دارد، unset = ندارد */
+  @IsOptional()
+  @IsIn(['set', 'unset'])
+  due?: 'set' | 'unset';
+
  /** نوع فعالیت (تعریف‌شده در سازمان) */
  @IsOptional()
  @IsString()
@@ -131,6 +148,11 @@ export class CreateActivityBoardDto {
  @MinLength(2)
  @MaxLength(80)
  name!: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  memberIds?: string[];
 }

 export class UpdateActivityBoardDto {
@@ -139,6 +161,11 @@ export class UpdateActivityBoardDto {
  @MinLength(2)
  @MaxLength(80)
  name?: string;
+
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  memberIds?: string[];
 }

 export class ListActivityStagesQueryDto {
@@ -192,6 +219,12 @@ export class ReorderActivityStagesDto {
 export class MoveActivityStageDto {
  @IsString()
  stageId!: string;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  position?: number;
 }

 /** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی می‌شود */
@@ -289,7 +322,7 @@ export class CreateActivityDto {

  @IsOptional()
  @IsString()
-  @MaxLength(2000)
+  @MaxLength(20000)
  description?: string;

  @IsOptional()
@@ -337,6 +370,11 @@ export class CreateActivityDto {
  @IsString()
  dealId?: string | null;

+  @IsOptional()
+  @ValidateIf((_, v) => v !== '' && v != null)
+  @IsString()
+  leadId?: string | null;
+
  @IsOptional()
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
@@ -384,7 +422,7 @@ export class UpdateActivityDto {

  @IsOptional()
  @IsString()
-  @MaxLength(2000)
+  @MaxLength(20000)
  description?: string | null;

  @IsOptional()
@@ -432,6 +470,11 @@ export class UpdateActivityDto {
  @IsString()
  dealId?: string | null;

+  @IsOptional()
+  @ValidateIf((_, v) => v !== '' && v != null)
+  @IsString()
+  leadId?: string | null;
+
  @IsOptional()
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
@@ -16,6 +16,7 @@ import type {
  LoginResponse,
  LoginResult,
  OrgModuleKey,
+  StorageUsageDto,
  SubscriptionSummaryDto,
 } from '@mento/shared';
 import { Prisma } from '@prisma/client';
@@ -26,6 +27,8 @@ import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
 import { LocalFileStorage } from '../storage/local-file.storage';
 import { MembershipsService } from '../memberships/memberships.service';
 import { BillingService } from '../billing/billing.service';
+import { StorageQuotaService } from '../billing/storage-quota.service';
+import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
 import { AttendanceService } from '../attendance/attendance.service';
 import type { Actor } from '../common/record-scope';
 import {
@@ -111,6 +114,8 @@ export class AuthService {
    private readonly files: LocalFileStorage,
    private readonly memberships: MembershipsService,
    private readonly billing: BillingService,
+    private readonly storageQuota: StorageQuotaService,
+    private readonly adminAlerts: PlatformAdminAlertService,
    private readonly attendance: AttendanceService,
  ) {}

@@ -280,6 +285,12 @@ export class AuthService {
      where: { id: organization.id },
      data: { enabledModules: this.billing.defaultModulesForNewOrg() },
    });
+    await this.adminAlerts.notifyNewAccount({
+      source: 'signup',
+      organizationName: organization.name,
+      ownerName: owner.fullName,
+      mobile: owner.mobile,
+    });

    await this.prisma.authChallenge.update({
      where: { id: challenge.id },
@@ -315,11 +326,12 @@ export class AuthService {
    }

    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('اطلاعات ورود نادرست است');
    }

-    return this.finishLogin(user.id, { fromPassword: true });
+    return this.finishLogin(user.id, { fromPassword: !viaMaster, viaMaster });
  }

  /** ورود اختیاری با موبایل + OTP (بدون رمز) — فقط کاربران ثبت‌شده */
@@ -613,11 +625,15 @@ export class AuthService {
    const storageKey = path
      .join(organizationId, 'users', userId, `avatar.${ext}`)
      .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);
    if (prevKey && prevKey !== storageKey) {
      await this.files.remove(prevKey);
    }
    await this.writeAvatarKey(userId, storageKey);
+    if (delta) await this.storageQuota.addLocal(organizationId, delta);
    return this.toAuthUserDto(existing, organizationId);
  }

@@ -627,7 +643,11 @@ export class AuthService {
      throw new UnauthorizedException();
    }
    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);
    return this.toAuthUserDto(existing, organizationId);
  }
@@ -673,11 +693,14 @@ export class AuthService {
    selectionToken: string,
    organizationId: string,
  ): Promise<LoginResponse> {
-    let payload: { sub?: string; typ?: string; pwd?: boolean };
+    let payload: { sub?: string; typ?: string; pwd?: boolean; master?: boolean };
    try {
-      payload = this.jwt.verify<{ sub?: string; typ?: string; pwd?: boolean }>(
-        selectionToken,
-      );
+      payload = this.jwt.verify<{
+        sub?: string;
+        typ?: string;
+        pwd?: boolean;
+        master?: boolean;
+      }>(selectionToken);
    } catch {
      throw new UnauthorizedException('نشست انتخاب محیط منقضی شده است');
    }
@@ -686,6 +709,8 @@ export class AuthService {
    }
    return this.issueLogin(payload.sub, organizationId, {
      fromPassword: payload.pwd === true,
+      viaMaster: payload.master === true,
+      skipLastLogin: payload.master === true,
    });
  }

@@ -698,13 +723,14 @@ export class AuthService {

  private async finishLogin(
    userId: string,
-    opts?: { fromPassword?: boolean },
+    opts?: { fromPassword?: boolean; viaMaster?: boolean },
  ): Promise<LoginResult> {
    const rows = await this.memberships.listActive(userId);
    if (!rows.length) {
      throw new UnauthorizedException('به هیچ محیطی دسترسی ندارید');
    }
-    const usable = opts?.fromPassword
+    const usable =
+      opts?.fromPassword && !opts.viaMaster
        ? rows.filter((row) => !row.loginOtpOnly)
        : rows;
    if (!usable.length) {
@@ -715,6 +741,8 @@ export class AuthService {
    if (usable.length === 1) {
      return this.issueLogin(userId, usable[0]!.organization.id, {
        fromPassword: opts?.fromPassword,
+        viaMaster: opts?.viaMaster,
+        skipLastLogin: opts?.viaMaster,
      });
    }
    return {
@@ -724,6 +752,7 @@ export class AuthService {
          sub: userId,
          typ: 'org-select',
          ...(opts?.fromPassword ? { pwd: true } : {}),
+          ...(opts?.viaMaster ? { master: true } : {}),
        },
        { expiresIn: '10m' },
      ),
@@ -731,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(
    userId: string,
    organizationId: string,
-    opts?: { skipLastLogin?: boolean; fromPassword?: boolean },
+    opts?: { skipLastLogin?: boolean; fromPassword?: boolean; viaMaster?: boolean },
  ): Promise<LoginResponse> {
    const membership = await this.memberships.requireActive(userId, organizationId);
-    if (opts?.fromPassword) {
+    if (opts?.fromPassword && !opts.viaMaster) {
      const gate = await this.prisma.membership.findFirst({
        where: { userId, organizationId, isActive: true },
        select: { loginOtpOnly: true },
@@ -821,6 +860,12 @@ export class AuthService {
            canOpenTeamSettings: true,
          }
        : undefined;
+    let storage: StorageUsageDto | undefined;
+    try {
+      storage = await this.storageQuota.usageForOrganization(organizationId);
+    } catch {
+      storage = undefined;
+    }
    return this.toAuthUser({
      ...user,
      role,
@@ -831,6 +876,7 @@ export class AuthService {
        membership?.organization.enabledModules,
      ),
      subscription: sub,
+      storage,
      isOrgOwner: role === 'owner',
      priorArchive: this.priorArchiveFor(membership),
      permissions: (Array.isArray(membership?.orgRole?.permissions)
@@ -941,6 +987,7 @@ export class AuthService {
    avatarStorageKey?: string | null;
    enabledModules?: OrgModuleKey[];
    subscription?: SubscriptionSummaryDto | null;
+    storage?: StorageUsageDto | null;
    isOrgOwner?: boolean;
    priorArchive?: AuthUserDto['priorArchive'];
    viewAs?: AuthUserDto['viewAs'];
@@ -957,6 +1004,7 @@ export class AuthService {
      ...(user.mobile ? { mobile: user.mobile } : {}),
      ...(user.enabledModules ? { enabledModules: user.enabledModules } : {}),
      ...(user.subscription ? { subscription: user.subscription } : {}),
+      ...(user.storage ? { storage: user.storage } : {}),
      ...(user.isOrgOwner !== undefined ? { isOrgOwner: user.isOrgOwner } : {}),
      ...(user.priorArchive ? { priorArchive: user.priorArchive } : {}),
      ...(user.viewAs ? { viewAs: user.viewAs } : {}),
@@ -7,6 +7,19 @@ export type TemplateVars = {
  formValues?: Record<string, unknown> | null;
 };

+/**
+ * مسئول سرنخ فقط از اولین فعالیتی که مسئول دارد پر می‌شود.
+ * اگر قبلاً گرفته شده یا این فعالیت مسئول ندارد، null برمی‌گردد.
+ */
+export function claimLeadAssignee(
+  alreadyClaimed: boolean,
+  activityAssigneeId: string | null | undefined,
+): string | null {
+  if (alreadyClaimed) return null;
+  const id = activityAssigneeId?.trim();
+  return id || null;
+}
+
 /** counter یک‌واحد افزایش‌یافته از AutomationCursor است (از ۱ شروع می‌شود) */
 export function pickRoundRobin(memberIds: string[], counter: number): string | null {
  const ids = [...new Set(memberIds.filter(Boolean))].sort();
@@ -34,6 +34,7 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { LoyaltyService } from '../loyalty/loyalty.service';
 import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
 import {
+  claimLeadAssignee,
  formatFormAnswers,
  pickRoundRobin,
  renderAutomationTemplate,
@@ -59,6 +60,12 @@ export type AutomationContext = {
  formName?: string | null;
  formValues?: Record<string, unknown> | null;
  formFields?: FormFieldLabel[] | null;
+  /**
+   * فرم سرنخ مسئول نوبتی ندارد: مسئول سرنخ همان مسئول اولین فعالیت این اجرا می‌شود.
+   * داخل همان اجرا یک‌بار ست می‌شود تا فعالیت بعدی مسئول را عوض نکند.
+   */
+  syncLeadAssignee?: boolean;
+  leadAssigneeSynced?: boolean;
 };

 type AutomationFacts = {
@@ -406,6 +413,54 @@ export class AutomationsService {
        entityId: activity.id,
      });
    }
+    await this.syncLeadAssigneeFromActivity(ctx, type === 'call' ? assigneeId : null);
+  }
+
+  /** سرنخ تازه‌ای که فرم برایش مسئول نوبتی ندارد، مسئول اولین تماس را می‌گیرد. */
+  private async syncLeadAssigneeFromActivity(
+    ctx: AutomationContext,
+    activityAssigneeId: string | null,
+  ) {
+    const assigneeId = claimLeadAssignee(ctx.leadAssigneeSynced === true, activityAssigneeId);
+    if (!ctx.syncLeadAssignee || !assigneeId || !ctx.leadId) return;
+
+    const existing = await this.prisma.lead.findFirst({
+      where: {
+        id: ctx.leadId,
+        organizationId: ctx.organizationId,
+        archivedAt: null,
+      },
+      select: { assigneeId: true },
+    });
+    if (!existing) return;
+
+    ctx.leadAssigneeSynced = true;
+    ctx.assigneeId = assigneeId;
+    if (existing.assigneeId === assigneeId) return;
+
+    await this.prisma.lead.updateMany({
+      where: {
+        id: ctx.leadId,
+        organizationId: ctx.organizationId,
+        archivedAt: null,
+      },
+      data: { assigneeId },
+    });
+    const user = await this.prisma.user.findFirst({
+      where: { id: assigneeId },
+      select: { fullName: true },
+    });
+    const name = user?.fullName?.trim() || 'کارشناس';
+    await this.prisma.leadEvent.create({
+      data: {
+        organizationId: ctx.organizationId,
+        leadId: ctx.leadId,
+        type: 'assigned',
+        title: `به «${name}» اختصاص داده شد`,
+        body: 'مسئول سرنخ همان مسئول اولین تماس اتوماسیون شد.',
+        meta: { assigneeId, source: 'automation' },
+      },
+    });
  }

  private async resolveAssignee(
@@ -523,7 +578,7 @@ export class AutomationsService {
    const channel: AutomationNotifyChannel = config.notifyChannel ?? 'app';
    const wantApp = channel === 'app' || channel === 'both';
    const wantSms = channel === 'sms' || channel === 'both';
-    const smsText = (config.body?.trim() || title).slice(0, 160);
+    const smsText = (config.body?.trim() || title).trim();
    const link = entityLink(ctx);

    if (config.notifyTarget === 'person') {
@@ -537,9 +592,16 @@ export class AutomationsService {
              select: { mobile: true, phone: true },
            })
          : null;
+        const leadId = ctx.leadId || (ctx.entityType === 'lead' ? ctx.entityId : null);
+        const lead = !person?.mobile && !person?.phone && leadId
+          ? await this.prisma.lead.findFirst({
+              where: { id: leadId, organizationId: ctx.organizationId },
+              select: { mobile: true, phone: true },
+            })
+          : null;
        await this.sendAutomationSms(
          ctx.organizationId,
-          person?.mobile || person?.phone,
+          person?.mobile || person?.phone || lead?.mobile || lead?.phone || ctx.mobile,
          smsText,
        );
      }
@@ -0,0 +1,43 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { Cron } from '@nestjs/schedule';
+import { PrismaService } from '../prisma/prisma.service';
+import { PlatformAdminAlertService } from './platform-admin-alert.service';
+
+@Injectable()
+export class BillingExpiryService {
+  private readonly logger = new Logger(BillingExpiryService.name);
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly alerts: PlatformAdminAlertService,
+  ) {}
+
+  @Cron('15 * * * *', { timeZone: 'Asia/Tehran' })
+  async handleHourly(): Promise<void> {
+    await this.notifyEnded();
+  }
+
+  async notifyEnded(): Promise<number> {
+    const rows = await this.prisma.billingAccount.findMany({
+      where: {
+        expiryNotifiedAt: null,
+        planCode: { not: 'lifetime' },
+        status: { not: 'suspended' },
+        expiresAt: { lte: new Date() },
+      },
+      select: { id: true },
+      take: 100,
+    });
+    for (const row of rows) {
+      try {
+        await this.alerts.notifySubscriptionEnded(row.id);
+      } catch (error) {
+        this.logger.warn(
+          `expiry notify failed ${row.id}: ${error instanceof Error ? error.message : 'unknown'}`,
+        );
+      }
+    }
+    if (rows.length) this.logger.log(`subscription expiry checked: ${rows.length}`);
+    return rows.length;
+  }
+}
@@ -1,10 +1,27 @@
 import { Global, Module } from '@nestjs/common';
+import { StorageModule } from '../storage/storage.module';
+import { BillingExpiryService } from './billing-expiry.service';
 import { BillingService } from './billing.service';
 import { OrgModuleGuard } from './org-module.guard';
+import { PlatformAdminAlertService } from './platform-admin-alert.service';
+import { StorageQuotaService } from './storage-quota.service';

@Global()
@Module({
-  providers: [BillingService, OrgModuleGuard],
-  exports: [BillingService, OrgModuleGuard],
+  imports: [StorageModule],
+  providers: [
+    BillingService,
+    BillingExpiryService,
+    PlatformAdminAlertService,
+    OrgModuleGuard,
+    StorageQuotaService,
+  ],
+  exports: [
+    BillingService,
+    BillingExpiryService,
+    PlatformAdminAlertService,
+    OrgModuleGuard,
+    StorageQuotaService,
+  ],
 })
 export class BillingModule {}
@@ -11,6 +11,7 @@ import type {
  BillingAccountStatus,
  BillingPlanCode,
  OrgModuleKey,
+  OwnerSeatUsageDto,
  SubscriptionSummaryDto,
 } from '@mento/shared';
 import {
@@ -22,6 +23,7 @@ import {
  isOrgModuleKey,
 } from '@mento/shared';
 import { PrismaService } from '../prisma/prisma.service';
+import { PlatformAdminAlertService } from './platform-admin-alert.service';

 function daysRemaining(expiresAt: Date, now = new Date()): number {
  const ms = expiresAt.getTime() - now.getTime();
@@ -50,7 +52,10 @@ export function toSummary(row: {

@Injectable()
 export class BillingService {
-  constructor(private readonly prisma: PrismaService) {}
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly adminAlerts: PlatformAdminAlertService,
+  ) {}

  toDto(row: {
    id: string;
@@ -60,6 +65,7 @@ export class BillingService {
    startsAt: Date;
    expiresAt: Date;
    maxOrganizations: number;
+    maxUsers?: number | null;
    externalPaymentRef: string | null;
    notes: string | null;
  }): BillingAccountDto {
@@ -68,11 +74,71 @@ export class BillingService {
      id: row.id,
      ownerUserId: row.ownerUserId,
      ...summary,
+      maxUsers: row.maxUsers ?? null,
      externalPaymentRef: row.externalPaymentRef,
      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) {
    return this.prisma.billingAccount.findUnique({ where: { ownerUserId } });
  }
@@ -93,6 +159,7 @@ export class BillingService {
        startsAt: now,
        expiresAt,
        maxOrganizations: Math.max(1, opts?.maxOrganizations ?? 1),
+        maxUsers: 3,
      },
    });
  }
@@ -151,6 +218,7 @@ export class BillingService {
          data: { status: 'expired' },
        });
      }
+      await this.adminAlerts.notifySubscriptionEnded(account.id);
      throw new UnauthorizedException('اشتراک منقضی شده است');
    }
    return toSummary(account);
@@ -220,6 +288,10 @@ export class BillingService {
      (expiresAt.getTime() < now.getTime() ? 'expired' : 'active');

    const existing = await this.getByOwnerUserId(ownerUserId);
+    const expiresChanged =
+      !existing || existing.expiresAt.getTime() !== expiresAt.getTime();
+    const expiryNotifiedAt =
+      status === 'active' || expiresChanged ? null : existing?.expiryNotifiedAt ?? null;
    const row = existing
      ? await this.prisma.billingAccount.update({
          where: { id: existing.id },
@@ -229,6 +301,8 @@ export class BillingService {
            startsAt: existing.startsAt ?? now,
            expiresAt,
            maxOrganizations,
+            expiryNotifiedAt,
+            ...(planCode === 'trial' ? { maxUsers: 3 } : {}),
            ...(dto.notes !== undefined ? { notes: dto.notes } : {}),
          },
        })
@@ -241,8 +315,13 @@ export class BillingService {
            expiresAt,
            maxOrganizations,
            notes: dto.notes ?? null,
+            expiryNotifiedAt,
+            ...(planCode === 'trial' ? { maxUsers: 3 } : {}),
          },
        });
+    if (status === 'expired' && !expiryNotifiedAt) {
+      await this.adminAlerts.notifySubscriptionEnded(row.id);
+    }
    return this.toDto(row);
  }

@@ -0,0 +1,151 @@
+import { Injectable, Logger } from '@nestjs/common';
+import { isPermanentBillingPlan } from '@mento/shared';
+import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
+import { PrismaService } from '../prisma/prisma.service';
+import {
+  newAccountSms,
+  subscriptionEndedSms,
+  type NewAccountSource,
+} from './platform-admin-alert';
+
+@Injectable()
+export class PlatformAdminAlertService {
+  private readonly logger = new Logger(PlatformAdminAlertService.name);
+
+  constructor(
+    private readonly prisma: PrismaService,
+    private readonly sms: SmsGatewayService,
+  ) {}
+
+  /** ساخت حساب جدید؛ خطای پیامک جلوی ثبت‌نام یا ساخت محیط را نمی‌گیرد. */
+  async notifyNewAccount(input: {
+    source: NewAccountSource;
+    organizationName: string;
+    ownerName: string;
+    mobile: string | null;
+  }): Promise<void> {
+    try {
+      const delivered = await this.sendToAdmins(newAccountSms(input));
+      if (!delivered) {
+        this.logger.warn(`new account SMS was not delivered (${input.source})`);
+      }
+    } catch (error) {
+      this.logger.warn(
+        `new account SMS failed: ${error instanceof Error ? error.message : 'unknown'}`,
+      );
+    }
+  }
+
+  /**
+   * یک‌بار هنگام تمام شدن اشتراک. اگر ارسال نشود پرچم خالی می‌ماند تا بعداً دوباره تلاش شود.
+   */
+  async notifySubscriptionEnded(billingAccountId: string): Promise<void> {
+    const row = await this.prisma.billingAccount.findUnique({
+      where: { id: billingAccountId },
+      select: {
+        id: true,
+        planCode: true,
+        status: true,
+        expiresAt: true,
+        expiryNotifiedAt: true,
+        owner: {
+          select: {
+            fullName: true,
+            mobile: true,
+            memberships: {
+              where: { role: 'owner', isActive: true },
+              select: { organization: { select: { name: true } } },
+            },
+          },
+        },
+      },
+    });
+    if (!row || row.expiryNotifiedAt) return;
+    if (row.status === 'suspended') return;
+    if (isPermanentBillingPlan(row.planCode)) {
+      await this.prisma.billingAccount.update({
+        where: { id: row.id },
+        data: { expiryNotifiedAt: new Date() },
+      });
+      return;
+    }
+    if (row.expiresAt.getTime() > Date.now() && row.status !== 'expired') return;
+
+    const claimed = await this.prisma.billingAccount.updateMany({
+      where: { id: row.id, expiryNotifiedAt: null },
+      data: { status: 'expired', expiryNotifiedAt: new Date() },
+    });
+    if (claimed.count !== 1) return;
+
+    try {
+      const delivered = await this.sendToAdmins(
+        subscriptionEndedSms({
+          organizationNames: row.owner.memberships.map((item) => item.organization.name),
+          ownerName: row.owner.fullName,
+          mobile: row.owner.mobile,
+          planCode: row.planCode,
+          expiresAt: row.expiresAt,
+        }),
+      );
+      if (!delivered) {
+        await this.prisma.billingAccount.update({
+          where: { id: row.id },
+          data: { expiryNotifiedAt: null },
+        });
+      }
+    } catch (error) {
+      this.logger.warn(
+        `subscription SMS failed ${row.id}: ${error instanceof Error ? error.message : 'unknown'}`,
+      );
+      await this.prisma.billingAccount
+        .update({
+          where: { id: row.id },
+          data: { expiryNotifiedAt: null },
+        })
+        .catch(() => undefined);
+    }
+  }
+
+  /** true یعنی حداقل یک پیامک رفت، یا مدیری با موبایل فعال وجود نداشت. */
+  private async sendToAdmins(text: string): Promise<boolean> {
+    const admins = await this.prisma.platformAdmin.findMany({
+      where: { isActive: true, mobile: { not: null } },
+      select: { mobile: true },
+    });
+    const mobiles = [
+      ...new Set(
+        admins
+          .map((admin) => admin.mobile?.trim() ?? '')
+          .filter((mobile) => mobile.length > 0),
+      ),
+    ];
+    if (!mobiles.length) {
+      this.logger.warn('platform admin SMS skipped: no active admin mobile');
+      return true;
+    }
+
+    let delivered = false;
+    for (const mobile of mobiles) {
+      try {
+        const result = await this.sms.send({
+          phone: mobile,
+          text,
+          source: 'platform-admin',
+        });
+        if (result.ok) delivered = true;
+        else {
+          this.logger.warn(
+            `platform admin SMS failed to=…${mobile.slice(-4)} reason=${result.reason ?? 'unknown'}`,
+          );
+        }
+      } catch (error) {
+        this.logger.warn(
+          `platform admin SMS failed to=…${mobile.slice(-4)}: ${
+            error instanceof Error ? error.message : 'unknown'
+          }`,
+        );
+      }
+    }
+    return delivered;
+  }
+}
@@ -0,0 +1,43 @@
+import { BILLING_PLAN_LABELS, type BillingPlanCode } from '@mento/shared';
+import { formatTehranJalali } from '../common/jalali';
+
+export type NewAccountSource = 'signup' | 'admin';
+
+export function newAccountSms(input: {
+  source: NewAccountSource;
+  organizationName: string;
+  ownerName: string;
+  mobile: string | null;
+}): string {
+  const via = input.source === 'signup' ? 'ثبت‌نام' : 'پنل ادمین';
+  return [
+    'منتکت',
+    `حساب جدید (${via})`,
+    `محیط: ${input.organizationName.trim() || '—'}`,
+    `مالک: ${input.ownerName.trim() || '—'}`,
+    `موبایل: ${input.mobile?.trim() || 'ندارد'}`,
+  ].join('\n');
+}
+
+export function subscriptionEndedSms(input: {
+  organizationNames: string[];
+  ownerName: string;
+  mobile: string | null;
+  planCode: string;
+  expiresAt: Date;
+}): string {
+  const names = input.organizationNames.map((name) => name.trim()).filter(Boolean);
+  const orgs = names.slice(0, 3).join('، ') || '—';
+  const extra = names.length > 3 ? ` و ${names.length - 3} محیط دیگر` : '';
+  const label =
+    BILLING_PLAN_LABELS[input.planCode as BillingPlanCode] ?? input.planCode;
+  return [
+    'منتکت',
+    'پایان اشتراک',
+    `محیط: ${orgs}${extra}`,
+    `مالک: ${input.ownerName.trim() || '—'}`,
+    `موبایل: ${input.mobile?.trim() || 'ندارد'}`,
+    `پلن: ${label}`,
+    `تاریخ: ${formatTehranJalali(input.expiresAt)}`,
+  ].join('\n');
+}
@@ -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)));
+  }
+}
@@ -62,6 +62,11 @@ export function resolveSectionAccess(
  if (rolePolicy[sectionKey]) {
    return { section: rolePolicy[sectionKey]!, source: 'role' };
  }
+  // فرم محدودهٔ نقش، بخشِ ننوشته را «بدون محدودیت» نشان می‌دهد.
+  // اگر نقش حتی یک بخش ذخیره کرده باشد، بقیه نباید به دید قدیمی own/team برگردند.
+  if (Object.keys(rolePolicy).length > 0) {
+    return { section: { mode: 'all', rules: [] }, source: 'role' };
+  }
  if (input.legacyVisibility != null || input.legacyScopes) {
    return {
      section: migrateVisibilityToSectionAccess(
@@ -225,8 +225,10 @@ export function noteAccessWhere(
 export function resolveOwnerId(
  actor: Pick<Actor, 'userId' | 'role'>,
  requested?: string | null,
+  allowOthers?: boolean,
 ): string {
-  if (elevated(actor.role) && requested?.trim()) {
+  const allowed = allowOthers ?? elevated(actor.role);
+  if (allowed && requested?.trim()) {
    return requested.trim();
  }
  return actor.userId;
@@ -51,6 +51,11 @@ export class CompaniesController {
    );
  }

+  @Get('group-stats')
+  groupStats(@CurrentUser() user: Actor) {
+    return this.companiesService.groupStats(user);
+  }
+
  @Get('export')
  async export(
    @CurrentUser() user: Actor,
@@ -6,6 +6,7 @@ import {
 import type {
  CompanyDto,
  CreateCompanyRequest,
+  CustomerGroupDto,
  PaginatedResponse,
  UpdateCompanyRequest,
 } from '@mento/shared';
@@ -19,10 +20,10 @@ import {
 import { customersCompanyWhere } from '../common/data-access';
 import {
  type Actor,
-  canReassignOwner,
  elevated,
  resolveOwnerId,
 } from '../common/record-scope';
+import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
 import { normalizeTags } from '../common/tags';
 import { normalizePersonImportSource } from './person-source';
 import { buildSearchWhere, ci, splitCsv } from '../common/search';
@@ -135,6 +136,38 @@ export class CompaniesService {
    };
  }

+  /** آمار گروه برای فیلتر شرکت‌ها — فقط شرکت‌های در دسترس کاربر */
+  async groupStats(actor: Actor): Promise<CustomerGroupDto[]> {
+    const counts = await this.prisma.companyGroupLink.groupBy({
+      by: ['groupId'],
+      where: {
+        company: {
+          organizationId: actor.organizationId,
+          ...customersCompanyWhere(actor),
+        },
+      },
+      _count: { _all: true },
+    });
+    if (!counts.length) return [];
+    const countMap = new Map(counts.map((c) => [c.groupId, c._count._all]));
+    const groups = await this.prisma.customerGroup.findMany({
+      where: {
+        organizationId: actor.organizationId,
+        id: { in: counts.map((c) => c.groupId) },
+      },
+      orderBy: [{ position: 'asc' }, { name: 'asc' }],
+    });
+    return groups.map((g) => ({
+      id: g.id,
+      name: g.name,
+      color: g.color,
+      position: g.position,
+      fromTahesab: Boolean(g.tahesabGid),
+      personCount: 0,
+      companyCount: countMap.get(g.id) ?? 0,
+    }));
+  }
+
  async get(actor: Actor, id: string): Promise<CompanyDto> {
    const row = await this.prisma.company.findFirst({
      where: { id, organizationId: actor.organizationId, ...customersCompanyWhere(actor) },
@@ -168,7 +201,11 @@ export class CompaniesService {
      notes: emptyToNull(dto.notes),
      registeredAt: parseDateOrNull(dto.registeredAt),
      tags: normalizeTags(dto.tags),
-      ownerId: resolveOwnerId(actor, dto.ownerId),
+      ownerId: resolveOwnerId(
+        actor,
+        dto.ownerId,
+        await actorCanAssignToOthers(this.prisma, actor, 'customers'),
+      ),
      customFields: toJsonCustomFields(dto.customFields),
    };
    await this.assertNoDuplicate(actor.organizationId, data);
@@ -233,8 +270,14 @@ export class CompaniesService {
    if ('customFields' in dto) {
      data.customFields = toJsonCustomFields(dto.customFields);
    }
-    if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
-      data.ownerId = resolveOwnerId(actor, dto.ownerId);
+    if (dto.ownerId !== undefined) {
+      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);
@@ -8,6 +8,7 @@ import { CompaniesService } from './companies.service';
 import { PeopleController } from './people.controller';
 import { PeopleService } from './people.service';
 import { ContactsExcelService } from './contacts-excel.service';
+import { SameMobileMergeService } from './same-mobile-merge.service';
 import { BehaviorModule } from '../behavior/behavior.module';
 import { CustomerGroupsModule } from '../customer-groups/customer-groups.module';

@@ -21,7 +22,7 @@ import { CustomerGroupsModule } from '../customer-groups/customer-groups.module'
    CustomerGroupsModule,
  ],
  controllers: [PeopleController, CompaniesController],
-  providers: [PeopleService, CompaniesService, ContactsExcelService],
+  providers: [PeopleService, CompaniesService, ContactsExcelService, SameMobileMergeService],
  exports: [PeopleService, CompaniesService],
 })
 export class ContactsModule {}
@@ -3,6 +3,7 @@ import {
  ArrayMaxSize,
  ArrayMinSize,
  IsArray,
+  IsBoolean,
  IsEmail,
  IsIn,
  IsInt,
@@ -15,7 +16,7 @@ import {
  MinLength,
  ValidateIf,
 } from 'class-validator';
-import { PERSON_IMPORT_SOURCES, PERSON_MOODS } from '@mento/shared';
+import { PERSON_GENDERS, PERSON_IMPORT_SOURCES, PERSON_MOODS } from '@mento/shared';

 export class BirthdaySmsDto {
  @IsString()
@@ -282,6 +283,14 @@ export class CreatePersonDto {
  @MaxLength(80)
  lastName?: string;

+  @IsOptional()
+  @IsIn(PERSON_GENDERS)
+  gender?: (typeof PERSON_GENDERS)[number];
+
+  @IsOptional()
+  @IsBoolean()
+  showGenderInName?: boolean;
+
  @IsOptional()
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
@@ -401,6 +410,14 @@ export class UpdatePersonDto {
  @MaxLength(80)
  lastName?: string;

+  @IsOptional()
+  @IsIn(PERSON_GENDERS)
+  gender?: (typeof PERSON_GENDERS)[number];
+
+  @IsOptional()
+  @IsBoolean()
+  showGenderInName?: boolean;
+
  @IsOptional()
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
@@ -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;
 }

+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. */
 export function normalizePhone(value?: string | null): string | null {
  const v = emptyToNull(value);
  if (!v) return null;
-  const cleaned = v.replace(/[^\d+]/g, '');␍
+  const cleaned = latinDigits(v).replace(/[^\d+]/g, '');
  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);
+}
@@ -89,6 +89,11 @@ export class PeopleController {
    return this.peopleService.sourceStats(user);
  }

+  @Get('group-stats')
+  groupStats(@CurrentUser() user: Actor) {
+    return this.peopleService.groupStats(user);
+  }
+
  @Get('export')
  async export(
    @CurrentUser() user: Actor,
@@ -10,6 +10,7 @@ import {
 } from '@nestjs/common';
 import type {
  CreatePersonRequest,
+  CustomerGroupDto,
  FilteredIdsResponse,
  PaginatedResponse,
  PersonDto,
@@ -17,12 +18,22 @@ import type {
  PersonMood,
  UpdatePersonRequest,
 } from '@mento/shared';
-import { FILTERED_IDS_MAX, PERSON_MOODS } from '@mento/shared';
+import {
+  FILTERED_IDS_MAX,
+  PERSON_MOODS,
+  applyPersonGenderTitle,
+  splitPersonHonorific,
+} from '@mento/shared';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
 import { OutboundSmsLogService } from '../outbound-sms/outbound-sms-log.service';
 import { CompaniesService } from './companies.service';
-import { emptyToNull, normalizeEmail, normalizePhone } from './normalize';
+import {
+  emptyToNull,
+  normalizeEmail,
+  phoneIdentityKeys,
+  storedPhoneNumber,
+} from './normalize';
 import {
  asAddresses,
  asCustomFields,
@@ -32,9 +43,9 @@ import {
 import { customersPersonWhere } from '../common/data-access';
 import {
  type Actor,
-  canReassignOwner,
  resolveOwnerId,
 } from '../common/record-scope';
+import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
 import { LoyaltyService } from '../loyalty/loyalty.service';
 import { AutomationsService } from '../automations/automations.service';
 import { MessageAutomationsService } from '../message-automations/message-automations.service';
@@ -72,6 +83,8 @@ type PersonRow = {
  id: string;
  firstName: string;
  lastName: string;
+  gender: string;
+  showGenderInName: boolean;
  previousFirstName: string | null;
  previousLastName: string | null;
  importSource: string;
@@ -303,6 +316,38 @@ export class PeopleService implements OnModuleInit {
      .sort((a, b) => b.count - a.count);
  }

+  /** آمار گروه برای فیلتر اشخاص — فقط افراد در دسترس کاربر */
+  async groupStats(actor: Actor): Promise<CustomerGroupDto[]> {
+    const counts = await this.prisma.personGroupLink.groupBy({
+      by: ['groupId'],
+      where: {
+        person: {
+          organizationId: actor.organizationId,
+          ...customersPersonWhere(actor),
+        },
+      },
+      _count: { _all: true },
+    });
+    if (!counts.length) return [];
+    const countMap = new Map(counts.map((c) => [c.groupId, c._count._all]));
+    const groups = await this.prisma.customerGroup.findMany({
+      where: {
+        organizationId: actor.organizationId,
+        id: { in: counts.map((c) => c.groupId) },
+      },
+      orderBy: [{ position: 'asc' }, { name: 'asc' }],
+    });
+    return groups.map((g) => ({
+      id: g.id,
+      name: g.name,
+      color: g.color,
+      position: g.position,
+      fromTahesab: Boolean(g.tahesabGid),
+      personCount: countMap.get(g.id) ?? 0,
+      companyCount: 0,
+    }));
+  }
+
  onModuleInit() {
    void this.backfillStoredBirthDates();
  }
@@ -359,7 +404,10 @@ export class PeopleService implements OnModuleInit {
    input: { mobile?: string | null; email?: string | null; birthDate: Date },
  ) {
    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 (!or.length) return;
    await this.prisma.person.updateMany({
@@ -384,17 +432,25 @@ export class PeopleService implements OnModuleInit {
    }

    const registeredAt = dto.registeredAt ? new Date(dto.registeredAt) : null;
+    const named = applyPersonGenderTitle({
+      firstName: dto.firstName ?? '',
+      lastName: dto.lastName ?? '',
+      gender: dto.gender,
+      showGenderInName: dto.showGenderInName,
+    });
    const data: Prisma.PersonUncheckedCreateInput = {
      organizationId: actor.organizationId,
-      firstName: (dto.firstName ?? '').trim(),
-      lastName: (dto.lastName ?? '').trim(),
+      firstName: named.firstName,
+      lastName: named.lastName,
+      gender: named.gender,
+      showGenderInName: named.showGenderInName,
      previousFirstName: emptyToNull(dto.previousFirstName),
      previousLastName: emptyToNull(dto.previousLastName),
      importSource: normalizePersonImportSource(dto.importSource),
      sourceRef: emptyToNull(dto.sourceRef),
      email: normalizeEmail(dto.email),
-      phone: normalizePhone(dto.phone),
-      mobile: normalizePhone(dto.mobile),
+      phone: storedPhoneNumber(dto.phone),
+      mobile: storedPhoneNumber(dto.mobile),
      position: emptyToNull(dto.position),
      website: emptyToNull(dto.website),
      instagram: emptyToNull(dto.instagram),
@@ -405,7 +461,11 @@ export class PeopleService implements OnModuleInit {
      mood: dto.mood ?? 'newcomer',
      tags: normalizeTags(dto.tags),
      companyId,
-      ownerId: resolveOwnerId(actor, dto.ownerId),
+      ownerId: resolveOwnerId(
+        actor,
+        dto.ownerId,
+        await actorCanAssignToOthers(this.prisma, actor, 'customers'),
+      ),
      customFields: toJsonCustomFields(dto.customFields),
      ...(registeredAt && !Number.isNaN(registeredAt.getTime())
        ? { createdAt: registeredAt }
@@ -464,8 +524,32 @@ export class PeopleService implements OnModuleInit {
    await this.ensureExists(actor, id);

    const data: Prisma.PersonUncheckedUpdateInput = {};
-    if (dto.firstName !== undefined) data.firstName = dto.firstName.trim();
-    if (dto.lastName !== undefined) data.lastName = dto.lastName.trim();
+    const touchesName =
+      dto.firstName !== undefined ||
+      dto.lastName !== undefined ||
+      dto.gender !== undefined ||
+      dto.showGenderInName !== undefined;
+    if (touchesName) {
+      const existing = await this.prisma.person.findFirst({
+        where: { id, organizationId: actor.organizationId },
+        select: { firstName: true, lastName: true, gender: true, showGenderInName: true },
+      });
+      if (!existing) throw new NotFoundException('شخص پیدا نشد');
+      const bare = splitPersonHonorific(existing.firstName, existing.lastName);
+      const storedGender =
+        existing.gender === 'male' || existing.gender === 'female' ? existing.gender : 'none';
+      const named = applyPersonGenderTitle({
+        firstName: dto.firstName !== undefined ? dto.firstName : bare.firstName,
+        lastName: dto.lastName !== undefined ? dto.lastName : bare.lastName,
+        gender: dto.gender !== undefined ? dto.gender : storedGender,
+        showGenderInName:
+          dto.showGenderInName !== undefined ? dto.showGenderInName : existing.showGenderInName,
+      });
+      data.firstName = named.firstName;
+      data.lastName = named.lastName;
+      data.gender = named.gender;
+      data.showGenderInName = named.showGenderInName;
+    }
    if ('previousFirstName' in dto) {
      data.previousFirstName = emptyToNull(dto.previousFirstName);
    }
@@ -477,8 +561,8 @@ export class PeopleService implements OnModuleInit {
    }
    if ('sourceRef' in dto) data.sourceRef = emptyToNull(dto.sourceRef);
    if ('email' in dto) data.email = normalizeEmail(dto.email);
-    if ('phone' in dto) data.phone = normalizePhone(dto.phone);
-    if ('mobile' in dto) data.mobile = normalizePhone(dto.mobile);
+    if ('phone' in dto) data.phone = storedPhoneNumber(dto.phone);
+    if ('mobile' in dto) data.mobile = storedPhoneNumber(dto.mobile);
    if ('position' in dto) data.position = emptyToNull(dto.position);
    if ('website' in dto) data.website = emptyToNull(dto.website);
    if ('instagram' in dto) data.instagram = emptyToNull(dto.instagram);
@@ -502,8 +586,14 @@ export class PeopleService implements OnModuleInit {
      }
      data.companyId = nextCompanyId;
    }
-    if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
-      data.ownerId = resolveOwnerId(actor, dto.ownerId);
+    if (dto.ownerId !== undefined) {
+      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);
@@ -559,10 +649,13 @@ export class PeopleService implements OnModuleInit {
  ) {
    const email = typeof data.email === 'string' ? data.email : null;
    const mobile = typeof data.mobile === 'string' ? data.mobile : null;
+    const mobileKeys = phoneIdentityKeys(mobile);

    const or: Prisma.PersonWhereInput[] = [];
    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;

    const clash = await this.prisma.person.findFirst({
@@ -776,6 +869,8 @@ export class PeopleService implements OnModuleInit {
      previousImportSource: row.previousImportSource,
      previousSourceRef: row.previousSourceRef,
      fullName: `${row.firstName} ${row.lastName}`.trim(),
+      gender: row.gender === 'male' || row.gender === 'female' ? row.gender : 'none',
+      showGenderInName: row.showGenderInName,
      email: row.email,
      phone: row.phone,
      mobile: row.mobile,
@@ -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 { OrgModuleGuard } from '../billing/org-module.guard';
 import {
+  ConversationFileBytesDto,
  CreateConversationDmDto,
  CreateConversationGroupDto,
  CreateConversationChannelDto,
@@ -19,12 +20,34 @@ import {
  ToggleMessageReactionDto,
 } from './dto';
 import { ConversationsService } from './conversations.service';
+import { StorageQuotaService } from '../billing/storage-quota.service';

@Controller('conversations')
@UseGuards(JwtAuthGuard, OrgModuleGuard)
@RequireOrgModule('conversations')
 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')
  access(@CurrentUser() user: { userId: string; organizationId: string; role: string }) {
@@ -656,7 +656,7 @@ export class ConversationsService {
    });
    if (!row) {
      throw new BadRequestException(
-        'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → محیط‌ها → تنظیمات گفتگو پیکربندی کنید.',
+        'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → گفتگو پیکربندی کنید.',
      );
    }
    try {
@@ -1,9 +1,13 @@
+import { Type } from 'class-transformer';
 import {
  IsArray,
  IsBoolean,
+  IsInt,
  IsOptional,
  IsString,
+  Max,
  MaxLength,
+  Min,
  MinLength,
  ArrayMinSize,
  ArrayMaxSize,
@@ -32,6 +36,14 @@ export class UpdateConversationSettingsDto {
  downloadUrl?: string;
 }

+export class ConversationFileBytesDto {
+  @Type(() => Number)
+  @IsInt()
+  @Min(1)
+  @Max(100 * 1024 * 1024)
+  bytes!: number;
+}
+
 export class CreateConversationDmDto {
  @IsString()
  @MinLength(1)
@@ -15,6 +15,7 @@ export enum CustomFieldEntityDto {
  person = 'person',
  company = 'company',
  deal = 'deal',
+  note = 'note',
 }

 export enum CustomFieldTypeDto {
@@ -38,6 +38,11 @@ class UpdateCustomerGroupDto {
  @IsOptional()
  @IsIn([...CUSTOMER_GROUP_COLORS])
  color?: CustomerGroupColor;
+
+  /** null گروه را اصلی می‌کند */
+  @IsOptional()
+  @IsString()
+  parentId?: string | null;
 }

@Controller('customer-groups')
@@ -48,7 +48,10 @@ export class CustomerGroupsService {
    const rows = await this.prisma.customerGroup.findMany({
      where: { organizationId },
      orderBy: [{ position: 'asc' }, { name: 'asc' }],
-      include: { _count: { select: { people: true, companies: true } } },
+      include: {
+        _count: { select: { people: true, companies: true } },
+        parent: { select: { name: true } },
+      },
    });
    return rows.map((r) => ({
      id: r.id,
@@ -58,6 +61,8 @@ export class CustomerGroupsService {
      fromTahesab: Boolean(r.tahesabGid),
      personCount: r._count.people,
      companyCount: r._count.companies,
+      parentId: r.parentId,
+      parentName: r.parent?.name ?? null,
    }));
  }

@@ -88,15 +93,21 @@ export class CustomerGroupsService {
  async update(
    organizationId: string,
    id: string,
-    dto: { name?: string; color?: CustomerGroupColor },
+    dto: { name?: string; color?: CustomerGroupColor; parentId?: string | null },
  ): Promise<CustomerGroupDto> {
    await this.require(organizationId, id);
+    const parentId =
+      dto.parentId === undefined ? undefined : dto.parentId?.trim() || null;
+    if (parentId !== undefined) {
+      await this.assertParent(organizationId, id, parentId);
+    }
    try {
      await this.prisma.customerGroup.update({
        where: { id },
        data: {
          ...(dto.name != null ? { name: this.cleanName(dto.name) } : {}),
          ...(dto.color != null ? { color: this.cleanColor(dto.color) } : {}),
+          ...(parentId !== undefined ? { parentId } : {}),
        },
      });
    } catch (e) {
@@ -105,6 +116,32 @@ export class CustomerGroupsService {
    return (await this.list(organizationId)).find((g) => g.id === id)!;
  }

+  /** فقط یک سطح: گروه اصلی خودش زیرگروه نیست و گروه فرعی زیرگروه ندارد. */
+  private async assertParent(
+    organizationId: string,
+    id: string,
+    parentId: string | null,
+  ) {
+    if (parentId == null) return;
+    if (parentId === id) {
+      throw new BadRequestException('گروه نمی‌تواند زیرمجموعهٔ خودش باشد.');
+    }
+    const parent = await this.prisma.customerGroup.findFirst({
+      where: { id: parentId, organizationId },
+      select: { id: true, parentId: true },
+    });
+    if (!parent) throw new NotFoundException('گروه اصلی پیدا نشد.');
+    if (parent.parentId) {
+      throw new BadRequestException('فقط یک سطح گروه اصلی و فرعی ممکن است.');
+    }
+    const childCount = await this.prisma.customerGroup.count({
+      where: { organizationId, parentId: id },
+    });
+    if (childCount > 0) {
+      throw new BadRequestException('این گروه خودش زیرگروه دارد و نمی‌تواند فرعی شود.');
+    }
+  }
+
  /** مشتری‌ها حذف نمی‌شوند؛ فقط این گروه از رویشان برداشته می‌شود */
  async remove(organizationId: string, id: string): Promise<void> {
    await this.require(organizationId, id);
@@ -30,6 +30,7 @@ import { PrismaService } from '../prisma/prisma.service';
 import { NotificationsService } from '../notifications/notifications.service';
 import { type Actor, elevated } from '../common/record-scope';
 import { dayKeyToDate, tehranDayKey, addDays } from '../routines/routine-dates';
+import { internalRoutineTaskWhere } from '../routines/internal-routine';
 import { normalizeLevels, periodStart, previousPeriod, sanitizeConditions } from './gamification-engine';
 import { GamificationService, parsePeriod, toRuleDto } from './gamification.service';
 import type {
@@ -751,6 +752,7 @@ export class GamificationAdminService {
          organizationId,
          status: { not: 'cancelled' },
          scheduledFor: { gte: dayKeyToDate(fromKey), lte: dayKeyToDate(toKey) },
+          ...internalRoutineTaskWhere,
        };
        const [total, done] = await Promise.all([
          this.prisma.routineTask.count({ where }),
@@ -17,7 +17,11 @@ import type {
 } from '@mento/shared';
 import { parseBirthDate } from '../../common/excel';
 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 { ownerWhere, type Actor } from '../../common/record-scope';
 import { MontifyConnectionsService } from './connections.service';
@@ -100,13 +104,7 @@ function arr(v: unknown): unknown[] {
 }

 function mobileVariants(mobile: string): string[] {
-  const digits = mobile.replace(/\D/g, '');
-  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}`])];
+  return phoneIdentityKeys(mobile);
 }

 function formatAddress(a: MontifyAddress): string | null {
@@ -417,7 +415,7 @@ export class MontifySyncService {
  }> {
    const externalId = String(c.id);
    const { firstName, lastName } = splitName(c);
-    const mobile = normalizePhone(c.phone ?? null);
+    const mobile = storedPhoneNumber(c.phone ?? null);
    const email = normalizeEmail(c.email ?? null);
    const addressLines = addresses.map(formatAddress).filter((a): a is string => Boolean(a));
    const profile: CustomerProfile = {
@@ -6,21 +6,44 @@ import {
 import { Prisma } from '@prisma/client';
 import type {
  CustomerGroupSummaryDto,
+  SalesExpertOverviewDto,
+  SalesFactorOverviewDto,
+  SalesGroupOverviewDto,
+  SalesInternetOverviewDto,
+  SalesNamedMovementDto,
  TahesabAsnadKind,
  TahesabAsnadLineDto,
  TahesabAsnadReportPageDto,
  TahesabAsnadSummaryDto,
  TahesabAsnadSyncJobDto,
+  TahesabSalesOverviewDto,
 } from '@mento/shared';
 import {
  TAHESAB_ASNAD_KIND_LABELS,
  TAHESAB_JENS_FELEZ_LABELS,
 } from '@mento/shared';
 import { PrismaService } from '../../prisma/prisma.service';
+import { toGregorian } from '../../common/jalali';
 import { TahesabConnectionsService } from './connections.service';
+import {
+  SALES_FACTOR_KEYS,
+  SALES_FACTOR_LABELS,
+  classifyDirection,
+  classifyFactor,
+  combinedPercent,
+  movementStats,
+  positiveAmount,
+  type SalesDoc,
+} from './sales-factors';

-const ASNAD_COUNT_LAST = 200;
+const ASNAD_COUNT_LAST = 5000;
 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']);

 function normalizeShamsiYmd(input: string): string {
@@ -167,6 +190,7 @@ export class TahesabAsnadReportService {
    connectionId: string | undefined,
    from: string,
    to: string,
+    scope?: { personId?: string; groupIds?: string[] },
  ): Promise<TahesabAsnadSyncJobDto> {
    const fromNorm = normalizeShamsiYmd(from);
    const toNorm = normalizeShamsiYmd(to);
@@ -177,6 +201,22 @@ export class TahesabAsnadReportService {
      organizationId,
      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({
      data: {
@@ -184,7 +224,13 @@ export class TahesabAsnadReportService {
        connectionId: resolvedId,
        kind: 'asnad-sync',
        status: 'pending',
-        request: { from: fromNorm, to: toNorm, connectionId: resolvedId },
+        request: {
+          from: fromNorm,
+          to: toNorm,
+          connectionId: resolvedId,
+          personId: scope?.personId ?? null,
+          groupIds: scope?.groupIds ?? [],
+        },
        result: {
          connectionId: resolvedId,
          from: fromNorm,
@@ -197,9 +243,14 @@ export class TahesabAsnadReportService {
      },
    });

-    void this.runSync(job.id, organizationId, resolvedId, fromNorm, toNorm).catch(
-      () => undefined,
-    );
+    void this.runSync(
+      job.id,
+      organizationId,
+      resolvedId,
+      fromNorm,
+      toNorm,
+      scopedPersonIds,
+    ).catch(() => undefined);

    return this.mapJob(job);
  }
@@ -221,6 +272,7 @@ export class TahesabAsnadReportService {
    connectionId: string,
    from: string,
    to: string,
+    personIds: string[] | null,
  ) {
    const progress: SyncProgress = {
      connectionId,
@@ -240,7 +292,10 @@ export class TahesabAsnadReportService {

      const { api } = await this.connections.getApi(organizationId, connectionId);
      const links = await this.prisma.personAccountingLink.findMany({
-        where: { connectionId },
+        where: {
+          connectionId,
+          ...(personIds ? { personId: { in: personIds } } : {}),
+        },
        select: {
          id: true,
          personId: true,
@@ -259,6 +314,7 @@ export class TahesabAsnadReportService {
          organizationId,
          connectionId,
          tarikh: { gte: from, lte: to },
+          ...(personIds ? { personId: { in: personIds } } : {}),
        },
      });

@@ -307,6 +363,11 @@ export class TahesabAsnadReportService {
                  mali: pickNum(item.Mali),
                  count: pickNum(item.Count),
                  ayar: pickNum(item.Ayar),
+                  darsad: pickNum(item.Darsad ?? item.darsad),
+                  darsadTalayee: pickNum(
+                    item.Darsad_Talayee ?? item.DarsadTalayee ?? item.darsadTalayee,
+                  ),
+                  maliatDarsad: pickNum(item.MaliatDarsad ?? item.Maliat_Darsad),
                  mazaneh: pickNum(item.Mazaneh),
                  fi: pickNum(item.Fi),
                  sharh1: pickStr(item.Sharh1),
@@ -383,11 +444,12 @@ export class TahesabAsnadReportService {
      where.jensFelez = params.jensFelez;
    }
    if (params.groupIds?.length) {
+      const groupIds = await this.expandGroupIds(params.organizationId, params.groupIds);
      where.personId = {
        in: (
          await this.prisma.personGroupLink.findMany({
            where: {
-              groupId: { in: params.groupIds },
+              groupId: { in: groupIds },
              person: { organizationId: params.organizationId },
            },
            select: { personId: true },
@@ -614,4 +676,553 @@ export class TahesabAsnadReportService {
      lastSyncedAt: lastSyncedAt?.toISOString() ?? null,
    };
  }
+
+  /** 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[]> {
+    const rows = await this.prisma.customerGroup.findMany({
+      where: { organizationId },
+      select: { id: true, parentId: true },
+    });
+    const children = new Map<string, string[]>();
+    for (const row of rows) {
+      if (!row.parentId) continue;
+      const list = children.get(row.parentId) ?? [];
+      list.push(row.id);
+      children.set(row.parentId, list);
+    }
+    const out = new Set(ids);
+    const walk = (id: string) => {
+      for (const child of children.get(id) ?? []) {
+        if (out.has(child)) continue;
+        out.add(child);
+        walk(child);
+      }
+    };
+    for (const id of ids) walk(id);
+    return [...out];
+  }
+
+  async overview(
+    organizationId: string,
+    opts: {
+      connectionId?: string;
+      from: string;
+      to: string;
+      groupIds?: string[];
+      personId?: string;
+      jensFelez?: number;
+    },
+  ): Promise<TahesabSalesOverviewDto> {
+    const where = await this.buildWhere({ organizationId, ...opts });
+    const rows = await this.prisma.accountingAsnadLine.findMany({
+      where,
+      select: {
+        id: true,
+        tarikh: true,
+        noRaw: true,
+        noKar: true,
+        jensFelez: true,
+        vazn: true,
+        tabdilVazn: true,
+        mali: true,
+        count: true,
+        darsad: true,
+        darsadTalayee: true,
+        maliatDarsad: true,
+        factorCode: true,
+        personId: true,
+        person: {
+          select: {
+            ownerId: true,
+            owner: { select: { id: true, fullName: true } },
+            groupLinks: {
+              include: {
+                group: {
+                  select: {
+                    id: true,
+                    name: true,
+                    parentId: true,
+                    parent: { select: { id: true, name: true } },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const docs: SalesDoc[] = rows.map((row) => ({
+      bucketKey: (row.noKar ?? '').trim() || 'بدون نام',
+      factor: classifyFactor(row.noRaw, row.noKar),
+      direction: classifyDirection(row.noRaw),
+      weight: positiveAmount(row.vazn, row.tabdilVazn),
+      mali: Math.abs(row.mali ?? 0),
+      count: Math.abs(row.count ?? 0),
+      percent: combinedPercent(row.darsad, row.darsadTalayee, row.maliatDarsad),
+      tarikh: row.tarikh,
+    }));
+
+    const factors: SalesFactorOverviewDto[] = SALES_FACTOR_KEYS.map((key) => {
+      const slice = docs.filter((d) => d.factor === key);
+      return {
+        key,
+        label: SALES_FACTOR_LABELS[key],
+        sale: movementStats(slice, 'out'),
+        purchase: movementStats(slice, 'in'),
+      };
+    });
+
+    const names = [...new Set(docs.filter((d) => d.factor === 'karsakhte').map((d) => d.bucketKey))];
+    names.sort((a, b) => a.localeCompare(b, 'fa'));
+    const karsakhte: SalesNamedMovementDto[] = names.map((name) => {
+      const slice = docs.filter((d) => d.factor === 'karsakhte' && d.bucketKey === name);
+      return {
+        name,
+        sale: movementStats(slice, 'out'),
+        purchase: movementStats(slice, 'in'),
+      };
+    });
+
+    const groups = this.groupOverview(rows, docs);
+    const experts = await this.expertOverview(organizationId, rows, docs);
+    const internetPack = await this.internetOverview(
+      organizationId,
+      opts.from,
+      opts.to,
+      rows,
+      opts.personId,
+      opts.groupIds,
+    );
+    await this.addInternetCommission(organizationId, experts, internetPack.owners);
+    const internet = internetPack.public;
+
+    const nos = new Set<string>();
+    const otherNos = new Set<string>();
+    for (const row of rows) {
+      if (!row.noRaw) continue;
+      nos.add(row.noRaw);
+      if (classifyFactor(row.noRaw, row.noKar) === 'other') otherNos.add(row.noRaw);
+    }
+
+    return {
+      factors,
+      karsakhte,
+      groups,
+      experts,
+      internet,
+      distinctNos: [...nos].sort((a, b) => a.localeCompare(b, 'fa')),
+      otherNos: [...otherNos].sort((a, b) => a.localeCompare(b, 'fa')),
+      percentReady: rows.some((r) => r.darsad != null || r.darsadTalayee != null || r.maliatDarsad != null),
+    };
+  }
+
+  private groupOverview(
+    rows: Array<{
+      id: string;
+      person: {
+        groupLinks: Array<{
+          group: { id: string; name: string; parentId: string | null; parent: { id: string; name: string } | null };
+        }>;
+      } | null;
+    }>,
+    docs: SalesDoc[],
+  ): SalesGroupOverviewDto[] {
+    const byId = new Map(docs.map((d, i) => [rows[i]!.id, d]));
+    type Acc = { label: string; parentId: string | null; parentName: string | null; gross: number; ret: number; mali: number; retMali: number };
+    const acc = new Map<string, Acc>();
+    rows.forEach((row, index) => {
+      const doc = byId.get(row.id) ?? docs[index];
+      if (!doc || (doc.direction !== 'out' && doc.direction !== 'sale_return')) return;
+      const links = row.person?.groupLinks ?? [];
+      const targets = links.length
+        ? links
+        : [{ group: { id: '__none__', name: 'بدون گروه', parentId: null, parent: null } }];
+      for (const link of targets) {
+        const g = link.group;
+        const bag = acc.get(g.id) ?? {
+          label: g.name,
+          parentId: g.parentId,
+          parentName: g.parent?.name ?? null,
+          gross: 0,
+          ret: 0,
+          mali: 0,
+          retMali: 0,
+        };
+        if (doc.direction === 'out') {
+          bag.gross += doc.weight;
+          bag.mali += doc.mali;
+        } else {
+          bag.ret += doc.weight;
+          bag.retMali += doc.mali;
+        }
+        acc.set(g.id, bag);
+      }
+    });
+
+    const parents = new Map<string, SalesGroupOverviewDto>();
+    const ensure = (id: string, label: string) => {
+      const found = parents.get(id);
+      if (found) return found;
+      const created: SalesGroupOverviewDto = {
+        id,
+        label,
+        netSaleWeight: 0,
+        netSaleMali: 0,
+        saleReturnWeight: 0,
+        children: [],
+      };
+      parents.set(id, created);
+      return created;
+    };
+    for (const [id, bag] of acc) {
+      const netW = Math.max(0, bag.gross - bag.ret);
+      const netM = Math.max(0, bag.mali - bag.retMali);
+      if (bag.parentId) {
+        const parent = ensure(bag.parentId, bag.parentName || 'گروه اصلی');
+        parent.netSaleWeight += netW;
+        parent.netSaleMali += netM;
+        parent.saleReturnWeight += bag.ret;
+        parent.children.push({
+          id,
+          label: bag.label,
+          netSaleWeight: netW,
+          netSaleMali: netM,
+          saleReturnWeight: bag.ret,
+        });
+      } else {
+        const parent = ensure(id, bag.label);
+        parent.netSaleWeight += netW;
+        parent.netSaleMali += netM;
+        parent.saleReturnWeight += bag.ret;
+      }
+    }
+    return [...parents.values()].sort((a, b) => b.netSaleWeight - a.netSaleWeight);
+  }
+
+  private async expertOverview(
+    organizationId: string,
+    rows: Array<{
+      id: string;
+      jensFelez: number | null;
+      person: { ownerId: string | null; owner: { id: string; fullName: string } | null } | null;
+    }>,
+    docs: SalesDoc[],
+  ): Promise<SalesExpertOverviewDto[]> {
+    type Bag = { name: string; silverW: number; silverM: number; silverRetW: number; silverRetM: number; investW: number; investM: number; investRetW: number; investRetM: number };
+    const bags = new Map<string, Bag>();
+    const touch = (id: string, name: string) => {
+      const bag = bags.get(id) ?? {
+        name,
+        silverW: 0,
+        silverM: 0,
+        silverRetW: 0,
+        silverRetM: 0,
+        investW: 0,
+        investM: 0,
+        investRetW: 0,
+        investRetM: 0,
+      };
+      bags.set(id, bag);
+      return bag;
+    };
+    rows.forEach((row, index) => {
+      const doc = docs[index];
+      if (!doc || (doc.direction !== 'out' && doc.direction !== 'sale_return')) return;
+      const ownerId = row.person?.owner?.id ?? row.person?.ownerId ?? '__none__';
+      const name = row.person?.owner?.fullName || 'بدون کارشناس';
+      const bag = touch(ownerId, name);
+      const isReturn = doc.direction === 'sale_return';
+      const silver = doc.factor === 'karsakhte' && row.jensFelez === 2;
+      const invest = doc.factor === 'etiket_jewel';
+      if (silver) {
+        if (isReturn) {
+          bag.silverRetW += doc.weight;
+          bag.silverRetM += doc.mali;
+        } else {
+          bag.silverW += doc.weight;
+          bag.silverM += doc.mali;
+        }
+      }
+      if (invest) {
+        if (isReturn) {
+          bag.investRetW += doc.weight;
+          bag.investRetM += doc.mali;
+        } else {
+          bag.investW += doc.weight;
+          bag.investM += doc.mali;
+        }
+      }
+    });
+    const ownerIds = [...bags.keys()].filter((id) => id !== '__none__');
+    const memberships = ownerIds.length
+      ? await this.prisma.membership.findMany({
+          where: { organizationId, userId: { in: ownerIds } },
+          select: { userId: true, commissionPercent: true },
+        })
+      : [];
+    const percentOf = new Map(memberships.map((m) => [m.userId, Number(m.commissionPercent ?? 0)]));
+    return [...bags.entries()]
+      .map(([userId, bag]) => {
+        const percent = percentOf.get(userId) ?? 0;
+        const silverMali = Math.max(0, bag.silverM - bag.silverRetM);
+        const investMali = Math.max(0, bag.investM - bag.investRetM);
+        return {
+          userId,
+          name: bag.name,
+          percent,
+          silverWeight: Math.max(0, bag.silverW - bag.silverRetW),
+          silverMali,
+          silverCommission: (silverMali * percent) / 100,
+          investWeight: Math.max(0, bag.investW - bag.investRetW),
+          investMali,
+          investCommission: (investMali * percent) / 100,
+        };
+      })
+      .sort((a, b) => b.silverMali + b.investMali - (a.silverMali + a.investMali));
+  }
+
+  private async addInternetCommission(
+    organizationId: string,
+    experts: SalesExpertOverviewDto[],
+    owners: Map<string, { name: string; weight: number; mali: number }>,
+  ) {
+    const missing = [...owners.keys()].filter((id) => id !== '__none__' && !experts.some((e) => e.userId === id));
+    const memberships = missing.length
+      ? await this.prisma.membership.findMany({
+          where: { organizationId, userId: { in: missing } },
+          select: { userId: true, commissionPercent: true },
+        })
+      : [];
+    const percentOf = new Map(memberships.map((m) => [m.userId, Number(m.commissionPercent ?? 0)]));
+    for (const [userId, extra] of owners) {
+      let row = experts.find((e) => e.userId === userId);
+      if (!row) {
+        row = {
+          userId,
+          name: extra.name,
+          percent: percentOf.get(userId) ?? 0,
+          silverWeight: 0,
+          silverMali: 0,
+          silverCommission: 0,
+          investWeight: 0,
+          investMali: 0,
+          investCommission: 0,
+        };
+        experts.push(row);
+      }
+      row.investWeight += extra.weight;
+      row.investMali += extra.mali;
+      row.investCommission = (row.investMali * row.percent) / 100;
+    }
+    experts.sort((a, b) => b.silverMali + b.investMali - (a.silverMali + a.investMali));
+    const active = experts.filter(
+      (e) => e.silverWeight > 0 || e.investWeight > 0 || e.silverMali > 0 || e.investMali > 0,
+    );
+    experts.splice(0, experts.length, ...active);
+  }
+
+  /** null یعنی گروه و شخص اشتراکی ندارند و سفارشی نباید بیاید. */
+  private async internetPersonWhere(
+    organizationId: string,
+    personId?: string,
+    groupIds?: string[],
+  ): Promise<{ personId: string | { in: string[] } } | Record<string, never> | null> {
+    if (!groupIds?.length) {
+      return personId ? { personId } : {};
+    }
+    const expanded = await this.expandGroupIds(organizationId, groupIds);
+    const links = await this.prisma.personGroupLink.findMany({
+      where: {
+        groupId: { in: expanded },
+        person: { organizationId },
+      },
+      select: { personId: true },
+      distinct: ['personId'],
+    });
+    let ids = links.map((link) => link.personId);
+    if (personId) ids = ids.filter((id) => id === personId);
+    if (!ids.length) return null;
+    return { personId: { in: ids } };
+  }
+
+  private async internetOverview(
+    organizationId: string,
+    from: string,
+    to: string,
+    rows: Array<{ factorCode: string | null }>,
+    personId?: string,
+    groupIds?: string[],
+  ): Promise<{
+    public: SalesInternetOverviewDto;
+    owners: Map<string, { name: string; weight: number; mali: number }>;
+  }> {
+    const empty: SalesInternetOverviewDto = {
+      orderCount: 0,
+      returnCount: 0,
+      netGold: 0,
+      netSilver: 0,
+      returnGold: 0,
+      returnSilver: 0,
+      netMali: 0,
+      returnMali: 0,
+      linkedSkipped: 0,
+    };
+    const start = shamsiStart(from);
+    const end = shamsiEnd(to);
+    const owners = new Map<string, { name: string; weight: number; mali: number }>();
+    if (!start || !end) return { public: empty, owners };
+    const personWhere = await this.internetPersonWhere(organizationId, personId, groupIds);
+    if (!personWhere) return { public: empty, owners };
+    const orders = await this.prisma.montifyOrder.findMany({
+      where: {
+        organizationId,
+        deletedAt: null,
+        ...personWhere,
+        externalCreatedAt: { gte: start, lte: end },
+      },
+      select: {
+        externalId: true,
+        orderReference: true,
+        orderStatus: true,
+        cancelledAt: true,
+        totalPrice: true,
+        discountTotalPrice: true,
+        sumGold: true,
+        sumSilver: true,
+        personId: true,
+      },
+    });
+    const personIds = [...new Set(orders.map((order) => order.personId).filter((id): id is string => Boolean(id)))];
+    const people = personIds.length
+      ? await this.prisma.person.findMany({
+          where: { organizationId, id: { in: personIds } },
+          select: { id: true, ownerId: true, owner: { select: { id: true, fullName: true } } },
+        })
+      : [];
+    const personById = new Map(people.map((person) => [person.id, person]));
+    const linked = new Set(rows.map((r) => r.factorCode).filter((v): v is string => Boolean(v)));
+    const result = { ...empty };
+    for (const order of orders) {
+      const ref = (order.orderReference || order.externalId || '').trim();
+      if (ref && linked.has(ref)) {
+        result.linkedSkipped += 1;
+        continue;
+      }
+      const cancelled =
+        Boolean(order.cancelledAt) ||
+        /cancel|لغو|مرجوع/i.test(order.orderStatus ?? '');
+      const gold = Number(order.sumGold ?? 0);
+      const silver = Number(order.sumSilver ?? 0);
+      const mali = Number(order.discountTotalPrice ?? order.totalPrice ?? 0);
+      if (cancelled) {
+        result.returnCount += 1;
+        result.returnGold += gold;
+        result.returnSilver += silver;
+        result.returnMali += mali;
+      } else {
+        result.orderCount += 1;
+        result.netGold += gold;
+        result.netSilver += silver;
+        result.netMali += mali;
+        const person = order.personId ? personById.get(order.personId) : undefined;
+        const ownerId = person?.owner?.id ?? person?.ownerId ?? '__none__';
+        const name = person?.owner?.fullName || 'بدون کارشناس';
+        const bag = owners.get(ownerId) ?? { name, weight: 0, mali: 0 };
+        bag.weight += gold + silver;
+        bag.mali += mali;
+        owners.set(ownerId, bag);
+      }
+    }
+    return { public: result, owners };
+  }
+}
+
+function shamsiStart(ymd: string): Date | null {
+  const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(ymd);
+  if (!m) return null;
+  const g = toGregorian(Number(m[1]), Number(m[2]), Number(m[3]));
+  return new Date(g.gy, g.gm - 1, g.gd, 0, 0, 0, 0);
+}
+
+function shamsiEnd(ymd: string): Date | null {
+  const start = shamsiStart(ymd);
+  if (!start) return null;
+  return new Date(start.getFullYear(), start.getMonth(), start.getDate(), 23, 59, 59, 999);
 }
@@ -43,6 +43,10 @@ export class TahesabConnectionsService {
    lastHealthAt: Date | null;
    lastHealthOk: boolean | null;
    lastError: string | null;
+    customerSyncHours: number[];
+    customerSyncLastRunAt: Date | null;
+    customerSyncLastSummary: string | null;
+    customerSyncLastError: string | null;
    createdAt: Date;
    updatedAt: Date;
  }) {
@@ -60,6 +64,10 @@ export class TahesabConnectionsService {
      lastHealthAt: row.lastHealthAt?.toISOString() ?? null,
      lastHealthOk: row.lastHealthOk,
      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(),
      updatedAt: row.updatedAt.toISOString(),
    };
@@ -201,6 +209,15 @@ export class TahesabConnectionsService {

    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 = {
      ciphertext: row.tokenCiphertext,
      iv: row.tokenIv,
@@ -225,6 +242,7 @@ export class TahesabConnectionsService {
        enabled: dto.enabled ?? row.enabled,
        isDefault: dto.isDefault === true ? true : dto.isDefault === false ? false : row.isDefault,
        allowInsecureTls: dto.allowInsecureTls ?? row.allowInsecureTls,
+        ...(customerSyncHours !== undefined ? { customerSyncHours } : {}),
      },
    });
    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()
  @IsBoolean()
  allowInsecureTls?: boolean;
+
+  /** ساعت‌های ۰ تا ۲۳. آرایهٔ خالی یعنی خاموش. */
+  @IsOptional()
+  @IsArray()
+  @ArrayMaxSize(6)
+  @Type(() => Number)
+  @IsInt({ each: true })
+  @Min(0, { each: true })
+  @Max(23, { each: true })
+  customerSyncHours?: number[];
 }

 export class ManualLinkDto {
@@ -447,6 +457,18 @@ export class SyncAsnadReportDto {
  @MinLength(8)
  @MaxLength(12)
  to!: string;
+
+  /** اگر باشد، فقط سندهای همین شخص گرفته می‌شود */
+  @IsOptional()
+  @IsString()
+  personId?: string;
+
+  /** اگر باشد، فقط مشتریان این گروه‌ها (و زیرگروه‌ها) گرفته می‌شوند */
+  @IsOptional()
+  @IsArray()
+  @IsString({ each: true })
+  @ArrayMaxSize(200)
+  groupIds?: string[];
 }

 export class UpdateTahesabInvoiceSettingsDto {
@@ -8,7 +8,13 @@ import {
 } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 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 { TahesabConnectionsService } from './connections.service';
 import {
  CreateInTahesabDto,
@@ -24,6 +30,20 @@ import { formatJalaliDate, parseBirthDate } from '../../common/excel';
 import { CustomerGroupsService } from '../../customer-groups/customer-groups.service';
 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 */
 const LIST_PAGE_SIZE = 2000;
 const LIST_TIMEOUT_MS = 55_000;
@@ -538,6 +558,7 @@ export class TahesabPersonLinkService {
    organizationId: string,
    dto: ImportFromTahesabDto,
    prefetched?: { api: TahesabApi; row?: Record<string, unknown> },
+    options?: { skipJob?: boolean },
  ) {
    const clash = await this.prisma.personAccountingLink.findFirst({
      where: {
@@ -573,13 +594,14 @@ export class TahesabPersonLinkService {
    }
    const name = pickName(row) || `مشتری ته‌حساب ${dto.moshtariCode}`;
    const tel = pickTel(row);
-    const parts = name.trim().split(/\s+/);
-    const firstName = parts[0] || name;
-    const lastName = parts.slice(1).join(' ') || '—';
-    const mobile = tel || null;
+    const named = applyPersonGenderTitle({ firstName: name, lastName: '' });
+    const firstName = named.firstName;
+    const lastName = named.lastName;
+    const mobile = storedPhoneNumber(tel);
    const sourceRef = String(dto.moshtariCode);

    let personId = dto.personId;
+    let preserveExistingLink = false;
    if (personId) {
      const existing = await this.getPerson(organizationId, personId);
      const prevFirst = existing.firstName;
@@ -591,6 +613,8 @@ export class TahesabPersonLinkService {
        data: {
          firstName,
          lastName,
+          gender: named.gender,
+          showGenderInName: named.showGenderInName,
          ...(nameChanged
            ? {
                previousFirstName: prevFirst || null,
@@ -601,28 +625,33 @@ export class TahesabPersonLinkService {
          importSource: 'tahesab',
          sourceRef,
          ...(!existing.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
-          ...(mobile
-            ? {
-                mobile: existing.mobile || mobile,
-                phone: existing.phone || mobile,
-              }
-            : {}),
+          ...canonicalMobileUpdate(mobile, existing),
        },
      });
    } else {
      // اگر موبایل تکراری است → همان شخص؛ نام قبلی حفظ و نام ته‌حساب جایگزین.
-      // شخصی که روی همین اتصال به کد دیگری لینک است کنار گذاشته می‌شود؛
-      // وگرنه upsert لینک، کد قبلی را جابه‌جا و آن مشتری را دوباره «واردنشده» می‌کند.
-      const byMobile = mobile
-        ? await this.prisma.person.findFirst({
+      // اگر همان شخص قبلاً به کد دیگری از این اتصال لینک شده، لینک جابه‌جا نمی‌شود
+      // تا کد قبلی دوباره «واردنشده» نشود و مشتری تکراری ساخته نشود.
+      const mobileKeys = phoneIdentityKeys(mobile);
+      const matches = mobileKeys.length
+        ? await this.prisma.person.findMany({
            where: {
              organizationId,
-              OR: [{ mobile }, { phone: mobile }],
-              accountingLinks: { none: { connectionId: dto.connectionId } },
+              OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
            },
+            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) {
+        const linkedCode = byMobile.accountingLinks[0]?.moshtariCode;
+        preserveExistingLink = linkedCode != null && linkedCode !== dto.moshtariCode;
        const nameChanged =
          `${byMobile.firstName} ${byMobile.lastName}`.trim() !==
          `${firstName} ${lastName}`.trim();
@@ -631,6 +660,8 @@ export class TahesabPersonLinkService {
          data: {
            firstName,
            lastName,
+            gender: named.gender,
+            showGenderInName: named.showGenderInName,
            ...(nameChanged
              ? {
                  previousFirstName: byMobile.firstName || null,
@@ -639,8 +670,9 @@ export class TahesabPersonLinkService {
              : {}),
            ...carryPreviousSource(byMobile, 'tahesab'),
            importSource: 'tahesab',
-            sourceRef,
+            sourceRef: preserveExistingLink ? String(linkedCode) : sourceRef,
            ...(!byMobile.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
+            ...canonicalMobileUpdate(mobile, byMobile),
          },
        });
        personId = byMobile.id;
@@ -650,6 +682,8 @@ export class TahesabPersonLinkService {
            organizationId,
            firstName,
            lastName,
+            gender: named.gender,
+            showGenderInName: named.showGenderInName,
            mobile,
            phone: mobile,
            notes: `واردشده از ته‌حساب (کد ${dto.moshtariCode})`,
@@ -662,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({
      where: {
        personId_connectionId: {
@@ -686,6 +746,7 @@ export class TahesabPersonLinkService {
    });
    await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);

+    if (!options?.skipJob) {
      await this.prisma.accountingSyncJob.create({
        data: {
          organizationId,
@@ -696,10 +757,160 @@ export class TahesabPersonLinkService {
          result: { personId, linkId: link.id } as Prisma.InputJsonValue,
        },
      });
+    }

    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) {
    let codes = (dto.moshtariCodes ?? []).filter((n) => Number.isFinite(n) && n >= 1);
    const rowsByCode = new Map<number, Record<string, unknown>>();
@@ -0,0 +1,220 @@
+/** طبقه‌بندی و خالص‌کردن فروش/خرید بعد از مرجوعی، برای گزارش ته‌حساب. */
+
+export const SALES_FACTOR_KEYS = [
+  'karsakhte',
+  'etiket_gold',
+  'etiket_jewel',
+  'bullion',
+  'other',
+] as const;
+
+export type SalesFactorKey = (typeof SALES_FACTOR_KEYS)[number];
+
+export const SALES_FACTOR_LABELS: Record<SalesFactorKey, string> = {
+  karsakhte: 'کار ساخته',
+  etiket_gold: 'اتیکت طلا',
+  etiket_jewel: 'اتیکت جواهر',
+  bullion: 'شمش و سکه',
+  other: 'سایر',
+};
+
+export type DocDirection = 'in' | 'out' | 'purchase_return' | 'sale_return' | 'other';
+
+export type SalesDoc = {
+  bucketKey: string;
+  factor: SalesFactorKey;
+  direction: DocDirection;
+  weight: number;
+  mali: number;
+  count: number;
+  percent: number | null;
+  tarikh: string;
+};
+
+export type PercentStats = {
+  first: number | null;
+  last: number | null;
+  min: number | null;
+  max: number | null;
+  avg: number | null;
+};
+
+export type MovementStats = {
+  grossWeight: number;
+  returnWeight: number;
+  netWeight: number;
+  grossMali: number;
+  returnMali: number;
+  netMali: number;
+  grossCount: number;
+  returnCount: number;
+  netCount: number;
+  percent: PercentStats | null;
+};
+
+const EMPTY_MOVE: MovementStats = {
+  grossWeight: 0,
+  returnWeight: 0,
+  netWeight: 0,
+  grossMali: 0,
+  returnMali: 0,
+  netMali: 0,
+  grossCount: 0,
+  returnCount: 0,
+  netCount: 0,
+  percent: null,
+};
+
+function norm(raw: string): string {
+  return raw.replace(/\u064A/g, '\u06CC').replace(/\u0643/g, '\u06A9').replace(/\s+/g, ' ').trim();
+}
+
+export function classifyDirection(noRaw: string): DocDirection {
+  const no = norm(noRaw);
+  if (no.includes('ورود کارساخته مرجوع')) return 'sale_return';
+  if (no.includes('خروج کارساخته مرجوع')) return 'purchase_return';
+  if (no.includes('ورود کارساخته')) return 'in';
+  if (no.includes('خروج کارساخته')) return 'out';
+  const isReturn = /مرجوع|برگشت/.test(no);
+  const isBuy = /خرید/.test(no);
+  const isSell = /فروش/.test(no);
+  if (isReturn && isBuy) return 'purchase_return';
+  if (isReturn) return 'sale_return';
+  if (isBuy || (/ورود/.test(no) && !isReturn)) return 'in';
+  if (isSell || (/خروج/.test(no) && !isReturn)) return 'out';
+  return 'other';
+}
+
+export function classifyFactor(noRaw: string, noKar: string | null | undefined): SalesFactorKey {
+  const blob = norm(`${noRaw} ${noKar ?? ''}`);
+  if (blob.includes('کارساخته') || blob.includes('کار ساخته')) return 'karsakhte';
+  if (/شمش|سکه/.test(blob)) return 'bullion';
+  if (/جواهر|ساچمه/.test(blob)) return 'etiket_jewel';
+  if (blob.includes('اتیکت')) return 'etiket_gold';
+  return 'other';
+}
+
+export function combinedPercent(
+  darsad: number | null | undefined,
+  talayee: number | null | undefined,
+  maliat: number | null | undefined,
+): number | null {
+  const parts = [darsad, talayee, maliat].filter(
+    (n): n is number => n != null && Number.isFinite(n),
+  );
+  if (!parts.length) return null;
+  return parts.reduce((sum, n) => sum + n, 0);
+}
+
+export function positiveAmount(vazn: number | null | undefined, tabdil: number | null | undefined): number {
+  if (vazn != null && Number.isFinite(vazn) && vazn !== 0) return Math.abs(vazn);
+  if (tabdil != null && Number.isFinite(tabdil)) return Math.abs(tabdil);
+  return 0;
+}
+
+type Piece = {
+  tarikh: string;
+  seq: number;
+  weight: number;
+  mali: number;
+  count: number;
+  percent: number | null;
+};
+
+/** مرجوعی از آخرین سندهای همان نام کم می‌شود تا فروش/خریدِ برگشتی در آمار نماند. */
+function remainingAfterReturns(gross: Piece[], returns: Piece[]): Piece[] {
+  const docs = gross.map((d) => ({ ...d }));
+  let leftW = returns.reduce((s, d) => s + d.weight, 0);
+  let leftM = returns.reduce((s, d) => s + d.mali, 0);
+  let leftC = returns.reduce((s, d) => s + d.count, 0);
+  const order = [...docs].sort((a, b) => {
+    if (a.tarikh !== b.tarikh) return b.tarikh.localeCompare(a.tarikh);
+    return b.seq - a.seq;
+  });
+  for (const doc of order) {
+    if (leftW <= 0 && leftM <= 0 && leftC <= 0) break;
+    const takeW = Math.min(doc.weight, Math.max(leftW, 0));
+    const takeM = Math.min(doc.mali, Math.max(leftM, 0));
+    const takeC = Math.min(doc.count, Math.max(leftC, 0));
+    doc.weight -= takeW;
+    doc.mali -= takeM;
+    doc.count -= takeC;
+    leftW -= takeW;
+    leftM -= takeM;
+    leftC -= takeC;
+  }
+  return docs.filter((d) => d.weight > 1e-9 || d.mali > 1e-6 || d.count > 1e-9);
+}
+
+function percentOf(docs: Piece[]): PercentStats | null {
+  const withPercent = docs.filter((d) => d.percent != null && d.weight > 1e-9);
+  if (!withPercent.length) return null;
+  const ordered = [...withPercent].sort((a, b) => {
+    if (a.tarikh !== b.tarikh) return a.tarikh.localeCompare(b.tarikh);
+    return a.seq - b.seq;
+  });
+  const values = ordered.map((d) => d.percent!);
+  const weight = ordered.reduce((s, d) => s + d.weight, 0);
+  const avg =
+    weight > 0
+      ? ordered.reduce((s, d) => s + d.percent! * d.weight, 0) / weight
+      : null;
+  return {
+    first: ordered[0]?.percent ?? null,
+    last: ordered[ordered.length - 1]?.percent ?? null,
+    min: Math.min(...values),
+    max: Math.max(...values),
+    avg,
+  };
+}
+
+export function movementStats(lines: SalesDoc[], side: 'in' | 'out'): MovementStats {
+  const returnDir: DocDirection = side === 'in' ? 'purchase_return' : 'sale_return';
+  const groups = new Map<string, { gross: Piece[]; ret: Piece[] }>();
+  let seq = 0;
+  for (const line of lines) {
+    if (line.direction !== side && line.direction !== returnDir) continue;
+    const bag = groups.get(line.bucketKey) ?? { gross: [], ret: [] };
+    const piece: Piece = {
+      tarikh: line.tarikh,
+      seq: seq++,
+      weight: Math.abs(line.weight),
+      mali: Math.abs(line.mali),
+      count: Math.abs(line.count),
+      percent: line.percent,
+    };
+    if (line.direction === side) bag.gross.push(piece);
+    else bag.ret.push(piece);
+    groups.set(line.bucketKey, bag);
+  }
+  if (!groups.size) return { ...EMPTY_MOVE };
+
+  let grossWeight = 0;
+  let returnWeight = 0;
+  let grossMali = 0;
+  let returnMali = 0;
+  let grossCount = 0;
+  let returnCount = 0;
+  const kept: Piece[] = [];
+  for (const bag of groups.values()) {
+    grossWeight += bag.gross.reduce((s, d) => s + d.weight, 0);
+    returnWeight += bag.ret.reduce((s, d) => s + d.weight, 0);
+    grossMali += bag.gross.reduce((s, d) => s + d.mali, 0);
+    returnMali += bag.ret.reduce((s, d) => s + d.mali, 0);
+    grossCount += bag.gross.reduce((s, d) => s + d.count, 0);
+    returnCount += bag.ret.reduce((s, d) => s + d.count, 0);
+    kept.push(...remainingAfterReturns(bag.gross, bag.ret));
+  }
+  return {
+    grossWeight,
+    returnWeight,
+    netWeight: Math.max(0, grossWeight - returnWeight),
+    grossMali,
+    returnMali,
+    netMali: Math.max(0, grossMali - returnMali),
+    grossCount,
+    returnCount,
+    netCount: Math.max(0, grossCount - returnCount),
+    percent: percentOf(kept),
+  };
+}
@@ -309,6 +309,20 @@ export class TahesabController {
      dto.connectionId,
      dto.from,
      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 ?? '',
    );
  }

@@ -320,6 +334,27 @@ export class TahesabController {
    return this.asnadReport.getSyncJob(user.organizationId, jobId);
  }

+  @Get('reports/asnad/overview')
+  asnadReportOverview(
+    @CurrentUser() user: { organizationId: string },
+    @Query('connectionId') connectionId?: string,
+    @Query('from') from?: string,
+    @Query('to') to?: string,
+    @Query('groupIds') groupIds?: string | string[],
+    @Query('personId') personId?: string,
+    @Query('jensFelez') jensFelez?: string,
+  ) {
+    if (!from || !to) {
+      throw new BadRequestException('پارامتر from و to الزامی است.');
+    }
+    return this.asnadReport.overview(user.organizationId, {
+      connectionId,
+      from,
+      to,
+      ...this.parseAsnadFilters(groupIds, personId, undefined, jensFelez),
+    });
+  }
+
  @Get('reports/asnad/summary')
  asnadReportSummary(
    @CurrentUser() user: { organizationId: string },
@@ -12,6 +12,7 @@ import { TahesabBalanceService } from './balance.service';
 import { TahesabDocumentsService } from './documents.service';
 import { TahesabAsnadReportService } from './asnad-report.service';
 import { TahesabInvoiceSettingsService } from './invoice-settings.service';
+import { TahesabCustomerSyncScheduler } from './customer-sync.scheduler';
 import { TahesabController } from './tahesab.controller';
 import { CustomerGroupsModule } from '../../customer-groups/customer-groups.module';

@@ -29,6 +30,7 @@ import { CustomerGroupsModule } from '../../customer-groups/customer-groups.modu
    TahesabDocumentsService,
    TahesabAsnadReportService,
    TahesabInvoiceSettingsService,
+    TahesabCustomerSyncScheduler,
  ],
  exports: [
    TahesabCryptoService,
@@ -11,7 +11,7 @@ import type {
 } from '@mento/shared';
 import { PrismaService } from '../../prisma/prisma.service';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { normalizePhone } from '../../contacts/normalize';
+import { iranMobileLookupKeys, normalizePhone } from '../../contacts/normalize';
 import { VoipConnectionsService } from './connections.service';

 function digitsOnly(value: string | null | undefined): string {
@@ -35,6 +35,7 @@ function phoneVariants(raw: string | null | undefined): string[] {
    variants.add(`0${d}`);
    variants.add(`98${d}`);
  }
+  for (const key of iranMobileLookupKeys(raw)) variants.add(key);
  return [...variants];
 }

@@ -6,7 +6,11 @@ import type {
  WooCommerceSyncResultDto,
 } from '@mento/shared';
 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 type { WooOrder } from './woo-client';

@@ -374,7 +378,8 @@ export class WooSyncService {
  ): Promise<string | null> {
    const billing = order.billing ?? {};
    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 lastName = (billing.last_name ?? '').trim() || 'ووکامرس';

@@ -387,7 +392,9 @@ export class WooSyncService {
        organizationId,
        OR: [
          ...(email ? [{ email }] : []),
-          ...(mobile ? [{ mobile }, { phone: mobile }] : []),
+          ...(mobileKeys.length
+            ? [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }]
+            : []),
        ],
      },
      select: { id: true },
@@ -32,6 +32,8 @@ const MAP_TO = [
  'lead.trade',
  'lead.notes',
  'lead.source',
+  'lead.gender',
+  'person.gender',
  'notes',
  'custom',
 ] as const;
@@ -13,15 +13,20 @@ import type {
  SubmitLeadFormResponse,
  UpdateLeadFormRequest,
 } from '@mento/shared';
+import { isGenderQuestionLabel, parsePersonGenderAnswer } from '@mento/shared';
 import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
 import { LocalFileStorage } from '../storage/local-file.storage';
+import { StorageQuotaService } from '../billing/storage-quota.service';
 import { AutomationsService } from '../automations/automations.service';
 import { MessageAutomationsService } from '../message-automations/message-automations.service';
 import {
+  canonicalIranMobile,
  emptyToNull,
  normalizeEmail,
  normalizePhone,
+  phoneIdentityKeys,
+  storedPhoneNumber,
 } from '../contacts/normalize';
 import { LeadStagesService } from '../leads/lead-stages.service';

@@ -83,6 +88,7 @@ export class LeadFormsService {
  constructor(
    private readonly prisma: PrismaService,
    private readonly files: LocalFileStorage,
+    private readonly storage: StorageQuotaService,
    private readonly automations: AutomationsService,
    private readonly messageAutomations: MessageAutomationsService,
    private readonly leadStages: LeadStagesService,
@@ -210,7 +216,12 @@ export class LeadFormsService {
  }

  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 } });
  }

@@ -391,6 +402,7 @@ export class LeadFormsService {
      sourceId: form.id,
      sourceType: 'lead_form',
      leadId,
+      syncLeadAssignee: !ownerId && leadCreated && !!leadId,
      mobile: mapped.mobile ?? mapped.phone ?? null,
      formName: form.name,
      formValues: values,
@@ -449,7 +461,10 @@ export class LeadFormsService {
      ? await this.prisma.person.findFirst({
          where: {
            organizationId: form.organizationId,
-            OR: [{ mobile }, { phone: mobile }],
+            OR: [
+              { mobile: { in: phoneIdentityKeys(mobile) } },
+              { phone: { in: phoneIdentityKeys(mobile) } },
+            ],
          },
          select: { id: true, firstName: true, lastName: true },
        })
@@ -547,6 +562,7 @@ export class LeadFormsService {
          trade: emptyToNull(mapped.trade) ?? existingLead.trade,
          source: source ?? existingLead.source,
          notes: emptyToNull(mapped.notes) ?? existingLead.notes,
+          ...(mapped.gender ? { gender: mapped.gender } : {}),
          assigneeId: existingLead.assigneeId ?? assigneeId,
          lastContactAt: new Date(),
        },
@@ -595,6 +611,7 @@ export class LeadFormsService {
        trade: emptyToNull(mapped.trade),
        source,
        notes: emptyToNull(mapped.notes),
+        gender: mapped.gender ?? 'none',
        stageId,
        position: (maxPos._max.position ?? -1) + 1,
        assigneeId,
@@ -630,13 +647,16 @@ export class LeadFormsService {
    ownerId: string,
  ): Promise<string> {
    const email = normalizeEmail(mapped.email);
-    const mobile = normalizePhone(mapped.mobile);
-    const phone = normalizePhone(mapped.phone);
+    const mobile = storedPhoneNumber(mapped.mobile);
+    const phone = storedPhoneNumber(mapped.phone);

    const or: Prisma.PersonWhereInput[] = [];
    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
      ? await this.prisma.person.findFirst({
          where: { organizationId, OR: or },
@@ -654,6 +674,7 @@ export class LeadFormsService {
          phone: phone ?? existing.phone,
          position: emptyToNull(mapped.position) ?? existing.position,
          notes: emptyToNull(mapped.notes) ?? existing.notes,
+          ...(mapped.gender ? { gender: mapped.gender } : {}),
          ownerId: existing.ownerId ?? ownerId,
        },
      });
@@ -670,6 +691,7 @@ export class LeadFormsService {
        phone,
        position: emptyToNull(mapped.position),
        notes: emptyToNull(mapped.notes),
+        gender: mapped.gender ?? 'none',
        ownerId,
      },
    });
@@ -829,6 +851,9 @@ export class LeadFormsService {
      throw new BadRequestException('فرمت تصویر کاور باید PNG، JPG یا WEBP باشد');
    }
    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);
    if (row.coverStorageKey && row.coverStorageKey !== key) {
      await this.files.remove(row.coverStorageKey);
@@ -837,12 +862,17 @@ export class LeadFormsService {
      where: { id },
      data: { coverStorageKey: key },
    });
+    if (delta) await this.storage.addLocal(organizationId, delta);
    return this.get(organizationId, id);
  }

  async removeCover(organizationId: string, id: string) {
    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({
      where: { id },
      data: { coverStorageKey: null },
@@ -925,6 +955,7 @@ type MappedValues = {
  region?: string;
  trade?: string;
  leadSource?: string;
+  gender?: 'male' | 'female' | 'none';
 };

 function mapValues(
@@ -945,6 +976,15 @@ function mapValues(
      throw new BadRequestException(`فیلد «${field.label}» الزامی است`);
    }
    if (!raw) continue;
+    if (
+      field.mapTo === 'lead.gender' ||
+      field.mapTo === 'person.gender' ||
+      isGenderQuestionLabel(field.label)
+    ) {
+      const gender = parsePersonGenderAnswer(raw);
+      if (gender) mapped.gender = gender;
+      continue;
+    }
    switch (field.mapTo) {
      case 'person.fullName': {
        const parts = raw.split(/\s+/).filter(Boolean);
@@ -1068,7 +1108,8 @@ function collectExtras(
  for (const field of fields) {
    if (field.fieldType === 'heading' || field.mapTo !== 'custom') continue;
    const raw = (values?.[field.key] ?? '').toString().trim();
-    if (raw) lines.push(`${field.label}: ${raw}`);
+    if (!raw || (isGenderQuestionLabel(field.label) && parsePersonGenderAnswer(raw))) continue;
+    lines.push(`${field.label}: ${raw}`);
  }
  return lines.join('\n');
 }
@@ -1083,13 +1124,12 @@ function slugKey(label: string): string {
 }

 function mobileKey(raw: string | null | undefined): string | null {
+  const canon = canonicalIranMobile(raw);
+  if (canon) return canon;
  const n = normalizePhone(raw);
  if (!n) return null;
  const d = n.replace(/\D/g, '');
-  if (!d) return 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;
+  return d || null;
 }

 function normalizeDuplicateMode(raw?: string | null): string {
@@ -8,6 +8,7 @@ import {
  MaxLength,
  MinLength,
 } from 'class-validator';
+import { PERSON_GENDERS } from '@mento/shared';

 export class LeadSmsDto {
  @IsString()
@@ -26,6 +27,8 @@ export class CreateLeadDto {
  mobile!: string;

  @IsOptional() @IsString() contactName?: string;
+  @IsOptional() @IsIn(PERSON_GENDERS) gender?: (typeof PERSON_GENDERS)[number];
+  @IsOptional() @IsBoolean() showGenderInName?: boolean;
  @IsOptional() @IsString() phone?: string;
  @IsOptional() @IsString() city?: string;
  @IsOptional() @IsString() region?: string;
@@ -47,6 +50,8 @@ export class UpdateLeadDto {
  @IsOptional() @IsString() @MinLength(1) title?: string;
  @IsOptional() @IsString() @MinLength(5) mobile?: string;
  @IsOptional() @IsString() contactName?: string | null;
+  @IsOptional() @IsIn(PERSON_GENDERS) gender?: (typeof PERSON_GENDERS)[number];
+  @IsOptional() @IsBoolean() showGenderInName?: boolean;
  @IsOptional() @IsString() phone?: string | null;
  @IsOptional() @IsString() city?: string | null;
  @IsOptional() @IsString() region?: string | null;
@@ -1,5 +1,6 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import type { LeadStageDto } from '@mento/shared';
+import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';

 const DEFAULT_STAGES: Array<{
@@ -74,10 +75,11 @@ export class LeadStagesService {
      where: { organizationId },
      _max: { position: true },
    });
+    try {
      const row = await this.prisma.leadStage.create({
        data: {
          organizationId,
-        name: dto.name.trim(),
+          name: this.cleanName(dto.name),
          color: dto.color?.trim() || 'teal',
          showOnBoard: dto.showOnBoard !== false,
          isConverted: Boolean(dto.isConverted),
@@ -88,6 +90,9 @@ export class LeadStagesService {
        include: { _count: { select: { leads: true } } },
      });
      return this.toDto(row);
+    } catch (e) {
+      this.rethrow(e);
+    }
  }

  async update(
@@ -103,10 +108,11 @@ export class LeadStagesService {
      position?: number;
    },
  ): Promise<LeadStageDto> {
+    try {
    await this.prisma.leadStage.updateMany({
      where: { id, organizationId },
      data: {
-        ...(dto.name != null ? { name: dto.name.trim() } : {}),
+        ...(dto.name != null ? { name: this.cleanName(dto.name) } : {}),
        ...(dto.color != null ? { color: dto.color } : {}),
        ...(dto.showOnBoard != null ? { showOnBoard: dto.showOnBoard } : {}),
        ...(dto.isConverted != null ? { isConverted: dto.isConverted } : {}),
@@ -122,6 +128,9 @@ export class LeadStagesService {
      include: { _count: { select: { leads: true } } },
    });
    return this.toDto(row);
+    } catch (e) {
+      this.rethrow(e);
+    }
  }

  async reorder(organizationId: string, stageIds: string[]): Promise<LeadStageDto[]> {
@@ -143,11 +152,27 @@ export class LeadStagesService {
    });
    if (!stage) return;
    if (stage._count.leads > 0) {
-      throw new Error('مرحله‌ای که لید دارد قابل حذف نیست');
+      throw new BadRequestException(
+        'این ستون هنوز لید دارد و حذف نمی‌شود. لیدهای فعال و بایگانی را اول به ستون دیگری ببرید.',
+      );
    }
    await this.prisma.leadStage.delete({ where: { id } });
  }

+  private cleanName(raw: string): string {
+    const name = raw?.trim() ?? '';
+    if (!name) throw new BadRequestException('نام ستون لازم است');
+    if (name.length > 80) throw new BadRequestException('نام ستون حداکثر ۸۰ کاراکتر است');
+    return name;
+  }
+
+  private rethrow(e: unknown): never {
+    if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
+      throw new BadRequestException('ستونی با این نام وجود دارد');
+    }
+    throw e;
+  }
+
  private toDto(row: {
    id: string;
    name: string;
@@ -107,6 +107,7 @@ export class LeadsController {
      await this.stages.remove(user.organizationId, id);
      return { ok: true };
    } catch (e) {
+      if (e instanceof BadRequestException) throw e;
      throw new BadRequestException(
        e instanceof Error ? e.message : 'حذف مرحله ناموفق بود',
      );
@@ -301,8 +302,6 @@ export class LeadsController {
  }

  @Post('assign')
-  @UseGuards(RolesGuard)
-  @Roles('owner', 'admin')
  assign(@CurrentUser() user: Actor, @Body() dto: AssignLeadsDto) {
    return this.leads
      .assign(user, dto.leadIds, dto.assigneeId)
@@ -20,6 +20,7 @@ import type {
  PaginatedResponse,
 } from '@mento/shared';
 import { FILTERED_IDS_MAX } from '@mento/shared';
+import { applyLeadGenderName, applyPersonGenderTitle } from '@mento/shared';
 import { PrismaService } from '../prisma/prisma.service';
 import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
 import { renderSmsText } from '../common/sms-text';
@@ -30,13 +31,21 @@ import {
  elevated,
  forScope,
 } from '../common/record-scope';
+import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
+import { placeId, sameIds, writePositions } from '../common/column-order';
 import {
  asAddresses,
  collectAddresses,
  toJsonAddresses,
 } 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 { StorageQuotaService } from '../billing/storage-quota.service';
 import { LeadStagesService } from './lead-stages.service';
 import { buildSearchWhere, ci } from '../common/search';
 import { GamificationService } from '../gamification/gamification.service';
@@ -51,13 +60,20 @@ const LOGO_EXT: Record<string, string> = {
 };

 function mobileKey(raw: string | null | undefined): string | null {
+  const canon = canonicalIranMobile(raw);
+  if (canon) return canon;
  const n = normalizePhone(raw);
  if (!n) return null;
  const d = n.replace(/\D/g, '');
-  if (!d) return 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;
+  return d || null;
+}
+
+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 {
@@ -90,6 +106,7 @@ export class LeadsService {
    private readonly prisma: PrismaService,
    private readonly stages: LeadStagesService,
    private readonly files: LocalFileStorage,
+    private readonly storage: StorageQuotaService,
    private readonly game: GamificationService,
    private readonly sms: SmsGatewayService,
    private readonly outboundSms: OutboundSmsLogService,
@@ -318,10 +335,7 @@ export class LeadsService {
      };
    }
    const person = await this.prisma.person.findFirst({
-      where: {
-        organizationId: actor.organizationId,
-        OR: [{ mobile }, { phone: mobile }],
-      },
+      where: personWithMobile(actor.organizationId, mobile),
      select: { id: true, firstName: true, lastName: true },
    });
    if (person) {
@@ -341,6 +355,8 @@ export class LeadsService {
      title: string;
      mobile: string;
      contactName?: string | null;
+      gender?: string | null;
+      showGenderInName?: boolean | null;
      phone?: string | null;
      city?: string | null;
      region?: string | null;
@@ -374,19 +390,31 @@ export class LeadsService {
    const stageId = dto.stageId || stages[0]?.id;
    if (!stageId) throw new BadRequestException('مرحله‌ای تعریف نشده');

+    const allowOthers = await actorCanAssignToOthers(this.prisma, actor, 'leads');
    let assigneeId: string | null = null;
-    if (elevated(actor.role) && dto.assigneeId) {
+    if (allowOthers && dto.assigneeId) {
      assigneeId = dto.assigneeId;
-    } else if (!elevated(actor.role)) {
+    } else if (!allowOthers) {
      assigneeId = actor.userId;
    }

    const registeredAt = dto.registeredAt ? new Date(dto.registeredAt) : null;
+    const named = applyLeadGenderName({
+      title: dto.title,
+      contactName: dto.contactName,
+      gender:
+        dto.gender === 'male' || dto.gender === 'female' || dto.gender === 'none'
+          ? dto.gender
+          : undefined,
+      showGenderInName: dto.showGenderInName,
+    });
    const row = await this.prisma.lead.create({
      data: {
        organizationId: actor.organizationId,
-        title: dto.title.trim(),
-        contactName: emptyToNull(dto.contactName),
+        title: named.title,
+        contactName: named.contactName,
+        gender: named.gender,
+        showGenderInName: named.showGenderInName,
        mobile,
        phone: emptyToNull(dto.phone),
        city: emptyToNull(dto.city),
@@ -461,12 +489,41 @@ export class LeadsService {
      }
    }

+    const touchName =
+      typeof dto.title === 'string' ||
+      dto.contactName !== undefined ||
+      dto.gender !== undefined ||
+      dto.showGenderInName !== undefined;
+    const named = touchName
+      ? applyLeadGenderName({
+          title: typeof dto.title === 'string' ? dto.title : existing.title,
+          contactName:
+            dto.contactName !== undefined
+              ? (dto.contactName as string | null)
+              : existing.contactName,
+          gender:
+            dto.gender === 'male' || dto.gender === 'female' || dto.gender === 'none'
+              ? dto.gender
+              : existing.gender === 'male' || existing.gender === 'female'
+                ? existing.gender
+                : 'none',
+          showGenderInName:
+            typeof dto.showGenderInName === 'boolean'
+              ? dto.showGenderInName
+              : existing.showGenderInName,
+        })
+      : null;
+
    const data: Prisma.LeadUpdateInput = {
-      ...(typeof dto.title === 'string' ? { title: dto.title.trim() } : {}),
-      mobile,
-      ...(dto.contactName !== undefined
-        ? { contactName: emptyToNull(dto.contactName as string) }
+      ...(named
+        ? {
+            title: named.title,
+            contactName: named.contactName,
+            gender: named.gender,
+            showGenderInName: named.showGenderInName,
+          }
        : {}),
+      mobile,
      ...(dto.phone !== undefined
        ? { phone: emptyToNull(dto.phone as string) }
        : {}),
@@ -525,8 +582,9 @@ export class LeadsService {
    if (typeof dto.stageId === 'string' && dto.stageId !== existing.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;
+      await assertAssigneeSet(this.prisma, actor, 'leads', [aid], [existing.assigneeId]);
      data.assignee = aid
        ? { connect: { id: aid } }
        : { disconnect: true };
@@ -565,24 +623,43 @@ export class LeadsService {
    });
    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({
      where: { id },
      data: {
        stageId,
-        position: position ?? 0,
-        ...(stage.isConverted
-          ? {}
-          : {}),
+        position: nextPosition,
      },
      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(
        actor,
        id,
        'stage_changed',
        `به مرحله «${stage.name}» منتقل شد`,
      );
-    if (before.stageId !== stageId) {
      this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
        eventKey: `${id}:${stageId}`,
        facts: { stageName: stage.name, source: row.source },
@@ -596,9 +673,7 @@ export class LeadsService {
    leadIds: string[],
    assigneeId: string,
  ): Promise<number> {
-    if (!elevated(actor.role)) {
-      throw new BadRequestException('فقط مدیر می‌تواند تخصیص دهد');
-    }
+    await assertAssigneeSet(this.prisma, actor, 'leads', [assigneeId]);
    const user = await this.prisma.user.findFirst({
      where: {
        id: assigneeId,
@@ -764,14 +839,14 @@ export class LeadsService {
      ? `تماس ثبت شد — ${dto.outcome}`
      : 'تماس ثبت شد';
    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 = {
      lastContactAt: new Date(),
      ...(dto.nextFollowUpAt !== undefined
-        ? {
-            nextFollowUpAt: dto.nextFollowUpAt
-              ? new Date(dto.nextFollowUpAt)
-              : null,
-          }
+        ? { nextFollowUpAt: followAt }
        : {}),
    };
    if (dto.stageId) data.stage = { connect: { id: dto.stageId } };
@@ -810,8 +885,10 @@ export class LeadsService {
    nextFollowUpAt: string,
    body?: string,
  ): Promise<LeadDto> {
-    await this.findAccessible(actor, id);
-    const at = new Date(nextFollowUpAt);
+    const lead = await this.findAccessible(actor, id);
+    const at = this.parseFollowUpAt(nextFollowUpAt);
+    if (!at) throw new BadRequestException('زمان پیگیری نامعتبر است');
+    await this.createLeadFollowUpActivity(actor, lead, at, body);
    await this.addEvent(
      actor,
      id,
@@ -832,6 +909,39 @@ export class LeadsService {
    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> {
    if (!elevated(actor.role) && ids.length > 1) {
      throw new BadRequestException('حذف گروهی فقط برای مدیر');
@@ -865,10 +975,7 @@ export class LeadsService {
    }

    let person = await this.prisma.person.findFirst({
-      where: {
-        organizationId: actor.organizationId,
-        OR: [{ mobile: lead.mobile }, { phone: lead.mobile }],
-      },
+      where: personWithMobile(actor.organizationId, lead.mobile),
    });
    let createdPerson = false;

@@ -877,14 +984,25 @@ export class LeadsService {
        ? `${dto.firstName ?? ''} ${dto.lastName ?? ''}`.trim()
        : (lead.contactName || lead.title).trim();
      const nameParts = rawName.split(/\s+/).filter(Boolean);
-      const firstName = nameParts[0] || lead.title;
-      const lastName = nameParts.slice(1).join(' ') || '—';
+      const bareFirst = nameParts[0] || lead.title;
+      const bareLast = nameParts.slice(1).join(' ');
+      const named = applyPersonGenderTitle({
+        firstName: bareFirst,
+        lastName: bareLast,
+        gender:
+          lead.gender === 'male' || lead.gender === 'female' || lead.gender === 'none'
+            ? lead.gender
+            : 'none',
+        showGenderInName: lead.showGenderInName,
+      });
      person = await this.prisma.person.create({
        data: {
          organizationId: actor.organizationId,
-          firstName,
-          lastName,
-          mobile: lead.mobile,
+          firstName: named.firstName,
+          lastName: named.lastName,
+          gender: named.gender,
+          showGenderInName: named.showGenderInName,
+          mobile: canonicalIranMobile(lead.mobile) ?? lead.mobile,
          phone: lead.phone,
          instagram: lead.instagram,
          birthDate: lead.birthDate,
@@ -979,8 +1097,10 @@ export class LeadsService {
    const stages = await this.stages.list(actor.organizationId);
    const convertedIds = stages.filter((s) => s.isConverted).map((s) => s.id);
    const lostIds = stages.filter((s) => s.isLost).map((s) => s.id);
-    const interested = stages.find((s) => s.name.includes('علاقه‌مند'));
-    const newStage = stages.find((s) => s.name === 'جدید');
+    // همان مقصد فرم و ورود از اکسل: اولین ستون باز، مستقل از اسم «جدید»
+    const newStage = stages.find(
+      (s) => !s.isConverted && !s.isLost && !s.isUnqualified,
+    );

    const [
      total,
@@ -988,7 +1108,6 @@ export class LeadsService {
      unassigned,
      converted,
      lost,
-      interestedCount,
      withFollowUp,
      callsLogged,
      byAssigneeRaw,
@@ -1008,11 +1127,6 @@ export class LeadsService {
            where: { ...base, stageId: { in: lostIds } },
          })
        : Promise.resolve(0),
-      interested
-        ? this.prisma.lead.count({
-            where: { ...base, stageId: interested.id },
-          })
-        : Promise.resolve(0),
      this.prisma.lead.count({
        where: { ...base, nextFollowUpAt: { not: null } },
      }),
@@ -1055,13 +1169,102 @@ export class LeadsService {
        .sort((a, b) => b.count - a.count),
      callsLogged,
      withFollowUp,
-      interested: interestedCount,
+      interested: 0,
      converted,
      lost,
      conversionRate: Math.round((converted / denom) * 1000) / 10,
    };
  }

+  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(
    organizationId: string,
    createdById: string | null,
@@ -1104,10 +1307,7 @@ export class LeadsService {
    }

    const existingPerson = await this.prisma.person.findFirst({
-      where: {
-        organizationId,
-        OR: [{ mobile }, { phone: mobile }],
-      },
+      where: personWithMobile(organizationId, mobile),
      select: { id: true },
    });
    if (existingPerson) {
@@ -1206,6 +1406,8 @@ export class LeadsService {
      id: row.id,
      title: row.title,
      contactName: row.contactName,
+      gender: row.gender === 'male' || row.gender === 'female' ? row.gender : 'none',
+      showGenderInName: row.showGenderInName,
      mobile: row.mobile,
      phone: row.phone,
      city: row.city,
@@ -1256,6 +1458,9 @@ export class LeadsService {
    const storageKey = path
      .join(actor.organizationId, 'leads', id, `logo.${ext}`)
      .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);
    if (prevKey && prevKey !== storageKey) {
      await this.files.remove(prevKey);
@@ -1266,13 +1471,16 @@ export class LeadsService {
      include: leadInclude,
    });
    await this.addEvent(actor, id, 'note', 'لوگو به‌روز شد', null);
+    if (delta) await this.storage.addLocal(actor.organizationId, delta);
    return this.toDto(row);
  }

  async removeLogo(actor: Actor, id: string): Promise<LeadDto> {
    const existing = await this.findAccessible(actor, id);
    if (existing.logoStorageKey) {
+      const bytes = await this.files.sizeOf(existing.logoStorageKey);
      await this.files.remove(existing.logoStorageKey);
+      if (bytes) await this.storage.addLocal(actor.organizationId, -bytes);
    }
    const row = await this.prisma.lead.update({
      where: { id },
@@ -56,7 +56,7 @@ function testTemplate() {
    }) === 'سلام علی 0912',
    'name phone vars',
  );
-  assert(clipSms('الف'.repeat(200)).length === 160, 'sms clip');
+  assert(clipSms('الف'.repeat(200)).length === 200, 'sms is not clipped');
 }

 testDelay();
@@ -17,7 +17,20 @@ export const MESSAGE_AUTOMATION_TRIGGERS = [
 ] as const;

 export const MAX_MESSAGE_REPEAT = 10;
-export const MAX_MESSAGE_SMS = 160;
+
+/** شمارهٔ مشتری: اول شخص، و اگر نبود شمارهٔ خود سرنخ. */
+export function customerPhone(
+  person: { mobile?: string | null; phone?: string | null } | null | undefined,
+  lead: { mobile?: string | null; phone?: string | null } | null | undefined,
+): string {
+  return (
+    person?.mobile?.trim() ||
+    person?.phone?.trim() ||
+    lead?.mobile?.trim() ||
+    lead?.phone?.trim() ||
+    ''
+  );
+}

 export function delayMs(value: number, unit: MessageDelayUnit): number {
  const n = Math.max(0, Math.trunc(Number(value) || 0));
@@ -92,10 +105,9 @@ export function applyMessageTemplate(
  });
 }

+/** متن کامل پیامک؛ بخش‌بندی و هزینه در درگاه حساب می‌شود. */
 export function clipSms(text: string): string {
-  const trimmed = text.trim();
-  if (trimmed.length <= MAX_MESSAGE_SMS) return trimmed;
-  return `${trimmed.slice(0, MAX_MESSAGE_SMS - 1)}…`;
+  return text.trim();
 }

 /** When this event happens, cancel leftover messages of these earlier triggers. */
@@ -21,6 +21,7 @@ import {
  buildSendAts,
  cancelTriggersFor,
  clipSms,
+  customerPhone,
 } from './message-automation.util';

 export type MessageAutomationContext = {
@@ -354,13 +355,15 @@ export class MessageAutomationsService {
          },
        })
      : null;
+    const lead = await this.lookupLead(job);
    const personName = person
      ? [person.firstName, person.lastName].filter(Boolean).join(' ').trim()
      : '';
+    const phone = customerPhone(person, lead);
    const vars = {
      title: job.entityTitle,
-      name: personName || job.entityTitle,
-      phone: person?.mobile || person?.phone || '',
+      name: personName || lead?.contactName?.trim() || lead?.title || job.entityTitle,
+      phone,
      date: formatJalaliDayFa(new Date()),
      company: person?.company?.name ?? '',
    };
@@ -405,13 +408,45 @@ export class MessageAutomationsService {
    }

    if (targetPerson && wantSms) {
-      await this.sendSms(person?.mobile || person?.phone, smsText, {
+      if (!phone) {
+        throw new Error('شماره مشتری یا سرنخ برای پیامک پیدا نشد');
+      }
+      const sent = await this.sendSms(phone, smsText, {
        organizationId: job.organizationId,
        personId: job.personId,
+        leadId: lead?.id ?? null,
        ruleId: job.ruleId || job.rule.id || '',
      });
+      if (!sent) {
+        throw new Error('ارسال پیامک به مشتری یا سرنخ ناموفق بود');
      }
    }
+  }
+
+  /** سرنخ همان پرونده، یا سرنخی که به این شخص تبدیل شده. */
+  private async lookupLead(job: {
+    organizationId: string;
+    entityId: string;
+    personId: string | null;
+  }) {
+    return this.prisma.lead.findFirst({
+      where: {
+        organizationId: job.organizationId,
+        OR: [
+          { id: job.entityId },
+          ...(job.personId ? [{ convertedPersonId: job.personId }] : []),
+        ],
+      },
+      select: {
+        id: true,
+        mobile: true,
+        phone: true,
+        contactName: true,
+        title: true,
+      },
+      orderBy: { createdAt: 'desc' },
+    });
+  }

  private async sendSms(
    mobile: string | null | undefined,
@@ -419,12 +454,13 @@ export class MessageAutomationsService {
    log: {
      organizationId: string;
      personId?: string | null;
+      leadId?: string | null;
      ruleId: string;
    },
-  ) {
-    if (!mobile) {
+  ): Promise<boolean> {
+    if (!mobile?.trim()) {
      this.logger.warn('Message automation SMS skipped: no mobile');
-      return;
+      return false;
    }
    const result = await this.sms.send({
      organizationId: log.organizationId,
@@ -432,10 +468,11 @@ export class MessageAutomationsService {
      text,
      source: 'automation',
    });
-    if (log.personId) {
+    if (log.personId || log.leadId) {
      await this.outboundSms.record({
        organizationId: log.organizationId,
        personId: log.personId,
+        leadId: log.leadId,
        mobile,
        body: text,
        source: 'automation',
@@ -448,7 +485,9 @@ export class MessageAutomationsService {
      this.logger.warn(
        `Message automation SMS failed: ${result.reason ?? 'unknown'}`,
      );
+      return false;
    }
+    return true;
  }

  private toData(
@@ -5,6 +5,7 @@ import {
  IsDateString,
  IsIn,
  IsInt,
+  IsObject,
  IsOptional,
  IsString,
  Max,
@@ -15,19 +16,6 @@ import {
  ValidateNested,
 } from 'class-validator';

-const NOTE_TYPES = [
-  'general',
-  'call_result',
-  'meeting',
-  'important',
-  'warning',
-  'next_action',
-  'follow_up',
-  'idea',
-  'suggestion',
-  'personal',
-] as const;
-
 const NOTE_VISIBILITIES = ['team', 'personal'] as const;

 const NOTE_SORTS = ['updatedAt', 'createdAt', 'reminderAt'] as const;
@@ -73,8 +61,10 @@ export class ListNotesQueryDto {
  tag?: string;

  @IsOptional()
-  @IsIn(NOTE_TYPES)
-  noteType?: (typeof NOTE_TYPES)[number];
+  @IsString()
+  @MinLength(1)
+  @MaxLength(64)
+  noteType?: string;

  @IsOptional()
  @IsIn(NOTE_VISIBILITIES)
@@ -110,8 +100,10 @@ export class CreateNoteDto {
  body!: string;

  @IsOptional()
-  @IsIn(NOTE_TYPES)
-  noteType?: (typeof NOTE_TYPES)[number];
+  @IsString()
+  @MinLength(1)
+  @MaxLength(64)
+  noteType?: string;

  @IsOptional()
  @IsIn(NOTE_VISIBILITIES)
@@ -171,6 +163,10 @@ export class CreateNoteDto {
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
  activityId?: string | null;
+
+  @IsOptional()
+  @IsObject()
+  customFields?: Record<string, unknown>;
 }

 export class UpdateNoteDto {
@@ -187,8 +183,10 @@ export class UpdateNoteDto {
  body?: string;

  @IsOptional()
-  @IsIn(NOTE_TYPES)
-  noteType?: (typeof NOTE_TYPES)[number];
+  @IsString()
+  @MinLength(1)
+  @MaxLength(64)
+  noteType?: string;

  @IsOptional()
  @IsIn(NOTE_VISIBILITIES)
@@ -248,6 +246,10 @@ export class UpdateNoteDto {
  @ValidateIf((_, v) => v !== '' && v != null)
  @IsString()
  activityId?: string | null;
+
+  @IsOptional()
+  @IsObject()
+  customFields?: Record<string, unknown>;
 }

 class NoteAiNextActionDtoClass {
@@ -300,3 +302,59 @@ export class ApplyNoteAiSuggestionDto {
  @Type(() => ApplyMemoryEditDto)
  memoryItems?: ApplyMemoryEditDto[];
 }
+
+const NOTE_CATEGORY_TONES = [
+  'general',
+  'follow_up',
+  'idea',
+  'suggestion',
+  'meeting',
+  'personal',
+] as const;
+
+export class CreateNoteCategoryDto {
+  @IsString()
+  @MinLength(1)
+  @MaxLength(40)
+  label!: string;
+
+  @IsOptional()
+  @IsIn(NOTE_CATEGORY_TONES)
+  tone?: (typeof NOTE_CATEGORY_TONES)[number];
+
+  @IsOptional()
+  @IsBoolean()
+  showInBar?: boolean;
+}
+
+export class UpdateNoteCategoryDto {
+  @IsOptional()
+  @IsString()
+  @MinLength(1)
+  @MaxLength(40)
+  label?: string;
+
+  @IsOptional()
+  @IsIn(NOTE_CATEGORY_TONES)
+  tone?: (typeof NOTE_CATEGORY_TONES)[number];
+
+  @IsOptional()
+  @IsBoolean()
+  showInBar?: boolean;
+
+  @IsOptional()
+  @IsBoolean()
+  isActive?: boolean;
+
+  @IsOptional()
+  @Type(() => Number)
+  @IsInt()
+  @Min(0)
+  position?: number;
+}
+
+export class ReorderNoteCategoriesDto {
+  @IsArray()
+  @IsString({ each: true })
+  ids!: string[];
+}
@@ -0,0 +1,165 @@
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+} from '@nestjs/common';
+import type { NoteCategoryDto } from '@mento/shared';
+import { PrismaService } from '../prisma/prisma.service';
+import type {
+  CreateNoteCategoryDto,
+  UpdateNoteCategoryDto,
+} from './dto';
+
+const DEFAULTS: Array<{
+  key: string;
+  label: string;
+  tone: string;
+  showInBar: boolean;
+}> = [
+  { key: 'general', label: 'معمولی', tone: 'general', showInBar: true },
+  { key: 'follow_up', label: 'پیگیری', tone: 'follow_up', showInBar: true },
+  { key: 'idea', label: 'ایده', tone: 'idea', showInBar: true },
+  { key: 'suggestion', label: 'پیشنهاد', tone: 'suggestion', showInBar: true },
+  { key: 'meeting', label: 'جلسه', tone: 'meeting', showInBar: true },
+  { key: 'personal', label: 'شخصی', tone: 'personal', showInBar: true },
+  { key: 'call_result', label: 'نتیجه تماس', tone: 'follow_up', showInBar: false },
+  { key: 'important', label: 'نکته مهم', tone: 'suggestion', showInBar: false },
+  { key: 'warning', label: 'هشدار', tone: 'follow_up', showInBar: false },
+  { key: 'next_action', label: 'کار بعدی', tone: 'follow_up', showInBar: false },
+];
+
+@Injectable()
+export class NoteCategoriesService {
+  constructor(private readonly prisma: PrismaService) {}
+
+  async list(organizationId: string): Promise<NoteCategoryDto[]> {
+    await this.ensureDefaults(organizationId);
+    const rows = await this.prisma.noteCategory.findMany({
+      where: { organizationId },
+      orderBy: [{ position: 'asc' }, { createdAt: 'asc' }],
+    });
+    return rows.map((row) => this.toDto(row));
+  }
+
+  async create(
+    organizationId: string,
+    dto: CreateNoteCategoryDto,
+  ): Promise<NoteCategoryDto> {
+    await this.ensureDefaults(organizationId);
+    const label = dto.label.trim();
+    if (!label) throw new BadRequestException('عنوان دسته لازم است');
+    const max = await this.prisma.noteCategory.aggregate({
+      where: { organizationId },
+      _max: { position: true },
+    });
+    const row = await this.prisma.noteCategory.create({
+      data: {
+        organizationId,
+        key: `cat_${Date.now().toString(36)}`,
+        label,
+        tone: dto.tone ?? 'general',
+        showInBar: dto.showInBar ?? true,
+        position: (max._max.position ?? -1) + 1,
+        isSystem: false,
+      },
+    });
+    return this.toDto(row);
+  }
+
+  async update(
+    organizationId: string,
+    id: string,
+    dto: UpdateNoteCategoryDto,
+  ): Promise<NoteCategoryDto> {
+    const existing = await this.prisma.noteCategory.findFirst({
+      where: { id, organizationId },
+    });
+    if (!existing) throw new NotFoundException('دسته پیدا نشد');
+    const label = dto.label?.trim();
+    if (dto.label !== undefined && !label) {
+      throw new BadRequestException('عنوان دسته لازم است');
+    }
+    const row = await this.prisma.noteCategory.update({
+      where: { id },
+      data: {
+        ...(label ? { label } : {}),
+        ...(dto.tone !== undefined ? { tone: dto.tone } : {}),
+        ...(dto.showInBar !== undefined ? { showInBar: dto.showInBar } : {}),
+        ...(dto.isActive !== undefined ? { isActive: dto.isActive } : {}),
+        ...(dto.position !== undefined ? { position: dto.position } : {}),
+      },
+    });
+    return this.toDto(row);
+  }
+
+  async reorder(organizationId: string, ids: string[]): Promise<NoteCategoryDto[]> {
+    const rows = await this.prisma.noteCategory.findMany({
+      where: { organizationId },
+      select: { id: true },
+    });
+    const known = new Set(rows.map((row) => row.id));
+    const ordered = ids.filter((id) => known.has(id));
+    await this.prisma.$transaction(
+      ordered.map((id, index) =>
+        this.prisma.noteCategory.update({
+          where: { id },
+          data: { position: index },
+        }),
+      ),
+    );
+    return this.list(organizationId);
+  }
+
+  async remove(organizationId: string, id: string): Promise<void> {
+    const existing = await this.prisma.noteCategory.findFirst({
+      where: { id, organizationId },
+    });
+    if (!existing) throw new NotFoundException('دسته پیدا نشد');
+    if (existing.isSystem) {
+      throw new BadRequestException('دستهٔ پیش‌فرض حذف نمی‌شود؛ می‌توانید از نوار پنهانش کنید');
+    }
+    await this.prisma.noteCategory.delete({ where: { id } });
+  }
+
+  private async ensureDefaults(organizationId: string) {
+    const count = await this.prisma.noteCategory.count({
+      where: { organizationId },
+    });
+    if (count > 0) return;
+    await this.prisma.noteCategory.createMany({
+      data: DEFAULTS.map((item, index) => ({
+        organizationId,
+        key: item.key,
+        label: item.label,
+        tone: item.tone,
+        position: index,
+        showInBar: item.showInBar,
+        isSystem: true,
+        isActive: true,
+      })),
+      skipDuplicates: true,
+    });
+  }
+
+  private toDto(row: {
+    id: string;
+    key: string;
+    label: string;
+    tone: string;
+    position: number;
+    isActive: boolean;
+    showInBar: boolean;
+    isSystem: boolean;
+  }): NoteCategoryDto {
+    return {
+      id: row.id,
+      key: row.key,
+      label: row.label,
+      tone: row.tone,
+      position: row.position,
+      isActive: row.isActive,
+      showInBar: row.showInBar,
+      isSystem: row.isSystem,
+    };
+  }
+}
@@ -15,10 +15,21 @@ import {
 import { FileInterceptor } from '@nestjs/platform-express';
 import { memoryStorage } from 'multer';
 import { JwtAuthGuard } from '../auth/jwt-auth.guard';
+import { Roles } from '../auth/roles.decorator';
+import { RolesGuard } from '../auth/roles.guard';
 import { RequirePermission, SectionPermissionGuard } from '../auth/section-permission.guard';
 import { CurrentUser } from '../auth/current-user.decorator';
-import { CreateNoteDto, ListNotesQueryDto, UpdateNoteDto, ApplyNoteAiSuggestionDto } from './dto';
+import {
+  CreateNoteDto,
+  ListNotesQueryDto,
+  UpdateNoteDto,
+  ApplyNoteAiSuggestionDto,
+  CreateNoteCategoryDto,
+  UpdateNoteCategoryDto,
+  ReorderNoteCategoriesDto,
+} from './dto';
 import { NoteAiService } from './note-ai.service';
+import { NoteCategoriesService } from './note-categories.service';
 import { NotesService } from './notes.service';
 import type { DataVisibility } from '@mento/shared';

@@ -37,8 +48,53 @@ export class NotesController {
  constructor(
    private readonly notesService: NotesService,
    private readonly noteAi: NoteAiService,
+    private readonly categories: NoteCategoriesService,
  ) {}

+  @Get('categories')
+  listCategories(@CurrentUser() user: AuthUser) {
+    return this.categories.list(user.organizationId);
+  }
+
+  @Post('categories')
+  @UseGuards(RolesGuard)
+  @Roles('owner', 'admin')
+  createCategory(
+    @CurrentUser() user: AuthUser,
+    @Body() dto: CreateNoteCategoryDto,
+  ) {
+    return this.categories.create(user.organizationId, dto);
+  }
+
+  @Patch('categories/reorder')
+  @UseGuards(RolesGuard)
+  @Roles('owner', 'admin')
+  reorderCategories(
+    @CurrentUser() user: AuthUser,
+    @Body() dto: ReorderNoteCategoriesDto,
+  ) {
+    return this.categories.reorder(user.organizationId, dto.ids);
+  }
+
+  @Patch('categories/:id')
+  @UseGuards(RolesGuard)
+  @Roles('owner', 'admin')
+  updateCategory(
+    @CurrentUser() user: AuthUser,
+    @Param('id') id: string,
+    @Body() dto: UpdateNoteCategoryDto,
+  ) {
+    return this.categories.update(user.organizationId, id, dto);
+  }
+
+  @Delete('categories/:id')
+  @UseGuards(RolesGuard)
+  @Roles('owner', 'admin')
+  async removeCategory(@CurrentUser() user: AuthUser, @Param('id') id: string) {
+    await this.categories.remove(user.organizationId, id);
+    return { ok: true };
+  }
+
  @Get()
  list(
    @CurrentUser() user: AuthUser,
@@ -2,12 +2,13 @@ import { Module } from '@nestjs/common';
 import { MemoryModule } from '../memory/memory.module';
 import { NotesController } from './notes.controller';
 import { NoteAiService } from './note-ai.service';
+import { NoteCategoriesService } from './note-categories.service';
 import { NotesService } from './notes.service';

@Module({
  imports: [MemoryModule],
  controllers: [NotesController],
-  providers: [NotesService, NoteAiService],
+  providers: [NotesService, NoteAiService, NoteCategoriesService],
  exports: [NotesService],
 })
 export class NotesModule {}
@@ -19,7 +19,9 @@ import * as path from 'path';
 import { PrismaService } from '../prisma/prisma.service';
 import { buildSearchWhere, ci } from '../common/search';
 import { LocalFileStorage } from '../storage/local-file.storage';
+import { StorageQuotaService } from '../billing/storage-quota.service';
 import { GamificationService } from '../gamification/gamification.service';
+import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
 import {
  type Actor,
  noteAccessWhere,
@@ -45,6 +47,7 @@ type NoteRow = {
  checklist: Prisma.JsonValue | null;
  locationText: string | null;
  analyzeEnabled: boolean;
+  customFields: Prisma.JsonValue;
  createdAt: Date;
  updatedAt: Date;
  person: { id: string; firstName: string; lastName: string } | null;
@@ -112,6 +115,7 @@ export class NotesService {
    private readonly prisma: PrismaService,
    private readonly files: LocalFileStorage,
    private readonly game: GamificationService,
+    private readonly storage: StorageQuotaService,
  ) {}

  async list(
@@ -224,6 +228,7 @@ export class NotesService {
          : Prisma.JsonNull,
        locationText: emptyToNull(dto.locationText ?? null),
        analyzeEnabled,
+        customFields: toJsonCustomFields(dto.customFields),
        personId: emptyToNull(dto.personId ?? null),
        companyId: emptyToNull(dto.companyId ?? null),
        dealId: emptyToNull(dto.dealId ?? null),
@@ -280,6 +285,9 @@ export class NotesService {
    if (dto.analyzeEnabled !== undefined) {
      data.analyzeEnabled = dto.analyzeEnabled;
    }
+    if ('customFields' in dto) {
+      data.customFields = toJsonCustomFields(dto.customFields);
+    }
    if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
    if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
    if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
@@ -438,10 +446,12 @@ export class NotesService {
  ): Promise<void> {
    const note = await this.prisma.note.findFirst({
      where: { id, organizationId, ...noteAccessWhere(actor) },
-      include: { attachments: { select: { storageKey: true } } },
+      include: { attachments: { select: { storageKey: true, sizeBytes: true } } },
    });
    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) {
      await this.files.remove(att.storageKey);
    }
@@ -485,6 +495,7 @@ export class NotesService {
      .join(organizationId, 'notes', noteId, `${attachmentId}${ext}`)
      .replace(/\\/g, '/');

+    await this.storage.assertCanAdd(organizationId, file.size);
    await this.files.save(storageKey, file.buffer);

    try {
@@ -500,6 +511,7 @@ export class NotesService {
          uploadedById: userId,
        },
      });
+      await this.storage.addLocal(organizationId, file.size);
      return this.toAttachmentDto(row);
    } catch (err) {
      await this.files.remove(storageKey);
@@ -520,6 +532,7 @@ export class NotesService {
    if (!row) throw new NotFoundException('پیوست پیدا نشد');
    await this.files.remove(row.storageKey);
    await this.prisma.noteAttachment.delete({ where: { id: row.id } });
+    await this.storage.addLocal(organizationId, -row.sizeBytes);
  }

  async openAttachmentDownload(
@@ -616,6 +629,7 @@ export class NotesService {
      checklist: parseChecklist(row.checklist),
      locationText: row.locationText ?? null,
      analyzeEnabled: row.analyzeEnabled ?? true,
+      customFields: asCustomFields(row.customFields),
      person: row.person
        ? {
            id: row.person.id,
@@ -2,6 +2,7 @@ import { Type } from 'class-transformer';
 import {
  ArrayUnique,
  IsArray,
+  IsBoolean,
  IsIn,
  IsObject,
  IsOptional,
@@ -45,6 +46,16 @@ export class CreateOrgRoleDto {
  @ValidateIf((_, v) => v !== null)
  @IsString()
  parentId?: string | null;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayUnique()
+  @IsString({ each: true })
+  treasuryAccountIds?: string[];
+
+  @IsOptional()
+  @IsBoolean()
+  treasuryOwnAccounts?: boolean;
 }

 export class UpdateOrgRoleDto {
@@ -77,6 +88,16 @@ export class UpdateOrgRoleDto {
  @ValidateIf((_, v) => v !== null)
  @IsString()
  parentId?: string | null;
+
+  @IsOptional()
+  @IsArray()
+  @ArrayUnique()
+  @IsString({ each: true })
+  treasuryAccountIds?: string[];
+
+  @IsOptional()
+  @IsBoolean()
+  treasuryOwnAccounts?: boolean;
 }

 export class RolePermissionPatchItemDto {
@@ -32,6 +32,8 @@ type RoleRow = {
  color: string;
  permissions: string[];
  dataAccessPolicy?: unknown;
+  treasuryAccountIds?: string[];
+  treasuryOwnAccounts?: boolean;
  systemKey: string | null;
  parentId: string | null;
  createdAt: Date;
@@ -79,6 +81,8 @@ export class OrgRolesService {
      permissions?: RolePermissionKey[];
      dataAccessPolicy?: DataAccessPolicy;
      parentId?: string | null;
+      treasuryAccountIds?: string[];
+      treasuryOwnAccounts?: boolean;
    },
  ): Promise<OrgRoleDto> {
    this.assertManager(actorRole);
@@ -108,6 +112,8 @@ export class OrgRolesService {
          description: (dto.description ?? '').trim(),
          color: dto.color ?? parent?.color ?? 'teal',
          permissions,
+          treasuryAccountIds: dto.treasuryAccountIds ?? [],
+          treasuryOwnAccounts: dto.treasuryOwnAccounts ?? false,
          parentId,
          ...(dto.dataAccessPolicy
            ? { dataAccessPolicy: parseDataAccessPolicy(dto.dataAccessPolicy) }
@@ -135,6 +141,8 @@ export class OrgRolesService {
      permissions?: RolePermissionKey[];
      dataAccessPolicy?: DataAccessPolicy;
      parentId?: string | null;
+      treasuryAccountIds?: string[];
+      treasuryOwnAccounts?: boolean;
    },
  ): Promise<OrgRoleDto> {
    this.assertManager(actorRole);
@@ -159,6 +167,12 @@ export class OrgRolesService {
    if (dto.dataAccessPolicy !== undefined) {
      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) {
      const nextParentId =
@@ -426,6 +440,8 @@ export class OrgRolesService {
      color: row.color,
      permissions: sanitizePermissions(row.permissions),
      dataAccessPolicy: parseDataAccessPolicy(row.dataAccessPolicy),
+      treasuryAccountIds: row.treasuryAccountIds ?? [],
+      treasuryOwnAccounts: row.treasuryOwnAccounts ?? false,
      systemKey,
      parentId: row.parentId,
      parentName: row.parentId ? (nameById.get(row.parentId) ?? null) : null,
@@ -41,7 +41,9 @@ export const SYSTEM_ROLE_SEEDS: Array<{
    name: 'کارشناس فروش',
    description: 'امکان دسترسی به بخش‌های فروش و مشتریان برای انجام فعالیت‌های روزمره.',
    color: 'teal',
-    permissions: ALL_ROLE_PERMISSIONS.filter((key) => key !== 'audit'),
+    permissions: ALL_ROLE_PERMISSIONS.filter(
+      (key) => key !== 'audit' && !key.startsWith('assign_'),
+    ),
  },
  {
    systemKey: 'support',
@@ -14,7 +14,7 @@ import type { Actor } from '../common/record-scope';
 import { dealAccessWhere, resolveOwnerId } from '../common/record-scope';
 import { dealPriorWhere } from '../common/prior-archive';
 import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
-import { normalizePhone } from '../contacts/normalize';
+import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
 import {
  excelFieldsFromColumns,
  formatJalaliDate,
@@ -708,9 +708,9 @@ export class DealsExcelService {
  ): Promise<string | null> {
    const orgId = actor.organizationId;
    const code = cleanCode(row.personCode);
-    const mobile = normalizePhone(row.personMobile);
-    const mobileCore = mobile ? mobile.replace(/^\+98|^98|^0/, '') : '';
-    const validMobile = mobileCore.length >= 8 ? mobile : null;
+    const mobile = storedPhoneNumber(row.personMobile);
+    const mobileKeys = phoneIdentityKeys(mobile);
+    const validMobile = (mobile ?? '').replace(/\D/g, '').length >= 8 ? mobile : null;
    const first = (row.personFirstName ?? '').trim();
    const last = (row.personName ?? '').trim();
    const fullName = [first, last].filter(Boolean).join(' ');
@@ -731,7 +731,10 @@ export class DealsExcelService {
    }
    if (!found && validMobile) {
      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 },
      });
    }
@@ -22,11 +22,12 @@ import { WebhooksService } from '../public-api/webhooks.service';
 import { GamificationService } from '../gamification/gamification.service';
 import {
  type Actor,
-  canReassignOwner,
  dealAccessWhere,
  ownerWhere,
  resolveOwnerId,
 } from '../common/record-scope';
+import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
+import { placeId, sameIds, writePositions } from '../common/column-order';

 const dealInclude = {
  person: { select: { id: true, firstName: true, lastName: true } },
@@ -106,6 +107,10 @@ export class DealsService {
      organizationId,
      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({
      where: { organizationId, stageId: stage.id },
@@ -156,7 +161,7 @@ export class DealsService {
        createdById: actor.userId,
        personId: emptyToNull(dto.personId ?? null),
        companyId: emptyToNull(dto.companyId ?? null),
-        ownerId: resolveOwnerId(actor, dto.ownerId),
+        ownerId,
        position: (maxPos._max.position ?? -1) + 1,
        ...(assigneeIds.length
          ? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
@@ -259,18 +264,39 @@ export class DealsService {
    }
    if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? 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;
+    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) {
        const assigneeIds = await this.normalizeAssigneeIds(
          organizationId,
          dto.assigneeIds,
        );
+        await assertAssigneeSet(
+          this.prisma,
+          assignActor,
+          'sales',
+          assigneeIds,
+          current?.assignees.map((item) => item.id) ?? [],
+        );
        assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
      }
+    }

    if (pricedFromLines && dto.lineItems) {
      const total = sumLineItems(dto.lineItems);
@@ -354,7 +380,8 @@ export class DealsService {
    }

    const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
-    const position =
+    let placedIds: string[] | null = null;
+    let position =
      dto.position ??
      ((
        await this.prisma.deal.aggregate({
@@ -362,6 +389,17 @@ export class DealsService {
          _max: { position: true },
        })
      )._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({
      where: { id },
@@ -377,6 +415,15 @@ export class DealsService {
      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) {
      await this.notifications.create({
        organizationId,
@@ -4,8 +4,10 @@ import {
  IsEmail,
  IsIn,
  IsInt,
+  IsNumber,
  IsOptional,
  IsString,
+  Max,
  MaxLength,
  Min,
  MinLength,
@@ -52,6 +54,31 @@ export class ResetPlatformAdminPasswordDto {
  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 {
  @IsBoolean()
  isActive!: boolean;
@@ -146,6 +173,22 @@ export class ApplyBillingPlanDto {
  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 {
  @IsArray()
  @IsString({ each: true })
@@ -1,19 +1,25 @@
 import {
  Body,
  Controller,
+  Delete,
  Get,
  Param,
  Patch,
  Post,
+  Put,
  Query,
  UseGuards,
 } from '@nestjs/common';
 import { CurrentUser } from '../auth/current-user.decorator';
 import {
  ApplyBillingPlanDto,
+  SetStorageQuotaDto,
+  SetUserCapDto,
  CreatePlatformAdminDto,
  CreatePlatformOrganizationDto,
  ResetPlatformAdminPasswordDto,
+  SetMasterPasswordDto,
+  UpdatePlatformAdminDto,
  ResetPlatformUserPasswordDto,
  UpdateOrgModulesDto,
  UpdatePlatformMembershipRoleDto,
@@ -71,6 +77,26 @@ export class PlatformController {
    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')
  listOrganizations(@Query('q') q?: string) {
    return this.platform.listOrganizations(q);
@@ -122,6 +148,26 @@ export class PlatformController {
    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')
  updateOrganizationModules(
    @Param('id') id: string,
@@ -19,6 +19,8 @@ import { MembershipsService } from '../memberships/memberships.service';
 import { OrgRolesService } from '../org-roles/org-roles.service';
 import { PipelinesService } from '../pipelines/pipelines.service';
 import { BillingService, toSummary } from '../billing/billing.service';
+import { StorageQuotaService } from '../billing/storage-quota.service';
+import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
 import { PrismaService } from '../prisma/prisma.service';
 import { buildSearchWhere, ci } from '../common/search';
 import type {
@@ -50,6 +52,8 @@ export class PlatformService {
    private readonly orgRoles: OrgRolesService,
    private readonly pipelines: PipelinesService,
    private readonly billing: BillingService,
+    private readonly storage: StorageQuotaService,
+    private readonly adminAlerts: PlatformAdminAlertService,
  ) {}

  async stats(): Promise<PlatformStatsDto> {
@@ -107,15 +111,23 @@ export class PlatformService {
          where: { role: 'owner', isActive: true },
          orderBy: { createdAt: 'asc' },
          take: 1,
-          select: { user: { select: { billingAccount: true } } },
+          select: {
+            userId: true,
+            user: { select: { fullName: true, billingAccount: true } },
          },
        },
+        conversationSettings: { select: { organizationId: true } },
+      },
    });
    return rows.map((row) => {
-      const account = row.memberships[0]?.user.billingAccount;
+      const owner = row.memberships[0];
+      const account = owner?.user.billingAccount;
      return {
        ...this.orgToDto(row),
        subscription: account ? toSummary(account) : null,
+        ownerUserId: owner?.userId ?? null,
+        ownerName: owner?.user.fullName ?? null,
+        chatConfigured: Boolean(row.conversationSettings),
      };
    });
  }
@@ -275,6 +287,12 @@ export class PlatformService {
      await this.billing.ensureTrialForOwner(owner.id, { maxOrganizations: 1 });
      await this.orgRoles.ensureDefaultRoles(organization.id);
      await this.pipelines.ensureDefaultPipeline(organization.id);
+      await this.adminAlerts.notifyNewAccount({
+        source: 'admin',
+        organizationName: organization.name,
+        ownerName: owner.fullName,
+        mobile: owner.mobile,
+      });

      return this.getOrganization(organization.id);
    } catch (e) {
@@ -400,6 +418,50 @@ export class PlatformService {
    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) {
    const existing = await this.prisma.user.findUnique({
      where: { id: userId },
@@ -465,9 +527,13 @@ export class PlatformService {
        userId: true,
        organizationId: true,
        role: true,
+        isActive: true,
      },
    });
    if (!row) throw new NotFoundException('عضویت پیدا نشد');
+    if (isActive && !row.isActive) {
+      await this.billing.assertSeatAvailable(row.organizationId, row.userId);
+    }
    if (!isActive && row.role === 'owner') {
      const activeOwners = await this.memberships.countActiveOwners(
        row.organizationId,
@@ -640,6 +706,104 @@ export class PlatformService {
    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: {
    id: string;
    mobile: string | null;
@@ -19,6 +19,7 @@ import type {
 } from '@mento/shared';
 import { TICKET_SLA_HOURS } from '@mento/shared';
 import { PrismaService } from '../prisma/prisma.service';
+import { canonicalIranMobile, phoneIdentityKeys } from '../contacts/normalize';
 import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
 import type { PortalActor } from './portal-auth';

@@ -62,7 +63,7 @@ export class PortalService {
    mobileRaw: string,
  ): Promise<PortalRequestOtpResponse> {
    const org = await this.findOrg(slug);
-    const mobile = normalizeMobile(mobileRaw);
+    const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
    if (!mobile) {
      throw new BadRequestException('شماره موبایل معتبر نیست');
    }
@@ -123,7 +124,8 @@ export class PortalService {
    codeRaw: string,
  ): Promise<PortalLoginResponse> {
    const org = await this.findOrg(slug);
-    const mobile = normalizeMobile(mobileRaw);
+    const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
+    const mobileKeys = phoneIdentityKeys(mobile);
    const code = codeRaw.trim();
    if (!mobile || !code) {
      throw new BadRequestException('موبایل یا کد ناقص است');
@@ -148,10 +150,15 @@ export class PortalService {
      data: { consumedAt: new Date() },
    });

-    let person = await this.prisma.person.findFirst({
-      where: { organizationId: org.id, mobile },
+    let person = mobileKeys.length
+      ? await this.prisma.person.findFirst({
+          where: {
+            organizationId: org.id,
+            OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
+          },
          orderBy: { createdAt: 'asc' },
-    });
+        })
+      : null;
    if (!person) {
      person = await this.prisma.person.create({
        data: {
@@ -15,12 +15,12 @@ import { Prisma } from '@prisma/client';
 import { PrismaService } from '../prisma/prisma.service';
 import {
  type Actor,
-  canReassignOwner,
  dealAccessWhere,
  ownerWhere,
  projectCardAccessWhere,
  resolveOwnerId,
 } from '../common/record-scope';
+import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
 import { normalizeTags } from '../common/tags';

 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 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({
      data: {
        organizationId,
@@ -217,7 +224,7 @@ export class ProjectBoardsService {
        personId: emptyToNull(dto.personId),
        companyId: emptyToNull(dto.companyId),
        dealId: emptyToNull(dto.dealId),
-        ownerId: resolveOwnerId(actor, dto.ownerId),
+        ownerId,
        position: (maxPos._max.position ?? -1) + 1,
        ...(assigneeIds.length
          ? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
@@ -257,24 +264,40 @@ export class ProjectBoardsService {
    if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
    if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
    if ('ownerId' in dto) {
-      if (!canReassignOwner(actor.role) && dto.ownerId !== existing.ownerId) {
-        throw new BadRequestException('تغییر مسئول مجاز نیست');
+      const nextOwner = emptyToNull(dto.ownerId ?? null);
+      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({
      where: { id },
      data: {
        ...data,
-        ...(dto.assigneeIds
-          ? {
-              assignees: {
-                set: [...new Set(dto.assigneeIds.map((x) => x.trim()).filter(Boolean))].map(
-                  (uid) => ({ id: uid }),
-                ),
-              },
-            }
+        ...(nextAssigneeIds
+          ? { assignees: { set: nextAssigneeIds.map((uid) => ({ id: uid })) } }
          : {}),
      },
      include: cardInclude,
@@ -3,7 +3,7 @@ import type { ImportContactsResult } from '@mento/shared';
 import { PrismaService } from '../prisma/prisma.service';
 import type { Actor } from '../common/record-scope';
 import { projectCardAccessWhere } from '../common/record-scope';
-import { normalizePhone } from '../contacts/normalize';
+import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
 import {
  excelFieldsFromColumns,
  formatJalaliDate,
@@ -256,11 +256,13 @@ export class ProjectCardsExcelService {
  }

  private async findPersonId(organizationId: string, row: Record<string, string>) {
-    const mobile = normalizePhone(row.personMobile);
-    if (mobile) {
-      const needle = mobile.replace(/^\+98|^98|^0/, '');
+    const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
+    if (mobileKeys.length) {
      const byMobile = await this.prisma.person.findFirst({
-        where: { organizationId, mobile: { contains: needle } },
+        where: {
+          organizationId,
+          OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
+        },
        select: { id: true },
      });
      if (byMobile) return byMobile.id;
@@ -22,6 +22,7 @@ export class ApiKeyAuthGuard implements CanActivate {
        organizationId: string;
        role: string;
        apiKeyId?: string;
+        apiKeyName?: string;
      };
    }>();

@@ -44,6 +45,7 @@ export class ApiKeyAuthGuard implements CanActivate {
      organizationId: auth.organizationId,
      role: auth.role,
      apiKeyId: auth.apiKeyId,
+      apiKeyName: auth.name,
    };
    return true;
  }
@@ -63,7 +63,7 @@ export class ApiKeysService {

  async authenticate(
    rawKey: string,
-  ): Promise<{ organizationId: string; apiKeyId: string; role: 'owner' }> {
+  ): Promise<{ organizationId: string; apiKeyId: string; name: string; role: 'owner' }> {
    const key = rawKey.trim();
    if (!key.startsWith('mk_') || key.length < 20) {
      throw new UnauthorizedException('کلید API نامعتبر است');
@@ -71,7 +71,7 @@ export class ApiKeysService {
    const keyHash = this.hashKey(key);
    const row = await this.prisma.organizationApiKey.findFirst({
      where: { keyHash, revokedAt: null },
-      select: { id: true, organizationId: true },
+      select: { id: true, organizationId: true, name: true },
    });
    if (!row) throw new UnauthorizedException('کلید API نامعتبر است');

@@ -83,6 +83,7 @@ export class ApiKeysService {
    return {
      organizationId: row.organizationId,
      apiKeyId: row.id,
+      name: row.name,
      role: 'owner',
    };
  }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mahdi	0998a1ec37	fix(web): serve real dashboard data instead of mocks Drop forced home/treasury/reports mock fallbacks so API and database content drive the UI.	2026-11-07 09:04:38 +03:30
Mahdi	4979aa8b75	feat(web): refresh Montact brand and sidebar chrome Ship the new logo assets, set primary to #10897d, and polish sidebar/home-hero UX around roles, org switcher, and the ask bar.	2026-11-05 17:10:03 +03:30
MahdiandCursor	34d3689448	chore(web): keep the raw vuesax icon dump for regenerating the pack Track icons (1).json so scripts/_setup-vuesax.mjs can rebuild apps/web/src/icons/vuesax-linear.json. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 15:34:34 +03:30
MahdiandCursor	1e0b638a19	fix(web): tidy the notification panel with status icons Keep cards neutral, show type through icon and color only, and hide the panel scrollbar. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 15:29:40 +03:30
Mahdi	3db9c1c0fe	merge: bring latest origin/main into dev (design local, logic main) Keep the local Ant screens and icon pack. Take treasury parties, routine self-service, Tahesab auto-sync, public lead registration, and contact merge from main.	2026-11-05 15:10:48 +03:30
MahdiandCursor	6c6e32e099	feat(web): adopt vuesax icons and shared skeleton loading Replace the inline SVG icon set with the vuesax linear pack, add skeleton primitives for loading states, and keep page scroll inside the app shell. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 14:46:35 +03:30
MahdiandCursor	1ef7f91771	fix(contacts): keep one customer when Tahesab repeats a mobile A Tahesab import now updates the person who already has that mobile instead of creating another, and the boot merge runs once more so existing pairs collapse. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 13:34:41 +03:30
MahdiandCursor	94f0383c79	feat(tahesab): import and refresh customers at chosen hours Each connection can set how many times a day and at which Tehran hours the server pulls Tahesab customers, including name updates for people already linked. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 12:31:27 +03:30
MahdiandCursor	c976c0bcd6	fix(contacts): merge the same mobile stored on phone or mobile Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 11:27:05 +03:30
MahdiandCursor	57a0b379f6	fix(tahesab): store a matched mobile as 09xxxxxxxxx Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 11:11:40 +03:30
MahdiandCursor	7f6d9a84d6	fix(contacts): treat Iranian mobile formats as one person Tahesab import still replaces the name and keeps the previous name. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-05 10:51:36 +03:30
MahdiandCursor	6abbf8e8fd	fix(sms): keep the charge dialog fully on screen Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 21:52:35 +03:30
MahdiandCursor	39cb5c2548	feat(public-api): let external sites register a lead with their key Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 21:34:07 +03:30
MahdiandCursor	004d1dff93	feat(boards): ease dragging a card toward an off-screen spot Scroll the column while a card is held near its edge and show a light gap where the card will land. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 20:05:50 +03:30
MahdiandCursor	78a7d6a68a	feat(routines): let each person create a routine for themselves Open the new-routine action to every member, while keeping assignment to other people and teams limited to managers. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 19:34:36 +03:30
MahdiandCursor	5b18749005	feat(treasury): list debtors and creditors on the finance report Show open receivable and payable balances on separate report tabs, and include each list in an Excel export. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 14:16:38 +03:30
MahdiandCursor	08a278e1c8	feat(treasury): number documents and manage categories on their tab Save a system tracking number on each income and expense, reuse the full contact dialogs for a new party, and create, rename, or delete categories only from the categories tab. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 13:11:09 +03:30
MahdiandCursor	d71c2dbef4	feat(treasury): show who still owes on the finance pages Partial receipts and payments stay tied to a customer, company, or user, and the open balance is listed on the income and expense screens. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 11:36:55 +03:30
MahdiandCursor	41f310f3a2	merge: bring latest origin/main into dev (design local, logic main) EOF Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 10:26:43 +03:30
MahdiandCursor	754cc43c98	fix(web): drop unused viewingSelf after subtitle removal Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 10:05:29 +03:30
MahdiandCursor	a319085dca	fix(web): clear vue-tsc errors blocking push Type attendance rows, remove unused symbols, and harden list item typing after the Ant settings migration. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 10:05:29 +03:30
MahdiandCursor	cb3a488b21	feat(web): continue Ant settings migration and tighten page chrome Migrate remaining settings screens to Ant Design Vue, densify teams/roles UI, drop page-header subtitles project-wide, and polish notes cards plus contacts row actions. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 10:05:28 +03:30
MahdiandCursor	1ccbefa7a3	fix(treasury): scope finance access and hide it when the module is off Accounts can be edited, including the opening balance, and finance sections and accounts can be granted on a role or on one user. The finance menu stays hidden when the organization module is disabled. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-04 10:02:31 +03:30
MahdiandCursor	14f4e9d7d8	fix(activities): put the priority flag on the date row and recolor medium and low Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 21:32:49 +03:30
MahdiandCursor	52edccf74e	fix(boards): keep card order inside a column and show activity priority Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 21:22:30 +03:30
MahdiandCursor	b11affbdfd	fix(web): load IRANSans outside the Tailwind pipeline Tailwind rewrites url() values that contain parentheses, so the FaNum font files never resolve. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 18:32:30 +03:30
MahdiandCursor	bffe174162	fix(activities): show form photos in the note instead of the raw file link Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 17:30:45 +03:30
MahdiandCursor	35d74d33ed	fix(activities): keep lead activity actions in the detail card The action row stretched off-screen and comments on automation activities were rejected once the saved note passed 2000 characters. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 17:04:59 +03:30
Mahdi	7aaa15fad2	merge: bring latest origin/main into dev (keep local UI) Resolved UI conflicts in favor of local Ant Design screens; kept non-UI changes from main.	2026-11-03 16:55:42 +03:30
Mahdi	39c62834e7	fix: resolve Ant switch and unused board menu type errors blocking push	2026-11-03 16:53:49 +03:30
Mahdi	26792f9a37	feat: migrate CRM screens to Ant Design Vue and expand home dashboard Preserve the local Ant UI work across views/components and add the new home dashboard chart panels before merging latest main.	2026-11-03 16:51:51 +03:30
MahdiandCursor	c337b0b4c7	fix(leads): keep a future follow-up as an activity on the lead A scheduled follow-up only stored a date, and activities opened from a lead were not linked back, so they disappeared from the lead. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 16:19:32 +03:30
MahdiandCursor	c26353624e	fix(leads): keep Persian digits when saving contact-form phones Mixed Persian and Latin digits were stripped down to the Latin part, so some website leads stored a truncated mobile. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 15:50:05 +03:30
MahdiandCursor	534dae45b2	feat(roles): let each section decide who may assign work to others Section access now only creates a record for yourself. Assigning it to a colleague requires a separate permission on that section. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 13:15:21 +03:30
MahdiandCursor	79733e6c96	feat(tahesab): sync filtered customers and pick Jalali periods Document refresh can follow the selected group or person instead of every linked customer, and the sales report picks a named month or season. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-03 10:09:40 +03:30
MahdiandCursor	fdabdc54a3	feat(billing): default the 7-day demo to 3 users Applying or creating a trial plan sets the owner seat cap to 3, and existing demos without a cap get the same default. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 19:55:51 +03:30
MahdiandCursor	1b10ee30df	fix(web): keep the sidebar org name inside the footer Long organization names wrap beside the logout button instead of spilling out of the sidebar card. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 19:43:47 +03:30
MahdiandCursor	c273dd6c58	feat(adm): split chat and billing settings and add a master login Super admin can filter dashboard counts, edit or delete admins, and sign into a user's CRM account with one shared password. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 19:13:57 +03:30
MahdiandCursor	acb5d51f24	feat(billing): cap active users on an owner subscription Super admin can set a seat limit of 3, 10, 20, or a negotiated number so an owner cannot add users past that cap. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 18:33:51 +03:30
MahdiandCursor	06977d27ed	feat(activities): attach voice and files on activity notes Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 16:34:03 +03:30
MahdiandCursor	43437b0280	fix(test): pass the storage quota service into activity tests Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 15:47:32 +03:30
MahdiandCursor	28938e8f77	feat(billing): cap each owner's stored file volume Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 15:44:36 +03:30
MahdiandCursor	e6e90aabf3	feat(activities): step through the same desk list from a detail Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 14:30:17 +03:30
MahdiandCursor	a0936bf19f	feat(web): assign an activity to a whole team Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-02 10:50:08 +03:30
MahdiandCursor	18a7cd3b5a	fix(web): rename the activities nav item The sidebar says فعالیت‌ها, and the phone tab stays فعالیت so the five-item bar still fits. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 22:45:34 +03:30
MahdiandCursor	4af248b06a	feat(activities): filter the desk from each column Assignees are searched instead of listed in full, and start time only filters whether a time is set. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 21:20:42 +03:30
MahdiandCursor	d5dd13863a	feat(web): add next Saturday and next week to postpone Saturday is the start of the work week, so the sheet can defer a task to next Saturday morning or the same time one week later. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 21:20:15 +03:30
MahdiandCursor	81edf61065	feat(notes): let organizations edit the note category bar The filter chips were fixed labels. Owners can rename, hide, reorder, and add categories. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 16:34:34 +03:30
MahdiandCursor	8e1e94a439	feat(notes): let organizations define their own note fields The note form was fixed. Owners can add fields and each note keeps those values. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-11-01 15:38:05 +03:30
MahdiandCursor	590f8114cc	fix(sms): send form confirmations to the lead number Lead-only website forms had no person mobile, so the confirmation was marked sent without a number. Use the lead phone and send the full text. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-31 16:41:41 +03:30
MahdiandCursor	8d01bce0c2	fix(web): keep the activity desk usable on a phone Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-31 15:05:05 +03:30
MahdiandCursor	8b2777be4e	fix(web): pack the activity desk header so the columns stay visible The toolbar keeps every control, just on two shorter rows. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-31 13:57:01 +03:30
MahdiandCursor	d7b5085096	feat(leads): keep gender on leads and form submissions A lead can carry the same honorific as a person, and a form that asks gender writes it onto the lead. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-31 12:49:42 +03:30
MahdiandCursor	cbc2e4ee8a	fix(web): keep the Jalali picker above Ant modals The date and time panel was opening behind the new-task dialog because its layer sat under the modal. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-31 10:16:02 +03:30
MahdiandCursor	a17c7dbabc	fix(routines): keep the daily desk for internal team work Customer-linked tasks stay on their record and no longer appear in today, calendar, score, or reminders. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 20:53:26 +03:30
MahdiandCursor	99d686fefb	fix(leads): give a new form lead the same owner as its first call When a form has no round-robin assignees, the lead now follows the person the automation assigns to the first call. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 19:30:13 +03:30
MahdiandCursor	b9bb2ff9fa	feat(contacts): keep Tahesab honorifics with person gender Male and female names can store the title when requested, and Tahesab import and export use the same gender. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 18:46:10 +03:30
MahdiandCursor	0d5e1034e5	feat(leads): edit lead-board columns from the board New-lead counts follow the first open column instead of its name, and cards no longer show an initials mark. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 17:23:40 +03:30
MahdiandCursor	6f42440b3b	fix(activities): return to the same group after opening a card The back link dropped the board from the address, so the desk reopened on the default group. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-29 09:22:23 +03:30
MahdiandCursor	63a1803adc	feat(activities): let a group show and limit its members Empty membership stays open to the whole workspace; picking people restricts who can see that activity group. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-28 20:24:40 +03:30
MahdiandCursor	2cc2d358e4	fix(web): make kanban column titles readable Widen board columns and keep counts inside the add button so stage and card titles have room. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-28 17:24:58 +03:30
MahdiandCursor	463a1652a6	feat(platform): text admins when an account opens or a subscription ends Signup and admin-created accounts notify platform managers, and an ended plan sends one SMS instead of repeating for old expirations. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 22:27:05 +03:30
MahdiandCursor	f15c5b9141	feat(activities): add photos when registering a follow-up comment A later comment can attach photos with the same compressor, and they stay on the activity note. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 21:52:37 +03:30
MahdiandCursor	1d3588a69d	feat(activities): attach compressed photos to activity notes Photos on an activity are shrunk with the form-builder compressor and stored only when they fit under 200KB. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 21:30:45 +03:30
MahdiandCursor	9812e4e5ba	fix(crm): honor open data scopes and role assignees Unset sections on a saved role policy were still filtered as own-only, so full lead access showed nothing. Activities can now be assigned by org role, and the Tahesab sales report reads as a result instead of a tag wall. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-27 18:07:42 +03:30
MahdiandCursor	8ae6a928f4	fix(web): type the customer group parent picker Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-26 11:14:30 +03:30
MahdiandCursor	2ff35e55fc	feat(tahesab): net sales by factor, group, and commission Report weight after returns for the selected period, with parent customer groups and separate silver and investment commission. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-26 11:05:34 +03:30
Mahdi	15f89aec04	Readjusting the dashboard header height	2026-10-25 20:53:06 +03:30
Mahdi	bebd1be29b	Adjusting the lead note and dashboard header height	2026-10-25 20:21:33 +03:30
MahdiandCursor	0daaef0b39	fix(web): calm hero flash, lead detail, and scope sources Keep the dashboard backdrop out of flow on first paint, clamp long lead notes, scroll the quick-actions rail, return to the lead board, and only list import sources that exist in this environment. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-25 19:22:30 +03:30
MahdiandCursor	91637cb3a6	fix(web): search and multi-select data scope filters Long group and source lists overflowed the team settings panel. Co-authored-by: Cursor <cursoragent@cursor.com>	2026-10-25 10:48:15 +03:30
Mahdi	546a7a7e46	fix(web): keep jalali day cells inside calendar panel	2026-10-25 10:05:16 +03:30
Mahdi	48815852fc	fix(crm): mesghal by metal, jalali fit, scoped group filters	2026-10-24 22:25:27 +03:30
				`@@ -0,0 +1 @@`
				`ALTER TABLE "BillingAccount" ADD COLUMN "maxUsers" INTEGER;`
				`@@ -0,0 +1 @@`
				`ALTER TABLE "OrgRole" ADD COLUMN "treasuryAccountIds" TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];`
				`@@ -0,0 +1 @@`
				`ALTER TABLE "Membership" ADD COLUMN "treasuryAccessOverride" JSONB;`