From 5b6207cd4f94502baf0b0a9565c0291a7b115129 Mon Sep 17 00:00:00 2001 From: "s.esmaeili" Date: Tue, 13 Oct 2026 17:36:57 +0330 Subject: [PATCH 1/6] chore: consolidate all branches into dev Side branches (fix/*, integrate/*, release/*, ui/admin-responsive, migration/legacy-data) are fully contained in dev and main. dev and main are the only long-lived branches now. Co-Authored-By: Claude Haiku 5.5 From ea987b708f937fd558169444c15707febf05c2ed Mon Sep 17 00:00:00 2001 From: "s.esmaeili" Date: Tue, 13 Oct 2026 19:19:38 +0330 Subject: [PATCH 2/6] fix(accounting): zarrin copy and sign notes match verified install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Zarrin v228 was tested on the real install (test account 953): negative balance = owes, and temporary documents move the balance at once. Update the admin copy and provider comments to match what was verified. پنل: متن راهنمای زرین به‌روز شد: علامت مانده روی نصب واقعی بررسی شده است، و هشدار مربوط به ثبت سند موقت در «ثبت سفارش» اضافه شد. Co-Authored-By: Claude Haiku 5.5 --- .../components/accounting/AccountingConnection.vue | 3 +-- apps/admin-panel/src/views/manage/accounting.vue | 4 ++-- .../accounting-sync/providers/zarrin.provider.ts | 11 ++++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/admin-panel/src/components/accounting/AccountingConnection.vue b/apps/admin-panel/src/components/accounting/AccountingConnection.vue index 6b7cc03..57cf181 100644 --- a/apps/admin-panel/src/components/accounting/AccountingConnection.vue +++ b/apps/admin-panel/src/components/accounting/AccountingConnection.vue @@ -44,7 +44,6 @@ {{ c.label }} - آزموده‌نشده {{ c.desc }} @@ -78,7 +77,7 @@ منفی یعنی بدهکار مثبت یعنی بدهکار -
در دوره‌ی آزمایشی با یک حساب نمونه بررسی شود.
+
در زرین منفی یعنی بدهکار (روی نصب واقعی بررسی شد)؛ تغییرش ندهید مگر نصب شما خلاف این باشد.
diff --git a/apps/admin-panel/src/views/manage/accounting.vue b/apps/admin-panel/src/views/manage/accounting.vue index 9aed057..1c6998d 100644 --- a/apps/admin-panel/src/views/manage/accounting.vue +++ b/apps/admin-panel/src/views/manage/accounting.vue @@ -54,8 +54,8 @@ type="info" show-icon class="mb-4" - message="درایور زرین روی نصب واقعی تست نشده است" - description="طبق تصمیم مالک، پیش از استفاده‌ی واقعی یک دوره‌ی آزمایشی با اسناد موقت لازم است (علامت مانده و فیلد هزینه‌ی سنگ را بررسی کنید)." + message="در زرین سند موقت همان لحظه روی مانده‌ی مشتری اثر دارد" + description="برخلاف ته‌حساب. اگر سند در «ثبت سفارش» ثبت شود، مشتری در زرین پیش از تحویل بدهکار می‌شود؛ برای زرین «تحویل مسئول فروش» پیشنهاد می‌شود." /> ) { } function signed(s: ProviderSettings, v: Prisma.Decimal) { - // Until checked on a real installation (plan §9) the sign is a setting. + // v228: negative = owes (the default). Kept a setting in case another install differs. return (s.balanceOwesWhen ?? 'negative') === 'negative' ? v.negated() : v; } @@ -375,7 +376,7 @@ export const zarrinProvider: AccountingProvider = { async getChanges(s, cursor) { // parLastTenRadif without an account is the newest rows of the whole // journal; each row names its account (idHesab) and has an ascending idRadif. - // Not yet seen on a real install (ACC-01). + // Seen working on v228 (plan §13). const rows = listOf(await call(s, 'parLastTenRadif', { limit: CHANGE_WINDOW })); let maxId = 0; for (const r of rows) maxId = Math.max(maxId, Number(r.idRadif) || 0); From e26dddebd9f26c42faacb025e209efc5dc16be97 Mon Sep 17 00:00:00 2001 From: "s.esmaeili" Date: Wed, 14 Oct 2026 03:55:51 +0330 Subject: [PATCH 3/6] ui(admin-panel): restore login page design from the local design line Only the template, styles and decorative icon imports change. The script logic (login flow, validation, redirects) is identical to dev. Co-Authored-By: Claude Haiku 5.5 --- apps/admin-panel/src/views/auth/Login.vue | 654 ++++++++++++++++++++-- 1 file changed, 607 insertions(+), 47 deletions(-) diff --git a/apps/admin-panel/src/views/auth/Login.vue b/apps/admin-panel/src/views/auth/Login.vue index 6ca9d0b..2449ea3 100644 --- a/apps/admin-panel/src/views/auth/Login.vue +++ b/apps/admin-panel/src/views/auth/Login.vue @@ -6,15 +6,92 @@ the loading overlay becomes the button's own loading state. -->
-