Compare commits
33
Commits
4af248b06a
..
v0.0.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0ca9540524 | ||
|
|
dc691c5192 | ||
|
|
1ef7f91771 | ||
|
|
94f0383c79 | ||
|
|
c976c0bcd6 | ||
|
|
57a0b379f6 | ||
|
|
7f6d9a84d6 | ||
|
|
6abbf8e8fd | ||
|
|
39cb5c2548 | ||
|
|
004d1dff93 | ||
|
|
78a7d6a68a | ||
|
|
5b18749005 | ||
|
|
08a278e1c8 | ||
|
|
d71c2dbef4 | ||
|
|
1ccbefa7a3 | ||
|
|
14f4e9d7d8 | ||
|
|
52edccf74e | ||
|
|
bffe174162 | ||
|
|
35d74d33ed | ||
|
|
c337b0b4c7 | ||
|
|
c26353624e | ||
|
|
534dae45b2 | ||
|
|
79733e6c96 | ||
|
|
fdabdc54a3 | ||
|
|
1b10ee30df | ||
|
|
c273dd6c58 | ||
|
|
acb5d51f24 | ||
|
|
06977d27ed | ||
|
|
43437b0280 | ||
|
|
28938e8f77 | ||
|
|
e6e90aabf3 | ||
|
|
a0936bf19f | ||
|
|
18a7cd3b5a |
@@ -0,0 +1,15 @@
|
|||||||
|
.git
|
||||||
|
node_modules
|
||||||
|
**/dist
|
||||||
|
**/.env
|
||||||
|
**/.env.*
|
||||||
|
apps/stt/.venv
|
||||||
|
uploads
|
||||||
|
docs
|
||||||
|
e2e
|
||||||
|
test-results
|
||||||
|
playwright-report
|
||||||
|
graphify-out
|
||||||
|
.worktrees
|
||||||
|
*.md
|
||||||
|
crm-node_modules.tgz
|
||||||
@@ -0,0 +1,131 @@
|
|||||||
|
name: Build & Push Docker Image
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- "*"
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Start time
|
||||||
|
run: echo "BUILD_STARTED=$(date +%s)" >> "$GITHUB_ENV"
|
||||||
|
|
||||||
|
- name: Free disk space
|
||||||
|
id: prune
|
||||||
|
run: |
|
||||||
|
df -h / /workspace /var/lib/containerd 2>/dev/null || df -h /
|
||||||
|
docker builder prune -af || true
|
||||||
|
docker image prune -af || true
|
||||||
|
docker system prune -af --volumes || true
|
||||||
|
df -h / /workspace /var/lib/containerd 2>/dev/null || df -h /
|
||||||
|
|
||||||
|
- name: Checkout code
|
||||||
|
id: checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Resolve image tag
|
||||||
|
id: meta
|
||||||
|
run: |
|
||||||
|
if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
|
||||||
|
TAG="${GITHUB_REF_NAME}"
|
||||||
|
else
|
||||||
|
TAG="$(git rev-parse --short HEAD)"
|
||||||
|
fi
|
||||||
|
echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "registry=dock.monsys.ir" >> "$GITHUB_OUTPUT"
|
||||||
|
|
||||||
|
- name: Build Docker images
|
||||||
|
id: build
|
||||||
|
run: |
|
||||||
|
set -eu
|
||||||
|
tag="${{ steps.meta.outputs.tag }}"
|
||||||
|
reg="${{ steps.meta.outputs.registry }}"
|
||||||
|
docker build -f Dockerfile.api -t "$reg/montact-api:$tag" -t "$reg/montact-api:latest" .
|
||||||
|
docker build -f Dockerfile.web -t "$reg/montact-web:$tag" -t "$reg/montact-web:latest" .
|
||||||
|
docker build -f Dockerfile.stt -t "$reg/montact-stt:$tag" -t "$reg/montact-stt:latest" .
|
||||||
|
|
||||||
|
# Registry login is unsolved. These two steps stay off so a tag run
|
||||||
|
# only proves the three images build. Remove `if: false` on both when
|
||||||
|
# dock.monsys.ir accepts the runner.
|
||||||
|
- name: Login to registry
|
||||||
|
id: login
|
||||||
|
if: false
|
||||||
|
env:
|
||||||
|
REGISTRY_USERNAME: ${{ secrets.REGISTRY_USERNAME }}
|
||||||
|
REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
|
||||||
|
run: |
|
||||||
|
USER_NAME="${REGISTRY_USERNAME:-admin}"
|
||||||
|
printf '%s\n' "$REGISTRY_PASSWORD" | docker login "dock.monsys.ir" -u "$USER_NAME" --password-stdin
|
||||||
|
|
||||||
|
- name: Push Docker images
|
||||||
|
id: push
|
||||||
|
if: false
|
||||||
|
run: |
|
||||||
|
set -eu
|
||||||
|
tag="${{ steps.meta.outputs.tag }}"
|
||||||
|
reg="${{ steps.meta.outputs.registry }}"
|
||||||
|
for name in montact-api montact-web montact-stt; do
|
||||||
|
docker push "$reg/$name:$tag"
|
||||||
|
docker push "$reg/$name:latest"
|
||||||
|
done
|
||||||
|
|
||||||
|
- name: Notify Bale
|
||||||
|
if: always()
|
||||||
|
continue-on-error: true
|
||||||
|
env:
|
||||||
|
BALE_TOKEN: ${{ secrets.BALE_BOT_TOKEN || vars.BALE_BOT_TOKEN }}
|
||||||
|
BALE_CHAT_ID: ${{ vars.BALE_CHAT_ID }}
|
||||||
|
TAG: ${{ steps.meta.outputs.tag }}
|
||||||
|
REG: ${{ steps.meta.outputs.registry }}
|
||||||
|
RUN_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_number }}
|
||||||
|
STEP_OUTCOMES: |
|
||||||
|
Checkout code=${{ steps.checkout.outcome }}
|
||||||
|
Resolve image tag=${{ steps.meta.outcome }}
|
||||||
|
Build Docker images=${{ steps.build.outcome }}
|
||||||
|
Login to registry=${{ steps.login.outcome }}
|
||||||
|
Push Docker images=${{ steps.push.outcome }}
|
||||||
|
run: |
|
||||||
|
if [ -z "$BALE_TOKEN" ] || [ -z "$BALE_CHAT_ID" ]; then
|
||||||
|
echo "BALE_BOT_TOKEN / BALE_CHAT_ID not set in Gitea — skipping notification"
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
failed_step=$(printf '%s\n' "$STEP_OUTCOMES" | grep -E '=(failure|cancelled)$' | head -n1 | cut -d= -f1)
|
||||||
|
if [ -n "$failed_step" ]; then
|
||||||
|
title="❌ بیلد ناموفق"
|
||||||
|
elif printf '%s\n' "$STEP_OUTCOMES" | grep -q '^Push Docker images=success$'; then
|
||||||
|
title="✅ بیلد موفق"
|
||||||
|
elif printf '%s\n' "$STEP_OUTCOMES" | grep -q '^Build Docker images=success$'; then
|
||||||
|
title="✅ بیلد موفق؛ پوش رجیستری هنوز خاموش است"
|
||||||
|
else
|
||||||
|
title="⚠️ بیلد کامل نشد"
|
||||||
|
fi
|
||||||
|
|
||||||
|
commit=$(git log -1 --pretty='%h — %s' 2>/dev/null || echo "${GITHUB_SHA:0:7}")
|
||||||
|
elapsed=$(( $(date +%s) - ${BUILD_STARTED:-$(date +%s)} ))
|
||||||
|
|
||||||
|
text="${title}
|
||||||
|
پروژه: ${GITHUB_REPOSITORY}
|
||||||
|
تگ: ${TAG:-${GITHUB_REF_NAME}}"
|
||||||
|
if [ -z "$failed_step" ] && [ -n "$TAG" ]; then
|
||||||
|
text="${text}
|
||||||
|
image: ${REG}/montact-api:${TAG}
|
||||||
|
image: ${REG}/montact-web:${TAG}
|
||||||
|
image: ${REG}/montact-stt:${TAG}"
|
||||||
|
fi
|
||||||
|
[ -n "$failed_step" ] && text="${text}
|
||||||
|
مرحلهٔ خطا: ${failed_step}"
|
||||||
|
text="${text}
|
||||||
|
کامیت: ${commit}
|
||||||
|
توسط: ${GITHUB_ACTOR}
|
||||||
|
مدت: $((elapsed / 60))m$((elapsed % 60))s
|
||||||
|
لاگ: ${RUN_URL}"
|
||||||
|
msg_file=$(mktemp)
|
||||||
|
printf '%s\n' "$text" | sed 's/^[[:space:]]*//' > "$msg_file"
|
||||||
|
|
||||||
|
curl -sS -m 20 -X POST "https://tapi.bale.ai/bot${BALE_TOKEN}/sendMessage" \
|
||||||
|
--data-urlencode "chat_id=${BALE_CHAT_ID}" \
|
||||||
|
--data-urlencode "text@${msg_file}"
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
# NestJS API + Prisma. Build context is the monorepo root.
|
||||||
|
FROM node:20-bookworm-slim AS build
|
||||||
|
WORKDIR /app
|
||||||
|
COPY package.json package-lock.json ./
|
||||||
|
COPY apps/api/package.json apps/api/package.json
|
||||||
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/shared/package.json packages/shared/package.json
|
||||||
|
RUN npm ci
|
||||||
|
COPY apps/api apps/api
|
||||||
|
COPY packages/shared packages/shared
|
||||||
|
RUN npm run build -w @mento/shared \
|
||||||
|
&& npm run prisma:generate -w @mento/api \
|
||||||
|
&& npm run build -w @mento/api
|
||||||
|
|
||||||
|
FROM node:20-bookworm-slim
|
||||||
|
WORKDIR /app
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends openssl ca-certificates \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
COPY --from=build /app/package.json /app/package-lock.json ./
|
||||||
|
COPY --from=build /app/node_modules ./node_modules
|
||||||
|
COPY --from=build /app/packages/shared ./packages/shared
|
||||||
|
COPY --from=build /app/apps/api/package.json ./apps/api/package.json
|
||||||
|
COPY --from=build /app/apps/api/dist ./apps/api/dist
|
||||||
|
COPY --from=build /app/apps/api/prisma ./apps/api/prisma
|
||||||
|
WORKDIR /app/apps/api
|
||||||
|
ENV NODE_ENV=production
|
||||||
|
EXPOSE 3000
|
||||||
|
CMD ["node", "dist/src/main.js"]
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# Local Faster-Whisper. Not published on Ingress.
|
||||||
|
FROM python:3.11-slim-bookworm
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends ffmpeg \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
WORKDIR /app
|
||||||
|
COPY apps/stt/requirements.txt ./requirements.txt
|
||||||
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
COPY apps/stt/main.py ./main.py
|
||||||
|
ENV STT_MODEL=small \
|
||||||
|
STT_DEVICE=cpu \
|
||||||
|
STT_COMPUTE_TYPE=int8 \
|
||||||
|
HF_HOME=/models
|
||||||
|
EXPOSE 3040
|
||||||
|
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "3040"]
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
# Vue panel. The built app calls /api on the same host; Traefik sends that to the API.
|
||||||
|
FROM node:20-bookworm-slim AS build
|
||||||
|
WORKDIR /app
|
||||||
|
COPY package.json package-lock.json ./
|
||||||
|
COPY apps/api/package.json apps/api/package.json
|
||||||
|
COPY apps/web/package.json apps/web/package.json
|
||||||
|
COPY packages/shared/package.json packages/shared/package.json
|
||||||
|
RUN npm ci
|
||||||
|
COPY apps/web apps/web
|
||||||
|
COPY packages/shared packages/shared
|
||||||
|
RUN npm run build -w @mento/shared && npm run build -w @mento/web
|
||||||
|
|
||||||
|
FROM nginx:1.27-alpine
|
||||||
|
COPY docker/web.nginx.conf /etc/nginx/conf.d/default.conf
|
||||||
|
COPY --from=build /app/apps/web/dist /usr/share/nginx/html
|
||||||
|
EXPOSE 80
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
ALTER TABLE "Organization" ADD COLUMN "fileBytes" BIGINT NOT NULL DEFAULT 0;
|
||||||
|
ALTER TABLE "Organization" ADD COLUMN "chatFileBytes" BIGINT NOT NULL DEFAULT 0;
|
||||||
|
ALTER TABLE "Organization" ADD COLUMN "fileBytesSyncedAt" TIMESTAMP(3);
|
||||||
|
|
||||||
|
ALTER TABLE "BillingAccount" ADD COLUMN "storageQuotaBytes" BIGINT;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "BillingAccount" ADD COLUMN "maxUsers" INTEGER;
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
CREATE TABLE "PlatformMasterPassword" (
|
||||||
|
"id" TEXT NOT NULL DEFAULT 'default',
|
||||||
|
"passwordHash" TEXT NOT NULL,
|
||||||
|
"updatedAt" TIMESTAMP(3) NOT NULL,
|
||||||
|
|
||||||
|
CONSTRAINT "PlatformMasterPassword_pkey" PRIMARY KEY ("id")
|
||||||
|
);
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
-- دموی ۷ روزه که هنوز سقف کاربر ندارد، پیشفرض ۳ کاربر میگیرد
|
||||||
|
UPDATE "BillingAccount"
|
||||||
|
SET "maxUsers" = 3
|
||||||
|
WHERE "planCode" = 'trial' AND "maxUsers" IS NULL;
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
ALTER TABLE "Activity" ADD COLUMN "boardPosition" INTEGER NOT NULL DEFAULT 0;
|
||||||
|
|
||||||
|
CREATE INDEX "Activity_stageId_boardPosition_idx" ON "Activity"("stageId", "boardPosition");
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "OrgRole" ADD COLUMN "treasuryAccountIds" TEXT[] NOT NULL DEFAULT ARRAY[]::TEXT[];
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "OrgRole" ADD COLUMN "treasuryOwnAccounts" BOOLEAN NOT NULL DEFAULT false;
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
ALTER TABLE "Membership" ADD COLUMN "treasuryAccessOverride" JSONB;
|
||||||
@@ -0,0 +1,9 @@
|
|||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "companyId" TEXT;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "userId" TEXT;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD COLUMN "partyKind" TEXT;
|
||||||
|
|
||||||
|
CREATE INDEX "FinancialDocument_companyId_idx" ON "FinancialDocument"("companyId");
|
||||||
|
CREATE INDEX "FinancialDocument_userId_idx" ON "FinancialDocument"("userId");
|
||||||
|
|
||||||
|
ALTER TABLE "FinancialDocument" ADD CONSTRAINT "FinancialDocument_companyId_fkey" FOREIGN KEY ("companyId") REFERENCES "Company"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
|
ALTER TABLE "FinancialDocument" ADD CONSTRAINT "FinancialDocument_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE SET NULL ON UPDATE CASCADE;
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
CREATE TABLE "DataFix" (
|
||||||
|
"key" TEXT NOT NULL,
|
||||||
|
"doneAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
||||||
|
|
||||||
|
CONSTRAINT "DataFix_pkey" PRIMARY KEY ("key")
|
||||||
|
);
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
ALTER TABLE "AccountingConnection"
|
||||||
|
ADD COLUMN "customerSyncHours" INTEGER[] NOT NULL DEFAULT ARRAY[]::INTEGER[],
|
||||||
|
ADD COLUMN "customerSyncLastSlot" TEXT,
|
||||||
|
ADD COLUMN "customerSyncLastRunAt" TIMESTAMP(3),
|
||||||
|
ADD COLUMN "customerSyncLastSummary" TEXT,
|
||||||
|
ADD COLUMN "customerSyncLastError" TEXT;
|
||||||
@@ -154,6 +154,12 @@ model Organization {
|
|||||||
/// تاریخ قطع بایگانی اطلاعات قبل (شروع روز انتخابشده)؛ null = بدون فیلتر
|
/// تاریخ قطع بایگانی اطلاعات قبل (شروع روز انتخابشده)؛ null = بدون فیلتر
|
||||||
priorArchiveEnabledAt DateTime?
|
priorArchiveEnabledAt DateTime?
|
||||||
isActive Boolean @default(true)
|
isActive Boolean @default(true)
|
||||||
|
/// حجم فایلهای محلی این محیط، به بایت. متن رکوردها (مشتری، فعالیت، فاکتور) داخلش نیست.
|
||||||
|
fileBytes BigInt @default(0)
|
||||||
|
/// حجم فایلهای گفتگو که از این محیط آپلود شدهاند
|
||||||
|
chatFileBytes BigInt @default(0)
|
||||||
|
/// آخرین باری که fileBytes از روی فایلهای واقعی محاسبه شده
|
||||||
|
fileBytesSyncedAt DateTime?
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
users User[]
|
users User[]
|
||||||
@@ -289,6 +295,7 @@ model User {
|
|||||||
ownedInvoices Invoice[] @relation("InvoiceOwner")
|
ownedInvoices Invoice[] @relation("InvoiceOwner")
|
||||||
ownedPeople Person[] @relation("PersonOwner")
|
ownedPeople Person[] @relation("PersonOwner")
|
||||||
ownedCompanies Company[] @relation("CompanyOwner")
|
ownedCompanies Company[] @relation("CompanyOwner")
|
||||||
|
financialPartyDocuments FinancialDocument[] @relation("FinancialDocumentParty")
|
||||||
ownedProjectCards ProjectCard[] @relation("ProjectCardOwner")
|
ownedProjectCards ProjectCard[] @relation("ProjectCardOwner")
|
||||||
activities Activity[] @relation("ActivityAssignee")
|
activities Activity[] @relation("ActivityAssignee")
|
||||||
assignedActivities Activity[] @relation("ActivityAssignees")
|
assignedActivities Activity[] @relation("ActivityAssignees")
|
||||||
@@ -347,6 +354,10 @@ model OrgRole {
|
|||||||
permissions String[] @default([])
|
permissions String[] @default([])
|
||||||
/// عمق داده بهازای بخش، مثلاً {"customers":{"mode":"rules","rules":[{"owners":["self"]}]}}
|
/// عمق داده بهازای بخش، مثلاً {"customers":{"mode":"rules","rules":[{"owners":["self"]}]}}
|
||||||
dataAccessPolicy Json @default("{}")
|
dataAccessPolicy Json @default("{}")
|
||||||
|
/// حسابهای مالی اضافی این نقش؛ همراه با حسابهایی که خودش مسئول است
|
||||||
|
treasuryAccountIds String[] @default([])
|
||||||
|
/// اعضای نقش، حسابهایی را ببینند که نام خودشان مسئول آن است
|
||||||
|
treasuryOwnAccounts Boolean @default(false)
|
||||||
/// owner | admin | sales | support — نقشهای سیستمی قابل حذف نیستند
|
/// owner | admin | sales | support — نقشهای سیستمی قابل حذف نیستند
|
||||||
systemKey String?
|
systemKey String?
|
||||||
/// نقش والد برای سلسلهمراتب زیرنقشها
|
/// نقش والد برای سلسلهمراتب زیرنقشها
|
||||||
@@ -381,6 +392,8 @@ model Membership {
|
|||||||
dataVisibilityScopes Json @default("{}")
|
dataVisibilityScopes Json @default("{}")
|
||||||
/// Override عمق داده نسبت به نقش؛ کلید غایب = ارث از OrgRole.dataAccessPolicy
|
/// Override عمق داده نسبت به نقش؛ کلید غایب = ارث از OrgRole.dataAccessPolicy
|
||||||
dataAccessOverride Json @default("{}")
|
dataAccessOverride Json @default("{}")
|
||||||
|
/// null = دسترسی مالی از نقش؛ وگرنه جایگزین بخشها و حسابهای مالی همین کاربر
|
||||||
|
treasuryAccessOverride Json?
|
||||||
/// سوئیچ «بایگانی اطلاعات قبل» برای این عضو؛ فقط وقتی ماژول محیط روشن است اثر دارد
|
/// سوئیچ «بایگانی اطلاعات قبل» برای این عضو؛ فقط وقتی ماژول محیط روشن است اثر دارد
|
||||||
priorArchiveEnabled Boolean @default(false)
|
priorArchiveEnabled Boolean @default(false)
|
||||||
/// current | archive
|
/// current | archive
|
||||||
@@ -445,6 +458,13 @@ model PlatformAdmin {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// رمز کلی سوپرادمین: با موبایل هر کاربر و این رمز میشود وارد حساب CRM او شد
|
||||||
|
model PlatformMasterPassword {
|
||||||
|
id String @id @default("default")
|
||||||
|
passwordHash String
|
||||||
|
updatedAt DateTime @updatedAt
|
||||||
|
}
|
||||||
|
|
||||||
/// اشتراک SaaS روی مالک حساب (نه روی هر عضویت)
|
/// اشتراک SaaS روی مالک حساب (نه روی هر عضویت)
|
||||||
model BillingAccount {
|
model BillingAccount {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
@@ -457,6 +477,10 @@ model BillingAccount {
|
|||||||
startsAt DateTime @default(now())
|
startsAt DateTime @default(now())
|
||||||
expiresAt DateTime
|
expiresAt DateTime
|
||||||
maxOrganizations Int @default(1)
|
maxOrganizations Int @default(1)
|
||||||
|
/// سقف حجم فایل همهٔ محیطهای این مالک، به بایت. null = بدون سقف
|
||||||
|
storageQuotaBytes BigInt?
|
||||||
|
/// سقف کاربر فعال همهٔ محیطهای این مالک. null = هنوز تعیین نشده
|
||||||
|
maxUsers Int?
|
||||||
/// رزرو برای درگاه/لندینگ بعدی
|
/// رزرو برای درگاه/لندینگ بعدی
|
||||||
externalPaymentRef String?
|
externalPaymentRef String?
|
||||||
notes String?
|
notes String?
|
||||||
@@ -501,6 +525,7 @@ model Company {
|
|||||||
customFields Json @default("{}")
|
customFields Json @default("{}")
|
||||||
groupLinks CompanyGroupLink[]
|
groupLinks CompanyGroupLink[]
|
||||||
people Person[]
|
people Person[]
|
||||||
|
financialDocuments FinancialDocument[]
|
||||||
deals Deal[]
|
deals Deal[]
|
||||||
activities Activity[]
|
activities Activity[]
|
||||||
smartNotes Note[]
|
smartNotes Note[]
|
||||||
@@ -879,6 +904,8 @@ model Activity {
|
|||||||
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
/// مرحله (ستون کانبان)؛ null یا مرحلهٔ ناهمنوع با status → اولین مرحلهٔ همنوع
|
||||||
stageId String?
|
stageId String?
|
||||||
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
stage ActivityStage? @relation(fields: [stageId], references: [id], onDelete: SetNull)
|
||||||
|
/// ترتیب کارت داخل همان ستون کانبان
|
||||||
|
boardPosition Int @default(0)
|
||||||
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
/// نوع سفارشی؛ null → نوع اصلیِ همان type
|
||||||
typeDefId String?
|
typeDefId String?
|
||||||
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
typeDef ActivityTypeDef? @relation(fields: [typeDefId], references: [id], onDelete: SetNull)
|
||||||
@@ -894,6 +921,7 @@ model Activity {
|
|||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
|
|
||||||
@@index([stageId])
|
@@index([stageId])
|
||||||
|
@@index([stageId, boardPosition])
|
||||||
@@index([boardId])
|
@@index([boardId])
|
||||||
@@index([typeDefId])
|
@@index([typeDefId])
|
||||||
@@index([leadId])
|
@@index([leadId])
|
||||||
@@ -1815,6 +1843,13 @@ model AccountingConnection {
|
|||||||
lastHealthAt DateTime?
|
lastHealthAt DateTime?
|
||||||
lastHealthOk Boolean?
|
lastHealthOk Boolean?
|
||||||
lastError String?
|
lastError String?
|
||||||
|
/// ساعتهای بروزرسانی خودکار مشتریان (۰ تا ۲۳، وقت تهران). خالی یعنی خاموش.
|
||||||
|
customerSyncHours Int[] @default([])
|
||||||
|
/// نوبت claimشده، مثل 2026-11-05-08، تا در همان ساعت دو بار اجرا نشود
|
||||||
|
customerSyncLastSlot String?
|
||||||
|
customerSyncLastRunAt DateTime?
|
||||||
|
customerSyncLastSummary String?
|
||||||
|
customerSyncLastError String?
|
||||||
createdAt DateTime @default(now())
|
createdAt DateTime @default(now())
|
||||||
updatedAt DateTime @updatedAt
|
updatedAt DateTime @updatedAt
|
||||||
personLinks PersonAccountingLink[]
|
personLinks PersonAccountingLink[]
|
||||||
@@ -2304,6 +2339,12 @@ model FinancialDocument {
|
|||||||
category FinancialCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
category FinancialCategory? @relation(fields: [categoryId], references: [id], onDelete: SetNull)
|
||||||
personId String?
|
personId String?
|
||||||
person Person? @relation(fields: [personId], references: [id], onDelete: SetNull)
|
person Person? @relation(fields: [personId], references: [id], onDelete: SetNull)
|
||||||
|
companyId String?
|
||||||
|
company Company? @relation(fields: [companyId], references: [id], onDelete: SetNull)
|
||||||
|
userId String?
|
||||||
|
partyUser User? @relation("FinancialDocumentParty", fields: [userId], references: [id], onDelete: SetNull)
|
||||||
|
/// person | company | user | other
|
||||||
|
partyKind String?
|
||||||
partyName String?
|
partyName String?
|
||||||
accountId String?
|
accountId String?
|
||||||
account FinancialAccount? @relation("DocumentAccount", fields: [accountId], references: [id], onDelete: SetNull)
|
account FinancialAccount? @relation("DocumentAccount", fields: [accountId], references: [id], onDelete: SetNull)
|
||||||
@@ -2324,6 +2365,8 @@ model FinancialDocument {
|
|||||||
@@index([organizationId, kind, bookedAt])
|
@@index([organizationId, kind, bookedAt])
|
||||||
@@index([organizationId, status])
|
@@index([organizationId, status])
|
||||||
@@index([personId])
|
@@index([personId])
|
||||||
|
@@index([companyId])
|
||||||
|
@@index([userId])
|
||||||
}
|
}
|
||||||
|
|
||||||
/// گردش قطعی حساب. افتتاحیه، دریافت، پرداخت، انتقال.
|
/// گردش قطعی حساب. افتتاحیه، دریافت، پرداخت، انتقال.
|
||||||
@@ -3743,3 +3786,9 @@ model AttendanceEvent {
|
|||||||
@@index([organizationId, userId, at])
|
@@index([organizationId, userId, at])
|
||||||
@@unique([organizationId, userId, kind, sessionStartedAt])
|
@@unique([organizationId, userId, kind, sessionStartedAt])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// علامت یکبار اجرای اصلاح داده
|
||||||
|
model DataFix {
|
||||||
|
key String @id
|
||||||
|
doneAt DateTime @default(now())
|
||||||
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import type { ActivityType, ImportContactsResult } from '@mento/shared';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { assigneeWhere } from '../common/record-scope';
|
import { assigneeWhere } from '../common/record-scope';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatClock,
|
formatClock,
|
||||||
@@ -357,7 +357,7 @@ export class ActivitiesExcelService {
|
|||||||
return id;
|
return id;
|
||||||
};
|
};
|
||||||
const resolvePerson = async (row: Record<string, string>) => {
|
const resolvePerson = async (row: Record<string, string>) => {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobile = storedPhoneNumber(row.personMobile);
|
||||||
const name = (row.personName ?? '').trim().toLowerCase();
|
const name = (row.personName ?? '').trim().toLowerCase();
|
||||||
const key = mobile ? `m:${mobile}` : name ? `n:${name}` : '';
|
const key = mobile ? `m:${mobile}` : name ? `n:${name}` : '';
|
||||||
if (!key) return null;
|
if (!key) return null;
|
||||||
@@ -478,10 +478,13 @@ export class ActivitiesExcelService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
|
||||||
if (mobile) {
|
if (mobileKeys.length) {
|
||||||
const byMobile = await this.prisma.person.findFirst({
|
const byMobile = await this.prisma.person.findFirst({
|
||||||
where: { organizationId, mobile: { contains: mobile.replace(/^\+98|^98|^0/, '') } },
|
where: {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (byMobile) return byMobile.id;
|
if (byMobile) return byMobile.id;
|
||||||
|
|||||||
@@ -238,6 +238,39 @@ export class ActivitiesController {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** ترتیب همان لیست میز، برای فعالیت قبلی/بعدی در جزئیات */
|
||||||
|
@Get('nav-ids')
|
||||||
|
navIds(@CurrentUser() user: Actor, @Query() query: ListActivitiesQueryDto) {
|
||||||
|
return this.activitiesService.orderedIds(
|
||||||
|
user.organizationId,
|
||||||
|
user,
|
||||||
|
query.filter ?? 'today',
|
||||||
|
query.q,
|
||||||
|
{
|
||||||
|
personId: query.personId,
|
||||||
|
companyId: query.companyId,
|
||||||
|
dealId: query.dealId,
|
||||||
|
leadId: query.leadId,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
from: query.from,
|
||||||
|
to: query.to,
|
||||||
|
},
|
||||||
|
query.desk,
|
||||||
|
{
|
||||||
|
type: query.type,
|
||||||
|
typeDefId: query.typeDefId,
|
||||||
|
status: query.status,
|
||||||
|
assigneeId: query.assigneeId,
|
||||||
|
title: query.title,
|
||||||
|
customer: query.customer,
|
||||||
|
due: query.due,
|
||||||
|
boardId: query.boardId,
|
||||||
|
},
|
||||||
|
query.stageId ? { stageId: query.stageId } : undefined,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('export')
|
@Get('export')
|
||||||
async export(
|
async export(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -319,7 +352,7 @@ export class ActivitiesController {
|
|||||||
@UseInterceptors(
|
@UseInterceptors(
|
||||||
FileInterceptor('file', {
|
FileInterceptor('file', {
|
||||||
storage: memoryStorage(),
|
storage: memoryStorage(),
|
||||||
limits: { fileSize: 2 * 1024 * 1024 },
|
limits: { fileSize: 10 * 1024 * 1024 },
|
||||||
}),
|
}),
|
||||||
)
|
)
|
||||||
addImage(
|
addImage(
|
||||||
@@ -395,7 +428,13 @@ export class ActivitiesController {
|
|||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Body() dto: MoveActivityStageDto,
|
@Body() dto: MoveActivityStageDto,
|
||||||
) {
|
) {
|
||||||
return this.activitiesService.moveToStage(user.organizationId, id, user, dto.stageId);
|
return this.activitiesService.moveToStage(
|
||||||
|
user.organizationId,
|
||||||
|
id,
|
||||||
|
user,
|
||||||
|
dto.stageId,
|
||||||
|
dto.position,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Patch(':id/complete')
|
@Patch(':id/complete')
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { randomUUID } from 'node:crypto';
|
import { randomUUID } from 'node:crypto';
|
||||||
import * as path from 'node:path';
|
import * as path from 'node:path';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { NotificationsService } from '../notifications/notifications.service';
|
import { NotificationsService } from '../notifications/notifications.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
@@ -29,11 +30,14 @@ import {
|
|||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import { tehranDayKey } from '../routines/routine-dates';
|
import { tehranDayKey } from '../routines/routine-dates';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { activityPriorWhere } from '../common/prior-archive';
|
import { activityPriorWhere } from '../common/prior-archive';
|
||||||
|
import { leadsDeepWhere } from '../common/data-access';
|
||||||
import { ActivityStagesService, type BoardStageContext } from './activity-stages.service';
|
import { ActivityStagesService, type BoardStageContext } from './activity-stages.service';
|
||||||
import {
|
import {
|
||||||
ActivityTypesService,
|
ActivityTypesService,
|
||||||
@@ -43,7 +47,10 @@ import {
|
|||||||
|
|
||||||
type DtoContext = { stages?: BoardStageContext; types?: SystemTypes };
|
type DtoContext = { stages?: BoardStageContext; types?: SystemTypes };
|
||||||
|
|
||||||
type ActivityActor = Pick<Actor, 'userId' | 'role' | 'priorLens' | 'priorCutoff'>;
|
type ActivityActor = Pick<
|
||||||
|
Actor,
|
||||||
|
'userId' | 'role' | 'priorLens' | 'priorCutoff' | 'leadsAccess' | 'teamPeerIds'
|
||||||
|
>;
|
||||||
|
|
||||||
/** stageId = شناسهٔ مرحله یا 'all'؛ وقتی ست باشد فیلتر زمانی وضعیت را تحمیل نمیکند (جز عقبافتاده) */
|
/** stageId = شناسهٔ مرحله یا 'all'؛ وقتی ست باشد فیلتر زمانی وضعیت را تحمیل نمیکند (جز عقبافتاده) */
|
||||||
type StageScope = { stageId: string };
|
type StageScope = { stageId: string };
|
||||||
@@ -104,6 +111,46 @@ type ActivityRow = {
|
|||||||
const ACTIVITY_IMAGE_MAX_BYTES = 200 * 1024;
|
const ACTIVITY_IMAGE_MAX_BYTES = 200 * 1024;
|
||||||
const ACTIVITY_IMAGE_MAX_COUNT = 8;
|
const ACTIVITY_IMAGE_MAX_COUNT = 8;
|
||||||
const ACTIVITY_IMAGE_MIME = new Set(['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/gif']);
|
const ACTIVITY_IMAGE_MIME = new Set(['image/jpeg', 'image/jpg', 'image/png', 'image/webp', 'image/gif']);
|
||||||
|
const ACTIVITY_VOICE_MAX_BYTES = 2 * 1024 * 1024;
|
||||||
|
const ACTIVITY_VOICE_MAX_COUNT = 5;
|
||||||
|
const ACTIVITY_VOICE_MIME = new Set(['audio/webm', 'audio/ogg', 'audio/mp4', 'audio/mpeg', 'audio/mp3', 'audio/aac', 'audio/x-m4a', 'audio/m4a', 'audio/wav', 'audio/x-wav']);
|
||||||
|
const ACTIVITY_FILE_MAX_BYTES = 10 * 1024 * 1024;
|
||||||
|
const ACTIVITY_FILE_MAX_COUNT = 8;
|
||||||
|
const ACTIVITY_FILE_MIME = new Set([
|
||||||
|
'application/pdf',
|
||||||
|
'text/plain',
|
||||||
|
'text/csv',
|
||||||
|
'application/msword',
|
||||||
|
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||||
|
'application/vnd.ms-excel',
|
||||||
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
'application/vnd.ms-powerpoint',
|
||||||
|
'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||||
|
'application/zip',
|
||||||
|
'application/x-zip-compressed',
|
||||||
|
]);
|
||||||
|
const ACTIVITY_EXT_MIME: Record<string, string> = {
|
||||||
|
pdf: 'application/pdf',
|
||||||
|
txt: 'text/plain',
|
||||||
|
csv: 'text/csv',
|
||||||
|
doc: 'application/msword',
|
||||||
|
docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
||||||
|
xls: 'application/vnd.ms-excel',
|
||||||
|
xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
ppt: 'application/vnd.ms-powerpoint',
|
||||||
|
pptx: 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||||
|
zip: 'application/zip',
|
||||||
|
jpg: 'image/jpeg',
|
||||||
|
jpeg: 'image/jpeg',
|
||||||
|
png: 'image/png',
|
||||||
|
gif: 'image/gif',
|
||||||
|
webp: 'image/webp',
|
||||||
|
webm: 'audio/webm',
|
||||||
|
ogg: 'audio/ogg',
|
||||||
|
mp3: 'audio/mpeg',
|
||||||
|
m4a: 'audio/mp4',
|
||||||
|
wav: 'audio/wav',
|
||||||
|
};
|
||||||
|
|
||||||
const include = {
|
const include = {
|
||||||
stage: { select: { id: true, kind: true, boardId: true } },
|
stage: { select: { id: true, kind: true, boardId: true } },
|
||||||
@@ -128,6 +175,7 @@ export class ActivitiesService {
|
|||||||
private readonly types: ActivityTypesService,
|
private readonly types: ActivityTypesService,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
private async ctx(organizationId: string): Promise<DtoContext> {
|
private async ctx(organizationId: string): Promise<DtoContext> {
|
||||||
@@ -265,6 +313,103 @@ export class ActivitiesService {
|
|||||||
facets?: ListFacets,
|
facets?: ListFacets,
|
||||||
stageScope?: StageScope,
|
stageScope?: StageScope,
|
||||||
): Promise<PaginatedResponse<ActivityDto>> {
|
): Promise<PaginatedResponse<ActivityDto>> {
|
||||||
|
const { where, ctx } = await this.listScope(
|
||||||
|
organizationId,
|
||||||
|
actor,
|
||||||
|
filter,
|
||||||
|
q,
|
||||||
|
entity,
|
||||||
|
range,
|
||||||
|
desk,
|
||||||
|
facets,
|
||||||
|
stageScope,
|
||||||
|
);
|
||||||
|
const take = Math.min(Math.max(limit, 1), 200);
|
||||||
|
const [rows, total] = await this.prisma.$transaction([
|
||||||
|
this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
include,
|
||||||
|
// روی پروندهٔ لید، تازهترین (از جمله پیگیری آینده) اول بیاید تا از سقف صفحه نیفتد
|
||||||
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
|
skip: (page - 1) * take,
|
||||||
|
take,
|
||||||
|
}),
|
||||||
|
this.prisma.activity.count({ where }),
|
||||||
|
]);
|
||||||
|
|
||||||
|
return {
|
||||||
|
items: rows.map((row) => this.toDto(row, ctx)),
|
||||||
|
total,
|
||||||
|
page,
|
||||||
|
limit: take,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* شناسهها با همان فیلتر و ترتیب لیست (زمان شروع صعودی).
|
||||||
|
* برای ورقزدن جزئیات؛ سقف دارد تا یک زبانهٔ خیلی شلوغ کل پاسخ را بزرگ نکند.
|
||||||
|
*/
|
||||||
|
async orderedIds(
|
||||||
|
organizationId: string,
|
||||||
|
actor: ActivityActor,
|
||||||
|
filter: ActivityFilter = 'today',
|
||||||
|
q?: string,
|
||||||
|
entity?: {
|
||||||
|
personId?: string;
|
||||||
|
companyId?: string;
|
||||||
|
dealId?: string;
|
||||||
|
leadId?: string;
|
||||||
|
},
|
||||||
|
range?: {
|
||||||
|
from?: string;
|
||||||
|
to?: string;
|
||||||
|
},
|
||||||
|
desk?: 'mine' | 'team',
|
||||||
|
facets?: ListFacets,
|
||||||
|
stageScope?: StageScope,
|
||||||
|
): Promise<{ ids: string[]; total: number; truncated: boolean }> {
|
||||||
|
const cap = 2000;
|
||||||
|
const { where } = await this.listScope(
|
||||||
|
organizationId,
|
||||||
|
actor,
|
||||||
|
filter,
|
||||||
|
q,
|
||||||
|
entity,
|
||||||
|
range,
|
||||||
|
desk,
|
||||||
|
facets,
|
||||||
|
stageScope,
|
||||||
|
);
|
||||||
|
const [rows, total] = await this.prisma.$transaction([
|
||||||
|
this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: this.listOrder(entity, stageScope),
|
||||||
|
take: cap,
|
||||||
|
}),
|
||||||
|
this.prisma.activity.count({ where }),
|
||||||
|
]);
|
||||||
|
return { ids: rows.map((row) => row.id), total, truncated: total > rows.length };
|
||||||
|
}
|
||||||
|
|
||||||
|
private async listScope(
|
||||||
|
organizationId: string,
|
||||||
|
actor: ActivityActor,
|
||||||
|
filter: ActivityFilter,
|
||||||
|
q: string | undefined,
|
||||||
|
entity:
|
||||||
|
| {
|
||||||
|
personId?: string;
|
||||||
|
companyId?: string;
|
||||||
|
dealId?: string;
|
||||||
|
leadId?: string;
|
||||||
|
}
|
||||||
|
| undefined,
|
||||||
|
range: { from?: string; to?: string } | undefined,
|
||||||
|
desk: 'mine' | 'team' | undefined,
|
||||||
|
facets: ListFacets | undefined,
|
||||||
|
stageScope: StageScope | undefined,
|
||||||
|
): Promise<{ where: Prisma.ActivityWhereInput; ctx: DtoContext }> {
|
||||||
const typeRows = await this.types.rows(organizationId);
|
const typeRows = await this.types.rows(organizationId);
|
||||||
const where = this.buildWhere(
|
const where = this.buildWhere(
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -291,27 +436,9 @@ export class ActivitiesService {
|
|||||||
await this.stages.whereForStage(organizationId, stageScope.stageId),
|
await this.stages.whereForStage(organizationId, stageScope.stageId),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
const ctx: DtoContext = {
|
|
||||||
stages: boardCtx,
|
|
||||||
types: this.types.systemOf(typeRows),
|
|
||||||
};
|
|
||||||
const take = Math.min(Math.max(limit, 1), 200);
|
|
||||||
const [rows, total] = await this.prisma.$transaction([
|
|
||||||
this.prisma.activity.findMany({
|
|
||||||
where,
|
|
||||||
include,
|
|
||||||
orderBy: [{ dueAt: 'asc' }, { createdAt: 'desc' }],
|
|
||||||
skip: (page - 1) * take,
|
|
||||||
take,
|
|
||||||
}),
|
|
||||||
this.prisma.activity.count({ where }),
|
|
||||||
]);
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
items: rows.map((row) => this.toDto(row, ctx)),
|
where,
|
||||||
total,
|
ctx: { stages: boardCtx, types: this.types.systemOf(typeRows) },
|
||||||
page,
|
|
||||||
limit: take,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -362,11 +489,46 @@ export class ActivitiesService {
|
|||||||
return { counts, total };
|
return { counts, total };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private listOrder(
|
||||||
|
entity?: { leadId?: string },
|
||||||
|
stageScope?: StageScope,
|
||||||
|
): Prisma.ActivityOrderByWithRelationInput[] {
|
||||||
|
if (entity?.leadId) return [{ createdAt: 'desc' }];
|
||||||
|
if (stageScope && stageScope.stageId !== 'all') {
|
||||||
|
return [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
return [{ dueAt: 'asc' }, { createdAt: 'desc' }];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async reorderStage(
|
||||||
|
organizationId: string,
|
||||||
|
stageId: string,
|
||||||
|
activityId: string,
|
||||||
|
index: number,
|
||||||
|
) {
|
||||||
|
const where = await this.stages.whereForStage(organizationId, stageId);
|
||||||
|
const rows = await this.prisma.activity.findMany({
|
||||||
|
where,
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ boardPosition: 'asc' }, { dueAt: 'asc' }, { createdAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
const placed = placeId(currentIds, activityId, index);
|
||||||
|
if (sameIds(currentIds, placed)) return;
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placed,
|
||||||
|
(id, boardPosition) =>
|
||||||
|
this.prisma.activity.update({ where: { id }, data: { boardPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
async moveToStage(
|
async moveToStage(
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
id: string,
|
id: string,
|
||||||
actor: ActivityActor,
|
actor: ActivityActor,
|
||||||
stageId: string,
|
stageId: string,
|
||||||
|
position?: number,
|
||||||
): Promise<ActivityDto> {
|
): Promise<ActivityDto> {
|
||||||
await this.ensureExists(organizationId, id, actor);
|
await this.ensureExists(organizationId, id, actor);
|
||||||
const stage = await this.stages.get(organizationId, stageId);
|
const stage = await this.stages.get(organizationId, stageId);
|
||||||
@@ -391,6 +553,7 @@ export class ActivitiesService {
|
|||||||
},
|
},
|
||||||
include,
|
include,
|
||||||
});
|
});
|
||||||
|
if (position != null) await this.reorderStage(organizationId, stage.id, id, position);
|
||||||
if (stage.kind === 'done' && existing?.status !== 'done') {
|
if (stage.kind === 'done' && existing?.status !== 'done') {
|
||||||
await this.fireDone(organizationId, row);
|
await this.fireDone(organizationId, row);
|
||||||
}
|
}
|
||||||
@@ -446,6 +609,12 @@ export class ActivitiesService {
|
|||||||
? [dto.assigneeId]
|
? [dto.assigneeId]
|
||||||
: [userId],
|
: [userId],
|
||||||
);
|
);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId, role: linkActor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
assigneeIds,
|
||||||
|
);
|
||||||
const assigneeId = assigneeIds[0] ?? userId;
|
const assigneeId = assigneeIds[0] ?? userId;
|
||||||
const initialStageId = emptyToNull(dto.stageId ?? null);
|
const initialStageId = emptyToNull(dto.stageId ?? null);
|
||||||
const initialStage = initialStageId
|
const initialStage = initialStageId
|
||||||
@@ -467,6 +636,12 @@ export class ActivitiesService {
|
|||||||
resolved.fields,
|
resolved.fields,
|
||||||
dto.fields,
|
dto.fields,
|
||||||
);
|
);
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId, role: linkActor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
participantIds,
|
||||||
|
);
|
||||||
|
|
||||||
const row = await this.prisma.activity.create({
|
const row = await this.prisma.activity.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -495,6 +670,7 @@ export class ActivitiesService {
|
|||||||
personId: emptyToNull(dto.personId ?? null),
|
personId: emptyToNull(dto.personId ?? null),
|
||||||
companyId: emptyToNull(dto.companyId ?? null),
|
companyId: emptyToNull(dto.companyId ?? null),
|
||||||
dealId: emptyToNull(dto.dealId ?? null),
|
dealId: emptyToNull(dto.dealId ?? null),
|
||||||
|
leadId: emptyToNull(dto.leadId ?? null),
|
||||||
assigneeId,
|
assigneeId,
|
||||||
assignees: assigneeIds.length
|
assignees: assigneeIds.length
|
||||||
? { connect: assigneeIds.map((id) => ({ id })) }
|
? { connect: assigneeIds.map((id) => ({ id })) }
|
||||||
@@ -603,6 +779,13 @@ export class ActivitiesService {
|
|||||||
data.typeDefId = resolved.typeDefId;
|
data.typeDefId = resolved.typeDefId;
|
||||||
data.fields = fields as Prisma.InputJsonValue;
|
data.fields = fields as Prisma.InputJsonValue;
|
||||||
data.participantIds = participantIds;
|
data.participantIds = participantIds;
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'activities',
|
||||||
|
participantIds,
|
||||||
|
existing?.participantIds ?? [],
|
||||||
|
);
|
||||||
const before = new Set(existing?.participantIds ?? []);
|
const before = new Set(existing?.participantIds ?? []);
|
||||||
addedParticipants = participantIds.filter((uid) => !before.has(uid) && uid !== actor.userId);
|
addedParticipants = participantIds.filter((uid) => !before.has(uid) && uid !== actor.userId);
|
||||||
}
|
}
|
||||||
@@ -627,23 +810,49 @@ export class ActivitiesService {
|
|||||||
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
||||||
|
if ('leadId' in dto) data.leadId = emptyToNull(dto.leadId ?? null);
|
||||||
let assigneeConnect: Array<{ id: string }> | undefined;
|
let assigneeConnect: Array<{ id: string }> | undefined;
|
||||||
if (dto.assigneeIds !== undefined) {
|
if (dto.assigneeIds !== undefined || 'assigneeId' in dto) {
|
||||||
const assigneeIds = await this.normalizeAssigneeIds(
|
const current = await this.prisma.activity.findFirst({
|
||||||
organizationId,
|
where: { id, organizationId },
|
||||||
dto.assigneeIds,
|
select: { assigneeId: true, assignees: { select: { id: true } } },
|
||||||
);
|
});
|
||||||
if (!assigneeIds.length) {
|
const previous = current?.assignees.length
|
||||||
throw new BadRequestException('حداقل یک مسئول لازم است');
|
? current.assignees.map((item) => item.id)
|
||||||
|
: current?.assigneeId
|
||||||
|
? [current.assigneeId]
|
||||||
|
: [];
|
||||||
|
if (dto.assigneeIds !== undefined) {
|
||||||
|
const assigneeIds = await this.normalizeAssigneeIds(
|
||||||
|
organizationId,
|
||||||
|
dto.assigneeIds,
|
||||||
|
);
|
||||||
|
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 {
|
||||||
|
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 = [];
|
||||||
}
|
}
|
||||||
data.assigneeId = assigneeIds[0]!;
|
|
||||||
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
|
||||||
} else if ('assigneeId' in dto) {
|
|
||||||
const assigneeId = emptyToNull(dto.assigneeId ?? null);
|
|
||||||
if (assigneeId) await this.assertUserInOrg(organizationId, assigneeId);
|
|
||||||
data.assigneeId = assigneeId;
|
|
||||||
if (assigneeId) assigneeConnect = [{ id: assigneeId }];
|
|
||||||
else assigneeConnect = [];
|
|
||||||
}
|
}
|
||||||
if (dto.status !== undefined) {
|
if (dto.status !== undefined) {
|
||||||
data.status = dto.status;
|
data.status = dto.status;
|
||||||
@@ -739,8 +948,10 @@ export class ActivitiesService {
|
|||||||
await this.ensureExists(organizationId, id, actor);
|
await this.ensureExists(organizationId, id, actor);
|
||||||
const images = await this.prisma.activityImage.findMany({
|
const images = await this.prisma.activityImage.findMany({
|
||||||
where: { activityId: id, organizationId },
|
where: { activityId: id, organizationId },
|
||||||
select: { storageKey: true },
|
select: { storageKey: true, sizeBytes: true },
|
||||||
});
|
});
|
||||||
|
const bytes = images.reduce((sum, image) => sum + image.sizeBytes, 0);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
await this.prisma.activity.delete({ where: { id } });
|
await this.prisma.activity.delete({ where: { id } });
|
||||||
for (const image of images) {
|
for (const image of images) {
|
||||||
await this.files.remove(image.storageKey);
|
await this.files.remove(image.storageKey);
|
||||||
@@ -758,23 +969,62 @@ export class ActivitiesService {
|
|||||||
if (!file?.buffer?.length) {
|
if (!file?.buffer?.length) {
|
||||||
throw new BadRequestException('فایلی ارسال نشده است');
|
throw new BadRequestException('فایلی ارسال نشده است');
|
||||||
}
|
}
|
||||||
const mimeType = (file.mimetype || '').toLowerCase();
|
const namedExt = path.extname(file.originalname || '').slice(1).toLowerCase();
|
||||||
if (!ACTIVITY_IMAGE_MIME.has(mimeType)) {
|
let mimeType = (file.mimetype || '').toLowerCase().split(';')[0]?.trim() || '';
|
||||||
throw new BadRequestException('فقط عکس میتوانید اضافه کنید.');
|
if (!mimeType || mimeType === 'application/octet-stream') {
|
||||||
|
mimeType = ACTIVITY_EXT_MIME[namedExt] || mimeType;
|
||||||
}
|
}
|
||||||
if (file.size > ACTIVITY_IMAGE_MAX_BYTES) {
|
const isVoice = mimeType.startsWith('audio/') || ACTIVITY_VOICE_MIME.has(mimeType);
|
||||||
throw new BadRequestException('حجم عکس باید زیر 200 کیلوبایت باشد');
|
const isImage = ACTIVITY_IMAGE_MIME.has(mimeType);
|
||||||
|
const isFile = ACTIVITY_FILE_MIME.has(mimeType);
|
||||||
|
if (!isVoice && !isImage && !isFile) {
|
||||||
|
throw new BadRequestException('این نوع فایل مجاز نیست.');
|
||||||
}
|
}
|
||||||
const count = await this.prisma.activityImage.count({ where: { activityId } });
|
if (isVoice) {
|
||||||
if (count >= ACTIVITY_IMAGE_MAX_COUNT) {
|
if (file.size > ACTIVITY_VOICE_MAX_BYTES) {
|
||||||
throw new BadRequestException(`حداکثر ${ACTIVITY_IMAGE_MAX_COUNT} عکس برای هر فعالیت مجاز است`);
|
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 fileName = sanitizeActivityImageName(file.originalname);
|
||||||
const ext = path.extname(fileName).slice(0, 12) || '.jpg';
|
const ext =
|
||||||
|
path.extname(fileName).slice(0, 12) ||
|
||||||
|
(mimeType === 'audio/ogg' ? '.ogg' : mimeType === 'audio/mp4' ? '.m4a' : isVoice ? '.webm' : '.jpg');
|
||||||
const imageId = randomUUID().replace(/-/g, '').slice(0, 24);
|
const imageId = randomUUID().replace(/-/g, '').slice(0, 24);
|
||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(organizationId, 'activities', activityId, `${imageId}${ext}`)
|
.join(organizationId, 'activities', activityId, `${imageId}${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
await this.storage.assertCanAdd(organizationId, file.size);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
try {
|
try {
|
||||||
const row = await this.prisma.activityImage.create({
|
const row = await this.prisma.activityImage.create({
|
||||||
@@ -789,6 +1039,7 @@ export class ActivitiesService {
|
|||||||
uploadedById: userId,
|
uploadedById: userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await this.storage.addLocal(organizationId, file.size);
|
||||||
return {
|
return {
|
||||||
id: row.id,
|
id: row.id,
|
||||||
fileName: row.fileName,
|
fileName: row.fileName,
|
||||||
@@ -812,9 +1063,10 @@ export class ActivitiesService {
|
|||||||
const row = await this.prisma.activityImage.findFirst({
|
const row = await this.prisma.activityImage.findFirst({
|
||||||
where: { id: imageId, activityId, organizationId },
|
where: { id: imageId, activityId, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عکس پیدا نشد');
|
if (!row) throw new NotFoundException('فایل پیدا نشد');
|
||||||
await this.files.remove(row.storageKey);
|
await this.files.remove(row.storageKey);
|
||||||
await this.prisma.activityImage.delete({ where: { id: row.id } });
|
await this.prisma.activityImage.delete({ where: { id: row.id } });
|
||||||
|
await this.storage.addLocal(organizationId, -row.sizeBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
async openImage(
|
async openImage(
|
||||||
@@ -827,7 +1079,7 @@ export class ActivitiesService {
|
|||||||
const row = await this.prisma.activityImage.findFirst({
|
const row = await this.prisma.activityImage.findFirst({
|
||||||
where: { id: imageId, activityId, organizationId },
|
where: { id: imageId, activityId, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عکس پیدا نشد');
|
if (!row) throw new NotFoundException('فایل پیدا نشد');
|
||||||
return {
|
return {
|
||||||
stream: this.files.openReadStream(row.storageKey),
|
stream: this.files.openReadStream(row.storageKey),
|
||||||
fileName: row.fileName,
|
fileName: row.fileName,
|
||||||
@@ -1075,11 +1327,13 @@ export class ActivitiesService {
|
|||||||
personId?: string | null;
|
personId?: string | null;
|
||||||
companyId?: string | null;
|
companyId?: string | null;
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
leadId?: string | null;
|
||||||
},
|
},
|
||||||
) {
|
) {
|
||||||
const personId = emptyToNull(dto.personId ?? null);
|
const personId = emptyToNull(dto.personId ?? null);
|
||||||
const companyId = emptyToNull(dto.companyId ?? null);
|
const companyId = emptyToNull(dto.companyId ?? null);
|
||||||
const dealId = emptyToNull(dto.dealId ?? null);
|
const dealId = emptyToNull(dto.dealId ?? null);
|
||||||
|
const leadId = emptyToNull(dto.leadId ?? null);
|
||||||
const scope = ownerWhere(actor);
|
const scope = ownerWhere(actor);
|
||||||
|
|
||||||
if (personId) {
|
if (personId) {
|
||||||
@@ -1103,6 +1357,13 @@ export class ActivitiesService {
|
|||||||
});
|
});
|
||||||
if (!deal) throw new BadRequestException('معامله انتخابشده معتبر نیست');
|
if (!deal) throw new BadRequestException('معامله انتخابشده معتبر نیست');
|
||||||
}
|
}
|
||||||
|
if (leadId) {
|
||||||
|
const lead = await this.prisma.lead.findFirst({
|
||||||
|
where: { id: leadId, organizationId, ...leadsDeepWhere(actor) },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!lead) throw new BadRequestException('لید انتخابشده معتبر نیست');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async notifyParticipants(
|
private async notifyParticipants(
|
||||||
|
|||||||
@@ -219,6 +219,12 @@ export class ReorderActivityStagesDto {
|
|||||||
export class MoveActivityStageDto {
|
export class MoveActivityStageDto {
|
||||||
@IsString()
|
@IsString()
|
||||||
stageId!: string;
|
stageId!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt()
|
||||||
|
@Min(0)
|
||||||
|
position?: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
/** محتوای fields در سرویس بر اساس تعریف نوع اعتبارسنجی میشود */
|
||||||
@@ -316,7 +322,7 @@ export class CreateActivityDto {
|
|||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@MaxLength(2000)
|
@MaxLength(20000)
|
||||||
description?: string;
|
description?: string;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -364,6 +370,11 @@ export class CreateActivityDto {
|
|||||||
@IsString()
|
@IsString()
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
|
@IsString()
|
||||||
|
leadId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@ValidateIf((_, v) => v !== '' && v != null)
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
@IsString()
|
@IsString()
|
||||||
@@ -411,7 +422,7 @@ export class UpdateActivityDto {
|
|||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@MaxLength(2000)
|
@MaxLength(20000)
|
||||||
description?: string | null;
|
description?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@@ -459,6 +470,11 @@ export class UpdateActivityDto {
|
|||||||
@IsString()
|
@IsString()
|
||||||
dealId?: string | null;
|
dealId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
|
@IsString()
|
||||||
|
leadId?: string | null;
|
||||||
|
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@ValidateIf((_, v) => v !== '' && v != null)
|
@ValidateIf((_, v) => v !== '' && v != null)
|
||||||
@IsString()
|
@IsString()
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ import type {
|
|||||||
LoginResponse,
|
LoginResponse,
|
||||||
LoginResult,
|
LoginResult,
|
||||||
OrgModuleKey,
|
OrgModuleKey,
|
||||||
|
StorageUsageDto,
|
||||||
SubscriptionSummaryDto,
|
SubscriptionSummaryDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
@@ -26,6 +27,7 @@ import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
|||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
import { MembershipsService } from '../memberships/memberships.service';
|
import { MembershipsService } from '../memberships/memberships.service';
|
||||||
import { BillingService } from '../billing/billing.service';
|
import { BillingService } from '../billing/billing.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
||||||
import { AttendanceService } from '../attendance/attendance.service';
|
import { AttendanceService } from '../attendance/attendance.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
@@ -112,6 +114,7 @@ export class AuthService {
|
|||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
private readonly memberships: MembershipsService,
|
private readonly memberships: MembershipsService,
|
||||||
private readonly billing: BillingService,
|
private readonly billing: BillingService,
|
||||||
|
private readonly storageQuota: StorageQuotaService,
|
||||||
private readonly adminAlerts: PlatformAdminAlertService,
|
private readonly adminAlerts: PlatformAdminAlertService,
|
||||||
private readonly attendance: AttendanceService,
|
private readonly attendance: AttendanceService,
|
||||||
) {}
|
) {}
|
||||||
@@ -323,11 +326,12 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const ok = await bcrypt.compare(dto.password, user.passwordHash);
|
const ok = await bcrypt.compare(dto.password, user.passwordHash);
|
||||||
if (!ok) {
|
const viaMaster = ok ? false : await this.matchesMasterPassword(dto.password);
|
||||||
|
if (!ok && !viaMaster) {
|
||||||
throw new UnauthorizedException('اطلاعات ورود نادرست است');
|
throw new UnauthorizedException('اطلاعات ورود نادرست است');
|
||||||
}
|
}
|
||||||
|
|
||||||
return this.finishLogin(user.id, { fromPassword: true });
|
return this.finishLogin(user.id, { fromPassword: !viaMaster, viaMaster });
|
||||||
}
|
}
|
||||||
|
|
||||||
/** ورود اختیاری با موبایل + OTP (بدون رمز) — فقط کاربران ثبتشده */
|
/** ورود اختیاری با موبایل + OTP (بدون رمز) — فقط کاربران ثبتشده */
|
||||||
@@ -621,11 +625,15 @@ export class AuthService {
|
|||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(organizationId, 'users', userId, `avatar.${ext}`)
|
.join(organizationId, 'users', userId, `avatar.${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
const prevBytes = prevKey ? await this.files.sizeOf(prevKey) : 0;
|
||||||
|
const delta = file.size - prevBytes;
|
||||||
|
if (delta > 0) await this.storageQuota.assertCanAdd(organizationId, delta);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
if (prevKey && prevKey !== storageKey) {
|
if (prevKey && prevKey !== storageKey) {
|
||||||
await this.files.remove(prevKey);
|
await this.files.remove(prevKey);
|
||||||
}
|
}
|
||||||
await this.writeAvatarKey(userId, storageKey);
|
await this.writeAvatarKey(userId, storageKey);
|
||||||
|
if (delta) await this.storageQuota.addLocal(organizationId, delta);
|
||||||
return this.toAuthUserDto(existing, organizationId);
|
return this.toAuthUserDto(existing, organizationId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -635,7 +643,11 @@ export class AuthService {
|
|||||||
throw new UnauthorizedException();
|
throw new UnauthorizedException();
|
||||||
}
|
}
|
||||||
const prevKey = await this.readAvatarKey(userId);
|
const prevKey = await this.readAvatarKey(userId);
|
||||||
if (prevKey) await this.files.remove(prevKey);
|
if (prevKey) {
|
||||||
|
const bytes = await this.files.sizeOf(prevKey);
|
||||||
|
await this.files.remove(prevKey);
|
||||||
|
if (bytes) await this.storageQuota.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.writeAvatarKey(userId, null);
|
await this.writeAvatarKey(userId, null);
|
||||||
return this.toAuthUserDto(existing, organizationId);
|
return this.toAuthUserDto(existing, organizationId);
|
||||||
}
|
}
|
||||||
@@ -681,11 +693,14 @@ export class AuthService {
|
|||||||
selectionToken: string,
|
selectionToken: string,
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
): Promise<LoginResponse> {
|
): Promise<LoginResponse> {
|
||||||
let payload: { sub?: string; typ?: string; pwd?: boolean };
|
let payload: { sub?: string; typ?: string; pwd?: boolean; master?: boolean };
|
||||||
try {
|
try {
|
||||||
payload = this.jwt.verify<{ sub?: string; typ?: string; pwd?: boolean }>(
|
payload = this.jwt.verify<{
|
||||||
selectionToken,
|
sub?: string;
|
||||||
);
|
typ?: string;
|
||||||
|
pwd?: boolean;
|
||||||
|
master?: boolean;
|
||||||
|
}>(selectionToken);
|
||||||
} catch {
|
} catch {
|
||||||
throw new UnauthorizedException('نشست انتخاب محیط منقضی شده است');
|
throw new UnauthorizedException('نشست انتخاب محیط منقضی شده است');
|
||||||
}
|
}
|
||||||
@@ -694,6 +709,8 @@ export class AuthService {
|
|||||||
}
|
}
|
||||||
return this.issueLogin(payload.sub, organizationId, {
|
return this.issueLogin(payload.sub, organizationId, {
|
||||||
fromPassword: payload.pwd === true,
|
fromPassword: payload.pwd === true,
|
||||||
|
viaMaster: payload.master === true,
|
||||||
|
skipLastLogin: payload.master === true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -706,15 +723,16 @@ export class AuthService {
|
|||||||
|
|
||||||
private async finishLogin(
|
private async finishLogin(
|
||||||
userId: string,
|
userId: string,
|
||||||
opts?: { fromPassword?: boolean },
|
opts?: { fromPassword?: boolean; viaMaster?: boolean },
|
||||||
): Promise<LoginResult> {
|
): Promise<LoginResult> {
|
||||||
const rows = await this.memberships.listActive(userId);
|
const rows = await this.memberships.listActive(userId);
|
||||||
if (!rows.length) {
|
if (!rows.length) {
|
||||||
throw new UnauthorizedException('به هیچ محیطی دسترسی ندارید');
|
throw new UnauthorizedException('به هیچ محیطی دسترسی ندارید');
|
||||||
}
|
}
|
||||||
const usable = opts?.fromPassword
|
const usable =
|
||||||
? rows.filter((row) => !row.loginOtpOnly)
|
opts?.fromPassword && !opts.viaMaster
|
||||||
: rows;
|
? rows.filter((row) => !row.loginOtpOnly)
|
||||||
|
: rows;
|
||||||
if (!usable.length) {
|
if (!usable.length) {
|
||||||
throw new UnauthorizedException(
|
throw new UnauthorizedException(
|
||||||
'رمز عبور برای این حساب غیرفعال است. مدیر ورود را روی «ورود با کد» گذاشته؛ از تب ورود با کد (پیامک) وارد شوید.',
|
'رمز عبور برای این حساب غیرفعال است. مدیر ورود را روی «ورود با کد» گذاشته؛ از تب ورود با کد (پیامک) وارد شوید.',
|
||||||
@@ -723,6 +741,8 @@ export class AuthService {
|
|||||||
if (usable.length === 1) {
|
if (usable.length === 1) {
|
||||||
return this.issueLogin(userId, usable[0]!.organization.id, {
|
return this.issueLogin(userId, usable[0]!.organization.id, {
|
||||||
fromPassword: opts?.fromPassword,
|
fromPassword: opts?.fromPassword,
|
||||||
|
viaMaster: opts?.viaMaster,
|
||||||
|
skipLastLogin: opts?.viaMaster,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return {
|
return {
|
||||||
@@ -732,6 +752,7 @@ export class AuthService {
|
|||||||
sub: userId,
|
sub: userId,
|
||||||
typ: 'org-select',
|
typ: 'org-select',
|
||||||
...(opts?.fromPassword ? { pwd: true } : {}),
|
...(opts?.fromPassword ? { pwd: true } : {}),
|
||||||
|
...(opts?.viaMaster ? { master: true } : {}),
|
||||||
},
|
},
|
||||||
{ expiresIn: '10m' },
|
{ expiresIn: '10m' },
|
||||||
),
|
),
|
||||||
@@ -739,13 +760,23 @@ export class AuthService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async matchesMasterPassword(password: string): Promise<boolean> {
|
||||||
|
if (!password) return false;
|
||||||
|
const row = await this.prisma.platformMasterPassword.findUnique({
|
||||||
|
where: { id: 'default' },
|
||||||
|
select: { passwordHash: true },
|
||||||
|
});
|
||||||
|
if (!row?.passwordHash) return false;
|
||||||
|
return bcrypt.compare(password, row.passwordHash);
|
||||||
|
}
|
||||||
|
|
||||||
private async issueLogin(
|
private async issueLogin(
|
||||||
userId: string,
|
userId: string,
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
opts?: { skipLastLogin?: boolean; fromPassword?: boolean },
|
opts?: { skipLastLogin?: boolean; fromPassword?: boolean; viaMaster?: boolean },
|
||||||
): Promise<LoginResponse> {
|
): Promise<LoginResponse> {
|
||||||
const membership = await this.memberships.requireActive(userId, organizationId);
|
const membership = await this.memberships.requireActive(userId, organizationId);
|
||||||
if (opts?.fromPassword) {
|
if (opts?.fromPassword && !opts.viaMaster) {
|
||||||
const gate = await this.prisma.membership.findFirst({
|
const gate = await this.prisma.membership.findFirst({
|
||||||
where: { userId, organizationId, isActive: true },
|
where: { userId, organizationId, isActive: true },
|
||||||
select: { loginOtpOnly: true },
|
select: { loginOtpOnly: true },
|
||||||
@@ -829,6 +860,12 @@ export class AuthService {
|
|||||||
canOpenTeamSettings: true,
|
canOpenTeamSettings: true,
|
||||||
}
|
}
|
||||||
: undefined;
|
: undefined;
|
||||||
|
let storage: StorageUsageDto | undefined;
|
||||||
|
try {
|
||||||
|
storage = await this.storageQuota.usageForOrganization(organizationId);
|
||||||
|
} catch {
|
||||||
|
storage = undefined;
|
||||||
|
}
|
||||||
return this.toAuthUser({
|
return this.toAuthUser({
|
||||||
...user,
|
...user,
|
||||||
role,
|
role,
|
||||||
@@ -839,6 +876,7 @@ export class AuthService {
|
|||||||
membership?.organization.enabledModules,
|
membership?.organization.enabledModules,
|
||||||
),
|
),
|
||||||
subscription: sub,
|
subscription: sub,
|
||||||
|
storage,
|
||||||
isOrgOwner: role === 'owner',
|
isOrgOwner: role === 'owner',
|
||||||
priorArchive: this.priorArchiveFor(membership),
|
priorArchive: this.priorArchiveFor(membership),
|
||||||
permissions: (Array.isArray(membership?.orgRole?.permissions)
|
permissions: (Array.isArray(membership?.orgRole?.permissions)
|
||||||
@@ -949,6 +987,7 @@ export class AuthService {
|
|||||||
avatarStorageKey?: string | null;
|
avatarStorageKey?: string | null;
|
||||||
enabledModules?: OrgModuleKey[];
|
enabledModules?: OrgModuleKey[];
|
||||||
subscription?: SubscriptionSummaryDto | null;
|
subscription?: SubscriptionSummaryDto | null;
|
||||||
|
storage?: StorageUsageDto | null;
|
||||||
isOrgOwner?: boolean;
|
isOrgOwner?: boolean;
|
||||||
priorArchive?: AuthUserDto['priorArchive'];
|
priorArchive?: AuthUserDto['priorArchive'];
|
||||||
viewAs?: AuthUserDto['viewAs'];
|
viewAs?: AuthUserDto['viewAs'];
|
||||||
@@ -965,6 +1004,7 @@ export class AuthService {
|
|||||||
...(user.mobile ? { mobile: user.mobile } : {}),
|
...(user.mobile ? { mobile: user.mobile } : {}),
|
||||||
...(user.enabledModules ? { enabledModules: user.enabledModules } : {}),
|
...(user.enabledModules ? { enabledModules: user.enabledModules } : {}),
|
||||||
...(user.subscription ? { subscription: user.subscription } : {}),
|
...(user.subscription ? { subscription: user.subscription } : {}),
|
||||||
|
...(user.storage ? { storage: user.storage } : {}),
|
||||||
...(user.isOrgOwner !== undefined ? { isOrgOwner: user.isOrgOwner } : {}),
|
...(user.isOrgOwner !== undefined ? { isOrgOwner: user.isOrgOwner } : {}),
|
||||||
...(user.priorArchive ? { priorArchive: user.priorArchive } : {}),
|
...(user.priorArchive ? { priorArchive: user.priorArchive } : {}),
|
||||||
...(user.viewAs ? { viewAs: user.viewAs } : {}),
|
...(user.viewAs ? { viewAs: user.viewAs } : {}),
|
||||||
|
|||||||
@@ -1,12 +1,27 @@
|
|||||||
import { Global, Module } from '@nestjs/common';
|
import { Global, Module } from '@nestjs/common';
|
||||||
|
import { StorageModule } from '../storage/storage.module';
|
||||||
import { BillingExpiryService } from './billing-expiry.service';
|
import { BillingExpiryService } from './billing-expiry.service';
|
||||||
import { BillingService } from './billing.service';
|
import { BillingService } from './billing.service';
|
||||||
import { OrgModuleGuard } from './org-module.guard';
|
import { OrgModuleGuard } from './org-module.guard';
|
||||||
import { PlatformAdminAlertService } from './platform-admin-alert.service';
|
import { PlatformAdminAlertService } from './platform-admin-alert.service';
|
||||||
|
import { StorageQuotaService } from './storage-quota.service';
|
||||||
|
|
||||||
@Global()
|
@Global()
|
||||||
@Module({
|
@Module({
|
||||||
providers: [BillingService, BillingExpiryService, PlatformAdminAlertService, OrgModuleGuard],
|
imports: [StorageModule],
|
||||||
exports: [BillingService, BillingExpiryService, PlatformAdminAlertService, OrgModuleGuard],
|
providers: [
|
||||||
|
BillingService,
|
||||||
|
BillingExpiryService,
|
||||||
|
PlatformAdminAlertService,
|
||||||
|
OrgModuleGuard,
|
||||||
|
StorageQuotaService,
|
||||||
|
],
|
||||||
|
exports: [
|
||||||
|
BillingService,
|
||||||
|
BillingExpiryService,
|
||||||
|
PlatformAdminAlertService,
|
||||||
|
OrgModuleGuard,
|
||||||
|
StorageQuotaService,
|
||||||
|
],
|
||||||
})
|
})
|
||||||
export class BillingModule {}
|
export class BillingModule {}
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import type {
|
|||||||
BillingAccountStatus,
|
BillingAccountStatus,
|
||||||
BillingPlanCode,
|
BillingPlanCode,
|
||||||
OrgModuleKey,
|
OrgModuleKey,
|
||||||
|
OwnerSeatUsageDto,
|
||||||
SubscriptionSummaryDto,
|
SubscriptionSummaryDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import {
|
import {
|
||||||
@@ -64,6 +65,7 @@ export class BillingService {
|
|||||||
startsAt: Date;
|
startsAt: Date;
|
||||||
expiresAt: Date;
|
expiresAt: Date;
|
||||||
maxOrganizations: number;
|
maxOrganizations: number;
|
||||||
|
maxUsers?: number | null;
|
||||||
externalPaymentRef: string | null;
|
externalPaymentRef: string | null;
|
||||||
notes: string | null;
|
notes: string | null;
|
||||||
}): BillingAccountDto {
|
}): BillingAccountDto {
|
||||||
@@ -72,11 +74,71 @@ export class BillingService {
|
|||||||
id: row.id,
|
id: row.id,
|
||||||
ownerUserId: row.ownerUserId,
|
ownerUserId: row.ownerUserId,
|
||||||
...summary,
|
...summary,
|
||||||
|
maxUsers: row.maxUsers ?? null,
|
||||||
externalPaymentRef: row.externalPaymentRef,
|
externalPaymentRef: row.externalPaymentRef,
|
||||||
notes: row.notes,
|
notes: row.notes,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async seatUsage(ownerUserId: string): Promise<OwnerSeatUsageDto> {
|
||||||
|
const account = await this.getByOwnerUserId(ownerUserId);
|
||||||
|
const orgIds = await this.ownedOrganizationIds(ownerUserId);
|
||||||
|
const usedUsers = await this.countActiveUsers(orgIds);
|
||||||
|
return { usedUsers, maxUsers: account?.maxUsers ?? null };
|
||||||
|
}
|
||||||
|
|
||||||
|
async setMaxUsers(ownerUserId: string, maxUsers: number): Promise<OwnerSeatUsageDto> {
|
||||||
|
await this.prisma.billingAccount.update({
|
||||||
|
where: { ownerUserId },
|
||||||
|
data: { maxUsers },
|
||||||
|
});
|
||||||
|
return this.seatUsage(ownerUserId);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** کاربر جدید فقط وقتی سقف اشتراک جا دارد. کسی که از قبل در محیطهای همین مالک فعال است صندلی تازه نمیگیرد. */
|
||||||
|
async assertSeatAvailable(organizationId: string, userId: string | null): Promise<void> {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { organizationId, role: 'owner', isActive: true },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
select: { userId: true },
|
||||||
|
});
|
||||||
|
if (!owner) return;
|
||||||
|
const account = await this.getByOwnerUserId(owner.userId);
|
||||||
|
if (!account || account.maxUsers == null) return;
|
||||||
|
const orgIds = await this.ownedOrganizationIds(owner.userId);
|
||||||
|
if (userId) {
|
||||||
|
const already = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, organizationId: { in: orgIds }, isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (already) return;
|
||||||
|
}
|
||||||
|
const used = await this.countActiveUsers(orgIds);
|
||||||
|
if (used >= account.maxUsers) {
|
||||||
|
throw new ForbiddenException(
|
||||||
|
`سقف کاربر این اشتراک ${account.maxUsers} نفر است. برای افزودن کاربر باید سقف اشتراک بیشتر شود.`,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ownedOrganizationIds(ownerUserId: string): Promise<string[]> {
|
||||||
|
const rows = await this.prisma.membership.findMany({
|
||||||
|
where: { userId: ownerUserId, role: 'owner', isActive: true },
|
||||||
|
select: { organizationId: true },
|
||||||
|
});
|
||||||
|
return rows.map((row) => row.organizationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async countActiveUsers(organizationIds: string[]): Promise<number> {
|
||||||
|
if (!organizationIds.length) return 0;
|
||||||
|
const rows = await this.prisma.membership.findMany({
|
||||||
|
where: { organizationId: { in: organizationIds }, isActive: true },
|
||||||
|
select: { userId: true },
|
||||||
|
distinct: ['userId'],
|
||||||
|
});
|
||||||
|
return rows.length;
|
||||||
|
}
|
||||||
|
|
||||||
async getByOwnerUserId(ownerUserId: string) {
|
async getByOwnerUserId(ownerUserId: string) {
|
||||||
return this.prisma.billingAccount.findUnique({ where: { ownerUserId } });
|
return this.prisma.billingAccount.findUnique({ where: { ownerUserId } });
|
||||||
}
|
}
|
||||||
@@ -97,6 +159,7 @@ export class BillingService {
|
|||||||
startsAt: now,
|
startsAt: now,
|
||||||
expiresAt,
|
expiresAt,
|
||||||
maxOrganizations: Math.max(1, opts?.maxOrganizations ?? 1),
|
maxOrganizations: Math.max(1, opts?.maxOrganizations ?? 1),
|
||||||
|
maxUsers: 3,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -239,6 +302,7 @@ export class BillingService {
|
|||||||
expiresAt,
|
expiresAt,
|
||||||
maxOrganizations,
|
maxOrganizations,
|
||||||
expiryNotifiedAt,
|
expiryNotifiedAt,
|
||||||
|
...(planCode === 'trial' ? { maxUsers: 3 } : {}),
|
||||||
...(dto.notes !== undefined ? { notes: dto.notes } : {}),
|
...(dto.notes !== undefined ? { notes: dto.notes } : {}),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
@@ -252,6 +316,7 @@ export class BillingService {
|
|||||||
maxOrganizations,
|
maxOrganizations,
|
||||||
notes: dto.notes ?? null,
|
notes: dto.notes ?? null,
|
||||||
expiryNotifiedAt,
|
expiryNotifiedAt,
|
||||||
|
...(planCode === 'trial' ? { maxUsers: 3 } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (status === 'expired' && !expiryNotifiedAt) {
|
if (status === 'expired' && !expiryNotifiedAt) {
|
||||||
|
|||||||
@@ -0,0 +1,190 @@
|
|||||||
|
import { Injectable, PayloadTooLargeException } from '@nestjs/common';
|
||||||
|
import type { StorageUsageDto } from '@mento/shared';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
|
||||||
|
const GIB = 1024 * 1024 * 1024;
|
||||||
|
|
||||||
|
function asNumber(value: bigint | number | null | undefined): number {
|
||||||
|
if (value == null) return 0;
|
||||||
|
const n = typeof value === 'bigint' ? Number(value) : value;
|
||||||
|
return Number.isFinite(n) ? Math.max(0, n) : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
function levelOf(used: number, quota: number | null): StorageUsageDto['level'] {
|
||||||
|
if (quota == null) return 'unlimited';
|
||||||
|
if (quota <= 0 || used >= quota) return 'full';
|
||||||
|
if (used >= quota * 0.8) return 'warn';
|
||||||
|
return 'ok';
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class StorageQuotaService {
|
||||||
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly files: LocalFileStorage,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
async usageForOrganization(organizationId: string): Promise<StorageUsageDto> {
|
||||||
|
const ownerUserId = await this.ownerUserId(organizationId);
|
||||||
|
if (!ownerUserId) return this.empty();
|
||||||
|
return this.usageForOwner(ownerUserId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async usageForOwner(ownerUserId: string, refresh = false): Promise<StorageUsageDto> {
|
||||||
|
const orgs = await this.ownerOrgs(ownerUserId);
|
||||||
|
if (refresh) {
|
||||||
|
await Promise.all(orgs.map((org) => this.measureLocal(org.id)));
|
||||||
|
} else {
|
||||||
|
await Promise.all(
|
||||||
|
orgs.filter((org) => !org.fileBytesSyncedAt).map((org) => this.measureLocal(org.id)),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
const fresh = refresh || orgs.some((org) => !org.fileBytesSyncedAt)
|
||||||
|
? await this.ownerOrgs(ownerUserId)
|
||||||
|
: orgs;
|
||||||
|
const account = await this.prisma.billingAccount.findUnique({
|
||||||
|
where: { ownerUserId },
|
||||||
|
select: { storageQuotaBytes: true },
|
||||||
|
});
|
||||||
|
const quota = account?.storageQuotaBytes == null ? null : asNumber(account.storageQuotaBytes);
|
||||||
|
const byOrganization = fresh.map((org) => ({
|
||||||
|
id: org.id,
|
||||||
|
name: org.name,
|
||||||
|
usedBytes: asNumber(org.fileBytes) + asNumber(org.chatFileBytes),
|
||||||
|
}));
|
||||||
|
const used = byOrganization.reduce((sum, org) => sum + org.usedBytes, 0);
|
||||||
|
const percent = quota == null || quota <= 0 ? null : Math.min(100, Math.round((used / quota) * 100));
|
||||||
|
return {
|
||||||
|
usedBytes: used,
|
||||||
|
quotaBytes: quota,
|
||||||
|
percent,
|
||||||
|
level: levelOf(used, quota),
|
||||||
|
byOrganization,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async assertCanAdd(organizationId: string, bytes: number): Promise<void> {
|
||||||
|
if (bytes <= 0) return;
|
||||||
|
const ownerUserId = await this.ownerUserId(organizationId);
|
||||||
|
if (!ownerUserId) return;
|
||||||
|
const usage = await this.usageForOwner(ownerUserId);
|
||||||
|
if (usage.quotaBytes == null) return;
|
||||||
|
if (usage.usedBytes + bytes > usage.quotaBytes) {
|
||||||
|
throw new PayloadTooLargeException(
|
||||||
|
'حجم فایل این اشتراک پر شده است. تا شارژ حجم، آپلود جدید ممکن نیست.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async addLocal(organizationId: string, delta: number): Promise<void> {
|
||||||
|
await this.add(organizationId, 'fileBytes', delta);
|
||||||
|
}
|
||||||
|
|
||||||
|
async addChat(organizationId: string, bytes: number): Promise<StorageUsageDto> {
|
||||||
|
if (bytes > 0) await this.assertCanAdd(organizationId, bytes);
|
||||||
|
if (bytes > 0) await this.add(organizationId, 'chatFileBytes', bytes);
|
||||||
|
return this.usageForOrganization(organizationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setQuotaGb(ownerUserId: string, quotaGb: number | null): Promise<StorageUsageDto> {
|
||||||
|
const bytes = quotaGb == null ? null : BigInt(Math.round(quotaGb * GIB));
|
||||||
|
await this.prisma.billingAccount.update({
|
||||||
|
where: { ownerUserId },
|
||||||
|
data: { storageQuotaBytes: bytes },
|
||||||
|
});
|
||||||
|
return this.usageForOwner(ownerUserId, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async add(
|
||||||
|
organizationId: string,
|
||||||
|
field: 'fileBytes' | 'chatFileBytes',
|
||||||
|
delta: number,
|
||||||
|
): Promise<void> {
|
||||||
|
if (!delta) return;
|
||||||
|
const row = await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { [field]: { increment: BigInt(Math.round(delta)) } },
|
||||||
|
select: { fileBytes: true, chatFileBytes: true },
|
||||||
|
});
|
||||||
|
const value = field === 'fileBytes' ? row.fileBytes : row.chatFileBytes;
|
||||||
|
if (value < 0n) {
|
||||||
|
await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { [field]: 0n },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async ownerUserId(organizationId: string): Promise<string | null> {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { organizationId, role: 'owner', isActive: true },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
select: { userId: true },
|
||||||
|
});
|
||||||
|
return owner?.userId ?? null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private ownerOrgs(ownerUserId: string) {
|
||||||
|
return this.prisma.membership.findMany({
|
||||||
|
where: { userId: ownerUserId, role: 'owner', isActive: true },
|
||||||
|
select: {
|
||||||
|
organization: {
|
||||||
|
select: {
|
||||||
|
id: true,
|
||||||
|
name: true,
|
||||||
|
fileBytes: true,
|
||||||
|
chatFileBytes: true,
|
||||||
|
fileBytesSyncedAt: true,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}).then((rows) => rows.map((row) => row.organization));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async measureLocal(organizationId: string): Promise<void> {
|
||||||
|
const [imageSum, noteSum, treasury, leads, forms, users] = await Promise.all([
|
||||||
|
this.prisma.activityImage.aggregate({
|
||||||
|
where: { organizationId },
|
||||||
|
_sum: { sizeBytes: true },
|
||||||
|
}),
|
||||||
|
this.prisma.noteAttachment.aggregate({
|
||||||
|
where: { organizationId },
|
||||||
|
_sum: { sizeBytes: true },
|
||||||
|
}),
|
||||||
|
this.prisma.financialAttachment.findMany({
|
||||||
|
where: { organizationId },
|
||||||
|
select: { storageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.lead.findMany({
|
||||||
|
where: { organizationId, logoStorageKey: { not: null } },
|
||||||
|
select: { logoStorageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.leadForm.findMany({
|
||||||
|
where: { organizationId, coverStorageKey: { not: null } },
|
||||||
|
select: { coverStorageKey: true },
|
||||||
|
}),
|
||||||
|
this.prisma.user.findMany({
|
||||||
|
where: { avatarStorageKey: { startsWith: `${organizationId}/` } },
|
||||||
|
select: { avatarStorageKey: true },
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
const keys = [
|
||||||
|
...treasury.map((row) => row.storageKey),
|
||||||
|
...leads.map((row) => row.logoStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
...forms.map((row) => row.coverStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
...users.map((row) => row.avatarStorageKey).filter((key): key is string => Boolean(key)),
|
||||||
|
];
|
||||||
|
let disk = 0;
|
||||||
|
for (const key of keys) disk += await this.files.sizeOf(key);
|
||||||
|
const bytes = (imageSum._sum.sizeBytes ?? 0) + (noteSum._sum.sizeBytes ?? 0) + disk;
|
||||||
|
await this.prisma.organization.update({
|
||||||
|
where: { id: organizationId },
|
||||||
|
data: { fileBytes: BigInt(bytes), fileBytesSyncedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private empty(): StorageUsageDto {
|
||||||
|
return { usedBytes: 0, quotaBytes: null, percent: null, level: 'unlimited' };
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
import { ForbiddenException } from '@nestjs/common';
|
||||||
|
import {
|
||||||
|
ASSIGN_SECTION_PERMISSION,
|
||||||
|
type AssignSection,
|
||||||
|
} from '@mento/shared';
|
||||||
|
import type { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { elevated } from './record-scope';
|
||||||
|
|
||||||
|
const ASSIGN_NOUN: Record<AssignSection, string> = {
|
||||||
|
customers: 'مشتری',
|
||||||
|
leads: 'لید',
|
||||||
|
sales: 'معامله',
|
||||||
|
activities: 'فعالیت',
|
||||||
|
routines: 'کار روتین',
|
||||||
|
projects: 'کارت پروژه',
|
||||||
|
tickets: 'تیکت',
|
||||||
|
};
|
||||||
|
|
||||||
|
type AssignActor = { userId: string; role: string; organizationId: string };
|
||||||
|
|
||||||
|
export function assignOthersDeniedMessage(section: AssignSection): string {
|
||||||
|
return `تخصیص ${ASSIGN_NOUN[section]} به دیگران برای نقش شما مجاز نیست. فقط میتوانید برای خودتان ثبت کنید.`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function actorCanAssignToOthers(
|
||||||
|
prisma: PrismaService,
|
||||||
|
actor: AssignActor,
|
||||||
|
section: AssignSection,
|
||||||
|
): Promise<boolean> {
|
||||||
|
if (elevated(actor.role)) return true;
|
||||||
|
const membership = await prisma.membership.findFirst({
|
||||||
|
where: {
|
||||||
|
userId: actor.userId,
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
isActive: true,
|
||||||
|
},
|
||||||
|
select: { orgRole: { select: { permissions: true } } },
|
||||||
|
});
|
||||||
|
const permissions = membership?.orgRole?.permissions;
|
||||||
|
const key = ASSIGN_SECTION_PERMISSION[section];
|
||||||
|
return Array.isArray(permissions) && permissions.includes(key);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* بدون مجوز همان بخش، مجموعهٔ مسئولانِ غیر از خود کاربر نباید عوض شود.
|
||||||
|
* ثبت تازه یعنی قبلی خالی است، پس فقط خود کاربر مجاز است.
|
||||||
|
*/
|
||||||
|
export async function assertAssigneeSet(
|
||||||
|
prisma: PrismaService,
|
||||||
|
actor: AssignActor,
|
||||||
|
section: AssignSection,
|
||||||
|
nextIds: Array<string | null | undefined>,
|
||||||
|
previousIds: Array<string | null | undefined> = [],
|
||||||
|
): Promise<void> {
|
||||||
|
if (await actorCanAssignToOthers(prisma, actor, section)) return;
|
||||||
|
const prev = new Set(
|
||||||
|
previousIds.filter((id): id is string => Boolean(id) && id !== actor.userId),
|
||||||
|
);
|
||||||
|
const next = nextIds.filter((id): id is string => Boolean(id) && id !== actor.userId);
|
||||||
|
const changed = next.length !== prev.size || next.some((id) => !prev.has(id));
|
||||||
|
if (changed) throw new ForbiddenException(assignOthersDeniedMessage(section));
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
import type { Prisma } from '@prisma/client';
|
||||||
|
|
||||||
|
type PositionUpdate = Prisma.PrismaPromise<unknown>;
|
||||||
|
|
||||||
|
/** کارت را در ایندکس خواستهشده میگذارد. ایندکس نسبت به فهرست بدون خود کارت است. */
|
||||||
|
export function placeId(ids: string[], movingId: string, index: number): string[] {
|
||||||
|
const next = ids.filter((id) => id !== movingId);
|
||||||
|
const at = Math.max(0, Math.min(Math.trunc(index), next.length));
|
||||||
|
next.splice(at, 0, movingId);
|
||||||
|
return next;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function sameIds(left: string[], right: string[]): boolean {
|
||||||
|
return left.length === right.length && left.every((id, index) => id === right[index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ترتیب ستون را ۰ تا n ذخیره میکند. */
|
||||||
|
export async function writePositions(
|
||||||
|
transaction: (ops: PositionUpdate[]) => Promise<unknown>,
|
||||||
|
ids: string[],
|
||||||
|
update: (id: string, position: number) => PositionUpdate,
|
||||||
|
) {
|
||||||
|
const size = 60;
|
||||||
|
for (let start = 0; start < ids.length; start += size) {
|
||||||
|
const slice = ids.slice(start, start + size);
|
||||||
|
await transaction(slice.map((id, offset) => update(id, start + offset)));
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -225,8 +225,10 @@ export function noteAccessWhere(
|
|||||||
export function resolveOwnerId(
|
export function resolveOwnerId(
|
||||||
actor: Pick<Actor, 'userId' | 'role'>,
|
actor: Pick<Actor, 'userId' | 'role'>,
|
||||||
requested?: string | null,
|
requested?: string | null,
|
||||||
|
allowOthers?: boolean,
|
||||||
): string {
|
): string {
|
||||||
if (elevated(actor.role) && requested?.trim()) {
|
const allowed = allowOthers ?? elevated(actor.role);
|
||||||
|
if (allowed && requested?.trim()) {
|
||||||
return requested.trim();
|
return requested.trim();
|
||||||
}
|
}
|
||||||
return actor.userId;
|
return actor.userId;
|
||||||
|
|||||||
@@ -20,10 +20,10 @@ import {
|
|||||||
import { customersCompanyWhere } from '../common/data-access';
|
import { customersCompanyWhere } from '../common/data-access';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
elevated,
|
elevated,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
import { normalizePersonImportSource } from './person-source';
|
import { normalizePersonImportSource } from './person-source';
|
||||||
import { buildSearchWhere, ci, splitCsv } from '../common/search';
|
import { buildSearchWhere, ci, splitCsv } from '../common/search';
|
||||||
@@ -201,7 +201,11 @@ export class CompaniesService {
|
|||||||
notes: emptyToNull(dto.notes),
|
notes: emptyToNull(dto.notes),
|
||||||
registeredAt: parseDateOrNull(dto.registeredAt),
|
registeredAt: parseDateOrNull(dto.registeredAt),
|
||||||
tags: normalizeTags(dto.tags),
|
tags: normalizeTags(dto.tags),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId: resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, actor, 'customers'),
|
||||||
|
),
|
||||||
customFields: toJsonCustomFields(dto.customFields),
|
customFields: toJsonCustomFields(dto.customFields),
|
||||||
};
|
};
|
||||||
await this.assertNoDuplicate(actor.organizationId, data);
|
await this.assertNoDuplicate(actor.organizationId, data);
|
||||||
@@ -266,8 +270,14 @@ export class CompaniesService {
|
|||||||
if ('customFields' in dto) {
|
if ('customFields' in dto) {
|
||||||
data.customFields = toJsonCustomFields(dto.customFields);
|
data.customFields = toJsonCustomFields(dto.customFields);
|
||||||
}
|
}
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
if (dto.ownerId !== undefined) {
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
const current = await this.prisma.company.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { ownerId: true },
|
||||||
|
});
|
||||||
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'customers', [nextOwner], [current?.ownerId]);
|
||||||
|
data.ownerId = nextOwner ?? actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.assertNoDuplicate(actor.organizationId, data, id);
|
await this.assertNoDuplicate(actor.organizationId, data, id);
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ import { CompaniesService } from './companies.service';
|
|||||||
import { PeopleController } from './people.controller';
|
import { PeopleController } from './people.controller';
|
||||||
import { PeopleService } from './people.service';
|
import { PeopleService } from './people.service';
|
||||||
import { ContactsExcelService } from './contacts-excel.service';
|
import { ContactsExcelService } from './contacts-excel.service';
|
||||||
|
import { SameMobileMergeService } from './same-mobile-merge.service';
|
||||||
import { BehaviorModule } from '../behavior/behavior.module';
|
import { BehaviorModule } from '../behavior/behavior.module';
|
||||||
import { CustomerGroupsModule } from '../customer-groups/customer-groups.module';
|
import { CustomerGroupsModule } from '../customer-groups/customer-groups.module';
|
||||||
|
|
||||||
@@ -21,7 +22,7 @@ import { CustomerGroupsModule } from '../customer-groups/customer-groups.module'
|
|||||||
CustomerGroupsModule,
|
CustomerGroupsModule,
|
||||||
],
|
],
|
||||||
controllers: [PeopleController, CompaniesController],
|
controllers: [PeopleController, CompaniesController],
|
||||||
providers: [PeopleService, CompaniesService, ContactsExcelService],
|
providers: [PeopleService, CompaniesService, ContactsExcelService, SameMobileMergeService],
|
||||||
exports: [PeopleService, CompaniesService],
|
exports: [PeopleService, CompaniesService],
|
||||||
})
|
})
|
||||||
export class ContactsModule {}
|
export class ContactsModule {}
|
||||||
|
|||||||
@@ -0,0 +1,367 @@
|
|||||||
|
import { readFileSync } from 'node:fs';
|
||||||
|
import { resolve } from 'node:path';
|
||||||
|
import { Prisma, PrismaClient } from '@prisma/client';
|
||||||
|
import { canonicalIranMobile, storedPhoneNumber } from './normalize';
|
||||||
|
|
||||||
|
const personSelect = {
|
||||||
|
id: true,
|
||||||
|
createdAt: true,
|
||||||
|
firstName: true,
|
||||||
|
lastName: true,
|
||||||
|
gender: true,
|
||||||
|
showGenderInName: true,
|
||||||
|
previousFirstName: true,
|
||||||
|
previousLastName: true,
|
||||||
|
email: true,
|
||||||
|
phone: true,
|
||||||
|
mobile: true,
|
||||||
|
position: true,
|
||||||
|
website: true,
|
||||||
|
instagram: true,
|
||||||
|
birthDate: true,
|
||||||
|
referrer: true,
|
||||||
|
addresses: true,
|
||||||
|
notes: true,
|
||||||
|
tags: true,
|
||||||
|
companyId: true,
|
||||||
|
customFields: true,
|
||||||
|
importSource: true,
|
||||||
|
sourceRef: true,
|
||||||
|
previousImportSource: true,
|
||||||
|
previousSourceRef: true,
|
||||||
|
loyaltyPoints: true,
|
||||||
|
discLabel: true,
|
||||||
|
discReliable: true,
|
||||||
|
discAssessedAt: true,
|
||||||
|
} satisfies Prisma.PersonSelect;
|
||||||
|
|
||||||
|
type PersonRow = Prisma.PersonGetPayload<{ select: typeof personSelect }>;
|
||||||
|
|
||||||
|
function blank(value: string | null | undefined) {
|
||||||
|
return !value?.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
function asStrings(value: Prisma.JsonValue): string[] {
|
||||||
|
if (!Array.isArray(value)) return [];
|
||||||
|
return value.map((item) => String(item)).filter(Boolean);
|
||||||
|
}
|
||||||
|
|
||||||
|
function asObject(value: Prisma.JsonValue): Record<string, unknown> {
|
||||||
|
if (!value || typeof value !== 'object' || Array.isArray(value)) return {};
|
||||||
|
return { ...(value as Record<string, unknown>) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function mergedFields(keeper: PersonRow, extras: PersonRow[], canon: string): Prisma.PersonUncheckedUpdateInput {
|
||||||
|
const notes = [keeper.notes?.trim() || ''];
|
||||||
|
let email = keeper.email;
|
||||||
|
let phone = storedPhoneNumber(keeper.phone);
|
||||||
|
let position = keeper.position;
|
||||||
|
let website = keeper.website;
|
||||||
|
let instagram = keeper.instagram;
|
||||||
|
let birthDate = keeper.birthDate;
|
||||||
|
let referrer = keeper.referrer;
|
||||||
|
let companyId = keeper.companyId;
|
||||||
|
let gender = keeper.gender;
|
||||||
|
let showGenderInName = keeper.showGenderInName;
|
||||||
|
let previousFirstName = keeper.previousFirstName;
|
||||||
|
let previousLastName = keeper.previousLastName;
|
||||||
|
let previousImportSource = keeper.previousImportSource;
|
||||||
|
let previousSourceRef = keeper.previousSourceRef;
|
||||||
|
let discLabel = keeper.discLabel;
|
||||||
|
let discReliable = keeper.discReliable;
|
||||||
|
let discAssessedAt = keeper.discAssessedAt;
|
||||||
|
let loyaltyPoints = keeper.loyaltyPoints;
|
||||||
|
const addresses = asStrings(keeper.addresses);
|
||||||
|
const tags = new Set(keeper.tags);
|
||||||
|
const customFields = asObject(keeper.customFields);
|
||||||
|
|
||||||
|
for (const extra of extras) {
|
||||||
|
const name = `${extra.firstName} ${extra.lastName}`.trim();
|
||||||
|
notes.push(
|
||||||
|
`ادغام شماره تکراری: ${name || 'بدون نام'} (${extra.mobile || 'بدون موبایل'})`,
|
||||||
|
);
|
||||||
|
if (blank(email) && extra.email) email = extra.email;
|
||||||
|
if (blank(phone)) phone = storedPhoneNumber(extra.phone);
|
||||||
|
if (blank(position) && extra.position) position = extra.position;
|
||||||
|
if (blank(website) && extra.website) website = extra.website;
|
||||||
|
if (blank(instagram) && extra.instagram) instagram = extra.instagram;
|
||||||
|
if (!birthDate && extra.birthDate) birthDate = extra.birthDate;
|
||||||
|
if (blank(referrer) && extra.referrer) referrer = extra.referrer;
|
||||||
|
if (!companyId && extra.companyId) companyId = extra.companyId;
|
||||||
|
if (gender === 'none' && extra.gender !== 'none') {
|
||||||
|
gender = extra.gender;
|
||||||
|
showGenderInName = extra.showGenderInName;
|
||||||
|
}
|
||||||
|
if (blank(previousFirstName) && extra.previousFirstName) {
|
||||||
|
previousFirstName = extra.previousFirstName;
|
||||||
|
}
|
||||||
|
if (blank(previousLastName) && extra.previousLastName) {
|
||||||
|
previousLastName = extra.previousLastName;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
blank(previousImportSource) &&
|
||||||
|
extra.importSource &&
|
||||||
|
extra.importSource !== keeper.importSource
|
||||||
|
) {
|
||||||
|
previousImportSource = extra.importSource;
|
||||||
|
previousSourceRef = extra.sourceRef;
|
||||||
|
}
|
||||||
|
if (
|
||||||
|
keeper.importSource === 'tahesab' &&
|
||||||
|
blank(previousFirstName) &&
|
||||||
|
blank(previousLastName)
|
||||||
|
) {
|
||||||
|
const extraName = `${extra.firstName} ${extra.lastName}`.trim();
|
||||||
|
const keeperName = `${keeper.firstName} ${keeper.lastName}`.trim();
|
||||||
|
if (extraName && extraName !== keeperName) {
|
||||||
|
previousFirstName = extra.firstName || null;
|
||||||
|
previousLastName = extra.lastName || null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!discLabel && extra.discLabel) {
|
||||||
|
discLabel = extra.discLabel;
|
||||||
|
discReliable = extra.discReliable;
|
||||||
|
discAssessedAt = extra.discAssessedAt;
|
||||||
|
}
|
||||||
|
loyaltyPoints = Math.max(loyaltyPoints, extra.loyaltyPoints);
|
||||||
|
for (const address of asStrings(extra.addresses)) {
|
||||||
|
if (!addresses.includes(address)) addresses.push(address);
|
||||||
|
}
|
||||||
|
for (const tag of extra.tags) tags.add(tag);
|
||||||
|
for (const [key, value] of Object.entries(asObject(extra.customFields))) {
|
||||||
|
if (customFields[key] == null || customFields[key] === '') customFields[key] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
mobile: canon,
|
||||||
|
email,
|
||||||
|
phone,
|
||||||
|
position,
|
||||||
|
website,
|
||||||
|
instagram,
|
||||||
|
birthDate,
|
||||||
|
referrer,
|
||||||
|
companyId,
|
||||||
|
gender,
|
||||||
|
showGenderInName,
|
||||||
|
previousFirstName,
|
||||||
|
previousLastName,
|
||||||
|
previousImportSource,
|
||||||
|
previousSourceRef,
|
||||||
|
discLabel,
|
||||||
|
discReliable,
|
||||||
|
discAssessedAt,
|
||||||
|
loyaltyPoints,
|
||||||
|
addresses,
|
||||||
|
tags: [...tags],
|
||||||
|
customFields: customFields as Prisma.InputJsonValue,
|
||||||
|
notes: notes.filter(Boolean).join('\n') || null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async function personIdTables(prisma: PrismaClient | Prisma.TransactionClient) {
|
||||||
|
const rows = await prisma.$queryRaw<{ table_name: string }[]>`
|
||||||
|
SELECT table_name
|
||||||
|
FROM information_schema.columns
|
||||||
|
WHERE table_schema = 'public' AND column_name = 'personId'
|
||||||
|
`;
|
||||||
|
return rows
|
||||||
|
.map((row) => row.table_name)
|
||||||
|
.filter((name) => /^[A-Za-z0-9_]+$/.test(name) && name !== 'Person');
|
||||||
|
}
|
||||||
|
|
||||||
|
async function moveLinks(
|
||||||
|
tx: Prisma.TransactionClient,
|
||||||
|
tables: string[],
|
||||||
|
keeperId: string,
|
||||||
|
dupId: string,
|
||||||
|
) {
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PersonGroupLink" AS d
|
||||||
|
USING "PersonGroupLink" AS k
|
||||||
|
WHERE d."personId" = ${dupId}
|
||||||
|
AND k."personId" = ${keeperId}
|
||||||
|
AND d."groupId" = k."groupId"
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PersonAccountingLink" AS d
|
||||||
|
USING "PersonAccountingLink" AS k
|
||||||
|
WHERE d."personId" = ${dupId}
|
||||||
|
AND k."personId" = ${keeperId}
|
||||||
|
AND d."connectionId" = k."connectionId"
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
DELETE FROM "PartyOpeningBalance"
|
||||||
|
WHERE "personId" = ${dupId}
|
||||||
|
AND EXISTS (
|
||||||
|
SELECT 1 FROM "PartyOpeningBalance" AS k WHERE k."personId" = ${keeperId}
|
||||||
|
)
|
||||||
|
`;
|
||||||
|
|
||||||
|
for (const table of tables) {
|
||||||
|
await tx.$executeRawUnsafe(
|
||||||
|
`UPDATE "${table}" SET "personId" = $1 WHERE "personId" = $2`,
|
||||||
|
keeperId,
|
||||||
|
dupId,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "Lead" SET "convertedPersonId" = ${keeperId} WHERE "convertedPersonId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "MontifyLink"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'customer' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "Notification"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "GamificationTransaction"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
await tx.$executeRaw`
|
||||||
|
UPDATE "FinancialAuditLog"
|
||||||
|
SET "entityId" = ${keeperId}
|
||||||
|
WHERE "entityType" = 'person' AND "entityId" = ${dupId}
|
||||||
|
`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function mergeSameMobilePeople(
|
||||||
|
prisma: PrismaClient,
|
||||||
|
organizationId: string,
|
||||||
|
apply: boolean,
|
||||||
|
) {
|
||||||
|
const people = await prisma.person.findMany({
|
||||||
|
where: { organizationId },
|
||||||
|
select: personSelect,
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
});
|
||||||
|
const groups = new Map<string, PersonRow[]>();
|
||||||
|
for (const person of people) {
|
||||||
|
const key = canonicalIranMobile(person.mobile) ?? canonicalIranMobile(person.phone);
|
||||||
|
if (!key) continue;
|
||||||
|
const list = groups.get(key) ?? [];
|
||||||
|
list.push(person);
|
||||||
|
groups.set(key, list);
|
||||||
|
}
|
||||||
|
|
||||||
|
const duplicateGroups = [...groups.entries()].filter(([, list]) => list.length > 1);
|
||||||
|
const preview = duplicateGroups.map(([mobile, list]) => ({
|
||||||
|
mobile,
|
||||||
|
people: list.map((person) => ({
|
||||||
|
id: person.id,
|
||||||
|
stored: person.mobile,
|
||||||
|
name: `${person.firstName} ${person.lastName}`.trim(),
|
||||||
|
})),
|
||||||
|
}));
|
||||||
|
|
||||||
|
if (!apply) {
|
||||||
|
const needsRewrite = people.filter((person) => {
|
||||||
|
const canon = canonicalIranMobile(person.mobile) ?? canonicalIranMobile(person.phone);
|
||||||
|
return Boolean(canon && (person.mobile !== canon || canonicalIranMobile(person.phone)));
|
||||||
|
}).length;
|
||||||
|
return { merged: 0, rewritten: 0, needsRewrite, failed: 0, groups: preview };
|
||||||
|
}
|
||||||
|
|
||||||
|
const tables = await personIdTables(prisma);
|
||||||
|
let merged = 0;
|
||||||
|
let rewritten = 0;
|
||||||
|
let failed = 0;
|
||||||
|
|
||||||
|
for (const [canon, list] of groups) {
|
||||||
|
const ordered = [...list].sort((a, b) => {
|
||||||
|
const aTahesab = a.importSource === 'tahesab' ? 0 : 1;
|
||||||
|
const bTahesab = b.importSource === 'tahesab' ? 0 : 1;
|
||||||
|
if (aTahesab !== bTahesab) return aTahesab - bTahesab;
|
||||||
|
return a.createdAt.getTime() - b.createdAt.getTime() || a.id.localeCompare(b.id);
|
||||||
|
});
|
||||||
|
const [keeper, ...extras] = ordered;
|
||||||
|
if (!keeper) continue;
|
||||||
|
if (!extras.length) {
|
||||||
|
const phoneCanon = canonicalIranMobile(keeper.phone);
|
||||||
|
const data: Prisma.PersonUpdateInput = {};
|
||||||
|
if (keeper.mobile !== canon) data.mobile = canon;
|
||||||
|
if (phoneCanon && keeper.phone !== phoneCanon) data.phone = phoneCanon;
|
||||||
|
if (Object.keys(data).length) {
|
||||||
|
await prisma.person.update({ where: { id: keeper.id }, data });
|
||||||
|
rewritten += 1;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await prisma.$transaction(
|
||||||
|
async (tx) => {
|
||||||
|
await tx.person.update({
|
||||||
|
where: { id: keeper.id },
|
||||||
|
data: mergedFields(keeper, extras, canon),
|
||||||
|
});
|
||||||
|
for (const extra of extras) {
|
||||||
|
await moveLinks(tx, tables, keeper.id, extra.id);
|
||||||
|
await tx.person.delete({ where: { id: extra.id } });
|
||||||
|
merged += 1;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ timeout: 60_000 },
|
||||||
|
);
|
||||||
|
} catch (error) {
|
||||||
|
failed += 1;
|
||||||
|
console.error(
|
||||||
|
`merge mobile ${canon} failed`,
|
||||||
|
error instanceof Error ? error.message : error,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return { merged, rewritten, needsRewrite: 0, failed, groups: preview };
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadEnv(file: string) {
|
||||||
|
const text = readFileSync(file, 'utf8');
|
||||||
|
for (const line of text.split(/\r?\n/)) {
|
||||||
|
const match = line.match(/^([A-Za-z0-9_]+)=(.*)$/);
|
||||||
|
if (!match || process.env[match[1]]) continue;
|
||||||
|
let value = match[2].trim();
|
||||||
|
if (
|
||||||
|
(value.startsWith('"') && value.endsWith('"')) ||
|
||||||
|
(value.startsWith("'") && value.endsWith("'"))
|
||||||
|
) {
|
||||||
|
value = value.slice(1, -1);
|
||||||
|
}
|
||||||
|
process.env[match[1]] = value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const direct = process.argv[1]?.replace(/\\/g, '/').includes('merge-same-mobile');
|
||||||
|
if (direct) {
|
||||||
|
loadEnv(resolve(__dirname, '../../.env'));
|
||||||
|
const orgId = process.argv.find((arg) => arg.startsWith('--org='))?.slice(6);
|
||||||
|
const apply = process.argv.includes('--apply');
|
||||||
|
if (!orgId) {
|
||||||
|
console.error('org id required: --org=<id>');
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
const prisma = new PrismaClient();
|
||||||
|
mergeSameMobilePeople(prisma, orgId, apply)
|
||||||
|
.then((result) => {
|
||||||
|
console.log(JSON.stringify({
|
||||||
|
apply,
|
||||||
|
merged: result.merged,
|
||||||
|
rewritten: result.rewritten,
|
||||||
|
needsRewrite: result.needsRewrite,
|
||||||
|
groupCount: result.groups.length,
|
||||||
|
groups: result.groups,
|
||||||
|
}, null, 2));
|
||||||
|
})
|
||||||
|
.catch((error) => {
|
||||||
|
console.error(error);
|
||||||
|
process.exitCode = 1;
|
||||||
|
})
|
||||||
|
.finally(() => prisma.$disconnect());
|
||||||
|
}
|
||||||
@@ -9,11 +9,54 @@ export function normalizeEmail(value?: string | null): string | null {
|
|||||||
return v ? v.toLowerCase() : null;
|
return v ? v.toLowerCase() : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const FA_DIGITS = '۰۱۲۳۴۵۶۷۸۹';
|
||||||
|
const AR_DIGITS = '٠١٢٣٤٥٦٧٨٩';
|
||||||
|
|
||||||
|
/** ارقام فارسی و عربی را به لاتین برمیگرداند تا از شماره حذف نشوند. */
|
||||||
|
function latinDigits(value: string): string {
|
||||||
|
return value.replace(/[۰-۹٠-٩]/g, (ch) => {
|
||||||
|
const fa = FA_DIGITS.indexOf(ch);
|
||||||
|
return String(fa >= 0 ? fa : AR_DIGITS.indexOf(ch));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/** Keep digits and leading + for Iranian/international numbers. */
|
/** Keep digits and leading + for Iranian/international numbers. */
|
||||||
export function normalizePhone(value?: string | null): string | null {
|
export function normalizePhone(value?: string | null): string | null {
|
||||||
const v = emptyToNull(value);
|
const v = emptyToNull(value);
|
||||||
if (!v) return null;
|
if (!v) return null;
|
||||||
const cleaned = v.replace(/[^\d+]/g, '');␍
|
const cleaned = latinDigits(v).replace(/[^\d+]/g, '');
|
||||||
return cleaned.length ? cleaned : null;
|
return cleaned.length ? cleaned : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** موبایل ایران به شکل 09xxxxxxxxx. 912… و 98912… و +98912… همان شمارهاند. */
|
||||||
|
export function canonicalIranMobile(value?: string | null): string | null {
|
||||||
|
const n = normalizePhone(value);
|
||||||
|
if (!n) return null;
|
||||||
|
let d = n.replace(/\D/g, '');
|
||||||
|
if (!d) return null;
|
||||||
|
if (d.startsWith('0098') && d.length >= 14) d = d.slice(4);
|
||||||
|
else if (d.startsWith('98') && d.length >= 12) d = d.slice(2);
|
||||||
|
if (d.length === 10 && d.startsWith('9')) d = `0${d}`;
|
||||||
|
return /^09\d{9}$/.test(d) ? d : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** شکلهایی که ممکن است همین موبایل با آنها ذخیره شده باشد. */
|
||||||
|
export function iranMobileLookupKeys(value?: string | null): string[] {
|
||||||
|
const canon = canonicalIranMobile(value);
|
||||||
|
if (!canon) return [];
|
||||||
|
const core = canon.slice(1);
|
||||||
|
return [canon, core, `98${core}`, `+98${core}`, `0098${core}`];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** برای تطبیق: اگر موبایل ایران است همه شکلها، وگرنه همان متن نرمالشده. */
|
||||||
|
export function phoneIdentityKeys(value?: string | null): string[] {
|
||||||
|
const keys = iranMobileLookupKeys(value);
|
||||||
|
if (keys.length) return keys;
|
||||||
|
const n = normalizePhone(value);
|
||||||
|
return n ? [n] : [];
|
||||||
|
}
|
||||||
|
|
||||||
|
/** ذخیره: موبایل ایران همیشه 09… ؛ بقیه شمارهها فقط تمیز میشوند. */
|
||||||
|
export function storedPhoneNumber(value?: string | null): string | null {
|
||||||
|
return canonicalIranMobile(value) ?? normalizePhone(value);
|
||||||
|
}
|
||||||
|
|||||||
@@ -28,7 +28,12 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { OutboundSmsLogService } from '../outbound-sms/outbound-sms-log.service';
|
import { OutboundSmsLogService } from '../outbound-sms/outbound-sms-log.service';
|
||||||
import { CompaniesService } from './companies.service';
|
import { CompaniesService } from './companies.service';
|
||||||
import { emptyToNull, normalizeEmail, normalizePhone } from './normalize';
|
import {
|
||||||
|
emptyToNull,
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from './normalize';
|
||||||
import {
|
import {
|
||||||
asAddresses,
|
asAddresses,
|
||||||
asCustomFields,
|
asCustomFields,
|
||||||
@@ -38,9 +43,9 @@ import {
|
|||||||
import { customersPersonWhere } from '../common/data-access';
|
import { customersPersonWhere } from '../common/data-access';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { LoyaltyService } from '../loyalty/loyalty.service';
|
import { LoyaltyService } from '../loyalty/loyalty.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
@@ -399,7 +404,10 @@ export class PeopleService implements OnModuleInit {
|
|||||||
input: { mobile?: string | null; email?: string | null; birthDate: Date },
|
input: { mobile?: string | null; email?: string | null; birthDate: Date },
|
||||||
) {
|
) {
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (input.mobile) or.push({ mobile: input.mobile });
|
const mobileKeys = phoneIdentityKeys(input.mobile);
|
||||||
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
if (input.email) or.push({ email: input.email });
|
if (input.email) or.push({ email: input.email });
|
||||||
if (!or.length) return;
|
if (!or.length) return;
|
||||||
await this.prisma.person.updateMany({
|
await this.prisma.person.updateMany({
|
||||||
@@ -441,8 +449,8 @@ export class PeopleService implements OnModuleInit {
|
|||||||
importSource: normalizePersonImportSource(dto.importSource),
|
importSource: normalizePersonImportSource(dto.importSource),
|
||||||
sourceRef: emptyToNull(dto.sourceRef),
|
sourceRef: emptyToNull(dto.sourceRef),
|
||||||
email: normalizeEmail(dto.email),
|
email: normalizeEmail(dto.email),
|
||||||
phone: normalizePhone(dto.phone),
|
phone: storedPhoneNumber(dto.phone),
|
||||||
mobile: normalizePhone(dto.mobile),
|
mobile: storedPhoneNumber(dto.mobile),
|
||||||
position: emptyToNull(dto.position),
|
position: emptyToNull(dto.position),
|
||||||
website: emptyToNull(dto.website),
|
website: emptyToNull(dto.website),
|
||||||
instagram: emptyToNull(dto.instagram),
|
instagram: emptyToNull(dto.instagram),
|
||||||
@@ -453,7 +461,11 @@ export class PeopleService implements OnModuleInit {
|
|||||||
mood: dto.mood ?? 'newcomer',
|
mood: dto.mood ?? 'newcomer',
|
||||||
tags: normalizeTags(dto.tags),
|
tags: normalizeTags(dto.tags),
|
||||||
companyId,
|
companyId,
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId: resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, actor, 'customers'),
|
||||||
|
),
|
||||||
customFields: toJsonCustomFields(dto.customFields),
|
customFields: toJsonCustomFields(dto.customFields),
|
||||||
...(registeredAt && !Number.isNaN(registeredAt.getTime())
|
...(registeredAt && !Number.isNaN(registeredAt.getTime())
|
||||||
? { createdAt: registeredAt }
|
? { createdAt: registeredAt }
|
||||||
@@ -549,8 +561,8 @@ export class PeopleService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
if ('sourceRef' in dto) data.sourceRef = emptyToNull(dto.sourceRef);
|
if ('sourceRef' in dto) data.sourceRef = emptyToNull(dto.sourceRef);
|
||||||
if ('email' in dto) data.email = normalizeEmail(dto.email);
|
if ('email' in dto) data.email = normalizeEmail(dto.email);
|
||||||
if ('phone' in dto) data.phone = normalizePhone(dto.phone);
|
if ('phone' in dto) data.phone = storedPhoneNumber(dto.phone);
|
||||||
if ('mobile' in dto) data.mobile = normalizePhone(dto.mobile);
|
if ('mobile' in dto) data.mobile = storedPhoneNumber(dto.mobile);
|
||||||
if ('position' in dto) data.position = emptyToNull(dto.position);
|
if ('position' in dto) data.position = emptyToNull(dto.position);
|
||||||
if ('website' in dto) data.website = emptyToNull(dto.website);
|
if ('website' in dto) data.website = emptyToNull(dto.website);
|
||||||
if ('instagram' in dto) data.instagram = emptyToNull(dto.instagram);
|
if ('instagram' in dto) data.instagram = emptyToNull(dto.instagram);
|
||||||
@@ -574,8 +586,14 @@ export class PeopleService implements OnModuleInit {
|
|||||||
}
|
}
|
||||||
data.companyId = nextCompanyId;
|
data.companyId = nextCompanyId;
|
||||||
}
|
}
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
if (dto.ownerId !== undefined) {
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
const current = await this.prisma.person.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { ownerId: true },
|
||||||
|
});
|
||||||
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'customers', [nextOwner], [current?.ownerId]);
|
||||||
|
data.ownerId = nextOwner ?? actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
await this.assertNoDuplicate(actor.organizationId, data, id);
|
await this.assertNoDuplicate(actor.organizationId, data, id);
|
||||||
@@ -631,10 +649,13 @@ export class PeopleService implements OnModuleInit {
|
|||||||
) {
|
) {
|
||||||
const email = typeof data.email === 'string' ? data.email : null;
|
const email = typeof data.email === 'string' ? data.email : null;
|
||||||
const mobile = typeof data.mobile === 'string' ? data.mobile : null;
|
const mobile = typeof data.mobile === 'string' ? data.mobile : null;
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
|
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (email) or.push({ email });
|
if (email) or.push({ email });
|
||||||
if (mobile) or.push({ mobile });
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
if (!or.length) return;
|
if (!or.length) return;
|
||||||
|
|
||||||
const clash = await this.prisma.person.findFirst({
|
const clash = await this.prisma.person.findFirst({
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
import { Injectable, Logger, type OnApplicationBootstrap } from '@nestjs/common';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { mergeSameMobilePeople } from './merge-same-mobile';
|
||||||
|
|
||||||
|
const FIX_KEY = 'person-mobile-canonical-v3';
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class SameMobileMergeService implements OnApplicationBootstrap {
|
||||||
|
private readonly logger = new Logger(SameMobileMergeService.name);
|
||||||
|
|
||||||
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
|
|
||||||
|
onApplicationBootstrap() {
|
||||||
|
if (process.env.NODE_ENV === 'test') return;
|
||||||
|
void this.run();
|
||||||
|
}
|
||||||
|
|
||||||
|
private async run() {
|
||||||
|
try {
|
||||||
|
const ready = await this.prisma.$queryRaw<{ ok: number }[]>`
|
||||||
|
SELECT 1 AS ok
|
||||||
|
FROM information_schema.columns
|
||||||
|
WHERE table_schema = 'public'
|
||||||
|
AND lower(table_name) = 'person'
|
||||||
|
AND lower(column_name) = 'gender'
|
||||||
|
`;
|
||||||
|
if (!ready.length) {
|
||||||
|
this.logger.warn('یکسانسازی موبایل رد شد: ستون gender هنوز نیست');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.prisma.$executeRaw`
|
||||||
|
CREATE TABLE IF NOT EXISTS "DataFix" (
|
||||||
|
"key" TEXT PRIMARY KEY,
|
||||||
|
"doneAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP
|
||||||
|
)
|
||||||
|
`;
|
||||||
|
|
||||||
|
const done = await this.prisma.$queryRaw<{ key: string }[]>`
|
||||||
|
SELECT "key" FROM "DataFix" WHERE "key" = ${FIX_KEY}
|
||||||
|
`;
|
||||||
|
if (done.length) return;
|
||||||
|
|
||||||
|
await this.prisma.$executeRaw`SELECT pg_advisory_lock(86051205)`;
|
||||||
|
try {
|
||||||
|
const again = await this.prisma.$queryRaw<{ key: string }[]>`
|
||||||
|
SELECT "key" FROM "DataFix" WHERE "key" = ${FIX_KEY}
|
||||||
|
`;
|
||||||
|
if (again.length) return;
|
||||||
|
|
||||||
|
const orgs = await this.prisma.organization.findMany({ select: { id: true } });
|
||||||
|
let merged = 0;
|
||||||
|
let rewritten = 0;
|
||||||
|
let failed = 0;
|
||||||
|
for (const org of orgs) {
|
||||||
|
try {
|
||||||
|
const result = await mergeSameMobilePeople(this.prisma, org.id, true);
|
||||||
|
merged += result.merged;
|
||||||
|
rewritten += result.rewritten;
|
||||||
|
failed += result.failed;
|
||||||
|
} catch (error) {
|
||||||
|
failed += 1;
|
||||||
|
this.logger.error(
|
||||||
|
`یکسانسازی موبایل برای محیط ${org.id} انجام نشد`,
|
||||||
|
error instanceof Error ? error.message : String(error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (failed) return;
|
||||||
|
await this.prisma.$executeRaw`
|
||||||
|
INSERT INTO "DataFix" ("key") VALUES (${FIX_KEY})
|
||||||
|
ON CONFLICT ("key") DO NOTHING
|
||||||
|
`;
|
||||||
|
this.logger.log(`شمارههای تکراری یکی شد: ${merged} ادغام، ${rewritten} بازنویسی`);
|
||||||
|
} finally {
|
||||||
|
await this.prisma.$executeRaw`SELECT pg_advisory_unlock(86051205)`;
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
this.logger.error(
|
||||||
|
'یکسانسازی موبایل مشتریها انجام نشد',
|
||||||
|
error instanceof Error ? error.stack : String(error),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -4,6 +4,7 @@ import { CurrentUser } from '../auth/current-user.decorator';
|
|||||||
import { RequireOrgModule } from '../billing/org-module.decorator';
|
import { RequireOrgModule } from '../billing/org-module.decorator';
|
||||||
import { OrgModuleGuard } from '../billing/org-module.guard';
|
import { OrgModuleGuard } from '../billing/org-module.guard';
|
||||||
import {
|
import {
|
||||||
|
ConversationFileBytesDto,
|
||||||
CreateConversationDmDto,
|
CreateConversationDmDto,
|
||||||
CreateConversationGroupDto,
|
CreateConversationGroupDto,
|
||||||
CreateConversationChannelDto,
|
CreateConversationChannelDto,
|
||||||
@@ -19,12 +20,34 @@ import {
|
|||||||
ToggleMessageReactionDto,
|
ToggleMessageReactionDto,
|
||||||
} from './dto';
|
} from './dto';
|
||||||
import { ConversationsService } from './conversations.service';
|
import { ConversationsService } from './conversations.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
|
|
||||||
@Controller('conversations')
|
@Controller('conversations')
|
||||||
@UseGuards(JwtAuthGuard, OrgModuleGuard)
|
@UseGuards(JwtAuthGuard, OrgModuleGuard)
|
||||||
@RequireOrgModule('conversations')
|
@RequireOrgModule('conversations')
|
||||||
export class ConversationsController {
|
export class ConversationsController {
|
||||||
constructor(private readonly conversations: ConversationsService) {}
|
constructor(
|
||||||
|
private readonly conversations: ConversationsService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Post('files/reserve')
|
||||||
|
reserveFile(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Body() dto: ConversationFileBytesDto,
|
||||||
|
) {
|
||||||
|
return this.storage.assertCanAdd(user.organizationId, dto.bytes).then(() =>
|
||||||
|
this.storage.usageForOrganization(user.organizationId),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('files/commit')
|
||||||
|
commitFile(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Body() dto: ConversationFileBytesDto,
|
||||||
|
) {
|
||||||
|
return this.storage.addChat(user.organizationId, dto.bytes);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('access')
|
@Get('access')
|
||||||
access(@CurrentUser() user: { userId: string; organizationId: string; role: string }) {
|
access(@CurrentUser() user: { userId: string; organizationId: string; role: string }) {
|
||||||
|
|||||||
@@ -656,7 +656,7 @@ export class ConversationsService {
|
|||||||
});
|
});
|
||||||
if (!row) {
|
if (!row) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → محیطها → تنظیمات گفتگو پیکربندی کنید.',
|
'تنظیمات گفتگو برای این محیط انجام نشده است. از سوپرادمین → گفتگو پیکربندی کنید.',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -1,9 +1,13 @@
|
|||||||
|
import { Type } from 'class-transformer';
|
||||||
import {
|
import {
|
||||||
IsArray,
|
IsArray,
|
||||||
IsBoolean,
|
IsBoolean,
|
||||||
|
IsInt,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
|
Max,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
|
Min,
|
||||||
MinLength,
|
MinLength,
|
||||||
ArrayMinSize,
|
ArrayMinSize,
|
||||||
ArrayMaxSize,
|
ArrayMaxSize,
|
||||||
@@ -32,6 +36,14 @@ export class UpdateConversationSettingsDto {
|
|||||||
downloadUrl?: string;
|
downloadUrl?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class ConversationFileBytesDto {
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@Max(100 * 1024 * 1024)
|
||||||
|
bytes!: number;
|
||||||
|
}
|
||||||
|
|
||||||
export class CreateConversationDmDto {
|
export class CreateConversationDmDto {
|
||||||
@IsString()
|
@IsString()
|
||||||
@MinLength(1)
|
@MinLength(1)
|
||||||
|
|||||||
@@ -17,7 +17,11 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { parseBirthDate } from '../../common/excel';
|
import { parseBirthDate } from '../../common/excel';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { normalizeEmail, normalizePhone } from '../../contacts/normalize';
|
import {
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { carryPreviousSource } from '../../contacts/person-source';
|
import { carryPreviousSource } from '../../contacts/person-source';
|
||||||
import { ownerWhere, type Actor } from '../../common/record-scope';
|
import { ownerWhere, type Actor } from '../../common/record-scope';
|
||||||
import { MontifyConnectionsService } from './connections.service';
|
import { MontifyConnectionsService } from './connections.service';
|
||||||
@@ -100,13 +104,7 @@ function arr(v: unknown): unknown[] {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mobileVariants(mobile: string): string[] {
|
function mobileVariants(mobile: string): string[] {
|
||||||
const digits = mobile.replace(/\D/g, '');
|
return phoneIdentityKeys(mobile);
|
||||||
let core = digits;
|
|
||||||
if (core.startsWith('0098')) core = core.slice(4);
|
|
||||||
else if (core.startsWith('98') && core.length === 12) core = core.slice(2);
|
|
||||||
else if (core.startsWith('0')) core = core.slice(1);
|
|
||||||
if (!core) return [mobile];
|
|
||||||
return [...new Set([mobile, core, `0${core}`, `98${core}`, `+98${core}`])];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatAddress(a: MontifyAddress): string | null {
|
function formatAddress(a: MontifyAddress): string | null {
|
||||||
@@ -417,7 +415,7 @@ export class MontifySyncService {
|
|||||||
}> {
|
}> {
|
||||||
const externalId = String(c.id);
|
const externalId = String(c.id);
|
||||||
const { firstName, lastName } = splitName(c);
|
const { firstName, lastName } = splitName(c);
|
||||||
const mobile = normalizePhone(c.phone ?? null);
|
const mobile = storedPhoneNumber(c.phone ?? null);
|
||||||
const email = normalizeEmail(c.email ?? null);
|
const email = normalizeEmail(c.email ?? null);
|
||||||
const addressLines = addresses.map(formatAddress).filter((a): a is string => Boolean(a));
|
const addressLines = addresses.map(formatAddress).filter((a): a is string => Boolean(a));
|
||||||
const profile: CustomerProfile = {
|
const profile: CustomerProfile = {
|
||||||
|
|||||||
@@ -38,6 +38,12 @@ import {
|
|||||||
|
|
||||||
const ASNAD_COUNT_LAST = 5000;
|
const ASNAD_COUNT_LAST = 5000;
|
||||||
const SYNC_CONCURRENCY = 3;
|
const SYNC_CONCURRENCY = 3;
|
||||||
|
|
||||||
|
function latinDigits(value: string): string {
|
||||||
|
return value
|
||||||
|
.replace(/[۰-۹]/g, (ch) => String('۰۱۲۳۴۵۶۷۸۹'.indexOf(ch)))
|
||||||
|
.replace(/[٠-٩]/g, (ch) => String('٠١٢٣٤٥٦٧٨٩'.indexOf(ch)));
|
||||||
|
}
|
||||||
const ASNAD_KINDS = new Set<string>(['sale', 'return', 'purchase', 'other']);
|
const ASNAD_KINDS = new Set<string>(['sale', 'return', 'purchase', 'other']);
|
||||||
|
|
||||||
function normalizeShamsiYmd(input: string): string {
|
function normalizeShamsiYmd(input: string): string {
|
||||||
@@ -184,6 +190,7 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: string | undefined,
|
connectionId: string | undefined,
|
||||||
from: string,
|
from: string,
|
||||||
to: string,
|
to: string,
|
||||||
|
scope?: { personId?: string; groupIds?: string[] },
|
||||||
): Promise<TahesabAsnadSyncJobDto> {
|
): Promise<TahesabAsnadSyncJobDto> {
|
||||||
const fromNorm = normalizeShamsiYmd(from);
|
const fromNorm = normalizeShamsiYmd(from);
|
||||||
const toNorm = normalizeShamsiYmd(to);
|
const toNorm = normalizeShamsiYmd(to);
|
||||||
@@ -194,6 +201,22 @@ export class TahesabAsnadReportService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
connectionId,
|
connectionId,
|
||||||
);
|
);
|
||||||
|
const scopedPersonIds = await this.resolveSyncPersonIds(organizationId, scope);
|
||||||
|
if (scopedPersonIds && scopedPersonIds.length === 0) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'برای گروه یا شخص انتخابشده مشتریای پیدا نشد.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
if (scopedPersonIds) {
|
||||||
|
const linked = await this.prisma.personAccountingLink.count({
|
||||||
|
where: { connectionId: resolvedId, personId: { in: scopedPersonIds } },
|
||||||
|
});
|
||||||
|
if (linked === 0) {
|
||||||
|
throw new BadRequestException(
|
||||||
|
'مشتریان این فیلتر به تهحساب وصل نیستند. بهروزرسانی همه را بزنید یا اول اتصال مشتری را انجام دهید.',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const job = await this.prisma.accountingSyncJob.create({
|
const job = await this.prisma.accountingSyncJob.create({
|
||||||
data: {
|
data: {
|
||||||
@@ -201,7 +224,13 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: resolvedId,
|
connectionId: resolvedId,
|
||||||
kind: 'asnad-sync',
|
kind: 'asnad-sync',
|
||||||
status: 'pending',
|
status: 'pending',
|
||||||
request: { from: fromNorm, to: toNorm, connectionId: resolvedId },
|
request: {
|
||||||
|
from: fromNorm,
|
||||||
|
to: toNorm,
|
||||||
|
connectionId: resolvedId,
|
||||||
|
personId: scope?.personId ?? null,
|
||||||
|
groupIds: scope?.groupIds ?? [],
|
||||||
|
},
|
||||||
result: {
|
result: {
|
||||||
connectionId: resolvedId,
|
connectionId: resolvedId,
|
||||||
from: fromNorm,
|
from: fromNorm,
|
||||||
@@ -214,9 +243,14 @@ export class TahesabAsnadReportService {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
void this.runSync(job.id, organizationId, resolvedId, fromNorm, toNorm).catch(
|
void this.runSync(
|
||||||
() => undefined,
|
job.id,
|
||||||
);
|
organizationId,
|
||||||
|
resolvedId,
|
||||||
|
fromNorm,
|
||||||
|
toNorm,
|
||||||
|
scopedPersonIds,
|
||||||
|
).catch(() => undefined);
|
||||||
|
|
||||||
return this.mapJob(job);
|
return this.mapJob(job);
|
||||||
}
|
}
|
||||||
@@ -238,6 +272,7 @@ export class TahesabAsnadReportService {
|
|||||||
connectionId: string,
|
connectionId: string,
|
||||||
from: string,
|
from: string,
|
||||||
to: string,
|
to: string,
|
||||||
|
personIds: string[] | null,
|
||||||
) {
|
) {
|
||||||
const progress: SyncProgress = {
|
const progress: SyncProgress = {
|
||||||
connectionId,
|
connectionId,
|
||||||
@@ -257,7 +292,10 @@ export class TahesabAsnadReportService {
|
|||||||
|
|
||||||
const { api } = await this.connections.getApi(organizationId, connectionId);
|
const { api } = await this.connections.getApi(organizationId, connectionId);
|
||||||
const links = await this.prisma.personAccountingLink.findMany({
|
const links = await this.prisma.personAccountingLink.findMany({
|
||||||
where: { connectionId },
|
where: {
|
||||||
|
connectionId,
|
||||||
|
...(personIds ? { personId: { in: personIds } } : {}),
|
||||||
|
},
|
||||||
select: {
|
select: {
|
||||||
id: true,
|
id: true,
|
||||||
personId: true,
|
personId: true,
|
||||||
@@ -276,6 +314,7 @@ export class TahesabAsnadReportService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
connectionId,
|
connectionId,
|
||||||
tarikh: { gte: from, lte: to },
|
tarikh: { gte: from, lte: to },
|
||||||
|
...(personIds ? { personId: { in: personIds } } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -638,6 +677,82 @@ export class TahesabAsnadReportService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** null یعنی همهٔ مشتریان متصل. آرایه یعنی فقط همین اشخاص. */
|
||||||
|
private async resolveSyncPersonIds(
|
||||||
|
organizationId: string,
|
||||||
|
scope?: { personId?: string; groupIds?: string[] },
|
||||||
|
): Promise<string[] | null> {
|
||||||
|
const groupIds = (scope?.groupIds ?? []).map((id) => id.trim()).filter(Boolean);
|
||||||
|
const personId = scope?.personId?.trim() || undefined;
|
||||||
|
if (!personId && groupIds.length === 0) return null;
|
||||||
|
let ids: string[] | null = null;
|
||||||
|
if (groupIds.length) {
|
||||||
|
const expanded = await this.expandGroupIds(organizationId, groupIds);
|
||||||
|
const rows = await this.prisma.personGroupLink.findMany({
|
||||||
|
where: {
|
||||||
|
groupId: { in: expanded },
|
||||||
|
person: { organizationId },
|
||||||
|
},
|
||||||
|
select: { personId: true },
|
||||||
|
distinct: ['personId'],
|
||||||
|
});
|
||||||
|
ids = rows.map((row) => row.personId);
|
||||||
|
}
|
||||||
|
if (personId) ids = ids ? ids.filter((id) => id === personId) : [personId];
|
||||||
|
return ids ?? [];
|
||||||
|
}
|
||||||
|
|
||||||
|
async searchCustomers(
|
||||||
|
organizationId: string,
|
||||||
|
connectionId: string | undefined,
|
||||||
|
q: string,
|
||||||
|
) {
|
||||||
|
const resolvedId = await this.connections.resolveConnectionId(
|
||||||
|
organizationId,
|
||||||
|
connectionId,
|
||||||
|
);
|
||||||
|
const query = q.trim();
|
||||||
|
const tokens = query.split(/\s+/).filter(Boolean);
|
||||||
|
const code = Number(latinDigits(query));
|
||||||
|
const or: Prisma.PersonAccountingLinkWhereInput[] = [];
|
||||||
|
if (tokens.length) {
|
||||||
|
or.push({
|
||||||
|
person: {
|
||||||
|
organizationId,
|
||||||
|
AND: tokens.map((token) => ({
|
||||||
|
OR: [
|
||||||
|
{ firstName: { contains: token } },
|
||||||
|
{ lastName: { contains: token } },
|
||||||
|
],
|
||||||
|
})),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if (Number.isInteger(code) && code > 0 && latinDigits(query) === String(code)) {
|
||||||
|
or.push({ moshtariCode: code, person: { organizationId } });
|
||||||
|
}
|
||||||
|
const rows = await this.prisma.personAccountingLink.findMany({
|
||||||
|
where: {
|
||||||
|
connectionId: resolvedId,
|
||||||
|
...(or.length ? { OR: or } : { person: { organizationId } }),
|
||||||
|
},
|
||||||
|
take: 30,
|
||||||
|
orderBy: [{ person: { lastName: 'asc' } }, { person: { firstName: 'asc' } }],
|
||||||
|
select: {
|
||||||
|
personId: true,
|
||||||
|
moshtariCode: true,
|
||||||
|
person: { select: { firstName: true, lastName: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
items: rows.map((row) => ({
|
||||||
|
personId: row.personId,
|
||||||
|
moshtariCode: row.moshtariCode,
|
||||||
|
name: `${row.person.firstName} ${row.person.lastName}`.trim(),
|
||||||
|
})),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
/** گروه اصلی، زیرگروهها را هم داخل فیلتر میآورد. */
|
/** گروه اصلی، زیرگروهها را هم داخل فیلتر میآورد. */
|
||||||
private async expandGroupIds(organizationId: string, ids: string[]): Promise<string[]> {
|
private async expandGroupIds(organizationId: string, ids: string[]): Promise<string[]> {
|
||||||
const rows = await this.prisma.customerGroup.findMany({
|
const rows = await this.prisma.customerGroup.findMany({
|
||||||
|
|||||||
@@ -43,6 +43,10 @@ export class TahesabConnectionsService {
|
|||||||
lastHealthAt: Date | null;
|
lastHealthAt: Date | null;
|
||||||
lastHealthOk: boolean | null;
|
lastHealthOk: boolean | null;
|
||||||
lastError: string | null;
|
lastError: string | null;
|
||||||
|
customerSyncHours: number[];
|
||||||
|
customerSyncLastRunAt: Date | null;
|
||||||
|
customerSyncLastSummary: string | null;
|
||||||
|
customerSyncLastError: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
updatedAt: Date;
|
updatedAt: Date;
|
||||||
}) {
|
}) {
|
||||||
@@ -60,6 +64,10 @@ export class TahesabConnectionsService {
|
|||||||
lastHealthAt: row.lastHealthAt?.toISOString() ?? null,
|
lastHealthAt: row.lastHealthAt?.toISOString() ?? null,
|
||||||
lastHealthOk: row.lastHealthOk,
|
lastHealthOk: row.lastHealthOk,
|
||||||
lastError: row.lastError,
|
lastError: row.lastError,
|
||||||
|
customerSyncHours: [...row.customerSyncHours].sort((a, b) => a - b),
|
||||||
|
customerSyncLastRunAt: row.customerSyncLastRunAt?.toISOString() ?? null,
|
||||||
|
customerSyncLastSummary: row.customerSyncLastSummary,
|
||||||
|
customerSyncLastError: row.customerSyncLastError,
|
||||||
createdAt: row.createdAt.toISOString(),
|
createdAt: row.createdAt.toISOString(),
|
||||||
updatedAt: row.updatedAt.toISOString(),
|
updatedAt: row.updatedAt.toISOString(),
|
||||||
};
|
};
|
||||||
@@ -201,6 +209,15 @@ export class TahesabConnectionsService {
|
|||||||
|
|
||||||
if (dto.isDefault === true) await this.clearOtherDefaults(organizationId, id);
|
if (dto.isDefault === true) await this.clearOtherDefaults(organizationId, id);
|
||||||
|
|
||||||
|
let customerSyncHours: number[] | undefined;
|
||||||
|
if (dto.customerSyncHours !== undefined) {
|
||||||
|
const hours = dto.customerSyncHours.map((hour) => Math.trunc(hour));
|
||||||
|
if (new Set(hours).size !== hours.length) {
|
||||||
|
throw new BadRequestException('ساعتهای بروزرسانی نباید تکراری باشند.');
|
||||||
|
}
|
||||||
|
customerSyncHours = [...hours].sort((a, b) => a - b);
|
||||||
|
}
|
||||||
|
|
||||||
let enc = {
|
let enc = {
|
||||||
ciphertext: row.tokenCiphertext,
|
ciphertext: row.tokenCiphertext,
|
||||||
iv: row.tokenIv,
|
iv: row.tokenIv,
|
||||||
@@ -225,6 +242,7 @@ export class TahesabConnectionsService {
|
|||||||
enabled: dto.enabled ?? row.enabled,
|
enabled: dto.enabled ?? row.enabled,
|
||||||
isDefault: dto.isDefault === true ? true : dto.isDefault === false ? false : row.isDefault,
|
isDefault: dto.isDefault === true ? true : dto.isDefault === false ? false : row.isDefault,
|
||||||
allowInsecureTls: dto.allowInsecureTls ?? row.allowInsecureTls,
|
allowInsecureTls: dto.allowInsecureTls ?? row.allowInsecureTls,
|
||||||
|
...(customerSyncHours !== undefined ? { customerSyncHours } : {}),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return this.toDto(updated);
|
return this.toDto(updated);
|
||||||
|
|||||||
@@ -0,0 +1,99 @@
|
|||||||
|
import { Injectable, Logger } from '@nestjs/common';
|
||||||
|
import { Cron } from '@nestjs/schedule';
|
||||||
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
|
import { TahesabPersonLinkService } from './person-link.service';
|
||||||
|
|
||||||
|
/** ساعت و تاریخ امروز به وقت تهران، برای نوبت یکبار در هر ساعت. */
|
||||||
|
export function tehranSyncSlot(now = new Date()): { hour: number; slot: string } {
|
||||||
|
const parts = new Intl.DateTimeFormat('en-GB', {
|
||||||
|
timeZone: 'Asia/Tehran',
|
||||||
|
year: 'numeric',
|
||||||
|
month: '2-digit',
|
||||||
|
day: '2-digit',
|
||||||
|
hour: '2-digit',
|
||||||
|
hourCycle: 'h23',
|
||||||
|
}).formatToParts(now);
|
||||||
|
const read = (type: Intl.DateTimeFormatPartTypes) =>
|
||||||
|
parts.find((part) => part.type === type)?.value ?? '';
|
||||||
|
let hour = Number(read('hour'));
|
||||||
|
if (!Number.isFinite(hour) || hour === 24) hour = 0;
|
||||||
|
const slot = `${read('year')}-${read('month')}-${read('day')}-${String(hour).padStart(2, '0')}`;
|
||||||
|
return { hour, slot };
|
||||||
|
}
|
||||||
|
|
||||||
|
@Injectable()
|
||||||
|
export class TahesabCustomerSyncScheduler {
|
||||||
|
private readonly logger = new Logger(TahesabCustomerSyncScheduler.name);
|
||||||
|
private busy = false;
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly links: TahesabPersonLinkService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Cron('* * * * *', { timeZone: 'Asia/Tehran' })
|
||||||
|
async tick() {
|
||||||
|
if (process.env.NODE_ENV === 'test' || this.busy) return;
|
||||||
|
this.busy = true;
|
||||||
|
try {
|
||||||
|
const { hour, slot } = tehranSyncSlot();
|
||||||
|
const connections = await this.prisma.accountingConnection.findMany({
|
||||||
|
where: {
|
||||||
|
provider: 'tahesab',
|
||||||
|
enabled: true,
|
||||||
|
customerSyncHours: { has: hour },
|
||||||
|
},
|
||||||
|
select: { id: true, organizationId: true, label: true, customerSyncLastSlot: true },
|
||||||
|
});
|
||||||
|
for (const connection of connections) {
|
||||||
|
if (connection.customerSyncLastSlot === slot) continue;
|
||||||
|
const claimed = await this.prisma.accountingConnection.updateMany({
|
||||||
|
where: {
|
||||||
|
id: connection.id,
|
||||||
|
OR: [
|
||||||
|
{ customerSyncLastSlot: null },
|
||||||
|
{ customerSyncLastSlot: { not: slot } },
|
||||||
|
],
|
||||||
|
},
|
||||||
|
data: { customerSyncLastSlot: slot },
|
||||||
|
});
|
||||||
|
if (claimed.count !== 1) continue;
|
||||||
|
await this.run(connection.organizationId, connection.id, connection.label);
|
||||||
|
}
|
||||||
|
} catch (err) {
|
||||||
|
this.logger.warn(
|
||||||
|
`بررسی زمانبندی مشتریان تهحساب ناموفق بود: ${
|
||||||
|
err instanceof Error ? err.message : err
|
||||||
|
}`,
|
||||||
|
);
|
||||||
|
} finally {
|
||||||
|
this.busy = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private async run(organizationId: string, connectionId: string, label: string) {
|
||||||
|
try {
|
||||||
|
const result = await this.links.syncAllCustomers(organizationId, connectionId);
|
||||||
|
await this.prisma.accountingConnection.update({
|
||||||
|
where: { id: connectionId },
|
||||||
|
data: {
|
||||||
|
customerSyncLastRunAt: new Date(),
|
||||||
|
customerSyncLastSummary: result.summary,
|
||||||
|
customerSyncLastError: result.error,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.logger.log(`بروزرسانی خودکار «${label}»: ${result.summary}`);
|
||||||
|
} catch (err) {
|
||||||
|
const message = (err instanceof Error ? err.message : 'همگامسازی ناموفق بود').slice(0, 500);
|
||||||
|
await this.prisma.accountingConnection.update({
|
||||||
|
where: { id: connectionId },
|
||||||
|
data: {
|
||||||
|
customerSyncLastRunAt: new Date(),
|
||||||
|
customerSyncLastSummary: null,
|
||||||
|
customerSyncLastError: message,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
this.logger.warn(`بروزرسانی خودکار «${label}» ناموفق بود: ${message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -86,6 +86,16 @@ export class UpdateTahesabConnectionDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
allowInsecureTls?: boolean;
|
allowInsecureTls?: boolean;
|
||||||
|
|
||||||
|
/** ساعتهای ۰ تا ۲۳. آرایهٔ خالی یعنی خاموش. */
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayMaxSize(6)
|
||||||
|
@Type(() => Number)
|
||||||
|
@IsInt({ each: true })
|
||||||
|
@Min(0, { each: true })
|
||||||
|
@Max(23, { each: true })
|
||||||
|
customerSyncHours?: number[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class ManualLinkDto {
|
export class ManualLinkDto {
|
||||||
@@ -447,6 +457,18 @@ export class SyncAsnadReportDto {
|
|||||||
@MinLength(8)
|
@MinLength(8)
|
||||||
@MaxLength(12)
|
@MaxLength(12)
|
||||||
to!: string;
|
to!: string;
|
||||||
|
|
||||||
|
/** اگر باشد، فقط سندهای همین شخص گرفته میشود */
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
personId?: string;
|
||||||
|
|
||||||
|
/** اگر باشد، فقط مشتریان این گروهها (و زیرگروهها) گرفته میشوند */
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@IsString({ each: true })
|
||||||
|
@ArrayMaxSize(200)
|
||||||
|
groupIds?: string[];
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateTahesabInvoiceSettingsDto {
|
export class UpdateTahesabInvoiceSettingsDto {
|
||||||
|
|||||||
@@ -8,7 +8,12 @@ import {
|
|||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { carryPreviousSource } from '../../contacts/person-source';
|
import { carryPreviousSource, namesDiffer } from '../../contacts/person-source';
|
||||||
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { applyPersonGenderTitle } from '@mento/shared';
|
import { applyPersonGenderTitle } from '@mento/shared';
|
||||||
import { TahesabConnectionsService } from './connections.service';
|
import { TahesabConnectionsService } from './connections.service';
|
||||||
import {
|
import {
|
||||||
@@ -25,6 +30,20 @@ import { formatJalaliDate, parseBirthDate } from '../../common/excel';
|
|||||||
import { CustomerGroupsService } from '../../customer-groups/customer-groups.service';
|
import { CustomerGroupsService } from '../../customer-groups/customer-groups.service';
|
||||||
import { normalizeIranMobile, SanadBuilders, type TahesabApi } from './tahesab-methods';
|
import { normalizeIranMobile, SanadBuilders, type TahesabApi } from './tahesab-methods';
|
||||||
|
|
||||||
|
/** موبایل تهحساب را به شکل 0912… ذخیره میکند، حتی اگر قبلاً 912… یا +98912… بوده باشد. */
|
||||||
|
function canonicalMobileUpdate(
|
||||||
|
incoming: string | null,
|
||||||
|
current: { mobile: string | null; phone: string | null },
|
||||||
|
): { mobile?: string; phone?: string } {
|
||||||
|
const mobile =
|
||||||
|
canonicalIranMobile(incoming) ??
|
||||||
|
canonicalIranMobile(current.mobile) ??
|
||||||
|
canonicalIranMobile(current.phone);
|
||||||
|
if (!mobile) return {};
|
||||||
|
const phone = canonicalIranMobile(current.phone);
|
||||||
|
return phone ? { mobile, phone } : { mobile };
|
||||||
|
}
|
||||||
|
|
||||||
/** اندازهٔ هر صفحهٔ «همه» (بازهٔ کد) — امن برای پروکسی/nginx */
|
/** اندازهٔ هر صفحهٔ «همه» (بازهٔ کد) — امن برای پروکسی/nginx */
|
||||||
const LIST_PAGE_SIZE = 2000;
|
const LIST_PAGE_SIZE = 2000;
|
||||||
const LIST_TIMEOUT_MS = 55_000;
|
const LIST_TIMEOUT_MS = 55_000;
|
||||||
@@ -539,6 +558,7 @@ export class TahesabPersonLinkService {
|
|||||||
organizationId: string,
|
organizationId: string,
|
||||||
dto: ImportFromTahesabDto,
|
dto: ImportFromTahesabDto,
|
||||||
prefetched?: { api: TahesabApi; row?: Record<string, unknown> },
|
prefetched?: { api: TahesabApi; row?: Record<string, unknown> },
|
||||||
|
options?: { skipJob?: boolean },
|
||||||
) {
|
) {
|
||||||
const clash = await this.prisma.personAccountingLink.findFirst({
|
const clash = await this.prisma.personAccountingLink.findFirst({
|
||||||
where: {
|
where: {
|
||||||
@@ -577,10 +597,11 @@ export class TahesabPersonLinkService {
|
|||||||
const named = applyPersonGenderTitle({ firstName: name, lastName: '' });
|
const named = applyPersonGenderTitle({ firstName: name, lastName: '' });
|
||||||
const firstName = named.firstName;
|
const firstName = named.firstName;
|
||||||
const lastName = named.lastName;
|
const lastName = named.lastName;
|
||||||
const mobile = tel || null;
|
const mobile = storedPhoneNumber(tel);
|
||||||
const sourceRef = String(dto.moshtariCode);
|
const sourceRef = String(dto.moshtariCode);
|
||||||
|
|
||||||
let personId = dto.personId;
|
let personId = dto.personId;
|
||||||
|
let preserveExistingLink = false;
|
||||||
if (personId) {
|
if (personId) {
|
||||||
const existing = await this.getPerson(organizationId, personId);
|
const existing = await this.getPerson(organizationId, personId);
|
||||||
const prevFirst = existing.firstName;
|
const prevFirst = existing.firstName;
|
||||||
@@ -604,28 +625,33 @@ export class TahesabPersonLinkService {
|
|||||||
importSource: 'tahesab',
|
importSource: 'tahesab',
|
||||||
sourceRef,
|
sourceRef,
|
||||||
...(!existing.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
...(!existing.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
||||||
...(mobile
|
...canonicalMobileUpdate(mobile, existing),
|
||||||
? {
|
|
||||||
mobile: existing.mobile || mobile,
|
|
||||||
phone: existing.phone || mobile,
|
|
||||||
}
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
// اگر موبایل تکراری است → همان شخص؛ نام قبلی حفظ و نام تهحساب جایگزین.
|
// اگر موبایل تکراری است → همان شخص؛ نام قبلی حفظ و نام تهحساب جایگزین.
|
||||||
// شخصی که روی همین اتصال به کد دیگری لینک است کنار گذاشته میشود؛
|
// اگر همان شخص قبلاً به کد دیگری از این اتصال لینک شده، لینک جابهجا نمیشود
|
||||||
// وگرنه upsert لینک، کد قبلی را جابهجا و آن مشتری را دوباره «واردنشده» میکند.
|
// تا کد قبلی دوباره «واردنشده» نشود و مشتری تکراری ساخته نشود.
|
||||||
const byMobile = mobile
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
? await this.prisma.person.findFirst({
|
const matches = mobileKeys.length
|
||||||
|
? await this.prisma.person.findMany({
|
||||||
where: {
|
where: {
|
||||||
organizationId,
|
organizationId,
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
accountingLinks: { none: { connectionId: dto.connectionId } },
|
|
||||||
},
|
},
|
||||||
|
include: {
|
||||||
|
accountingLinks: {
|
||||||
|
where: { connectionId: dto.connectionId },
|
||||||
|
select: { moshtariCode: true },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
})
|
})
|
||||||
: null;
|
: [];
|
||||||
|
const byMobile = matches.find((person) => person.importSource === 'tahesab') ?? matches[0] ?? null;
|
||||||
if (byMobile) {
|
if (byMobile) {
|
||||||
|
const linkedCode = byMobile.accountingLinks[0]?.moshtariCode;
|
||||||
|
preserveExistingLink = linkedCode != null && linkedCode !== dto.moshtariCode;
|
||||||
const nameChanged =
|
const nameChanged =
|
||||||
`${byMobile.firstName} ${byMobile.lastName}`.trim() !==
|
`${byMobile.firstName} ${byMobile.lastName}`.trim() !==
|
||||||
`${firstName} ${lastName}`.trim();
|
`${firstName} ${lastName}`.trim();
|
||||||
@@ -644,8 +670,9 @@ export class TahesabPersonLinkService {
|
|||||||
: {}),
|
: {}),
|
||||||
...carryPreviousSource(byMobile, 'tahesab'),
|
...carryPreviousSource(byMobile, 'tahesab'),
|
||||||
importSource: 'tahesab',
|
importSource: 'tahesab',
|
||||||
sourceRef,
|
sourceRef: preserveExistingLink ? String(linkedCode) : sourceRef,
|
||||||
...(!byMobile.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
...(!byMobile.birthDate && pickBirthDate(row) ? { birthDate: pickBirthDate(row) } : {}),
|
||||||
|
...canonicalMobileUpdate(mobile, byMobile),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
personId = byMobile.id;
|
personId = byMobile.id;
|
||||||
@@ -669,6 +696,32 @@ export class TahesabPersonLinkService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (preserveExistingLink) {
|
||||||
|
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
||||||
|
const existing = await this.prisma.personAccountingLink.findFirst({
|
||||||
|
where: { personId, connectionId: dto.connectionId },
|
||||||
|
include: {
|
||||||
|
connection: { select: { label: true, dbName: true, isDefault: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (!existing) {
|
||||||
|
throw new NotFoundException('لینک تهحساب این مشتری یافت نشد.');
|
||||||
|
}
|
||||||
|
if (!options?.skipJob) {
|
||||||
|
await this.prisma.accountingSyncJob.create({
|
||||||
|
data: {
|
||||||
|
organizationId,
|
||||||
|
connectionId: dto.connectionId,
|
||||||
|
kind: 'import',
|
||||||
|
status: 'success',
|
||||||
|
request: dto as unknown as Prisma.InputJsonValue,
|
||||||
|
result: { personId, linkId: existing.id, keptLink: true } as Prisma.InputJsonValue,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return { personId, link: this.linkDto(existing) };
|
||||||
|
}
|
||||||
|
|
||||||
const link = await this.prisma.personAccountingLink.upsert({
|
const link = await this.prisma.personAccountingLink.upsert({
|
||||||
where: {
|
where: {
|
||||||
personId_connectionId: {
|
personId_connectionId: {
|
||||||
@@ -693,18 +746,169 @@ export class TahesabPersonLinkService {
|
|||||||
});
|
});
|
||||||
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
await this.applyTahesabGroup(organizationId, dto.connectionId, personId, row);
|
||||||
|
|
||||||
|
if (!options?.skipJob) {
|
||||||
|
await this.prisma.accountingSyncJob.create({
|
||||||
|
data: {
|
||||||
|
organizationId,
|
||||||
|
connectionId: dto.connectionId,
|
||||||
|
kind: 'import',
|
||||||
|
status: 'success',
|
||||||
|
request: dto as unknown as Prisma.InputJsonValue,
|
||||||
|
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({
|
await this.prisma.accountingSyncJob.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId,
|
organizationId,
|
||||||
connectionId: dto.connectionId,
|
connectionId,
|
||||||
kind: 'import',
|
kind: 'customer-sync',
|
||||||
status: 'success',
|
status: !imported && !updated && (failed > 0 || errors.length > 0) ? 'error' : 'success',
|
||||||
request: dto as unknown as Prisma.InputJsonValue,
|
result: { imported, updated, failed, pages: page - 1 } as Prisma.InputJsonValue,
|
||||||
result: { personId, linkId: link.id } as Prisma.InputJsonValue,
|
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
this.logger.log(`همگامسازی مشتریان تهحساب ${connectionId}: ${summary}`);
|
||||||
return { personId, link: this.linkDto(link) };
|
return {
|
||||||
|
imported,
|
||||||
|
updated,
|
||||||
|
failed,
|
||||||
|
summary,
|
||||||
|
error: errors.length ? errors.join('؛ ') : null,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
async importBulk(organizationId: string, dto: ImportBulkFromTahesabDto) {
|
async importBulk(organizationId: string, dto: ImportBulkFromTahesabDto) {
|
||||||
|
|||||||
@@ -309,6 +309,20 @@ export class TahesabController {
|
|||||||
dto.connectionId,
|
dto.connectionId,
|
||||||
dto.from,
|
dto.from,
|
||||||
dto.to,
|
dto.to,
|
||||||
|
{ personId: dto.personId, groupIds: dto.groupIds },
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('reports/asnad/customers')
|
||||||
|
searchAsnadCustomers(
|
||||||
|
@CurrentUser() user: { organizationId: string },
|
||||||
|
@Query('connectionId') connectionId?: string,
|
||||||
|
@Query('q') q?: string,
|
||||||
|
) {
|
||||||
|
return this.asnadReport.searchCustomers(
|
||||||
|
user.organizationId,
|
||||||
|
connectionId,
|
||||||
|
q ?? '',
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import { TahesabBalanceService } from './balance.service';
|
|||||||
import { TahesabDocumentsService } from './documents.service';
|
import { TahesabDocumentsService } from './documents.service';
|
||||||
import { TahesabAsnadReportService } from './asnad-report.service';
|
import { TahesabAsnadReportService } from './asnad-report.service';
|
||||||
import { TahesabInvoiceSettingsService } from './invoice-settings.service';
|
import { TahesabInvoiceSettingsService } from './invoice-settings.service';
|
||||||
|
import { TahesabCustomerSyncScheduler } from './customer-sync.scheduler';
|
||||||
import { TahesabController } from './tahesab.controller';
|
import { TahesabController } from './tahesab.controller';
|
||||||
import { CustomerGroupsModule } from '../../customer-groups/customer-groups.module';
|
import { CustomerGroupsModule } from '../../customer-groups/customer-groups.module';
|
||||||
|
|
||||||
@@ -29,6 +30,7 @@ import { CustomerGroupsModule } from '../../customer-groups/customer-groups.modu
|
|||||||
TahesabDocumentsService,
|
TahesabDocumentsService,
|
||||||
TahesabAsnadReportService,
|
TahesabAsnadReportService,
|
||||||
TahesabInvoiceSettingsService,
|
TahesabInvoiceSettingsService,
|
||||||
|
TahesabCustomerSyncScheduler,
|
||||||
],
|
],
|
||||||
exports: [
|
exports: [
|
||||||
TahesabCryptoService,
|
TahesabCryptoService,
|
||||||
|
|||||||
@@ -11,7 +11,7 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { NotificationsService } from '../../notifications/notifications.service';
|
import { NotificationsService } from '../../notifications/notifications.service';
|
||||||
import { normalizePhone } from '../../contacts/normalize';
|
import { iranMobileLookupKeys, normalizePhone } from '../../contacts/normalize';
|
||||||
import { VoipConnectionsService } from './connections.service';
|
import { VoipConnectionsService } from './connections.service';
|
||||||
|
|
||||||
function digitsOnly(value: string | null | undefined): string {
|
function digitsOnly(value: string | null | undefined): string {
|
||||||
@@ -35,6 +35,7 @@ function phoneVariants(raw: string | null | undefined): string[] {
|
|||||||
variants.add(`0${d}`);
|
variants.add(`0${d}`);
|
||||||
variants.add(`98${d}`);
|
variants.add(`98${d}`);
|
||||||
}
|
}
|
||||||
|
for (const key of iranMobileLookupKeys(raw)) variants.add(key);
|
||||||
return [...variants];
|
return [...variants];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,11 @@ import type {
|
|||||||
WooCommerceSyncResultDto,
|
WooCommerceSyncResultDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { PrismaService } from '../../prisma/prisma.service';
|
import { PrismaService } from '../../prisma/prisma.service';
|
||||||
import { normalizeEmail, normalizePhone } from '../../contacts/normalize';
|
import {
|
||||||
|
normalizeEmail,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
|
} from '../../contacts/normalize';
|
||||||
import { WooConnectionsService } from './connections.service';
|
import { WooConnectionsService } from './connections.service';
|
||||||
import type { WooOrder } from './woo-client';
|
import type { WooOrder } from './woo-client';
|
||||||
|
|
||||||
@@ -374,7 +378,8 @@ export class WooSyncService {
|
|||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const billing = order.billing ?? {};
|
const billing = order.billing ?? {};
|
||||||
const email = normalizeEmail(billing.email ?? null);
|
const email = normalizeEmail(billing.email ?? null);
|
||||||
const mobile = normalizePhone(billing.phone ?? null);
|
const mobile = storedPhoneNumber(billing.phone ?? null);
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const firstName = (billing.first_name ?? '').trim() || 'مشتری';
|
const firstName = (billing.first_name ?? '').trim() || 'مشتری';
|
||||||
const lastName = (billing.last_name ?? '').trim() || 'ووکامرس';
|
const lastName = (billing.last_name ?? '').trim() || 'ووکامرس';
|
||||||
|
|
||||||
@@ -387,7 +392,9 @@ export class WooSyncService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
OR: [
|
OR: [
|
||||||
...(email ? [{ email }] : []),
|
...(email ? [{ email }] : []),
|
||||||
...(mobile ? [{ mobile }, { phone: mobile }] : []),
|
...(mobileKeys.length
|
||||||
|
? [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }]
|
||||||
|
: []),
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
|
|||||||
@@ -17,12 +17,16 @@ import { isGenderQuestionLabel, parsePersonGenderAnswer } from '@mento/shared';
|
|||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
import {
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
emptyToNull,
|
emptyToNull,
|
||||||
normalizeEmail,
|
normalizeEmail,
|
||||||
normalizePhone,
|
normalizePhone,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
storedPhoneNumber,
|
||||||
} from '../contacts/normalize';
|
} from '../contacts/normalize';
|
||||||
import { LeadStagesService } from '../leads/lead-stages.service';
|
import { LeadStagesService } from '../leads/lead-stages.service';
|
||||||
|
|
||||||
@@ -84,6 +88,7 @@ export class LeadFormsService {
|
|||||||
constructor(
|
constructor(
|
||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly automations: AutomationsService,
|
private readonly automations: AutomationsService,
|
||||||
private readonly messageAutomations: MessageAutomationsService,
|
private readonly messageAutomations: MessageAutomationsService,
|
||||||
private readonly leadStages: LeadStagesService,
|
private readonly leadStages: LeadStagesService,
|
||||||
@@ -211,7 +216,12 @@ export class LeadFormsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async remove(organizationId: string, id: string): Promise<void> {
|
async remove(organizationId: string, id: string): Promise<void> {
|
||||||
await this.findInOrg(organizationId, id);
|
const row = await this.findInOrg(organizationId, id);
|
||||||
|
if (row.coverStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(row.coverStorageKey);
|
||||||
|
await this.files.remove(row.coverStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.prisma.leadForm.delete({ where: { id } });
|
await this.prisma.leadForm.delete({ where: { id } });
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -451,7 +461,10 @@ export class LeadFormsService {
|
|||||||
? await this.prisma.person.findFirst({
|
? await this.prisma.person.findFirst({
|
||||||
where: {
|
where: {
|
||||||
organizationId: form.organizationId,
|
organizationId: form.organizationId,
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
OR: [
|
||||||
|
{ mobile: { in: phoneIdentityKeys(mobile) } },
|
||||||
|
{ phone: { in: phoneIdentityKeys(mobile) } },
|
||||||
|
],
|
||||||
},
|
},
|
||||||
select: { id: true, firstName: true, lastName: true },
|
select: { id: true, firstName: true, lastName: true },
|
||||||
})
|
})
|
||||||
@@ -634,13 +647,16 @@ export class LeadFormsService {
|
|||||||
ownerId: string,
|
ownerId: string,
|
||||||
): Promise<string> {
|
): Promise<string> {
|
||||||
const email = normalizeEmail(mapped.email);
|
const email = normalizeEmail(mapped.email);
|
||||||
const mobile = normalizePhone(mapped.mobile);
|
const mobile = storedPhoneNumber(mapped.mobile);
|
||||||
const phone = normalizePhone(mapped.phone);
|
const phone = storedPhoneNumber(mapped.phone);
|
||||||
|
|
||||||
const or: Prisma.PersonWhereInput[] = [];
|
const or: Prisma.PersonWhereInput[] = [];
|
||||||
if (email) or.push({ email });
|
if (email) or.push({ email });
|
||||||
if (mobile) or.push({ mobile });
|
|
||||||
|
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
|
if (mobileKeys.length) {
|
||||||
|
or.push({ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } });
|
||||||
|
}
|
||||||
const existing = or.length
|
const existing = or.length
|
||||||
? await this.prisma.person.findFirst({
|
? await this.prisma.person.findFirst({
|
||||||
where: { organizationId, OR: or },
|
where: { organizationId, OR: or },
|
||||||
@@ -835,6 +851,9 @@ export class LeadFormsService {
|
|||||||
throw new BadRequestException('فرمت تصویر کاور باید PNG، JPG یا WEBP باشد');
|
throw new BadRequestException('فرمت تصویر کاور باید PNG، JPG یا WEBP باشد');
|
||||||
}
|
}
|
||||||
const key = `lead-forms/${id}/cover.${ext}`;
|
const key = `lead-forms/${id}/cover.${ext}`;
|
||||||
|
const prevBytes = row.coverStorageKey ? await this.files.sizeOf(row.coverStorageKey) : 0;
|
||||||
|
const delta = file.buffer.length - prevBytes;
|
||||||
|
if (delta > 0) await this.storage.assertCanAdd(organizationId, delta);
|
||||||
await this.files.save(key, file.buffer);
|
await this.files.save(key, file.buffer);
|
||||||
if (row.coverStorageKey && row.coverStorageKey !== key) {
|
if (row.coverStorageKey && row.coverStorageKey !== key) {
|
||||||
await this.files.remove(row.coverStorageKey);
|
await this.files.remove(row.coverStorageKey);
|
||||||
@@ -843,12 +862,17 @@ export class LeadFormsService {
|
|||||||
where: { id },
|
where: { id },
|
||||||
data: { coverStorageKey: key },
|
data: { coverStorageKey: key },
|
||||||
});
|
});
|
||||||
|
if (delta) await this.storage.addLocal(organizationId, delta);
|
||||||
return this.get(organizationId, id);
|
return this.get(organizationId, id);
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeCover(organizationId: string, id: string) {
|
async removeCover(organizationId: string, id: string) {
|
||||||
const row = await this.findInOrg(organizationId, id);
|
const row = await this.findInOrg(organizationId, id);
|
||||||
if (row.coverStorageKey) await this.files.remove(row.coverStorageKey);
|
if (row.coverStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(row.coverStorageKey);
|
||||||
|
await this.files.remove(row.coverStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
|
}
|
||||||
await this.prisma.leadForm.update({
|
await this.prisma.leadForm.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { coverStorageKey: null },
|
data: { coverStorageKey: null },
|
||||||
@@ -1100,13 +1124,12 @@ function slugKey(label: string): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mobileKey(raw: string | null | undefined): string | null {
|
function mobileKey(raw: string | null | undefined): string | null {
|
||||||
|
const canon = canonicalIranMobile(raw);
|
||||||
|
if (canon) return canon;
|
||||||
const n = normalizePhone(raw);
|
const n = normalizePhone(raw);
|
||||||
if (!n) return null;
|
if (!n) return null;
|
||||||
const d = n.replace(/\D/g, '');
|
const d = n.replace(/\D/g, '');
|
||||||
if (!d) return null;
|
return d || null;
|
||||||
if (d.startsWith('98') && d.length >= 12) return `0${d.slice(2)}`;
|
|
||||||
if (d.length === 10 && d.startsWith('9')) return `0${d}`;
|
|
||||||
return d.startsWith('0') ? d : d;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function normalizeDuplicateMode(raw?: string | null): string {
|
function normalizeDuplicateMode(raw?: string | null): string {
|
||||||
|
|||||||
@@ -302,8 +302,6 @@ export class LeadsController {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Post('assign')
|
@Post('assign')
|
||||||
@UseGuards(RolesGuard)
|
|
||||||
@Roles('owner', 'admin')
|
|
||||||
assign(@CurrentUser() user: Actor, @Body() dto: AssignLeadsDto) {
|
assign(@CurrentUser() user: Actor, @Body() dto: AssignLeadsDto) {
|
||||||
return this.leads
|
return this.leads
|
||||||
.assign(user, dto.leadIds, dto.assigneeId)
|
.assign(user, dto.leadIds, dto.assigneeId)
|
||||||
|
|||||||
@@ -31,13 +31,21 @@ import {
|
|||||||
elevated,
|
elevated,
|
||||||
forScope,
|
forScope,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
import {
|
import {
|
||||||
asAddresses,
|
asAddresses,
|
||||||
collectAddresses,
|
collectAddresses,
|
||||||
toJsonAddresses,
|
toJsonAddresses,
|
||||||
} from '../common/custom-fields';
|
} from '../common/custom-fields';
|
||||||
import { emptyToNull, normalizePhone } from '../contacts/normalize';
|
import {
|
||||||
|
canonicalIranMobile,
|
||||||
|
emptyToNull,
|
||||||
|
normalizePhone,
|
||||||
|
phoneIdentityKeys,
|
||||||
|
} from '../contacts/normalize';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { LeadStagesService } from './lead-stages.service';
|
import { LeadStagesService } from './lead-stages.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
@@ -52,13 +60,20 @@ const LOGO_EXT: Record<string, string> = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function mobileKey(raw: string | null | undefined): string | null {
|
function mobileKey(raw: string | null | undefined): string | null {
|
||||||
|
const canon = canonicalIranMobile(raw);
|
||||||
|
if (canon) return canon;
|
||||||
const n = normalizePhone(raw);
|
const n = normalizePhone(raw);
|
||||||
if (!n) return null;
|
if (!n) return null;
|
||||||
const d = n.replace(/\D/g, '');
|
const d = n.replace(/\D/g, '');
|
||||||
if (!d) return null;
|
return d || null;
|
||||||
if (d.startsWith('98') && d.length >= 12) return `0${d.slice(2)}`;
|
}
|
||||||
if (d.length === 10 && d.startsWith('9')) return `0${d}`;
|
|
||||||
return d.startsWith('0') ? d : d;
|
function personWithMobile(organizationId: string, mobile: string): Prisma.PersonWhereInput {
|
||||||
|
const keys = phoneIdentityKeys(mobile);
|
||||||
|
return {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: keys } }, { phone: { in: keys } }],
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function leadAccessWhere(actor: Actor): Prisma.LeadWhereInput {
|
function leadAccessWhere(actor: Actor): Prisma.LeadWhereInput {
|
||||||
@@ -91,6 +106,7 @@ export class LeadsService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly stages: LeadStagesService,
|
private readonly stages: LeadStagesService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
private readonly sms: SmsGatewayService,
|
private readonly sms: SmsGatewayService,
|
||||||
private readonly outboundSms: OutboundSmsLogService,
|
private readonly outboundSms: OutboundSmsLogService,
|
||||||
@@ -319,10 +335,7 @@ export class LeadsService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
const person = await this.prisma.person.findFirst({
|
const person = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(actor.organizationId, mobile),
|
||||||
organizationId: actor.organizationId,
|
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
|
||||||
},
|
|
||||||
select: { id: true, firstName: true, lastName: true },
|
select: { id: true, firstName: true, lastName: true },
|
||||||
});
|
});
|
||||||
if (person) {
|
if (person) {
|
||||||
@@ -377,10 +390,11 @@ export class LeadsService {
|
|||||||
const stageId = dto.stageId || stages[0]?.id;
|
const stageId = dto.stageId || stages[0]?.id;
|
||||||
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
||||||
|
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, actor, 'leads');
|
||||||
let assigneeId: string | null = null;
|
let assigneeId: string | null = null;
|
||||||
if (elevated(actor.role) && dto.assigneeId) {
|
if (allowOthers && dto.assigneeId) {
|
||||||
assigneeId = dto.assigneeId;
|
assigneeId = dto.assigneeId;
|
||||||
} else if (!elevated(actor.role)) {
|
} else if (!allowOthers) {
|
||||||
assigneeId = actor.userId;
|
assigneeId = actor.userId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -568,8 +582,9 @@ export class LeadsService {
|
|||||||
if (typeof dto.stageId === 'string' && dto.stageId !== existing.stageId) {
|
if (typeof dto.stageId === 'string' && dto.stageId !== existing.stageId) {
|
||||||
data.stage = { connect: { id: dto.stageId } };
|
data.stage = { connect: { id: dto.stageId } };
|
||||||
}
|
}
|
||||||
if (elevated(actor.role) && dto.assigneeId !== undefined) {
|
if (dto.assigneeId !== undefined) {
|
||||||
const aid = dto.assigneeId ? String(dto.assigneeId) : null;
|
const aid = dto.assigneeId ? String(dto.assigneeId) : null;
|
||||||
|
await assertAssigneeSet(this.prisma, actor, 'leads', [aid], [existing.assigneeId]);
|
||||||
data.assignee = aid
|
data.assignee = aid
|
||||||
? { connect: { id: aid } }
|
? { connect: { id: aid } }
|
||||||
: { disconnect: true };
|
: { disconnect: true };
|
||||||
@@ -608,24 +623,43 @@ export class LeadsService {
|
|||||||
});
|
});
|
||||||
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
if (!stage) throw new NotFoundException('مرحله پیدا نشد');
|
||||||
|
|
||||||
|
let placedIds: string[] | null = null;
|
||||||
|
let nextPosition = position ?? 0;
|
||||||
|
if (position != null) {
|
||||||
|
const rows = await this.prisma.lead.findMany({
|
||||||
|
where: { organizationId: actor.organizationId, stageId, archivedAt: null },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, id, position);
|
||||||
|
nextPosition = Math.max(0, placedIds.indexOf(id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.lead.update({
|
const row = await this.prisma.lead.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: {
|
data: {
|
||||||
stageId,
|
stageId,
|
||||||
position: position ?? 0,
|
position: nextPosition,
|
||||||
...(stage.isConverted
|
|
||||||
? {}
|
|
||||||
: {}),
|
|
||||||
},
|
},
|
||||||
include: leadInclude,
|
include: leadInclude,
|
||||||
});
|
});
|
||||||
await this.addEvent(
|
if (placedIds) {
|
||||||
actor,
|
await writePositions(
|
||||||
id,
|
(ops) => this.prisma.$transaction(ops),
|
||||||
'stage_changed',
|
placedIds,
|
||||||
`به مرحله «${stage.name}» منتقل شد`,
|
(leadId, leadPosition) =>
|
||||||
);
|
this.prisma.lead.update({ where: { id: leadId }, data: { position: leadPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
if (before.stageId !== stageId) {
|
if (before.stageId !== stageId) {
|
||||||
|
await this.addEvent(
|
||||||
|
actor,
|
||||||
|
id,
|
||||||
|
'stage_changed',
|
||||||
|
`به مرحله «${stage.name}» منتقل شد`,
|
||||||
|
);
|
||||||
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
this.gameEvent(actor, 'LEAD_STAGE_CHANGED', row, {
|
||||||
eventKey: `${id}:${stageId}`,
|
eventKey: `${id}:${stageId}`,
|
||||||
facts: { stageName: stage.name, source: row.source },
|
facts: { stageName: stage.name, source: row.source },
|
||||||
@@ -639,9 +673,7 @@ export class LeadsService {
|
|||||||
leadIds: string[],
|
leadIds: string[],
|
||||||
assigneeId: string,
|
assigneeId: string,
|
||||||
): Promise<number> {
|
): Promise<number> {
|
||||||
if (!elevated(actor.role)) {
|
await assertAssigneeSet(this.prisma, actor, 'leads', [assigneeId]);
|
||||||
throw new BadRequestException('فقط مدیر میتواند تخصیص دهد');
|
|
||||||
}
|
|
||||||
const user = await this.prisma.user.findFirst({
|
const user = await this.prisma.user.findFirst({
|
||||||
where: {
|
where: {
|
||||||
id: assigneeId,
|
id: assigneeId,
|
||||||
@@ -807,14 +839,14 @@ export class LeadsService {
|
|||||||
? `تماس ثبت شد — ${dto.outcome}`
|
? `تماس ثبت شد — ${dto.outcome}`
|
||||||
: 'تماس ثبت شد';
|
: 'تماس ثبت شد';
|
||||||
await this.addEvent(actor, id, 'call', title, dto.body ?? null);
|
await this.addEvent(actor, id, 'call', title, dto.body ?? null);
|
||||||
|
const followAt = this.parseFollowUpAt(dto.nextFollowUpAt);
|
||||||
|
if (followAt) {
|
||||||
|
await this.createLeadFollowUpActivity(actor, before, followAt, dto.body);
|
||||||
|
}
|
||||||
const data: Prisma.LeadUpdateInput = {
|
const data: Prisma.LeadUpdateInput = {
|
||||||
lastContactAt: new Date(),
|
lastContactAt: new Date(),
|
||||||
...(dto.nextFollowUpAt !== undefined
|
...(dto.nextFollowUpAt !== undefined
|
||||||
? {
|
? { nextFollowUpAt: followAt }
|
||||||
nextFollowUpAt: dto.nextFollowUpAt
|
|
||||||
? new Date(dto.nextFollowUpAt)
|
|
||||||
: null,
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
};
|
};
|
||||||
if (dto.stageId) data.stage = { connect: { id: dto.stageId } };
|
if (dto.stageId) data.stage = { connect: { id: dto.stageId } };
|
||||||
@@ -853,8 +885,10 @@ export class LeadsService {
|
|||||||
nextFollowUpAt: string,
|
nextFollowUpAt: string,
|
||||||
body?: string,
|
body?: string,
|
||||||
): Promise<LeadDto> {
|
): Promise<LeadDto> {
|
||||||
await this.findAccessible(actor, id);
|
const lead = await this.findAccessible(actor, id);
|
||||||
const at = new Date(nextFollowUpAt);
|
const at = this.parseFollowUpAt(nextFollowUpAt);
|
||||||
|
if (!at) throw new BadRequestException('زمان پیگیری نامعتبر است');
|
||||||
|
await this.createLeadFollowUpActivity(actor, lead, at, body);
|
||||||
await this.addEvent(
|
await this.addEvent(
|
||||||
actor,
|
actor,
|
||||||
id,
|
id,
|
||||||
@@ -875,6 +909,39 @@ export class LeadsService {
|
|||||||
return this.toDto(row);
|
return this.toDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** پیگیری آینده باید خودش یک فعالیت باز و متصل به لید باشد، نه فقط یک تاریخ. */
|
||||||
|
private parseFollowUpAt(value?: string | null): Date | null {
|
||||||
|
if (!value) return null;
|
||||||
|
const at = new Date(value);
|
||||||
|
if (Number.isNaN(at.getTime())) {
|
||||||
|
throw new BadRequestException('زمان پیگیری نامعتبر است');
|
||||||
|
}
|
||||||
|
return at;
|
||||||
|
}
|
||||||
|
|
||||||
|
private async createLeadFollowUpActivity(
|
||||||
|
actor: Actor,
|
||||||
|
lead: { id: string; title: string; assigneeId: string | null },
|
||||||
|
dueAt: Date,
|
||||||
|
body?: string | null,
|
||||||
|
) {
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, actor, 'activities');
|
||||||
|
const assigneeId = allowOthers && lead.assigneeId ? lead.assigneeId : actor.userId;
|
||||||
|
await this.prisma.activity.create({
|
||||||
|
data: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
type: 'task',
|
||||||
|
title: `پیگیری: ${lead.title}`.slice(0, 200),
|
||||||
|
description: body?.trim() || null,
|
||||||
|
dueAt,
|
||||||
|
leadId: lead.id,
|
||||||
|
assigneeId,
|
||||||
|
assignees: { connect: [{ id: assigneeId }] },
|
||||||
|
createdById: actor.userId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
async archive(actor: Actor, ids: string[]): Promise<number> {
|
async archive(actor: Actor, ids: string[]): Promise<number> {
|
||||||
if (!elevated(actor.role) && ids.length > 1) {
|
if (!elevated(actor.role) && ids.length > 1) {
|
||||||
throw new BadRequestException('حذف گروهی فقط برای مدیر');
|
throw new BadRequestException('حذف گروهی فقط برای مدیر');
|
||||||
@@ -908,10 +975,7 @@ export class LeadsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let person = await this.prisma.person.findFirst({
|
let person = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(actor.organizationId, lead.mobile),
|
||||||
organizationId: actor.organizationId,
|
|
||||||
OR: [{ mobile: lead.mobile }, { phone: lead.mobile }],
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
let createdPerson = false;
|
let createdPerson = false;
|
||||||
|
|
||||||
@@ -938,7 +1002,7 @@ export class LeadsService {
|
|||||||
lastName: named.lastName,
|
lastName: named.lastName,
|
||||||
gender: named.gender,
|
gender: named.gender,
|
||||||
showGenderInName: named.showGenderInName,
|
showGenderInName: named.showGenderInName,
|
||||||
mobile: lead.mobile,
|
mobile: canonicalIranMobile(lead.mobile) ?? lead.mobile,
|
||||||
phone: lead.phone,
|
phone: lead.phone,
|
||||||
instagram: lead.instagram,
|
instagram: lead.instagram,
|
||||||
birthDate: lead.birthDate,
|
birthDate: lead.birthDate,
|
||||||
@@ -1112,6 +1176,95 @@ export class LeadsService {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async createFromExternal(input: {
|
||||||
|
organizationId: string;
|
||||||
|
siteName: string;
|
||||||
|
firstName?: string | null;
|
||||||
|
lastName?: string | null;
|
||||||
|
mobile: string;
|
||||||
|
storeName?: string | null;
|
||||||
|
source?: string | null;
|
||||||
|
}): Promise<{
|
||||||
|
ok: true;
|
||||||
|
created: boolean;
|
||||||
|
duplicate: boolean;
|
||||||
|
leadId: string | null;
|
||||||
|
}> {
|
||||||
|
const mobile = mobileKey(input.mobile);
|
||||||
|
if (!mobile || !/^09\d{9}$/.test(mobile)) {
|
||||||
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
|
}
|
||||||
|
|
||||||
|
const contactName =
|
||||||
|
`${input.firstName?.trim() ?? ''} ${input.lastName?.trim() ?? ''}`.trim() || null;
|
||||||
|
const storeName = input.storeName?.trim() ?? '';
|
||||||
|
const source = emptyToNull(input.source);
|
||||||
|
const title = storeName || contactName || mobile;
|
||||||
|
const siteName = input.siteName.trim() || 'سایت بیرونی';
|
||||||
|
|
||||||
|
const existing = await this.prisma.lead.findFirst({
|
||||||
|
where: { organizationId: input.organizationId, mobile, archivedAt: null },
|
||||||
|
select: { id: true, source: true, contactName: true },
|
||||||
|
});
|
||||||
|
if (existing) {
|
||||||
|
const patch: Prisma.LeadUpdateInput = {};
|
||||||
|
if (!existing.source && source) patch.source = source;
|
||||||
|
if (!existing.contactName && contactName) patch.contactName = contactName;
|
||||||
|
if (Object.keys(patch).length) {
|
||||||
|
await this.prisma.lead.update({ where: { id: existing.id }, data: patch });
|
||||||
|
}
|
||||||
|
await this.prisma.leadEvent.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
leadId: existing.id,
|
||||||
|
type: 'note',
|
||||||
|
title: 'درخواست دوباره از سایت',
|
||||||
|
body: [`سایت: ${siteName}`, source ? `منبع: ${source}` : null]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('\n'),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { ok: true, created: false, duplicate: true, leadId: existing.id };
|
||||||
|
}
|
||||||
|
|
||||||
|
const person = await this.prisma.person.findFirst({
|
||||||
|
where: personWithMobile(input.organizationId, mobile),
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (person) {
|
||||||
|
return { ok: true, created: false, duplicate: true, leadId: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
await this.stages.ensureDefaults(input.organizationId);
|
||||||
|
const stages = await this.stages.list(input.organizationId);
|
||||||
|
const stageId = stages[0]?.id;
|
||||||
|
if (!stageId) throw new BadRequestException('مرحلهای تعریف نشده');
|
||||||
|
|
||||||
|
const lead = await this.prisma.lead.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
title,
|
||||||
|
contactName,
|
||||||
|
mobile,
|
||||||
|
source,
|
||||||
|
notes: `ثبت از سایت: ${siteName}`,
|
||||||
|
stageId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
await this.prisma.leadEvent.create({
|
||||||
|
data: {
|
||||||
|
organizationId: input.organizationId,
|
||||||
|
leadId: lead.id,
|
||||||
|
type: 'created',
|
||||||
|
title: 'لید از سایت ثبت شد',
|
||||||
|
body: [`سایت: ${siteName}`, source ? `منبع: ${source}` : null]
|
||||||
|
.filter(Boolean)
|
||||||
|
.join('\n'),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return { ok: true, created: true, duplicate: false, leadId: lead.id };
|
||||||
|
}
|
||||||
|
|
||||||
async createFromImportRow(
|
async createFromImportRow(
|
||||||
organizationId: string,
|
organizationId: string,
|
||||||
createdById: string | null,
|
createdById: string | null,
|
||||||
@@ -1154,10 +1307,7 @@ export class LeadsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const existingPerson = await this.prisma.person.findFirst({
|
const existingPerson = await this.prisma.person.findFirst({
|
||||||
where: {
|
where: personWithMobile(organizationId, mobile),
|
||||||
organizationId,
|
|
||||||
OR: [{ mobile }, { phone: mobile }],
|
|
||||||
},
|
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (existingPerson) {
|
if (existingPerson) {
|
||||||
@@ -1308,6 +1458,9 @@ export class LeadsService {
|
|||||||
const storageKey = path
|
const storageKey = path
|
||||||
.join(actor.organizationId, 'leads', id, `logo.${ext}`)
|
.join(actor.organizationId, 'leads', id, `logo.${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
const prevBytes = prevKey ? await this.files.sizeOf(prevKey) : 0;
|
||||||
|
const delta = file.size - prevBytes;
|
||||||
|
if (delta > 0) await this.storage.assertCanAdd(actor.organizationId, delta);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
if (prevKey && prevKey !== storageKey) {
|
if (prevKey && prevKey !== storageKey) {
|
||||||
await this.files.remove(prevKey);
|
await this.files.remove(prevKey);
|
||||||
@@ -1318,13 +1471,16 @@ export class LeadsService {
|
|||||||
include: leadInclude,
|
include: leadInclude,
|
||||||
});
|
});
|
||||||
await this.addEvent(actor, id, 'note', 'لوگو بهروز شد', null);
|
await this.addEvent(actor, id, 'note', 'لوگو بهروز شد', null);
|
||||||
|
if (delta) await this.storage.addLocal(actor.organizationId, delta);
|
||||||
return this.toDto(row);
|
return this.toDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
async removeLogo(actor: Actor, id: string): Promise<LeadDto> {
|
async removeLogo(actor: Actor, id: string): Promise<LeadDto> {
|
||||||
const existing = await this.findAccessible(actor, id);
|
const existing = await this.findAccessible(actor, id);
|
||||||
if (existing.logoStorageKey) {
|
if (existing.logoStorageKey) {
|
||||||
|
const bytes = await this.files.sizeOf(existing.logoStorageKey);
|
||||||
await this.files.remove(existing.logoStorageKey);
|
await this.files.remove(existing.logoStorageKey);
|
||||||
|
if (bytes) await this.storage.addLocal(actor.organizationId, -bytes);
|
||||||
}
|
}
|
||||||
const row = await this.prisma.lead.update({
|
const row = await this.prisma.lead.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import * as path from 'path';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
||||||
import {
|
import {
|
||||||
@@ -114,6 +115,7 @@ export class NotesService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
private readonly game: GamificationService,
|
private readonly game: GamificationService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list(
|
async list(
|
||||||
@@ -444,10 +446,12 @@ export class NotesService {
|
|||||||
): Promise<void> {
|
): Promise<void> {
|
||||||
const note = await this.prisma.note.findFirst({
|
const note = await this.prisma.note.findFirst({
|
||||||
where: { id, organizationId, ...noteAccessWhere(actor) },
|
where: { id, organizationId, ...noteAccessWhere(actor) },
|
||||||
include: { attachments: { select: { storageKey: true } } },
|
include: { attachments: { select: { storageKey: true, sizeBytes: true } } },
|
||||||
});
|
});
|
||||||
if (!note) throw new NotFoundException('یادداشت پیدا نشد');
|
if (!note) throw new NotFoundException('یادداشت پیدا نشد');
|
||||||
|
|
||||||
|
const bytes = note.attachments.reduce((sum, file) => sum + file.sizeBytes, 0);
|
||||||
|
if (bytes) await this.storage.addLocal(organizationId, -bytes);
|
||||||
for (const att of note.attachments) {
|
for (const att of note.attachments) {
|
||||||
await this.files.remove(att.storageKey);
|
await this.files.remove(att.storageKey);
|
||||||
}
|
}
|
||||||
@@ -491,6 +495,7 @@ export class NotesService {
|
|||||||
.join(organizationId, 'notes', noteId, `${attachmentId}${ext}`)
|
.join(organizationId, 'notes', noteId, `${attachmentId}${ext}`)
|
||||||
.replace(/\\/g, '/');
|
.replace(/\\/g, '/');
|
||||||
|
|
||||||
|
await this.storage.assertCanAdd(organizationId, file.size);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -506,6 +511,7 @@ export class NotesService {
|
|||||||
uploadedById: userId,
|
uploadedById: userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
await this.storage.addLocal(organizationId, file.size);
|
||||||
return this.toAttachmentDto(row);
|
return this.toAttachmentDto(row);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
await this.files.remove(storageKey);
|
await this.files.remove(storageKey);
|
||||||
@@ -526,6 +532,7 @@ export class NotesService {
|
|||||||
if (!row) throw new NotFoundException('پیوست پیدا نشد');
|
if (!row) throw new NotFoundException('پیوست پیدا نشد');
|
||||||
await this.files.remove(row.storageKey);
|
await this.files.remove(row.storageKey);
|
||||||
await this.prisma.noteAttachment.delete({ where: { id: row.id } });
|
await this.prisma.noteAttachment.delete({ where: { id: row.id } });
|
||||||
|
await this.storage.addLocal(organizationId, -row.sizeBytes);
|
||||||
}
|
}
|
||||||
|
|
||||||
async openAttachmentDownload(
|
async openAttachmentDownload(
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Type } from 'class-transformer';
|
|||||||
import {
|
import {
|
||||||
ArrayUnique,
|
ArrayUnique,
|
||||||
IsArray,
|
IsArray,
|
||||||
|
IsBoolean,
|
||||||
IsIn,
|
IsIn,
|
||||||
IsObject,
|
IsObject,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
@@ -45,6 +46,16 @@ export class CreateOrgRoleDto {
|
|||||||
@ValidateIf((_, v) => v !== null)
|
@ValidateIf((_, v) => v !== null)
|
||||||
@IsString()
|
@IsString()
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayUnique()
|
||||||
|
@IsString({ each: true })
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class UpdateOrgRoleDto {
|
export class UpdateOrgRoleDto {
|
||||||
@@ -77,6 +88,16 @@ export class UpdateOrgRoleDto {
|
|||||||
@ValidateIf((_, v) => v !== null)
|
@ValidateIf((_, v) => v !== null)
|
||||||
@IsString()
|
@IsString()
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsArray()
|
||||||
|
@ArrayUnique()
|
||||||
|
@IsString({ each: true })
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsBoolean()
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
}
|
}
|
||||||
|
|
||||||
export class RolePermissionPatchItemDto {
|
export class RolePermissionPatchItemDto {
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ type RoleRow = {
|
|||||||
color: string;
|
color: string;
|
||||||
permissions: string[];
|
permissions: string[];
|
||||||
dataAccessPolicy?: unknown;
|
dataAccessPolicy?: unknown;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
systemKey: string | null;
|
systemKey: string | null;
|
||||||
parentId: string | null;
|
parentId: string | null;
|
||||||
createdAt: Date;
|
createdAt: Date;
|
||||||
@@ -79,6 +81,8 @@ export class OrgRolesService {
|
|||||||
permissions?: RolePermissionKey[];
|
permissions?: RolePermissionKey[];
|
||||||
dataAccessPolicy?: DataAccessPolicy;
|
dataAccessPolicy?: DataAccessPolicy;
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
},
|
},
|
||||||
): Promise<OrgRoleDto> {
|
): Promise<OrgRoleDto> {
|
||||||
this.assertManager(actorRole);
|
this.assertManager(actorRole);
|
||||||
@@ -108,6 +112,8 @@ export class OrgRolesService {
|
|||||||
description: (dto.description ?? '').trim(),
|
description: (dto.description ?? '').trim(),
|
||||||
color: dto.color ?? parent?.color ?? 'teal',
|
color: dto.color ?? parent?.color ?? 'teal',
|
||||||
permissions,
|
permissions,
|
||||||
|
treasuryAccountIds: dto.treasuryAccountIds ?? [],
|
||||||
|
treasuryOwnAccounts: dto.treasuryOwnAccounts ?? false,
|
||||||
parentId,
|
parentId,
|
||||||
...(dto.dataAccessPolicy
|
...(dto.dataAccessPolicy
|
||||||
? { dataAccessPolicy: parseDataAccessPolicy(dto.dataAccessPolicy) }
|
? { dataAccessPolicy: parseDataAccessPolicy(dto.dataAccessPolicy) }
|
||||||
@@ -135,6 +141,8 @@ export class OrgRolesService {
|
|||||||
permissions?: RolePermissionKey[];
|
permissions?: RolePermissionKey[];
|
||||||
dataAccessPolicy?: DataAccessPolicy;
|
dataAccessPolicy?: DataAccessPolicy;
|
||||||
parentId?: string | null;
|
parentId?: string | null;
|
||||||
|
treasuryAccountIds?: string[];
|
||||||
|
treasuryOwnAccounts?: boolean;
|
||||||
},
|
},
|
||||||
): Promise<OrgRoleDto> {
|
): Promise<OrgRoleDto> {
|
||||||
this.assertManager(actorRole);
|
this.assertManager(actorRole);
|
||||||
@@ -159,6 +167,12 @@ export class OrgRolesService {
|
|||||||
if (dto.dataAccessPolicy !== undefined) {
|
if (dto.dataAccessPolicy !== undefined) {
|
||||||
data.dataAccessPolicy = parseDataAccessPolicy(dto.dataAccessPolicy);
|
data.dataAccessPolicy = parseDataAccessPolicy(dto.dataAccessPolicy);
|
||||||
}
|
}
|
||||||
|
if (dto.treasuryAccountIds !== undefined) {
|
||||||
|
data.treasuryAccountIds = [...new Set(dto.treasuryAccountIds.map((id) => id.trim()).filter(Boolean))];
|
||||||
|
}
|
||||||
|
if (dto.treasuryOwnAccounts !== undefined) {
|
||||||
|
data.treasuryOwnAccounts = dto.treasuryOwnAccounts;
|
||||||
|
}
|
||||||
|
|
||||||
if (dto.parentId !== undefined) {
|
if (dto.parentId !== undefined) {
|
||||||
const nextParentId =
|
const nextParentId =
|
||||||
@@ -426,6 +440,8 @@ export class OrgRolesService {
|
|||||||
color: row.color,
|
color: row.color,
|
||||||
permissions: sanitizePermissions(row.permissions),
|
permissions: sanitizePermissions(row.permissions),
|
||||||
dataAccessPolicy: parseDataAccessPolicy(row.dataAccessPolicy),
|
dataAccessPolicy: parseDataAccessPolicy(row.dataAccessPolicy),
|
||||||
|
treasuryAccountIds: row.treasuryAccountIds ?? [],
|
||||||
|
treasuryOwnAccounts: row.treasuryOwnAccounts ?? false,
|
||||||
systemKey,
|
systemKey,
|
||||||
parentId: row.parentId,
|
parentId: row.parentId,
|
||||||
parentName: row.parentId ? (nameById.get(row.parentId) ?? null) : null,
|
parentName: row.parentId ? (nameById.get(row.parentId) ?? null) : null,
|
||||||
|
|||||||
@@ -41,7 +41,9 @@ export const SYSTEM_ROLE_SEEDS: Array<{
|
|||||||
name: 'کارشناس فروش',
|
name: 'کارشناس فروش',
|
||||||
description: 'امکان دسترسی به بخشهای فروش و مشتریان برای انجام فعالیتهای روزمره.',
|
description: 'امکان دسترسی به بخشهای فروش و مشتریان برای انجام فعالیتهای روزمره.',
|
||||||
color: 'teal',
|
color: 'teal',
|
||||||
permissions: ALL_ROLE_PERMISSIONS.filter((key) => key !== 'audit'),
|
permissions: ALL_ROLE_PERMISSIONS.filter(
|
||||||
|
(key) => key !== 'audit' && !key.startsWith('assign_'),
|
||||||
|
),
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
systemKey: 'support',
|
systemKey: 'support',
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ import type { Actor } from '../common/record-scope';
|
|||||||
import { dealAccessWhere, resolveOwnerId } from '../common/record-scope';
|
import { dealAccessWhere, resolveOwnerId } from '../common/record-scope';
|
||||||
import { dealPriorWhere } from '../common/prior-archive';
|
import { dealPriorWhere } from '../common/prior-archive';
|
||||||
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
import { asCustomFields, toJsonCustomFields } from '../common/custom-fields';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatJalaliDate,
|
formatJalaliDate,
|
||||||
@@ -708,9 +708,9 @@ export class DealsExcelService {
|
|||||||
): Promise<string | null> {
|
): Promise<string | null> {
|
||||||
const orgId = actor.organizationId;
|
const orgId = actor.organizationId;
|
||||||
const code = cleanCode(row.personCode);
|
const code = cleanCode(row.personCode);
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobile = storedPhoneNumber(row.personMobile);
|
||||||
const mobileCore = mobile ? mobile.replace(/^\+98|^98|^0/, '') : '';
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const validMobile = mobileCore.length >= 8 ? mobile : null;
|
const validMobile = (mobile ?? '').replace(/\D/g, '').length >= 8 ? mobile : null;
|
||||||
const first = (row.personFirstName ?? '').trim();
|
const first = (row.personFirstName ?? '').trim();
|
||||||
const last = (row.personName ?? '').trim();
|
const last = (row.personName ?? '').trim();
|
||||||
const fullName = [first, last].filter(Boolean).join(' ');
|
const fullName = [first, last].filter(Boolean).join(' ');
|
||||||
@@ -731,7 +731,10 @@ export class DealsExcelService {
|
|||||||
}
|
}
|
||||||
if (!found && validMobile) {
|
if (!found && validMobile) {
|
||||||
found = await this.prisma.person.findFirst({
|
found = await this.prisma.person.findFirst({
|
||||||
where: { organizationId: orgId, mobile: { contains: mobileCore } },
|
where: {
|
||||||
|
organizationId: orgId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,11 +22,12 @@ import { WebhooksService } from '../public-api/webhooks.service';
|
|||||||
import { GamificationService } from '../gamification/gamification.service';
|
import { GamificationService } from '../gamification/gamification.service';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
|
import { placeId, sameIds, writePositions } from '../common/column-order';
|
||||||
|
|
||||||
const dealInclude = {
|
const dealInclude = {
|
||||||
person: { select: { id: true, firstName: true, lastName: true } },
|
person: { select: { id: true, firstName: true, lastName: true } },
|
||||||
@@ -106,6 +107,10 @@ export class DealsService {
|
|||||||
organizationId,
|
organizationId,
|
||||||
dto.assigneeIds,
|
dto.assigneeIds,
|
||||||
);
|
);
|
||||||
|
const assignActor = { userId: actor.userId, role: actor.role, organizationId };
|
||||||
|
const allowOthers = await actorCanAssignToOthers(this.prisma, assignActor, 'sales');
|
||||||
|
const ownerId = resolveOwnerId(actor, dto.ownerId, allowOthers);
|
||||||
|
await assertAssigneeSet(this.prisma, assignActor, 'sales', [ownerId, ...assigneeIds]);
|
||||||
|
|
||||||
const maxPos = await this.prisma.deal.aggregate({
|
const maxPos = await this.prisma.deal.aggregate({
|
||||||
where: { organizationId, stageId: stage.id },
|
where: { organizationId, stageId: stage.id },
|
||||||
@@ -156,7 +161,7 @@ export class DealsService {
|
|||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
personId: emptyToNull(dto.personId ?? null),
|
personId: emptyToNull(dto.personId ?? null),
|
||||||
companyId: emptyToNull(dto.companyId ?? null),
|
companyId: emptyToNull(dto.companyId ?? null),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId,
|
||||||
position: (maxPos._max.position ?? -1) + 1,
|
position: (maxPos._max.position ?? -1) + 1,
|
||||||
...(assigneeIds.length
|
...(assigneeIds.length
|
||||||
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
||||||
@@ -259,17 +264,38 @@ export class DealsService {
|
|||||||
}
|
}
|
||||||
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
if ('personId' in dto) data.personId = emptyToNull(dto.personId ?? null);
|
||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if (dto.ownerId !== undefined && canReassignOwner(actor.role)) {
|
|
||||||
data.ownerId = resolveOwnerId(actor, dto.ownerId);
|
|
||||||
}
|
|
||||||
|
|
||||||
let assigneeConnect: { id: string }[] | undefined;
|
let assigneeConnect: { id: string }[] | undefined;
|
||||||
if (dto.assigneeIds !== undefined) {
|
if (dto.ownerId !== undefined || dto.assigneeIds !== undefined) {
|
||||||
const assigneeIds = await this.normalizeAssigneeIds(
|
const current = await this.prisma.deal.findFirst({
|
||||||
organizationId,
|
where: { id, organizationId },
|
||||||
dto.assigneeIds,
|
select: { ownerId: true, assignees: { select: { id: true } } },
|
||||||
);
|
});
|
||||||
assigneeConnect = assigneeIds.map((uid) => ({ id: uid }));
|
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) {
|
if (pricedFromLines && dto.lineItems) {
|
||||||
@@ -354,7 +380,8 @@ export class DealsService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
const status = stage.isWon ? 'won' : stage.isLost ? 'lost' : 'open';
|
||||||
const position =
|
let placedIds: string[] | null = null;
|
||||||
|
let position =
|
||||||
dto.position ??
|
dto.position ??
|
||||||
((
|
((
|
||||||
await this.prisma.deal.aggregate({
|
await this.prisma.deal.aggregate({
|
||||||
@@ -362,6 +389,17 @@ export class DealsService {
|
|||||||
_max: { position: true },
|
_max: { position: true },
|
||||||
})
|
})
|
||||||
)._max.position ?? -1) + 1;
|
)._max.position ?? -1) + 1;
|
||||||
|
if (dto.position != null) {
|
||||||
|
const rows = await this.prisma.deal.findMany({
|
||||||
|
where: { organizationId, stageId: stage.id },
|
||||||
|
select: { id: true },
|
||||||
|
orderBy: [{ position: 'asc' }, { updatedAt: 'desc' }],
|
||||||
|
});
|
||||||
|
const currentIds = rows.map((row) => row.id);
|
||||||
|
placedIds = placeId(currentIds, deal.id, dto.position);
|
||||||
|
position = Math.max(0, placedIds.indexOf(deal.id));
|
||||||
|
if (sameIds(currentIds, placedIds)) placedIds = null;
|
||||||
|
}
|
||||||
|
|
||||||
const row = await this.prisma.deal.update({
|
const row = await this.prisma.deal.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
@@ -377,6 +415,15 @@ export class DealsService {
|
|||||||
include: dealInclude,
|
include: dealInclude,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
if (placedIds) {
|
||||||
|
await writePositions(
|
||||||
|
(ops) => this.prisma.$transaction(ops),
|
||||||
|
placedIds,
|
||||||
|
(dealId, nextPosition) =>
|
||||||
|
this.prisma.deal.update({ where: { id: dealId }, data: { position: nextPosition } }),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (deal.ownerId && deal.stageId !== stage.id) {
|
if (deal.ownerId && deal.stageId !== stage.id) {
|
||||||
await this.notifications.create({
|
await this.notifications.create({
|
||||||
organizationId,
|
organizationId,
|
||||||
|
|||||||
@@ -4,8 +4,10 @@ import {
|
|||||||
IsEmail,
|
IsEmail,
|
||||||
IsIn,
|
IsIn,
|
||||||
IsInt,
|
IsInt,
|
||||||
|
IsNumber,
|
||||||
IsOptional,
|
IsOptional,
|
||||||
IsString,
|
IsString,
|
||||||
|
Max,
|
||||||
MaxLength,
|
MaxLength,
|
||||||
Min,
|
Min,
|
||||||
MinLength,
|
MinLength,
|
||||||
@@ -52,6 +54,31 @@ export class ResetPlatformAdminPasswordDto {
|
|||||||
password!: string;
|
password!: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class UpdatePlatformAdminDto {
|
||||||
|
@IsString()
|
||||||
|
@MinLength(2)
|
||||||
|
@MaxLength(120)
|
||||||
|
fullName!: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(40)
|
||||||
|
mobile!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@ValidateIf((_, value) => value !== null && value !== '')
|
||||||
|
@IsEmail()
|
||||||
|
email?: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SetMasterPasswordDto {
|
||||||
|
@ValidateIf((_, value) => value !== null)
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(120)
|
||||||
|
password!: string | null;
|
||||||
|
}
|
||||||
|
|
||||||
export class UpdatePlatformStatusDto {
|
export class UpdatePlatformStatusDto {
|
||||||
@IsBoolean()
|
@IsBoolean()
|
||||||
isActive!: boolean;
|
isActive!: boolean;
|
||||||
@@ -146,6 +173,22 @@ export class ApplyBillingPlanDto {
|
|||||||
status?: 'active' | 'expired' | 'suspended';
|
status?: 'active' | 'expired' | 'suspended';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SetUserCapDto {
|
||||||
|
@IsInt()
|
||||||
|
@Min(1)
|
||||||
|
@Max(100_000)
|
||||||
|
maxUsers!: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SetStorageQuotaDto {
|
||||||
|
/** گیگابایت؛ null = بدون سقف */
|
||||||
|
@IsNumber()
|
||||||
|
@Min(0)
|
||||||
|
@Max(100_000)
|
||||||
|
@ValidateIf((_, value) => value !== null)
|
||||||
|
quotaGb!: number | null;
|
||||||
|
}
|
||||||
|
|
||||||
export class UpdateOrgModulesDto {
|
export class UpdateOrgModulesDto {
|
||||||
@IsArray()
|
@IsArray()
|
||||||
@IsString({ each: true })
|
@IsString({ each: true })
|
||||||
|
|||||||
@@ -1,19 +1,25 @@
|
|||||||
import {
|
import {
|
||||||
Body,
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
|
Delete,
|
||||||
Get,
|
Get,
|
||||||
Param,
|
Param,
|
||||||
Patch,
|
Patch,
|
||||||
Post,
|
Post,
|
||||||
|
Put,
|
||||||
Query,
|
Query,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { CurrentUser } from '../auth/current-user.decorator';
|
import { CurrentUser } from '../auth/current-user.decorator';
|
||||||
import {
|
import {
|
||||||
ApplyBillingPlanDto,
|
ApplyBillingPlanDto,
|
||||||
|
SetStorageQuotaDto,
|
||||||
|
SetUserCapDto,
|
||||||
CreatePlatformAdminDto,
|
CreatePlatformAdminDto,
|
||||||
CreatePlatformOrganizationDto,
|
CreatePlatformOrganizationDto,
|
||||||
ResetPlatformAdminPasswordDto,
|
ResetPlatformAdminPasswordDto,
|
||||||
|
SetMasterPasswordDto,
|
||||||
|
UpdatePlatformAdminDto,
|
||||||
ResetPlatformUserPasswordDto,
|
ResetPlatformUserPasswordDto,
|
||||||
UpdateOrgModulesDto,
|
UpdateOrgModulesDto,
|
||||||
UpdatePlatformMembershipRoleDto,
|
UpdatePlatformMembershipRoleDto,
|
||||||
@@ -71,6 +77,26 @@ export class PlatformController {
|
|||||||
return this.platform.resetAdminPassword(id, dto);
|
return this.platform.resetAdminPassword(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('admins/:id/profile')
|
||||||
|
updateAdmin(@Param('id') id: string, @Body() dto: UpdatePlatformAdminDto) {
|
||||||
|
return this.platform.updateAdmin(id, dto);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete('admins/:id')
|
||||||
|
deleteAdmin(@Param('id') id: string, @CurrentUser() actor: PlatformActor) {
|
||||||
|
return this.platform.deleteAdmin(id, actor.platformAdminId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('master-password')
|
||||||
|
masterPasswordStatus() {
|
||||||
|
return this.platform.masterPasswordStatus();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Put('master-password')
|
||||||
|
setMasterPassword(@Body() dto: SetMasterPasswordDto) {
|
||||||
|
return this.platform.setMasterPassword(dto.password);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('organizations')
|
@Get('organizations')
|
||||||
listOrganizations(@Query('q') q?: string) {
|
listOrganizations(@Query('q') q?: string) {
|
||||||
return this.platform.listOrganizations(q);
|
return this.platform.listOrganizations(q);
|
||||||
@@ -122,6 +148,26 @@ export class PlatformController {
|
|||||||
return this.platform.applyBillingPlan(id, dto);
|
return this.platform.applyBillingPlan(id, dto);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('users/:id/storage')
|
||||||
|
storageUsage(@Param('id') id: string, @Query('refresh') refresh?: string) {
|
||||||
|
return this.platform.storageUsage(id, refresh === '1' || refresh === 'true');
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch('users/:id/billing/storage')
|
||||||
|
setStorageQuota(@Param('id') id: string, @Body() dto: SetStorageQuotaDto) {
|
||||||
|
return this.platform.setStorageQuota(id, dto.quotaGb);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('users/:id/seats')
|
||||||
|
seatUsage(@Param('id') id: string) {
|
||||||
|
return this.platform.seatUsage(id);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Patch('users/:id/billing/users')
|
||||||
|
setUserCap(@Param('id') id: string, @Body() dto: SetUserCapDto) {
|
||||||
|
return this.platform.setUserCap(id, dto.maxUsers);
|
||||||
|
}
|
||||||
|
|
||||||
@Patch('organizations/:id/modules')
|
@Patch('organizations/:id/modules')
|
||||||
updateOrganizationModules(
|
updateOrganizationModules(
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import { MembershipsService } from '../memberships/memberships.service';
|
|||||||
import { OrgRolesService } from '../org-roles/org-roles.service';
|
import { OrgRolesService } from '../org-roles/org-roles.service';
|
||||||
import { PipelinesService } from '../pipelines/pipelines.service';
|
import { PipelinesService } from '../pipelines/pipelines.service';
|
||||||
import { BillingService, toSummary } from '../billing/billing.service';
|
import { BillingService, toSummary } from '../billing/billing.service';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
import { PlatformAdminAlertService } from '../billing/platform-admin-alert.service';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
@@ -51,6 +52,7 @@ export class PlatformService {
|
|||||||
private readonly orgRoles: OrgRolesService,
|
private readonly orgRoles: OrgRolesService,
|
||||||
private readonly pipelines: PipelinesService,
|
private readonly pipelines: PipelinesService,
|
||||||
private readonly billing: BillingService,
|
private readonly billing: BillingService,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
private readonly adminAlerts: PlatformAdminAlertService,
|
private readonly adminAlerts: PlatformAdminAlertService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
@@ -109,15 +111,23 @@ export class PlatformService {
|
|||||||
where: { role: 'owner', isActive: true },
|
where: { role: 'owner', isActive: true },
|
||||||
orderBy: { createdAt: 'asc' },
|
orderBy: { createdAt: 'asc' },
|
||||||
take: 1,
|
take: 1,
|
||||||
select: { user: { select: { billingAccount: true } } },
|
select: {
|
||||||
|
userId: true,
|
||||||
|
user: { select: { fullName: true, billingAccount: true } },
|
||||||
|
},
|
||||||
},
|
},
|
||||||
|
conversationSettings: { select: { organizationId: true } },
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
return rows.map((row) => {
|
return rows.map((row) => {
|
||||||
const account = row.memberships[0]?.user.billingAccount;
|
const owner = row.memberships[0];
|
||||||
|
const account = owner?.user.billingAccount;
|
||||||
return {
|
return {
|
||||||
...this.orgToDto(row),
|
...this.orgToDto(row),
|
||||||
subscription: account ? toSummary(account) : null,
|
subscription: account ? toSummary(account) : null,
|
||||||
|
ownerUserId: owner?.userId ?? null,
|
||||||
|
ownerName: owner?.user.fullName ?? null,
|
||||||
|
chatConfigured: Boolean(row.conversationSettings),
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -408,6 +418,50 @@ export class PlatformService {
|
|||||||
return this.userToDto(row);
|
return this.userToDto(row);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async storageUsage(userId: string, refresh = false) {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, role: 'owner', isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!owner) {
|
||||||
|
throw new BadRequestException('حجم فایل فقط برای مالک محیط معنی دارد');
|
||||||
|
}
|
||||||
|
const account = await this.billing.getByOwnerUserId(userId);
|
||||||
|
if (!account) {
|
||||||
|
throw new BadRequestException('اول برای این مالک یک پلن اعمال کنید');
|
||||||
|
}
|
||||||
|
return this.storage.usageForOwner(userId, refresh);
|
||||||
|
}
|
||||||
|
|
||||||
|
async seatUsage(userId: string) {
|
||||||
|
await this.requireBillingOwner(userId);
|
||||||
|
return this.billing.seatUsage(userId);
|
||||||
|
}
|
||||||
|
|
||||||
|
async setUserCap(userId: string, maxUsers: number) {
|
||||||
|
await this.requireBillingOwner(userId);
|
||||||
|
return this.billing.setMaxUsers(userId, maxUsers);
|
||||||
|
}
|
||||||
|
|
||||||
|
private async requireBillingOwner(userId: string) {
|
||||||
|
const owner = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId, role: 'owner', isActive: true },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!owner) {
|
||||||
|
throw new BadRequestException('سقف کاربر فقط برای مالک محیط معنی دارد');
|
||||||
|
}
|
||||||
|
const account = await this.billing.getByOwnerUserId(userId);
|
||||||
|
if (!account) {
|
||||||
|
throw new BadRequestException('اول برای این مالک یک پلن اعمال کنید');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async setStorageQuota(userId: string, quotaGb: number | null) {
|
||||||
|
await this.storageUsage(userId, false);
|
||||||
|
return this.storage.setQuotaGb(userId, quotaGb);
|
||||||
|
}
|
||||||
|
|
||||||
async applyBillingPlan(userId: string, dto: ApplyBillingPlanDto) {
|
async applyBillingPlan(userId: string, dto: ApplyBillingPlanDto) {
|
||||||
const existing = await this.prisma.user.findUnique({
|
const existing = await this.prisma.user.findUnique({
|
||||||
where: { id: userId },
|
where: { id: userId },
|
||||||
@@ -473,9 +527,13 @@ export class PlatformService {
|
|||||||
userId: true,
|
userId: true,
|
||||||
organizationId: true,
|
organizationId: true,
|
||||||
role: true,
|
role: true,
|
||||||
|
isActive: true,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('عضویت پیدا نشد');
|
if (!row) throw new NotFoundException('عضویت پیدا نشد');
|
||||||
|
if (isActive && !row.isActive) {
|
||||||
|
await this.billing.assertSeatAvailable(row.organizationId, row.userId);
|
||||||
|
}
|
||||||
if (!isActive && row.role === 'owner') {
|
if (!isActive && row.role === 'owner') {
|
||||||
const activeOwners = await this.memberships.countActiveOwners(
|
const activeOwners = await this.memberships.countActiveOwners(
|
||||||
row.organizationId,
|
row.organizationId,
|
||||||
@@ -648,6 +706,104 @@ export class PlatformService {
|
|||||||
return { ok: true };
|
return { ok: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async updateAdmin(
|
||||||
|
id: string,
|
||||||
|
dto: { fullName: string; mobile: string; email?: string | null },
|
||||||
|
): Promise<PlatformAdminDto> {
|
||||||
|
const existing = await this.prisma.platformAdmin.findUnique({
|
||||||
|
where: { id },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!existing) throw new NotFoundException('ادمین پیدا نشد');
|
||||||
|
const fullName = dto.fullName.trim();
|
||||||
|
if (fullName.length < 2) {
|
||||||
|
throw new BadRequestException('نام معتبر نیست');
|
||||||
|
}
|
||||||
|
const mobile = normalizeMobile(dto.mobile);
|
||||||
|
if (!mobile) {
|
||||||
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
|
}
|
||||||
|
const email = dto.email?.trim().toLowerCase() || null;
|
||||||
|
const mobileTaken = await this.prisma.platformAdmin.findFirst({
|
||||||
|
where: { mobile, id: { not: id } },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (mobileTaken) {
|
||||||
|
throw new ConflictException('این شماره موبایل قبلاً ثبت شده است');
|
||||||
|
}
|
||||||
|
if (email) {
|
||||||
|
const emailTaken = await this.prisma.platformAdmin.findFirst({
|
||||||
|
where: { email, id: { not: id } },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (emailTaken) {
|
||||||
|
throw new ConflictException('این ایمیل قبلاً ثبت شده است');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const updated = await this.prisma.platformAdmin.update({
|
||||||
|
where: { id },
|
||||||
|
data: { fullName, mobile, email },
|
||||||
|
});
|
||||||
|
return this.adminToDto(updated);
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new ConflictException('موبایل یا ایمیل تکراری است');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteAdmin(id: string, actorId: string): Promise<{ ok: true }> {
|
||||||
|
const existing = await this.prisma.platformAdmin.findUnique({
|
||||||
|
where: { id },
|
||||||
|
select: { id: true },
|
||||||
|
});
|
||||||
|
if (!existing) throw new NotFoundException('ادمین پیدا نشد');
|
||||||
|
if (id === actorId) {
|
||||||
|
throw new BadRequestException('نمیتوانید حساب خودتان را حذف کنید');
|
||||||
|
}
|
||||||
|
const others = await this.prisma.platformAdmin.count({
|
||||||
|
where: { id: { not: id } },
|
||||||
|
});
|
||||||
|
if (others < 1) {
|
||||||
|
throw new BadRequestException('حداقل یک سوپرادمین باید بماند');
|
||||||
|
}
|
||||||
|
await this.prisma.platformAdmin.delete({ where: { id } });
|
||||||
|
return { ok: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
async masterPasswordStatus(): Promise<{ enabled: boolean; updatedAt: string | null }> {
|
||||||
|
const row = await this.prisma.platformMasterPassword.findUnique({
|
||||||
|
where: { id: 'default' },
|
||||||
|
select: { updatedAt: true },
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
enabled: Boolean(row),
|
||||||
|
updatedAt: row?.updatedAt.toISOString() ?? null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async setMasterPassword(
|
||||||
|
password: string | null,
|
||||||
|
): Promise<{ enabled: boolean; updatedAt: string | null }> {
|
||||||
|
const trimmed = password?.trim() ?? '';
|
||||||
|
if (!trimmed) {
|
||||||
|
await this.prisma.platformMasterPassword.deleteMany({ where: { id: 'default' } });
|
||||||
|
return { enabled: false, updatedAt: null };
|
||||||
|
}
|
||||||
|
if (trimmed.length < 8) {
|
||||||
|
throw new BadRequestException('رمز کلی حداقل ۸ کاراکتر لازم است');
|
||||||
|
}
|
||||||
|
const passwordHash = await bcrypt.hash(trimmed, 10);
|
||||||
|
const row = await this.prisma.platformMasterPassword.upsert({
|
||||||
|
where: { id: 'default' },
|
||||||
|
create: { id: 'default', passwordHash },
|
||||||
|
update: { passwordHash },
|
||||||
|
});
|
||||||
|
return { enabled: true, updatedAt: row.updatedAt.toISOString() };
|
||||||
|
}
|
||||||
|
|
||||||
private adminToDto(row: {
|
private adminToDto(row: {
|
||||||
id: string;
|
id: string;
|
||||||
mobile: string | null;
|
mobile: string | null;
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ import type {
|
|||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { TICKET_SLA_HOURS } from '@mento/shared';
|
import { TICKET_SLA_HOURS } from '@mento/shared';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
import { canonicalIranMobile, phoneIdentityKeys } from '../contacts/normalize';
|
||||||
import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
import { SmsGatewayService } from '../sms-billing/sms-gateway.service';
|
||||||
import type { PortalActor } from './portal-auth';
|
import type { PortalActor } from './portal-auth';
|
||||||
|
|
||||||
@@ -62,7 +63,7 @@ export class PortalService {
|
|||||||
mobileRaw: string,
|
mobileRaw: string,
|
||||||
): Promise<PortalRequestOtpResponse> {
|
): Promise<PortalRequestOtpResponse> {
|
||||||
const org = await this.findOrg(slug);
|
const org = await this.findOrg(slug);
|
||||||
const mobile = normalizeMobile(mobileRaw);
|
const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
|
||||||
if (!mobile) {
|
if (!mobile) {
|
||||||
throw new BadRequestException('شماره موبایل معتبر نیست');
|
throw new BadRequestException('شماره موبایل معتبر نیست');
|
||||||
}
|
}
|
||||||
@@ -123,7 +124,8 @@ export class PortalService {
|
|||||||
codeRaw: string,
|
codeRaw: string,
|
||||||
): Promise<PortalLoginResponse> {
|
): Promise<PortalLoginResponse> {
|
||||||
const org = await this.findOrg(slug);
|
const org = await this.findOrg(slug);
|
||||||
const mobile = normalizeMobile(mobileRaw);
|
const mobile = canonicalIranMobile(mobileRaw) ?? normalizeMobile(mobileRaw);
|
||||||
|
const mobileKeys = phoneIdentityKeys(mobile);
|
||||||
const code = codeRaw.trim();
|
const code = codeRaw.trim();
|
||||||
if (!mobile || !code) {
|
if (!mobile || !code) {
|
||||||
throw new BadRequestException('موبایل یا کد ناقص است');
|
throw new BadRequestException('موبایل یا کد ناقص است');
|
||||||
@@ -148,10 +150,15 @@ export class PortalService {
|
|||||||
data: { consumedAt: new Date() },
|
data: { consumedAt: new Date() },
|
||||||
});
|
});
|
||||||
|
|
||||||
let person = await this.prisma.person.findFirst({
|
let person = mobileKeys.length
|
||||||
where: { organizationId: org.id, mobile },
|
? await this.prisma.person.findFirst({
|
||||||
orderBy: { createdAt: 'asc' },
|
where: {
|
||||||
});
|
organizationId: org.id,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
})
|
||||||
|
: null;
|
||||||
if (!person) {
|
if (!person) {
|
||||||
person = await this.prisma.person.create({
|
person = await this.prisma.person.create({
|
||||||
data: {
|
data: {
|
||||||
|
|||||||
@@ -15,12 +15,12 @@ import { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import {
|
import {
|
||||||
type Actor,
|
type Actor,
|
||||||
canReassignOwner,
|
|
||||||
dealAccessWhere,
|
dealAccessWhere,
|
||||||
ownerWhere,
|
ownerWhere,
|
||||||
projectCardAccessWhere,
|
projectCardAccessWhere,
|
||||||
resolveOwnerId,
|
resolveOwnerId,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assertAssigneeSet } from '../common/assign-access';
|
||||||
import { normalizeTags } from '../common/tags';
|
import { normalizeTags } from '../common/tags';
|
||||||
|
|
||||||
const DEFAULT_STAGES = ['صف', 'در حال انجام', 'بازبینی', 'انجامشده'] as const;
|
const DEFAULT_STAGES = ['صف', 'در حال انجام', 'بازبینی', 'انجامشده'] as const;
|
||||||
@@ -206,6 +206,13 @@ export class ProjectBoardsService {
|
|||||||
});
|
});
|
||||||
|
|
||||||
const assigneeIds = [...new Set((dto.assigneeIds ?? []).map((id) => id.trim()).filter(Boolean))];
|
const assigneeIds = [...new Set((dto.assigneeIds ?? []).map((id) => id.trim()).filter(Boolean))];
|
||||||
|
const assignActor = { userId: actor.userId, role: actor.role, organizationId };
|
||||||
|
const ownerId = resolveOwnerId(
|
||||||
|
actor,
|
||||||
|
dto.ownerId,
|
||||||
|
await actorCanAssignToOthers(this.prisma, assignActor, 'projects'),
|
||||||
|
);
|
||||||
|
await assertAssigneeSet(this.prisma, assignActor, 'projects', [ownerId, ...assigneeIds]);
|
||||||
const created = await this.prisma.projectCard.create({
|
const created = await this.prisma.projectCard.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId,
|
organizationId,
|
||||||
@@ -217,7 +224,7 @@ export class ProjectBoardsService {
|
|||||||
personId: emptyToNull(dto.personId),
|
personId: emptyToNull(dto.personId),
|
||||||
companyId: emptyToNull(dto.companyId),
|
companyId: emptyToNull(dto.companyId),
|
||||||
dealId: emptyToNull(dto.dealId),
|
dealId: emptyToNull(dto.dealId),
|
||||||
ownerId: resolveOwnerId(actor, dto.ownerId),
|
ownerId,
|
||||||
position: (maxPos._max.position ?? -1) + 1,
|
position: (maxPos._max.position ?? -1) + 1,
|
||||||
...(assigneeIds.length
|
...(assigneeIds.length
|
||||||
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
? { assignees: { connect: assigneeIds.map((id) => ({ id })) } }
|
||||||
@@ -257,24 +264,40 @@ export class ProjectBoardsService {
|
|||||||
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
if ('companyId' in dto) data.companyId = emptyToNull(dto.companyId ?? null);
|
||||||
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
if ('dealId' in dto) data.dealId = emptyToNull(dto.dealId ?? null);
|
||||||
if ('ownerId' in dto) {
|
if ('ownerId' in dto) {
|
||||||
if (!canReassignOwner(actor.role) && dto.ownerId !== existing.ownerId) {
|
const nextOwner = emptyToNull(dto.ownerId ?? null);
|
||||||
throw new BadRequestException('تغییر مسئول مجاز نیست');
|
await assertAssigneeSet(
|
||||||
}
|
this.prisma,
|
||||||
data.ownerId = emptyToNull(dto.ownerId ?? null);
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'projects',
|
||||||
|
[nextOwner],
|
||||||
|
[existing.ownerId],
|
||||||
|
);
|
||||||
|
data.ownerId = nextOwner;
|
||||||
|
}
|
||||||
|
|
||||||
|
const nextAssigneeIds = dto.assigneeIds
|
||||||
|
? [...new Set(dto.assigneeIds.map((x) => x.trim()).filter(Boolean))]
|
||||||
|
: undefined;
|
||||||
|
if (nextAssigneeIds) {
|
||||||
|
const currentAssignees = await this.prisma.projectCard.findFirst({
|
||||||
|
where: { id },
|
||||||
|
select: { assignees: { select: { id: true } } },
|
||||||
|
});
|
||||||
|
await assertAssigneeSet(
|
||||||
|
this.prisma,
|
||||||
|
{ userId: actor.userId, role: actor.role, organizationId },
|
||||||
|
'projects',
|
||||||
|
nextAssigneeIds,
|
||||||
|
currentAssignees?.assignees.map((item) => item.id) ?? [],
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
const row = await this.prisma.projectCard.update({
|
const row = await this.prisma.projectCard.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: {
|
data: {
|
||||||
...data,
|
...data,
|
||||||
...(dto.assigneeIds
|
...(nextAssigneeIds
|
||||||
? {
|
? { assignees: { set: nextAssigneeIds.map((uid) => ({ id: uid })) } }
|
||||||
assignees: {
|
|
||||||
set: [...new Set(dto.assigneeIds.map((x) => x.trim()).filter(Boolean))].map(
|
|
||||||
(uid) => ({ id: uid }),
|
|
||||||
),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
: {}),
|
: {}),
|
||||||
},
|
},
|
||||||
include: cardInclude,
|
include: cardInclude,
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import type { ImportContactsResult } from '@mento/shared';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { projectCardAccessWhere } from '../common/record-scope';
|
import { projectCardAccessWhere } from '../common/record-scope';
|
||||||
import { normalizePhone } from '../contacts/normalize';
|
import { phoneIdentityKeys, storedPhoneNumber } from '../contacts/normalize';
|
||||||
import {
|
import {
|
||||||
excelFieldsFromColumns,
|
excelFieldsFromColumns,
|
||||||
formatJalaliDate,
|
formatJalaliDate,
|
||||||
@@ -256,11 +256,13 @@ export class ProjectCardsExcelService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
private async findPersonId(organizationId: string, row: Record<string, string>) {
|
||||||
const mobile = normalizePhone(row.personMobile);
|
const mobileKeys = phoneIdentityKeys(storedPhoneNumber(row.personMobile));
|
||||||
if (mobile) {
|
if (mobileKeys.length) {
|
||||||
const needle = mobile.replace(/^\+98|^98|^0/, '');
|
|
||||||
const byMobile = await this.prisma.person.findFirst({
|
const byMobile = await this.prisma.person.findFirst({
|
||||||
where: { organizationId, mobile: { contains: needle } },
|
where: {
|
||||||
|
organizationId,
|
||||||
|
OR: [{ mobile: { in: mobileKeys } }, { phone: { in: mobileKeys } }],
|
||||||
|
},
|
||||||
select: { id: true },
|
select: { id: true },
|
||||||
});
|
});
|
||||||
if (byMobile) return byMobile.id;
|
if (byMobile) return byMobile.id;
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ export class ApiKeyAuthGuard implements CanActivate {
|
|||||||
organizationId: string;
|
organizationId: string;
|
||||||
role: string;
|
role: string;
|
||||||
apiKeyId?: string;
|
apiKeyId?: string;
|
||||||
|
apiKeyName?: string;
|
||||||
};
|
};
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
@@ -44,6 +45,7 @@ export class ApiKeyAuthGuard implements CanActivate {
|
|||||||
organizationId: auth.organizationId,
|
organizationId: auth.organizationId,
|
||||||
role: auth.role,
|
role: auth.role,
|
||||||
apiKeyId: auth.apiKeyId,
|
apiKeyId: auth.apiKeyId,
|
||||||
|
apiKeyName: auth.name,
|
||||||
};
|
};
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,7 +63,7 @@ export class ApiKeysService {
|
|||||||
|
|
||||||
async authenticate(
|
async authenticate(
|
||||||
rawKey: string,
|
rawKey: string,
|
||||||
): Promise<{ organizationId: string; apiKeyId: string; role: 'owner' }> {
|
): Promise<{ organizationId: string; apiKeyId: string; name: string; role: 'owner' }> {
|
||||||
const key = rawKey.trim();
|
const key = rawKey.trim();
|
||||||
if (!key.startsWith('mk_') || key.length < 20) {
|
if (!key.startsWith('mk_') || key.length < 20) {
|
||||||
throw new UnauthorizedException('کلید API نامعتبر است');
|
throw new UnauthorizedException('کلید API نامعتبر است');
|
||||||
@@ -71,7 +71,7 @@ export class ApiKeysService {
|
|||||||
const keyHash = this.hashKey(key);
|
const keyHash = this.hashKey(key);
|
||||||
const row = await this.prisma.organizationApiKey.findFirst({
|
const row = await this.prisma.organizationApiKey.findFirst({
|
||||||
where: { keyHash, revokedAt: null },
|
where: { keyHash, revokedAt: null },
|
||||||
select: { id: true, organizationId: true },
|
select: { id: true, organizationId: true, name: true },
|
||||||
});
|
});
|
||||||
if (!row) throw new UnauthorizedException('کلید API نامعتبر است');
|
if (!row) throw new UnauthorizedException('کلید API نامعتبر است');
|
||||||
|
|
||||||
@@ -83,6 +83,7 @@ export class ApiKeysService {
|
|||||||
return {
|
return {
|
||||||
organizationId: row.organizationId,
|
organizationId: row.organizationId,
|
||||||
apiKeyId: row.id,
|
apiKeyId: row.id,
|
||||||
|
name: row.name,
|
||||||
role: 'owner',
|
role: 'owner',
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,18 +1,55 @@
|
|||||||
import {
|
import {
|
||||||
|
Body,
|
||||||
Controller,
|
Controller,
|
||||||
Get,
|
Get,
|
||||||
|
HttpCode,
|
||||||
|
HttpException,
|
||||||
|
HttpStatus,
|
||||||
Param,
|
Param,
|
||||||
|
Post,
|
||||||
Query,
|
Query,
|
||||||
UseGuards,
|
UseGuards,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
import { IsInt, IsOptional, IsString, Max, Min } from 'class-validator';
|
import { IsInt, IsOptional, IsString, Max, MaxLength, Min, MinLength } from 'class-validator';
|
||||||
import { Type } from 'class-transformer';
|
import { Type } from 'class-transformer';
|
||||||
import { CurrentUser } from '../auth/current-user.decorator';
|
import { CurrentUser } from '../auth/current-user.decorator';
|
||||||
import type { Prisma } from '@prisma/client';
|
import type { Prisma } from '@prisma/client';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { buildSearchWhere, ci } from '../common/search';
|
import { buildSearchWhere, ci } from '../common/search';
|
||||||
|
import { LeadsService } from '../leads/leads.service';
|
||||||
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
||||||
|
|
||||||
|
class CreateExternalLeadDto {
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(80)
|
||||||
|
firstName?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(80)
|
||||||
|
lastName?: string;
|
||||||
|
|
||||||
|
@IsString()
|
||||||
|
@MinLength(8)
|
||||||
|
@MaxLength(20)
|
||||||
|
mobile!: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
storeName?: string;
|
||||||
|
|
||||||
|
@IsOptional()
|
||||||
|
@IsString()
|
||||||
|
@MaxLength(200)
|
||||||
|
source?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const LEAD_RATE_WINDOW_MS = 60_000;
|
||||||
|
const LEAD_RATE_MAX = 60;
|
||||||
|
const leadHits = new Map<string, number[]>();
|
||||||
|
|
||||||
class ListQueryDto {
|
class ListQueryDto {
|
||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsString()
|
@IsString()
|
||||||
@@ -35,7 +72,36 @@ class ListQueryDto {
|
|||||||
@Controller('public/v1')
|
@Controller('public/v1')
|
||||||
@UseGuards(ApiKeyAuthGuard)
|
@UseGuards(ApiKeyAuthGuard)
|
||||||
export class PublicApiV1Controller {
|
export class PublicApiV1Controller {
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
constructor(
|
||||||
|
private readonly prisma: PrismaService,
|
||||||
|
private readonly leads: LeadsService,
|
||||||
|
) {}
|
||||||
|
|
||||||
|
@Post('leads')
|
||||||
|
@HttpCode(200)
|
||||||
|
createLead(
|
||||||
|
@CurrentUser()
|
||||||
|
user: { organizationId: string; apiKeyId?: string; apiKeyName?: string },
|
||||||
|
@Body() body: CreateExternalLeadDto,
|
||||||
|
) {
|
||||||
|
const bucket = user.apiKeyId || user.organizationId;
|
||||||
|
const now = Date.now();
|
||||||
|
const prev = (leadHits.get(bucket) ?? []).filter((t) => now - t < LEAD_RATE_WINDOW_MS);
|
||||||
|
if (prev.length >= LEAD_RATE_MAX) {
|
||||||
|
throw new HttpException('تعداد ارسال بیش از حد مجاز است. کمی بعد دوباره تلاش کنید.', HttpStatus.TOO_MANY_REQUESTS);
|
||||||
|
}
|
||||||
|
prev.push(now);
|
||||||
|
leadHits.set(bucket, prev);
|
||||||
|
return this.leads.createFromExternal({
|
||||||
|
organizationId: user.organizationId,
|
||||||
|
siteName: user.apiKeyName?.trim() || 'سایت بیرونی',
|
||||||
|
firstName: body.firstName,
|
||||||
|
lastName: body.lastName,
|
||||||
|
mobile: body.mobile,
|
||||||
|
storeName: body.storeName,
|
||||||
|
source: body.source,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
@Get('people')
|
@Get('people')
|
||||||
async listPeople(
|
async listPeople(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
import { BillingModule } from '../billing/billing.module';
|
import { BillingModule } from '../billing/billing.module';
|
||||||
|
import { LeadsModule } from '../leads/leads.module';
|
||||||
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
import { ApiKeyAuthGuard } from './api-key-auth.guard';
|
||||||
import { ApiKeysController } from './api-keys.controller';
|
import { ApiKeysController } from './api-keys.controller';
|
||||||
import { ApiKeysService } from './api-keys.service';
|
import { ApiKeysService } from './api-keys.service';
|
||||||
@@ -9,7 +10,7 @@ import { WebhooksController } from './webhooks.controller';
|
|||||||
import { WebhooksService } from './webhooks.service';
|
import { WebhooksService } from './webhooks.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuthModule, BillingModule],
|
imports: [AuthModule, BillingModule, LeadsModule],
|
||||||
controllers: [ApiKeysController, WebhooksController, PublicApiV1Controller],
|
controllers: [ApiKeysController, WebhooksController, PublicApiV1Controller],
|
||||||
providers: [ApiKeysService, ApiKeyAuthGuard, WebhooksService],
|
providers: [ApiKeysService, ApiKeyAuthGuard, WebhooksService],
|
||||||
exports: [ApiKeysService, WebhooksService],
|
exports: [ApiKeysService, WebhooksService],
|
||||||
|
|||||||
@@ -185,6 +185,7 @@ export function toRoutineDto(
|
|||||||
entityLink: normalizeEntityLink(row.entityLink),
|
entityLink: normalizeEntityLink(row.entityLink),
|
||||||
reminderMinutesBefore: row.reminderMinutesBefore,
|
reminderMinutesBefore: row.reminderMinutesBefore,
|
||||||
isActive: row.isActive,
|
isActive: row.isActive,
|
||||||
|
createdById: row.createdById,
|
||||||
recurrenceLabel: describeRecurrence(rule),
|
recurrenceLabel: describeRecurrence(rule),
|
||||||
executionRate: execution.total ? Math.round((execution.done / execution.total) * 100) : null,
|
executionRate: execution.total ? Math.round((execution.done / execution.total) * 100) : null,
|
||||||
executionTotal: execution.total,
|
executionTotal: execution.total,
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ import type { Prisma } from '@prisma/client';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { elevated } from '../common/record-scope';
|
import { elevated } from '../common/record-scope';
|
||||||
|
import { actorCanAssignToOthers, assignOthersDeniedMessage } from '../common/assign-access';
|
||||||
import {
|
import {
|
||||||
ChangeRoutineAssigneeDto,
|
ChangeRoutineAssigneeDto,
|
||||||
ListRoutinesQueryDto,
|
ListRoutinesQueryDto,
|
||||||
@@ -199,8 +200,7 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async create(actor: Actor, dto: SaveRoutineDto): Promise<RoutineDto> {
|
async create(actor: Actor, dto: SaveRoutineDto): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
const data = await this.buildData(actor, scope, this.ownRoutineInput(actor, scope, dto));
|
||||||
const data = await this.buildData(actor, scope, dto);
|
|
||||||
const row = await this.prisma.routine.create({
|
const row = await this.prisma.routine.create({
|
||||||
data: {
|
data: {
|
||||||
...data,
|
...data,
|
||||||
@@ -215,10 +215,9 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async update(actor: Actor, id: string, dto: SaveRoutineDto): Promise<RoutineDto> {
|
async update(actor: Actor, id: string, dto: SaveRoutineDto): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const data = await this.buildData(actor, scope, dto);
|
const data = await this.buildData(actor, scope, this.ownRoutineInput(actor, scope, dto));
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: data as Prisma.RoutineUncheckedUpdateInput,
|
data: data as Prisma.RoutineUncheckedUpdateInput,
|
||||||
@@ -231,9 +230,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async toggle(actor: Actor, id: string, isActive: boolean): Promise<RoutineDto> {
|
async toggle(actor: Actor, id: string, isActive: boolean): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { isActive },
|
data: { isActive },
|
||||||
@@ -250,9 +248,8 @@ export class RoutinesService {
|
|||||||
dto: ChangeRoutineAssigneeDto,
|
dto: ChangeRoutineAssigneeDto,
|
||||||
): Promise<RoutineDto> {
|
): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
const target = await this.resolveTarget(actor, scope, dto.assigneeId, dto.teamId);
|
const target = await this.resolveTarget(actor, scope, dto.assigneeId, dto.teamId);
|
||||||
await this.cancelTodayPending(id, 'تغییر مسئول روتین');
|
await this.cancelTodayPending(id, 'تغییر مسئول روتین');
|
||||||
const row = await this.prisma.routine.update({
|
const row = await this.prisma.routine.update({
|
||||||
@@ -267,9 +264,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async duplicate(actor: Actor, id: string): Promise<RoutineDto> {
|
async duplicate(actor: Actor, id: string): Promise<RoutineDto> {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const src = await this.findRoutine(actor.organizationId, id);
|
const src = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, src);
|
this.assertCanWriteRoutine(scope, src);
|
||||||
const {
|
const {
|
||||||
id: _id,
|
id: _id,
|
||||||
createdAt: _c,
|
createdAt: _c,
|
||||||
@@ -294,9 +290,8 @@ export class RoutinesService {
|
|||||||
|
|
||||||
async remove(actor: Actor, id: string) {
|
async remove(actor: Actor, id: string) {
|
||||||
const scope = await this.scope(actor);
|
const scope = await this.scope(actor);
|
||||||
assertManager(scope);
|
|
||||||
const existing = await this.findRoutine(actor.organizationId, id);
|
const existing = await this.findRoutine(actor.organizationId, id);
|
||||||
this.assertCanManageRoutine(scope, existing);
|
this.assertCanWriteRoutine(scope, existing);
|
||||||
await this.prisma.routine.update({
|
await this.prisma.routine.update({
|
||||||
where: { id },
|
where: { id },
|
||||||
data: { deletedAt: new Date(), isActive: false },
|
data: { deletedAt: new Date(), isActive: false },
|
||||||
@@ -344,6 +339,27 @@ export class RoutinesService {
|
|||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** عضو عادی فقط روتینی را مینویسد که خودش برای خودش ساخته است. */
|
||||||
|
private ownRoutineInput(actor: Actor, scope: RoutineScope, dto: SaveRoutineDto): SaveRoutineDto {
|
||||||
|
if (scope.isManager) return dto;
|
||||||
|
if (dto.teamId || (dto.assigneeId && dto.assigneeId !== actor.userId)) {
|
||||||
|
throw new ForbiddenException('فقط میتوانید برای خودتان روتین بسازید');
|
||||||
|
}
|
||||||
|
return { ...dto, assigneeId: actor.userId, teamId: null };
|
||||||
|
}
|
||||||
|
|
||||||
|
private assertCanWriteRoutine(
|
||||||
|
scope: RoutineScope,
|
||||||
|
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
||||||
|
) {
|
||||||
|
if (scope.isManager) {
|
||||||
|
this.assertCanManageRoutine(scope, row);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (row.createdById === scope.userId && row.assigneeId === scope.userId && !row.teamId) return;
|
||||||
|
throw new ForbiddenException('فقط روتینی که برای خودتان ساختهاید را میتوانید تغییر دهید');
|
||||||
|
}
|
||||||
|
|
||||||
private assertCanManageRoutine(
|
private assertCanManageRoutine(
|
||||||
scope: RoutineScope,
|
scope: RoutineScope,
|
||||||
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
row: { assigneeId: string | null; teamId: string | null; createdById: string | null },
|
||||||
@@ -360,6 +376,11 @@ export class RoutinesService {
|
|||||||
assigneeId?: string | null,
|
assigneeId?: string | null,
|
||||||
teamId?: string | null,
|
teamId?: string | null,
|
||||||
): Promise<{ assigneeId: string | null; teamId: string | null }> {
|
): Promise<{ assigneeId: string | null; teamId: string | null }> {
|
||||||
|
if ((assigneeId && assigneeId !== actor.userId) || teamId) {
|
||||||
|
if (!(await actorCanAssignToOthers(this.prisma, actor, 'routines'))) {
|
||||||
|
throw new ForbiddenException(assignOthersDeniedMessage('routines'));
|
||||||
|
}
|
||||||
|
}
|
||||||
if (assigneeId) {
|
if (assigneeId) {
|
||||||
if (!canManage(scope, assigneeId)) {
|
if (!canManage(scope, assigneeId)) {
|
||||||
throw new ForbiddenException('اجازه تعریف روتین برای این کاربر را ندارید');
|
throw new ForbiddenException('اجازه تعریف روتین برای این کاربر را ندارید');
|
||||||
|
|||||||
@@ -32,6 +32,15 @@ export class LocalFileStorage implements OnModuleInit {
|
|||||||
await fs.writeFile(abs, buffer);
|
await fs.writeFile(abs, buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async sizeOf(storageKey: string): Promise<number> {
|
||||||
|
try {
|
||||||
|
const stat = await fs.stat(this.absolutePath(storageKey));
|
||||||
|
return stat.size;
|
||||||
|
} catch {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async remove(storageKey: string): Promise<void> {
|
async remove(storageKey: string): Promise<void> {
|
||||||
const abs = this.absolutePath(storageKey);
|
const abs = this.absolutePath(storageKey);
|
||||||
try {
|
try {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import {
|
|||||||
elevated,
|
elevated,
|
||||||
ticketAccessWhere,
|
ticketAccessWhere,
|
||||||
} from '../common/record-scope';
|
} from '../common/record-scope';
|
||||||
|
import { assertAssigneeSet } from '../common/assign-access';
|
||||||
import { NotificationsService } from '../notifications/notifications.service';
|
import { NotificationsService } from '../notifications/notifications.service';
|
||||||
import { AutomationsService } from '../automations/automations.service';
|
import { AutomationsService } from '../automations/automations.service';
|
||||||
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
import { MessageAutomationsService } from '../message-automations/message-automations.service';
|
||||||
@@ -136,9 +137,7 @@ export class TicketsService {
|
|||||||
if (assigneeId) {
|
if (assigneeId) {
|
||||||
await this.assertUser(actor.organizationId, assigneeId);
|
await this.assertUser(actor.organizationId, assigneeId);
|
||||||
}
|
}
|
||||||
if (!elevated(actor.role) && assigneeId && assigneeId !== actor.userId) {
|
await assertAssigneeSet(this.prisma, actor, 'tickets', [assigneeId]);
|
||||||
assigneeId = actor.userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
const number = await this.nextNumber(actor.organizationId);
|
const number = await this.nextNumber(actor.organizationId);
|
||||||
const status = (dto.status as never) || 'open';
|
const status = (dto.status as never) || 'open';
|
||||||
@@ -270,9 +269,7 @@ export class TicketsService {
|
|||||||
if ('assigneeId' in dto) {
|
if ('assigneeId' in dto) {
|
||||||
const next = emptyToNull(dto.assigneeId ?? null);
|
const next = emptyToNull(dto.assigneeId ?? null);
|
||||||
if (next) await this.assertUser(actor.organizationId, next);
|
if (next) await this.assertUser(actor.organizationId, next);
|
||||||
if (!elevated(actor.role) && next && next !== actor.userId) {
|
await assertAssigneeSet(this.prisma, actor, 'tickets', [next], [existing.assigneeId]);
|
||||||
throw new BadRequestException('فقط میتوانید تیکت را به خودتان ارجاع دهید');
|
|
||||||
}
|
|
||||||
data.assigneeId = next;
|
data.assigneeId = next;
|
||||||
if (next && next !== existing.assigneeId && next !== actor.userId) {
|
if (next && next !== existing.assigneeId && next !== actor.userId) {
|
||||||
await this.notifications.create({
|
await this.notifications.create({
|
||||||
|
|||||||
@@ -1,7 +1,16 @@
|
|||||||
import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from '@nestjs/common';
|
import { CanActivate, ExecutionContext, ForbiddenException, Injectable } from '@nestjs/common';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import {
|
||||||
|
parseUserTreasuryAccess,
|
||||||
|
treasurySectionAllowed,
|
||||||
|
type TreasurySectionKey,
|
||||||
|
} from '@mento/shared';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* حقوق فقط با treasury_payroll.
|
||||||
|
* بقیه مسیرها با treasury باز میشوند؛ اگر بخش ریز انتخاب شده باشد فقط همانها.
|
||||||
|
*/
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class TreasuryAccessGuard implements CanActivate {
|
export class TreasuryAccessGuard implements CanActivate {
|
||||||
constructor(private readonly prisma: PrismaService) {}
|
constructor(private readonly prisma: PrismaService) {}
|
||||||
@@ -10,20 +19,56 @@ export class TreasuryAccessGuard implements CanActivate {
|
|||||||
const req = context.switchToHttp().getRequest<{ user?: Actor; originalUrl?: string; url?: string }>();
|
const req = context.switchToHttp().getRequest<{ user?: Actor; originalUrl?: string; url?: string }>();
|
||||||
const actor = req.user;
|
const actor = req.user;
|
||||||
if (!actor) throw new ForbiddenException('دسترسی مالی مجاز نیست.');
|
if (!actor) throw new ForbiddenException('دسترسی مالی مجاز نیست.');
|
||||||
const url = req.originalUrl || req.url || '';
|
|
||||||
const payroll = url.includes('/treasury/payroll');
|
|
||||||
if (actor.role === 'owner' || actor.role === 'admin') return true;
|
if (actor.role === 'owner' || actor.role === 'admin') return true;
|
||||||
const membership = await this.prisma.membership.findFirst({
|
const membership = await this.prisma.membership.findFirst({
|
||||||
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
||||||
select: { orgRole: { select: { permissions: true } } },
|
select: {
|
||||||
|
orgRole: { select: { permissions: true } },
|
||||||
|
treasuryAccessOverride: true,
|
||||||
|
},
|
||||||
});
|
});
|
||||||
const permissions = Array.isArray(membership?.orgRole?.permissions)
|
const rolePermissions = Array.isArray(membership?.orgRole?.permissions)
|
||||||
? membership.orgRole.permissions.map(String)
|
? membership.orgRole.permissions.map(String)
|
||||||
: [];
|
: [];
|
||||||
const allowed = payroll
|
const permissions = permissionsForTreasury(
|
||||||
? permissions.includes('treasury_payroll')
|
rolePermissions,
|
||||||
: permissions.includes('treasury') || permissions.includes('treasury_payroll');
|
parseUserTreasuryAccess(membership?.treasuryAccessOverride),
|
||||||
if (!allowed) throw new ForbiddenException('دسترسی مالی برای نقش شما مجاز نیست.');
|
);
|
||||||
|
const url = req.originalUrl || req.url || '';
|
||||||
|
if (!treasurySectionAllowed(actor.role, permissions, sectionForUrl(url))) {
|
||||||
|
throw new ForbiddenException('به این بخش مدیریت مالی دسترسی ندارید.');
|
||||||
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function permissionsForTreasury(
|
||||||
|
rolePermissions: string[],
|
||||||
|
override: ReturnType<typeof parseUserTreasuryAccess>,
|
||||||
|
): string[] {
|
||||||
|
if (!override) return rolePermissions;
|
||||||
|
const rest = rolePermissions.filter((key) => key !== 'treasury' && !key.startsWith('treasury_'));
|
||||||
|
if (!override.enabled) return rest;
|
||||||
|
return ['treasury', ...override.sections, ...rest];
|
||||||
|
}
|
||||||
|
|
||||||
|
function sectionForUrl(url: string): TreasurySectionKey | 'treasury_documents' {
|
||||||
|
if (url.includes('/treasury/payroll')) return 'treasury_payroll';
|
||||||
|
if (url.includes('/treasury/receivables') || url.includes('/treasury/installments')) {
|
||||||
|
return 'treasury_receivables';
|
||||||
|
}
|
||||||
|
if (url.includes('/treasury/recurring')) return 'treasury_recurring';
|
||||||
|
if (url.includes('/treasury/reports')) return 'treasury_reports';
|
||||||
|
if (url.includes('/treasury/audit')) return 'treasury_audit';
|
||||||
|
if (url.includes('/treasury/categories')) return 'treasury_categories';
|
||||||
|
if (
|
||||||
|
url.includes('/treasury/accounts') ||
|
||||||
|
url.includes('/treasury/transfers') ||
|
||||||
|
url.includes('/treasury/reconciliations') ||
|
||||||
|
url.includes('/treasury/adjustments')
|
||||||
|
) {
|
||||||
|
return 'treasury_accounts';
|
||||||
|
}
|
||||||
|
if (url.includes('/treasury/dashboard')) return 'treasury_dashboard';
|
||||||
|
return 'treasury_documents';
|
||||||
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { BadRequestException, Injectable, Logger, NotFoundException } from '@nes
|
|||||||
import { Cron } from '@nestjs/schedule';
|
import { Cron } from '@nestjs/schedule';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import ExcelJS from 'exceljs';
|
import ExcelJS from 'exceljs';
|
||||||
|
import type { TreasuryPartyBalanceDto } from '@mento/shared';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
|
|
||||||
@@ -314,7 +315,12 @@ export class TreasuryOpsService {
|
|||||||
return { from: from.toISOString(), to: to.toISOString(), current, previous, ...breakdown };
|
return { from: from.toISOString(), to: to.toISOString(), current, previous, ...breakdown };
|
||||||
}
|
}
|
||||||
|
|
||||||
async reportExcel(actor: Actor, from?: string, to?: string) {
|
async reportExcel(
|
||||||
|
actor: Actor,
|
||||||
|
from?: string,
|
||||||
|
to?: string,
|
||||||
|
parties?: { debtors: TreasuryPartyBalanceDto[]; creditors: TreasuryPartyBalanceDto[] },
|
||||||
|
) {
|
||||||
const data = await this.report(actor, from, to);
|
const data = await this.report(actor, from, to);
|
||||||
const book = new ExcelJS.Workbook();
|
const book = new ExcelJS.Workbook();
|
||||||
const sheet = book.addWorksheet('گزارش مالی');
|
const sheet = book.addWorksheet('گزارش مالی');
|
||||||
@@ -331,10 +337,41 @@ export class TreasuryOpsService {
|
|||||||
sheet.addRow([]);
|
sheet.addRow([]);
|
||||||
sheet.addRow(['دسته هزینه', 'مبلغ', 'سهم']);
|
sheet.addRow(['دسته هزینه', 'مبلغ', 'سهم']);
|
||||||
data.current.expenseCategories.forEach((row) => sheet.addRow([row.name, row.amount, row.share]));
|
data.current.expenseCategories.forEach((row) => sheet.addRow([row.name, row.amount, row.share]));
|
||||||
|
if (parties) {
|
||||||
|
this.addPartySheet(book, 'بدهکاران', parties.debtors, 'دریافتشده');
|
||||||
|
this.addPartySheet(book, 'بستانکاران', parties.creditors, 'پرداختشده');
|
||||||
|
}
|
||||||
const buffer = await book.xlsx.writeBuffer();
|
const buffer = await book.xlsx.writeBuffer();
|
||||||
return Buffer.from(buffer);
|
return Buffer.from(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private addPartySheet(
|
||||||
|
book: ExcelJS.Workbook,
|
||||||
|
title: string,
|
||||||
|
rows: TreasuryPartyBalanceDto[],
|
||||||
|
settledLabel: string,
|
||||||
|
) {
|
||||||
|
const sheet = book.addWorksheet(title);
|
||||||
|
const kindLabel: Record<string, string> = { person: 'مشتری', company: 'شرکت', user: 'کاربر' };
|
||||||
|
sheet.addRow(['طرف حساب', 'نوع', 'مبلغ کل', settledLabel, 'مانده']);
|
||||||
|
let amount = new Prisma.Decimal(0);
|
||||||
|
let settled = new Prisma.Decimal(0);
|
||||||
|
let remaining = new Prisma.Decimal(0);
|
||||||
|
for (const row of rows) {
|
||||||
|
sheet.addRow([
|
||||||
|
row.partyName,
|
||||||
|
(row.partyKind && kindLabel[row.partyKind]) || 'ثبت قبلی',
|
||||||
|
row.amount,
|
||||||
|
row.settledAmount,
|
||||||
|
row.remaining,
|
||||||
|
]);
|
||||||
|
amount = amount.plus(row.amount);
|
||||||
|
settled = settled.plus(row.settledAmount);
|
||||||
|
remaining = remaining.plus(row.remaining);
|
||||||
|
}
|
||||||
|
sheet.addRow(['جمع', '', money(amount), money(settled), money(remaining)]);
|
||||||
|
}
|
||||||
|
|
||||||
private async period(organizationId: string, from: Date, to: Date) {
|
private async period(organizationId: string, from: Date, to: Date) {
|
||||||
const docs = await this.prisma.financialDocument.findMany({
|
const docs = await this.prisma.financialDocument.findMany({
|
||||||
where: {
|
where: {
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Body, Controller, Get, Param, Patch, Post, Query, StreamableFile, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common';
|
import { Body, Controller, Delete, Get, Param, Patch, Post, Query, StreamableFile, UploadedFile, UseGuards, UseInterceptors } from '@nestjs/common';
|
||||||
import { FileInterceptor } from '@nestjs/platform-express';
|
import { FileInterceptor } from '@nestjs/platform-express';
|
||||||
import { memoryStorage } from 'multer';
|
import { memoryStorage } from 'multer';
|
||||||
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
import { JwtAuthGuard } from '../auth/jwt-auth.guard';
|
||||||
@@ -43,6 +43,20 @@ export class TreasuryController {
|
|||||||
return this.treasury.createCategory(user, body);
|
return this.treasury.createCategory(user, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Patch('categories/:id')
|
||||||
|
updateCategory(
|
||||||
|
@CurrentUser() user: Actor,
|
||||||
|
@Param('id') id: string,
|
||||||
|
@Body() body: { name?: string; isActive?: boolean },
|
||||||
|
) {
|
||||||
|
return this.treasury.updateCategory(user, id, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Delete('categories/:id')
|
||||||
|
deleteCategory(@CurrentUser() user: Actor, @Param('id') id: string) {
|
||||||
|
return this.treasury.deleteCategory(user, id);
|
||||||
|
}
|
||||||
|
|
||||||
@Get('accounts')
|
@Get('accounts')
|
||||||
accounts(
|
accounts(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -61,7 +75,18 @@ export class TreasuryController {
|
|||||||
updateAccount(
|
updateAccount(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@Param('id') id: string,
|
@Param('id') id: string,
|
||||||
@Body() body: { name?: string; notes?: string | null; isActive?: boolean; responsibleName?: string | null },
|
@Body()
|
||||||
|
body: {
|
||||||
|
name?: string;
|
||||||
|
type?: 'bank' | 'cash' | 'petty';
|
||||||
|
bankName?: string | null;
|
||||||
|
accountRef?: string | null;
|
||||||
|
notes?: string | null;
|
||||||
|
isActive?: boolean;
|
||||||
|
responsibleName?: string | null;
|
||||||
|
openingBalance?: string | number;
|
||||||
|
openingDate?: string;
|
||||||
|
},
|
||||||
) {
|
) {
|
||||||
return this.treasury.updateAccount(user, id, body);
|
return this.treasury.updateAccount(user, id, body);
|
||||||
}
|
}
|
||||||
@@ -81,6 +106,29 @@ export class TreasuryController {
|
|||||||
return this.treasury.transfer(user, body);
|
return this.treasury.transfer(user, body);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Get('parties')
|
||||||
|
parties(@CurrentUser() user: Actor, @Query('q') q?: string) {
|
||||||
|
return this.treasury.searchParties(user, q);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('parties/person')
|
||||||
|
createPartyPerson(
|
||||||
|
@CurrentUser() user: Actor,
|
||||||
|
@Body() body: { firstName?: string; lastName?: string },
|
||||||
|
) {
|
||||||
|
return this.treasury.createPartyPerson(user, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Post('parties/company')
|
||||||
|
createPartyCompany(@CurrentUser() user: Actor, @Body() body: { name?: string }) {
|
||||||
|
return this.treasury.createPartyCompany(user, body);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Get('party-balances')
|
||||||
|
partyBalances(@CurrentUser() user: Actor, @Query('kind') kind?: string) {
|
||||||
|
return this.treasury.partyBalances(user, kind === 'expense' ? 'expense' : 'income');
|
||||||
|
}
|
||||||
|
|
||||||
@Get('documents')
|
@Get('documents')
|
||||||
documents(
|
documents(
|
||||||
@CurrentUser() user: Actor,
|
@CurrentUser() user: Actor,
|
||||||
@@ -221,7 +269,11 @@ export class TreasuryController {
|
|||||||
@Query('from') from?: string,
|
@Query('from') from?: string,
|
||||||
@Query('to') to?: string,
|
@Query('to') to?: string,
|
||||||
) {
|
) {
|
||||||
const buffer = await this.ops.reportExcel(user, from, to);
|
const [debtors, creditors] = await Promise.all([
|
||||||
|
this.treasury.partyBalances(user, 'income'),
|
||||||
|
this.treasury.partyBalances(user, 'expense'),
|
||||||
|
]);
|
||||||
|
const buffer = await this.ops.reportExcel(user, from, to, { debtors, creditors });
|
||||||
return new StreamableFile(buffer, {
|
return new StreamableFile(buffer, {
|
||||||
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
type: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
disposition: 'attachment; filename="treasury-report.xlsx"',
|
disposition: 'attachment; filename="treasury-report.xlsx"',
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { Module } from '@nestjs/common';
|
import { Module } from '@nestjs/common';
|
||||||
import { AuthModule } from '../auth/auth.module';
|
import { AuthModule } from '../auth/auth.module';
|
||||||
|
import { ContactsModule } from '../contacts/contacts.module';
|
||||||
import { NotificationsModule } from '../notifications/notifications.module';
|
import { NotificationsModule } from '../notifications/notifications.module';
|
||||||
import { TreasuryController } from './treasury.controller';
|
import { TreasuryController } from './treasury.controller';
|
||||||
import { TreasuryAccessGuard } from './treasury-access.guard';
|
import { TreasuryAccessGuard } from './treasury-access.guard';
|
||||||
@@ -9,7 +10,7 @@ import { TreasuryReceivablesService } from './treasury-receivables.service';
|
|||||||
import { TreasuryService } from './treasury.service';
|
import { TreasuryService } from './treasury.service';
|
||||||
|
|
||||||
@Module({
|
@Module({
|
||||||
imports: [AuthModule, NotificationsModule],
|
imports: [AuthModule, NotificationsModule, ContactsModule],
|
||||||
controllers: [TreasuryController],
|
controllers: [TreasuryController],
|
||||||
providers: [
|
providers: [
|
||||||
TreasuryService,
|
TreasuryService,
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
import {
|
import {
|
||||||
BadRequestException,
|
BadRequestException,
|
||||||
|
ForbiddenException,
|
||||||
Injectable,
|
Injectable,
|
||||||
NotFoundException,
|
NotFoundException,
|
||||||
} from '@nestjs/common';
|
} from '@nestjs/common';
|
||||||
|
import { parseUserTreasuryAccess } from '@mento/shared';
|
||||||
import { randomUUID } from 'node:crypto';
|
import { randomUUID } from 'node:crypto';
|
||||||
import { Prisma } from '@prisma/client';
|
import { Prisma } from '@prisma/client';
|
||||||
import ExcelJS from 'exceljs';
|
import ExcelJS from 'exceljs';
|
||||||
@@ -11,10 +13,17 @@ import type {
|
|||||||
FinancialCategoryDto,
|
FinancialCategoryDto,
|
||||||
FinancialDocumentDto,
|
FinancialDocumentDto,
|
||||||
FinancialMovementDto,
|
FinancialMovementDto,
|
||||||
|
FinancialPartyKind,
|
||||||
TreasuryDashboardDto,
|
TreasuryDashboardDto,
|
||||||
|
TreasuryPartyBalanceDto,
|
||||||
|
TreasuryPartySearchDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
|
import { CompaniesService } from '../contacts/companies.service';
|
||||||
|
import { PeopleService } from '../contacts/people.service';
|
||||||
|
import { dateToJalali } from '../common/jalali';
|
||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
|
import { StorageQuotaService } from '../billing/storage-quota.service';
|
||||||
import type { Actor } from '../common/record-scope';
|
import type { Actor } from '../common/record-scope';
|
||||||
import { TreasuryReceivablesService } from './treasury-receivables.service';
|
import { TreasuryReceivablesService } from './treasury-receivables.service';
|
||||||
|
|
||||||
@@ -61,6 +70,9 @@ export class TreasuryService {
|
|||||||
private readonly prisma: PrismaService,
|
private readonly prisma: PrismaService,
|
||||||
private readonly receivables: TreasuryReceivablesService,
|
private readonly receivables: TreasuryReceivablesService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly storage: StorageQuotaService,
|
||||||
|
private readonly people: PeopleService,
|
||||||
|
private readonly companies: CompaniesService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async ensureCategories(organizationId: string) {
|
async ensureCategories(organizationId: string) {
|
||||||
@@ -108,27 +120,80 @@ export class TreasuryService {
|
|||||||
): Promise<FinancialCategoryDto> {
|
): Promise<FinancialCategoryDto> {
|
||||||
const name = input.name.trim();
|
const name = input.name.trim();
|
||||||
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
||||||
const row = await this.prisma.financialCategory.create({
|
try {
|
||||||
data: {
|
const row = await this.prisma.financialCategory.create({
|
||||||
organizationId: actor.organizationId,
|
data: {
|
||||||
name,
|
organizationId: actor.organizationId,
|
||||||
kind: input.kind,
|
name,
|
||||||
},
|
kind: input.kind,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
name: row.name,
|
||||||
|
kind: row.kind as FinancialCategoryDto['kind'],
|
||||||
|
isActive: row.isActive,
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new BadRequestException('این نام برای همین نوع دسته قبلاً ثبت شده است.');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async updateCategory(
|
||||||
|
actor: Actor,
|
||||||
|
id: string,
|
||||||
|
input: { name?: string; isActive?: boolean },
|
||||||
|
): Promise<FinancialCategoryDto> {
|
||||||
|
const current = await this.prisma.financialCategory.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
});
|
});
|
||||||
return {
|
if (!current) throw new NotFoundException('دستهبندی پیدا نشد.');
|
||||||
id: row.id,
|
const name = input.name == null ? current.name : input.name.trim();
|
||||||
name: row.name,
|
if (name.length < 2) throw new BadRequestException('نام دستهبندی کوتاه است.');
|
||||||
kind: row.kind as FinancialCategoryDto['kind'],
|
try {
|
||||||
isActive: row.isActive,
|
const row = await this.prisma.financialCategory.update({
|
||||||
};
|
where: { id: current.id },
|
||||||
|
data: {
|
||||||
|
name,
|
||||||
|
...(input.isActive == null ? {} : { isActive: input.isActive }),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
return {
|
||||||
|
id: row.id,
|
||||||
|
name: row.name,
|
||||||
|
kind: row.kind as FinancialCategoryDto['kind'],
|
||||||
|
isActive: row.isActive,
|
||||||
|
};
|
||||||
|
} catch (e) {
|
||||||
|
if (e instanceof Prisma.PrismaClientKnownRequestError && e.code === 'P2002') {
|
||||||
|
throw new BadRequestException('این نام برای همین نوع دسته قبلاً ثبت شده است.');
|
||||||
|
}
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async deleteCategory(actor: Actor, id: string): Promise<{ ok: true }> {
|
||||||
|
const current = await this.prisma.financialCategory.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
});
|
||||||
|
if (!current) throw new NotFoundException('دستهبندی پیدا نشد.');
|
||||||
|
await this.prisma.financialCategory.delete({ where: { id: current.id } });
|
||||||
|
return { ok: true };
|
||||||
}
|
}
|
||||||
|
|
||||||
async listAccounts(
|
async listAccounts(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
range?: { from?: string; to?: string },
|
range?: { from?: string; to?: string },
|
||||||
): Promise<FinancialAccountDto[]> {
|
): Promise<FinancialAccountDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
const accounts = await this.prisma.financialAccount.findMany({
|
const accounts = await this.prisma.financialAccount.findMany({
|
||||||
where: { organizationId: actor.organizationId },
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(scope ? { id: { in: scope } } : {}),
|
||||||
|
},
|
||||||
orderBy: [{ isActive: 'desc' }, { name: 'asc' }],
|
orderBy: [{ isActive: 'desc' }, { name: 'asc' }],
|
||||||
});
|
});
|
||||||
return Promise.all(accounts.map((account) => this.toAccountDto(account, range)));
|
return Promise.all(accounts.map((account) => this.toAccountDto(account, range)));
|
||||||
@@ -194,19 +259,89 @@ export class TreasuryService {
|
|||||||
async updateAccount(
|
async updateAccount(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
id: string,
|
id: string,
|
||||||
input: { name?: string; notes?: string | null; isActive?: boolean; responsibleName?: string | null },
|
input: {
|
||||||
|
name?: string;
|
||||||
|
type?: 'bank' | 'cash' | 'petty';
|
||||||
|
bankName?: string | null;
|
||||||
|
accountRef?: string | null;
|
||||||
|
notes?: string | null;
|
||||||
|
isActive?: boolean;
|
||||||
|
responsibleName?: string | null;
|
||||||
|
openingBalance?: string | number;
|
||||||
|
openingDate?: string;
|
||||||
|
},
|
||||||
): Promise<FinancialAccountDto> {
|
): Promise<FinancialAccountDto> {
|
||||||
const existing = await this.requireAccount(actor.organizationId, id);
|
const existing = await this.requireAccount(actor.organizationId, id, actor);
|
||||||
const row = await this.prisma.financialAccount.update({
|
if (input.type && !['bank', 'cash', 'petty'].includes(input.type)) {
|
||||||
where: { id: existing.id },
|
throw new BadRequestException('نوع حساب نامعتبر است.');
|
||||||
data: {
|
}
|
||||||
...(input.name?.trim() ? { name: input.name.trim() } : {}),
|
const opening = input.openingBalance !== undefined ? dec(input.openingBalance) : null;
|
||||||
...(input.notes !== undefined ? { notes: input.notes?.trim() || null } : {}),
|
if (opening?.isNegative()) {
|
||||||
...(input.responsibleName !== undefined
|
throw new BadRequestException('موجودی اولیه نمیتواند منفی باشد.');
|
||||||
? { responsibleName: input.responsibleName?.trim() || null }
|
}
|
||||||
: {}),
|
const openingDate =
|
||||||
...(input.isActive !== undefined ? { isActive: input.isActive } : {}),
|
input.openingDate !== undefined
|
||||||
},
|
? (startOfDay(input.openingDate) ?? existing.openingDate)
|
||||||
|
: null;
|
||||||
|
const row = await this.prisma.$transaction(async (tx) => {
|
||||||
|
const updated = await tx.financialAccount.update({
|
||||||
|
where: { id: existing.id },
|
||||||
|
data: {
|
||||||
|
...(input.name?.trim() ? { name: input.name.trim() } : {}),
|
||||||
|
...(input.type ? { type: input.type } : {}),
|
||||||
|
...(input.bankName !== undefined ? { bankName: input.bankName?.trim() || null } : {}),
|
||||||
|
...(input.accountRef !== undefined ? { accountRef: input.accountRef?.trim() || null } : {}),
|
||||||
|
...(input.notes !== undefined ? { notes: input.notes?.trim() || null } : {}),
|
||||||
|
...(input.responsibleName !== undefined
|
||||||
|
? { responsibleName: input.responsibleName?.trim() || null }
|
||||||
|
: {}),
|
||||||
|
...(input.isActive !== undefined ? { isActive: input.isActive } : {}),
|
||||||
|
...(opening ? { openingBalance: opening } : {}),
|
||||||
|
...(openingDate ? { openingDate } : {}),
|
||||||
|
},
|
||||||
|
});
|
||||||
|
if (opening || openingDate) {
|
||||||
|
const nextAmount = opening ?? existing.openingBalance;
|
||||||
|
const nextDate = openingDate ?? existing.openingDate;
|
||||||
|
const openings = await tx.financialMovement.findMany({
|
||||||
|
where: { accountId: existing.id, kind: 'opening', voidedAt: null },
|
||||||
|
orderBy: { createdAt: 'asc' },
|
||||||
|
});
|
||||||
|
if (nextAmount.isZero()) {
|
||||||
|
if (openings.length) {
|
||||||
|
await tx.financialMovement.updateMany({
|
||||||
|
where: { id: { in: openings.map((row) => row.id) } },
|
||||||
|
data: { voidedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (openings[0]) {
|
||||||
|
await tx.financialMovement.update({
|
||||||
|
where: { id: openings[0].id },
|
||||||
|
data: { amount: nextAmount, occurredAt: nextDate, direction: 'in' },
|
||||||
|
});
|
||||||
|
const extra = openings.slice(1).map((row) => row.id);
|
||||||
|
if (extra.length) {
|
||||||
|
await tx.financialMovement.updateMany({
|
||||||
|
where: { id: { in: extra } },
|
||||||
|
data: { voidedAt: new Date() },
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
await tx.financialMovement.create({
|
||||||
|
data: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
accountId: existing.id,
|
||||||
|
direction: 'in',
|
||||||
|
amount: nextAmount,
|
||||||
|
kind: 'opening',
|
||||||
|
occurredAt: nextDate,
|
||||||
|
memo: 'مانده افتتاحیه',
|
||||||
|
createdById: actor.userId,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return updated;
|
||||||
});
|
});
|
||||||
return this.toAccountDto(row);
|
return this.toAccountDto(row);
|
||||||
}
|
}
|
||||||
@@ -216,7 +351,7 @@ export class TreasuryService {
|
|||||||
accountId: string,
|
accountId: string,
|
||||||
range?: { from?: string; to?: string },
|
range?: { from?: string; to?: string },
|
||||||
): Promise<{ account: FinancialAccountDto; items: FinancialMovementDto[] }> {
|
): Promise<{ account: FinancialAccountDto; items: FinancialMovementDto[] }> {
|
||||||
const account = await this.requireAccount(actor.organizationId, accountId);
|
const account = await this.requireAccount(actor.organizationId, accountId, actor);
|
||||||
const from = startOfDay(range?.from);
|
const from = startOfDay(range?.from);
|
||||||
const to = startOfDay(range?.to);
|
const to = startOfDay(range?.to);
|
||||||
const rows = await this.prisma.financialMovement.findMany({
|
const rows = await this.prisma.financialMovement.findMany({
|
||||||
@@ -301,8 +436,8 @@ export class TreasuryService {
|
|||||||
if (dup) throw new BadRequestException('این انتقال قبلاً ثبت شده است.');
|
if (dup) throw new BadRequestException('این انتقال قبلاً ثبت شده است.');
|
||||||
}
|
}
|
||||||
const [source, target] = await Promise.all([
|
const [source, target] = await Promise.all([
|
||||||
this.requireAccount(actor.organizationId, input.fromAccountId),
|
this.requireAccount(actor.organizationId, input.fromAccountId, actor),
|
||||||
this.requireAccount(actor.organizationId, input.toAccountId),
|
this.requireAccount(actor.organizationId, input.toAccountId, actor),
|
||||||
]);
|
]);
|
||||||
if (!source.isActive || !target.isActive) {
|
if (!source.isActive || !target.isActive) {
|
||||||
throw new BadRequestException('حساب غیرفعال در انتقال قابل استفاده نیست.');
|
throw new BadRequestException('حساب غیرفعال در انتقال قابل استفاده نیست.');
|
||||||
@@ -352,10 +487,12 @@ export class TreasuryService {
|
|||||||
kind: 'income' | 'expense',
|
kind: 'income' | 'expense',
|
||||||
q?: string,
|
q?: string,
|
||||||
): Promise<FinancialDocumentDto[]> {
|
): Promise<FinancialDocumentDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
const rows = await this.prisma.financialDocument.findMany({
|
const rows = await this.prisma.financialDocument.findMany({
|
||||||
where: {
|
where: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
kind,
|
kind,
|
||||||
|
...(scope ? { OR: [{ accountId: null }, { accountId: { in: scope } }] } : {}),
|
||||||
...(q?.trim()
|
...(q?.trim()
|
||||||
? {
|
? {
|
||||||
OR: [
|
OR: [
|
||||||
@@ -382,7 +519,10 @@ export class TreasuryService {
|
|||||||
bookedAt?: string;
|
bookedAt?: string;
|
||||||
dueAt?: string | null;
|
dueAt?: string | null;
|
||||||
categoryId?: string | null;
|
categoryId?: string | null;
|
||||||
|
partyKind?: FinancialPartyKind | null;
|
||||||
personId?: string | null;
|
personId?: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
partyName?: string | null;
|
partyName?: string | null;
|
||||||
method?: string | null;
|
method?: string | null;
|
||||||
reference?: string | null;
|
reference?: string | null;
|
||||||
@@ -396,9 +536,13 @@ export class TreasuryService {
|
|||||||
const amount = dec(input.amount);
|
const amount = dec(input.amount);
|
||||||
if (title.length < 2) throw new BadRequestException('عنوان را وارد کنید.');
|
if (title.length < 2) throw new BadRequestException('عنوان را وارد کنید.');
|
||||||
if (!amount.greaterThan(0)) throw new BadRequestException('مبلغ باید بزرگتر از صفر باشد.');
|
if (!amount.greaterThan(0)) throw new BadRequestException('مبلغ باید بزرگتر از صفر باشد.');
|
||||||
|
const party = await this.resolveParty(actor, input);
|
||||||
const settle = input.settleAmount == null || input.settleAmount === ''
|
const settle = input.settleAmount == null || input.settleAmount === ''
|
||||||
? new Prisma.Decimal(0)
|
? new Prisma.Decimal(0)
|
||||||
: dec(input.settleAmount);
|
: dec(input.settleAmount);
|
||||||
|
if (party.partyKind === 'other' && !settle.equals(amount)) {
|
||||||
|
throw new BadRequestException('برای سایر، مبلغ دریافت یا پرداخت باید با مبلغ کل یکی باشد.');
|
||||||
|
}
|
||||||
if (settle.isNegative() || settle.greaterThan(amount)) {
|
if (settle.isNegative() || settle.greaterThan(amount)) {
|
||||||
throw new BadRequestException('مبلغ دریافت/پرداخت از مبلغ سند بیشتر است.');
|
throw new BadRequestException('مبلغ دریافت/پرداخت از مبلغ سند بیشتر است.');
|
||||||
}
|
}
|
||||||
@@ -406,7 +550,7 @@ export class TreasuryService {
|
|||||||
throw new BadRequestException('برای ثبت وجه قطعی، حساب را انتخاب کنید.');
|
throw new BadRequestException('برای ثبت وجه قطعی، حساب را انتخاب کنید.');
|
||||||
}
|
}
|
||||||
if (input.accountId) {
|
if (input.accountId) {
|
||||||
const account = await this.requireAccount(actor.organizationId, input.accountId);
|
const account = await this.requireAccount(actor.organizationId, input.accountId, actor);
|
||||||
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
||||||
if (input.kind === 'expense' && settle.greaterThan(0)) {
|
if (input.kind === 'expense' && settle.greaterThan(0)) {
|
||||||
const balance = await this.accountBalance(account.id);
|
const balance = await this.accountBalance(account.id);
|
||||||
@@ -417,6 +561,13 @@ export class TreasuryService {
|
|||||||
}
|
}
|
||||||
const bookedAt = startOfDay(input.bookedAt) ?? new Date();
|
const bookedAt = startOfDay(input.bookedAt) ?? new Date();
|
||||||
const doc = await this.prisma.$transaction(async (tx) => {
|
const doc = await this.prisma.$transaction(async (tx) => {
|
||||||
|
const reference = await this.nextDocumentReference(
|
||||||
|
tx,
|
||||||
|
actor.organizationId,
|
||||||
|
input.kind,
|
||||||
|
input.bookedAt,
|
||||||
|
bookedAt,
|
||||||
|
);
|
||||||
const created = await tx.financialDocument.create({
|
const created = await tx.financialDocument.create({
|
||||||
data: {
|
data: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
@@ -426,12 +577,15 @@ export class TreasuryService {
|
|||||||
bookedAt,
|
bookedAt,
|
||||||
dueAt: input.dueAt ? startOfDay(input.dueAt) : null,
|
dueAt: input.dueAt ? startOfDay(input.dueAt) : null,
|
||||||
categoryId: input.categoryId || null,
|
categoryId: input.categoryId || null,
|
||||||
personId: input.personId || null,
|
personId: party.personId,
|
||||||
partyName: input.partyName?.trim() || null,
|
companyId: party.companyId,
|
||||||
|
userId: party.userId,
|
||||||
|
partyKind: party.partyKind,
|
||||||
|
partyName: party.partyName,
|
||||||
accountId: input.accountId || null,
|
accountId: input.accountId || null,
|
||||||
method: input.method || null,
|
method: input.method || null,
|
||||||
status: settle.equals(0) ? 'open' : settle.equals(amount) ? 'settled' : 'partial',
|
status: settle.equals(0) ? 'open' : settle.equals(amount) ? 'settled' : 'partial',
|
||||||
reference: input.reference?.trim() || null,
|
reference,
|
||||||
notes: input.notes?.trim() || null,
|
notes: input.notes?.trim() || null,
|
||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
},
|
},
|
||||||
@@ -447,7 +601,7 @@ export class TreasuryService {
|
|||||||
kind: input.kind === 'income' ? 'receipt' : 'payment',
|
kind: input.kind === 'income' ? 'receipt' : 'payment',
|
||||||
occurredAt: startOfDay(input.settledAt ?? undefined) ?? bookedAt,
|
occurredAt: startOfDay(input.settledAt ?? undefined) ?? bookedAt,
|
||||||
memo: title,
|
memo: title,
|
||||||
reference: input.reference?.trim() || null,
|
reference,
|
||||||
createdById: actor.userId,
|
createdById: actor.userId,
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -460,6 +614,221 @@ export class TreasuryService {
|
|||||||
return this.toDocumentDto(doc);
|
return this.toDocumentDto(doc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** شماره پیگیری روزانه: DR-14050813-0001 برای درآمد و PD-… برای هزینه. */
|
||||||
|
private async nextDocumentReference(
|
||||||
|
tx: Prisma.TransactionClient,
|
||||||
|
organizationId: string,
|
||||||
|
kind: 'income' | 'expense',
|
||||||
|
bookedAtInput: string | undefined,
|
||||||
|
bookedAt: Date,
|
||||||
|
) {
|
||||||
|
const match = bookedAtInput?.match(/^(\d{4})-(\d{2})-(\d{2})/);
|
||||||
|
const when = match
|
||||||
|
? new Date(Number(match[1]), Number(match[2]) - 1, Number(match[3]))
|
||||||
|
: bookedAt;
|
||||||
|
const { jy, jm, jd } = dateToJalali(when);
|
||||||
|
const ymd = `${jy}${String(jm).padStart(2, '0')}${String(jd).padStart(2, '0')}`;
|
||||||
|
const prefix = `${kind === 'income' ? 'DR' : 'PD'}-${ymd}-`;
|
||||||
|
await tx.$executeRaw`SELECT pg_advisory_xact_lock(hashtext(${`finref:${organizationId}:${prefix}`})::bigint)`;
|
||||||
|
const latest = await tx.financialDocument.findFirst({
|
||||||
|
where: { organizationId, reference: { startsWith: prefix } },
|
||||||
|
orderBy: { reference: 'desc' },
|
||||||
|
select: { reference: true },
|
||||||
|
});
|
||||||
|
const current = Number(latest?.reference?.slice(prefix.length));
|
||||||
|
const next = Number.isFinite(current) && current > 0 ? current + 1 : 1;
|
||||||
|
return `${prefix}${String(next).padStart(4, '0')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
async searchParties(actor: Actor, q?: string): Promise<TreasuryPartySearchDto> {
|
||||||
|
const term = q?.trim() ?? '';
|
||||||
|
const contains = term ? { contains: term, mode: 'insensitive' as const } : undefined;
|
||||||
|
const [people, companies, users] = await Promise.all([
|
||||||
|
this.prisma.person.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(contains ? { OR: [{ firstName: contains }, { lastName: contains }] } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, firstName: true, lastName: true },
|
||||||
|
orderBy: { updatedAt: 'desc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
this.prisma.company.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
...(contains ? { name: contains } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, name: true },
|
||||||
|
orderBy: { updatedAt: 'desc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
this.prisma.user.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
isActive: true,
|
||||||
|
...(contains ? { fullName: contains } : {}),
|
||||||
|
},
|
||||||
|
select: { id: true, fullName: true },
|
||||||
|
orderBy: { fullName: 'asc' },
|
||||||
|
take: 20,
|
||||||
|
}),
|
||||||
|
]);
|
||||||
|
return {
|
||||||
|
people: people.map((row) => ({
|
||||||
|
id: row.id,
|
||||||
|
name: `${row.firstName} ${row.lastName}`.trim() || 'مشتری',
|
||||||
|
})),
|
||||||
|
companies,
|
||||||
|
users: users.map((row) => ({ id: row.id, name: row.fullName })),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
async createPartyPerson(actor: Actor, input: { firstName?: string; lastName?: string }) {
|
||||||
|
const firstName = input.firstName?.trim() ?? '';
|
||||||
|
const lastName = input.lastName?.trim() ?? '';
|
||||||
|
if (`${firstName} ${lastName}`.trim().length < 2) {
|
||||||
|
throw new BadRequestException('نام شخص را وارد کنید.');
|
||||||
|
}
|
||||||
|
const person = await this.people.create(actor, { firstName, lastName });
|
||||||
|
return { id: person.id, name: person.fullName, kind: 'person' as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
async createPartyCompany(actor: Actor, input: { name?: string }) {
|
||||||
|
const name = input.name?.trim() ?? '';
|
||||||
|
if (name.length < 2) throw new BadRequestException('نام شرکت را وارد کنید.');
|
||||||
|
const company = await this.companies.create(actor, { name });
|
||||||
|
return { id: company.id, name: company.name, kind: 'company' as const };
|
||||||
|
}
|
||||||
|
|
||||||
|
async partyBalances(actor: Actor, kind: 'income' | 'expense'): Promise<TreasuryPartyBalanceDto[]> {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
const rows = await this.prisma.financialDocument.findMany({
|
||||||
|
where: {
|
||||||
|
organizationId: actor.organizationId,
|
||||||
|
kind,
|
||||||
|
voidedAt: null,
|
||||||
|
status: { in: ['open', 'partial'] },
|
||||||
|
...(scope ? { OR: [{ accountId: null }, { accountId: { in: scope } }] } : {}),
|
||||||
|
},
|
||||||
|
select: {
|
||||||
|
amount: true,
|
||||||
|
partyKind: true,
|
||||||
|
personId: true,
|
||||||
|
companyId: true,
|
||||||
|
userId: true,
|
||||||
|
partyName: true,
|
||||||
|
movements: { select: { amount: true, voidedAt: true } },
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const buckets = new Map<string, {
|
||||||
|
key: string;
|
||||||
|
partyKind: FinancialPartyKind | null;
|
||||||
|
partyName: string;
|
||||||
|
amount: Prisma.Decimal;
|
||||||
|
settled: Prisma.Decimal;
|
||||||
|
remaining: Prisma.Decimal;
|
||||||
|
}>();
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.partyKind === 'other') continue;
|
||||||
|
const settled = this.settledOf(row.movements);
|
||||||
|
const rawRemaining = row.amount.minus(settled);
|
||||||
|
if (!rawRemaining.greaterThan(0)) continue;
|
||||||
|
const linkedId = row.personId || row.companyId || row.userId;
|
||||||
|
const partyKind = row.partyKind === 'person' || row.partyKind === 'company' || row.partyKind === 'user'
|
||||||
|
? row.partyKind
|
||||||
|
: null;
|
||||||
|
const key = partyKind && linkedId
|
||||||
|
? `${partyKind}:${linkedId}`
|
||||||
|
: `legacy:${(row.partyName || '').trim() || 'بدون طرف حساب'}`;
|
||||||
|
const current = buckets.get(key) ?? {
|
||||||
|
key,
|
||||||
|
partyKind,
|
||||||
|
partyName: row.partyName?.trim() || 'بدون طرف حساب',
|
||||||
|
amount: new Prisma.Decimal(0),
|
||||||
|
settled: new Prisma.Decimal(0),
|
||||||
|
remaining: new Prisma.Decimal(0),
|
||||||
|
};
|
||||||
|
current.amount = current.amount.plus(row.amount);
|
||||||
|
current.settled = current.settled.plus(settled);
|
||||||
|
current.remaining = current.remaining.plus(rawRemaining);
|
||||||
|
buckets.set(key, current);
|
||||||
|
}
|
||||||
|
return [...buckets.values()]
|
||||||
|
.sort((a, b) => b.remaining.comparedTo(a.remaining))
|
||||||
|
.map((row) => ({
|
||||||
|
key: row.key,
|
||||||
|
partyKind: row.partyKind,
|
||||||
|
partyName: row.partyName,
|
||||||
|
amount: money(row.amount),
|
||||||
|
settledAmount: money(row.settled),
|
||||||
|
remaining: money(row.remaining),
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
private async resolveParty(
|
||||||
|
actor: Actor,
|
||||||
|
input: {
|
||||||
|
partyKind?: FinancialPartyKind | null;
|
||||||
|
personId?: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
|
},
|
||||||
|
) {
|
||||||
|
const kind = input.partyKind;
|
||||||
|
if (kind === 'other') {
|
||||||
|
return { partyKind: 'other' as const, personId: null, companyId: null, userId: null, partyName: 'سایر' };
|
||||||
|
}
|
||||||
|
if (kind === 'person') {
|
||||||
|
const id = input.personId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('مشتری را انتخاب کنید.');
|
||||||
|
const person = await this.prisma.person.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, firstName: true, lastName: true },
|
||||||
|
});
|
||||||
|
if (!person) throw new BadRequestException('مشتری پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'person' as const,
|
||||||
|
personId: person.id,
|
||||||
|
companyId: null,
|
||||||
|
userId: null,
|
||||||
|
partyName: `${person.firstName} ${person.lastName}`.trim() || 'مشتری',
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'company') {
|
||||||
|
const id = input.companyId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('شرکت را انتخاب کنید.');
|
||||||
|
const company = await this.prisma.company.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, name: true },
|
||||||
|
});
|
||||||
|
if (!company) throw new BadRequestException('شرکت پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'company' as const,
|
||||||
|
personId: null,
|
||||||
|
companyId: company.id,
|
||||||
|
userId: null,
|
||||||
|
partyName: company.name,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
if (kind === 'user') {
|
||||||
|
const id = input.userId?.trim();
|
||||||
|
if (!id) throw new BadRequestException('کاربر را انتخاب کنید.');
|
||||||
|
const user = await this.prisma.user.findFirst({
|
||||||
|
where: { id, organizationId: actor.organizationId },
|
||||||
|
select: { id: true, fullName: true },
|
||||||
|
});
|
||||||
|
if (!user) throw new BadRequestException('کاربر پیدا نشد.');
|
||||||
|
return {
|
||||||
|
partyKind: 'user' as const,
|
||||||
|
personId: null,
|
||||||
|
companyId: null,
|
||||||
|
userId: user.id,
|
||||||
|
partyName: user.fullName,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
throw new BadRequestException('طرف حساب را انتخاب کنید.');
|
||||||
|
}
|
||||||
|
|
||||||
async settleDocument(
|
async settleDocument(
|
||||||
actor: Actor,
|
actor: Actor,
|
||||||
id: string,
|
id: string,
|
||||||
@@ -480,7 +849,7 @@ export class TreasuryService {
|
|||||||
if (amount.greaterThan(remaining)) {
|
if (amount.greaterThan(remaining)) {
|
||||||
throw new BadRequestException('مبلغ از مانده سند بیشتر است.');
|
throw new BadRequestException('مبلغ از مانده سند بیشتر است.');
|
||||||
}
|
}
|
||||||
const account = await this.requireAccount(actor.organizationId, input.accountId);
|
const account = await this.requireAccount(actor.organizationId, input.accountId, actor);
|
||||||
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
if (!account.isActive) throw new BadRequestException('حساب غیرفعال است.');
|
||||||
if (doc.kind === 'expense') {
|
if (doc.kind === 'expense') {
|
||||||
const balance = await this.accountBalance(account.id);
|
const balance = await this.accountBalance(account.id);
|
||||||
@@ -613,18 +982,27 @@ export class TreasuryService {
|
|||||||
if (!doc) throw new NotFoundException('سند پیدا نشد.');
|
if (!doc) throw new NotFoundException('سند پیدا نشد.');
|
||||||
const safeName = file.originalname.replace(/[^\w.\-\u0600-\u06FF]+/g, '_').slice(0, 80);
|
const safeName = file.originalname.replace(/[^\w.\-\u0600-\u06FF]+/g, '_').slice(0, 80);
|
||||||
const storageKey = `treasury/${actor.organizationId}/${doc.id}/${randomUUID()}-${safeName || 'file'}`;
|
const storageKey = `treasury/${actor.organizationId}/${doc.id}/${randomUUID()}-${safeName || 'file'}`;
|
||||||
|
const bytes = file.buffer.length;
|
||||||
|
await this.storage.assertCanAdd(actor.organizationId, bytes);
|
||||||
await this.files.save(storageKey, file.buffer);
|
await this.files.save(storageKey, file.buffer);
|
||||||
return this.prisma.financialAttachment.create({
|
try {
|
||||||
data: {
|
const row = await this.prisma.financialAttachment.create({
|
||||||
organizationId: actor.organizationId,
|
data: {
|
||||||
documentId: doc.id,
|
organizationId: actor.organizationId,
|
||||||
fileName: file.originalname,
|
documentId: doc.id,
|
||||||
mimeType: file.mimetype || 'application/octet-stream',
|
fileName: file.originalname,
|
||||||
storageKey,
|
mimeType: file.mimetype || 'application/octet-stream',
|
||||||
createdById: actor.userId,
|
storageKey,
|
||||||
},
|
createdById: actor.userId,
|
||||||
select: { id: true, fileName: true, createdAt: true },
|
},
|
||||||
});
|
select: { id: true, fileName: true, createdAt: true },
|
||||||
|
});
|
||||||
|
await this.storage.addLocal(actor.organizationId, bytes);
|
||||||
|
return row;
|
||||||
|
} catch (err) {
|
||||||
|
await this.files.remove(storageKey);
|
||||||
|
throw err;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async dashboard(
|
async dashboard(
|
||||||
@@ -633,9 +1011,14 @@ export class TreasuryService {
|
|||||||
): Promise<TreasuryDashboardDto> {
|
): Promise<TreasuryDashboardDto> {
|
||||||
const from = startOfDay(range?.from);
|
const from = startOfDay(range?.from);
|
||||||
const to = startOfDay(range?.to);
|
const to = startOfDay(range?.to);
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
const accountFilter = scope
|
||||||
|
? { OR: [{ accountId: null }, { accountId: { in: scope } }] }
|
||||||
|
: {};
|
||||||
const bookedWhere = {
|
const bookedWhere = {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
status: { not: 'void' },
|
status: { not: 'void' },
|
||||||
|
...accountFilter,
|
||||||
...(from || to
|
...(from || to
|
||||||
? { bookedAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
? { bookedAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
||||||
: {}),
|
: {}),
|
||||||
@@ -643,6 +1026,7 @@ export class TreasuryService {
|
|||||||
const cashWhere = {
|
const cashWhere = {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
voidedAt: null,
|
voidedAt: null,
|
||||||
|
...(scope ? { accountId: { in: scope } } : {}),
|
||||||
...(from || to
|
...(from || to
|
||||||
? { occurredAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
? { occurredAt: { ...(from ? { gte: from } : {}), ...(to ? { lte: to } : {}) } }
|
||||||
: {}),
|
: {}),
|
||||||
@@ -669,12 +1053,13 @@ export class TreasuryService {
|
|||||||
where: {
|
where: {
|
||||||
organizationId: actor.organizationId,
|
organizationId: actor.organizationId,
|
||||||
status: { in: ['open', 'partial'] },
|
status: { in: ['open', 'partial'] },
|
||||||
|
...accountFilter,
|
||||||
},
|
},
|
||||||
include: { movements: true },
|
include: { movements: true },
|
||||||
}),
|
}),
|
||||||
this.listAccounts(actor),
|
this.listAccounts(actor),
|
||||||
this.prisma.financialDocument.findMany({
|
this.prisma.financialDocument.findMany({
|
||||||
where: { organizationId: actor.organizationId },
|
where: { organizationId: actor.organizationId, ...accountFilter },
|
||||||
include: { category: true, account: true, movements: true },
|
include: { category: true, account: true, movements: true },
|
||||||
orderBy: { createdAt: 'desc' },
|
orderBy: { createdAt: 'desc' },
|
||||||
take: 8,
|
take: 8,
|
||||||
@@ -743,11 +1128,50 @@ export class TreasuryService {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async requireAccount(organizationId: string, id: string) {
|
private async accountScope(actor: Actor): Promise<string[] | null> {
|
||||||
|
if (actor.role === 'owner' || actor.role === 'admin') return null;
|
||||||
|
const membership = await this.prisma.membership.findFirst({
|
||||||
|
where: { userId: actor.userId, organizationId: actor.organizationId, isActive: true },
|
||||||
|
select: {
|
||||||
|
user: { select: { fullName: true } },
|
||||||
|
orgRole: { select: { treasuryAccountIds: true, treasuryOwnAccounts: true } },
|
||||||
|
treasuryAccessOverride: true,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
const override = parseUserTreasuryAccess(membership?.treasuryAccessOverride);
|
||||||
|
if (override && !override.enabled) return [];
|
||||||
|
const extra = override
|
||||||
|
? override.accountIds
|
||||||
|
: (membership?.orgRole?.treasuryAccountIds ?? []);
|
||||||
|
const own = override
|
||||||
|
? override.ownAccounts
|
||||||
|
: Boolean(membership?.orgRole?.treasuryOwnAccounts);
|
||||||
|
if (!own && extra.length === 0) return null;
|
||||||
|
const ids = new Set(extra);
|
||||||
|
const name = membership?.user.fullName?.trim();
|
||||||
|
if (own && name) {
|
||||||
|
const rows = await this.prisma.financialAccount.findMany({
|
||||||
|
where: { organizationId: actor.organizationId, responsibleName: { not: null } },
|
||||||
|
select: { id: true, responsibleName: true },
|
||||||
|
});
|
||||||
|
for (const row of rows) {
|
||||||
|
if (row.responsibleName?.trim() === name) ids.add(row.id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return [...ids];
|
||||||
|
}
|
||||||
|
|
||||||
|
private async requireAccount(organizationId: string, id: string, actor?: Actor) {
|
||||||
const row = await this.prisma.financialAccount.findFirst({
|
const row = await this.prisma.financialAccount.findFirst({
|
||||||
where: { id, organizationId },
|
where: { id, organizationId },
|
||||||
});
|
});
|
||||||
if (!row) throw new NotFoundException('حساب پیدا نشد.');
|
if (!row) throw new NotFoundException('حساب پیدا نشد.');
|
||||||
|
if (actor) {
|
||||||
|
const scope = await this.accountScope(actor);
|
||||||
|
if (scope && !scope.includes(row.id)) {
|
||||||
|
throw new ForbiddenException('به این حساب دسترسی ندارید.');
|
||||||
|
}
|
||||||
|
}
|
||||||
return row;
|
return row;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -813,7 +1237,10 @@ export class TreasuryService {
|
|||||||
bookedAt: Date;
|
bookedAt: Date;
|
||||||
dueAt: Date | null;
|
dueAt: Date | null;
|
||||||
categoryId: string | null;
|
categoryId: string | null;
|
||||||
|
partyKind?: string | null;
|
||||||
personId: string | null;
|
personId: string | null;
|
||||||
|
companyId?: string | null;
|
||||||
|
userId?: string | null;
|
||||||
partyName: string | null;
|
partyName: string | null;
|
||||||
accountId: string | null;
|
accountId: string | null;
|
||||||
method: string | null;
|
method: string | null;
|
||||||
@@ -840,7 +1267,10 @@ export class TreasuryService {
|
|||||||
dueAt: row.dueAt ? row.dueAt.toISOString() : null,
|
dueAt: row.dueAt ? row.dueAt.toISOString() : null,
|
||||||
categoryId: row.categoryId,
|
categoryId: row.categoryId,
|
||||||
categoryName: row.category?.name ?? null,
|
categoryName: row.category?.name ?? null,
|
||||||
|
partyKind: (row.partyKind as FinancialDocumentDto['partyKind']) ?? null,
|
||||||
personId: row.personId,
|
personId: row.personId,
|
||||||
|
companyId: row.companyId ?? null,
|
||||||
|
userId: row.userId ?? null,
|
||||||
partyName: row.partyName,
|
partyName: row.partyName,
|
||||||
accountId: row.accountId,
|
accountId: row.accountId,
|
||||||
accountName: row.account?.name ?? null,
|
accountName: row.account?.name ?? null,
|
||||||
|
|||||||
@@ -128,4 +128,10 @@ export class UpdateUserDataAccessDto {
|
|||||||
@IsOptional()
|
@IsOptional()
|
||||||
@IsObject()
|
@IsObject()
|
||||||
dataAccessOverride?: Record<string, unknown> | null;
|
dataAccessOverride?: Record<string, unknown> | null;
|
||||||
|
|
||||||
|
/** null = ارث از نقش */
|
||||||
|
@ValidateIf((_, v) => v !== null)
|
||||||
|
@IsOptional()
|
||||||
|
@IsObject()
|
||||||
|
treasuryAccessOverride?: Record<string, unknown> | null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,12 @@ import type {
|
|||||||
UpdateUserVisibilityRequest,
|
UpdateUserVisibilityRequest,
|
||||||
UserRole,
|
UserRole,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { DATA_SCOPES, DATA_VISIBILITIES, parseDataAccessPolicy } from '@mento/shared';
|
import {
|
||||||
|
DATA_SCOPES,
|
||||||
|
DATA_VISIBILITIES,
|
||||||
|
parseDataAccessPolicy,
|
||||||
|
parseUserTreasuryAccess,
|
||||||
|
} from '@mento/shared';
|
||||||
import { resolveAllSectionAccess } from '../common/data-access';
|
import { resolveAllSectionAccess } from '../common/data-access';
|
||||||
import { parseVisibilityScopes } from '../common/record-scope';
|
import { parseVisibilityScopes } from '../common/record-scope';
|
||||||
import * as bcrypt from 'bcryptjs';
|
import * as bcrypt from 'bcryptjs';
|
||||||
@@ -23,6 +28,7 @@ import { normalizeMobile } from '../auth/auth.service';
|
|||||||
import { PrismaService } from '../prisma/prisma.service';
|
import { PrismaService } from '../prisma/prisma.service';
|
||||||
import { OrgRolesService } from '../org-roles/org-roles.service';
|
import { OrgRolesService } from '../org-roles/org-roles.service';
|
||||||
import { MembershipsService } from '../memberships/memberships.service';
|
import { MembershipsService } from '../memberships/memberships.service';
|
||||||
|
import { BillingService } from '../billing/billing.service';
|
||||||
import { LocalFileStorage } from '../storage/local-file.storage';
|
import { LocalFileStorage } from '../storage/local-file.storage';
|
||||||
import * as path from 'path';
|
import * as path from 'path';
|
||||||
|
|
||||||
@@ -46,6 +52,7 @@ type MembershipRow = {
|
|||||||
dataVisibility?: string | null;
|
dataVisibility?: string | null;
|
||||||
dataVisibilityScopes?: unknown;
|
dataVisibilityScopes?: unknown;
|
||||||
dataAccessOverride?: unknown;
|
dataAccessOverride?: unknown;
|
||||||
|
treasuryAccessOverride?: unknown;
|
||||||
priorArchiveEnabled?: boolean;
|
priorArchiveEnabled?: boolean;
|
||||||
logoutTime?: string | null;
|
logoutTime?: string | null;
|
||||||
blockLoginAfterLogout?: boolean;
|
blockLoginAfterLogout?: boolean;
|
||||||
@@ -70,6 +77,7 @@ export class UsersService {
|
|||||||
private readonly orgRoles: OrgRolesService,
|
private readonly orgRoles: OrgRolesService,
|
||||||
private readonly memberships: MembershipsService,
|
private readonly memberships: MembershipsService,
|
||||||
private readonly files: LocalFileStorage,
|
private readonly files: LocalFileStorage,
|
||||||
|
private readonly billing: BillingService,
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
async list(organizationId: string): Promise<OrgUserDto[]> {
|
async list(organizationId: string): Promise<OrgUserDto[]> {
|
||||||
@@ -105,6 +113,7 @@ export class UsersService {
|
|||||||
return this.addExistingUser(organizationId, existingUser.id, resolved);
|
return this.addExistingUser(organizationId, existingUser.id, resolved);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, null);
|
||||||
const password = dto.password?.trim() ?? '';
|
const password = dto.password?.trim() ?? '';
|
||||||
if (password.length < 8) {
|
if (password.length < 8) {
|
||||||
throw new BadRequestException(
|
throw new BadRequestException(
|
||||||
@@ -367,23 +376,35 @@ export class UsersService {
|
|||||||
organizationId: string,
|
organizationId: string,
|
||||||
actorRole: UserRole,
|
actorRole: UserRole,
|
||||||
targetId: string,
|
targetId: string,
|
||||||
dto: { dataAccessOverride?: Record<string, unknown> | null },
|
dto: {
|
||||||
|
dataAccessOverride?: Record<string, unknown> | null;
|
||||||
|
treasuryAccessOverride?: Record<string, unknown> | null;
|
||||||
|
},
|
||||||
): Promise<OrgUserDto> {
|
): Promise<OrgUserDto> {
|
||||||
if (actorRole !== 'owner' && actorRole !== 'admin') {
|
if (actorRole !== 'owner' && actorRole !== 'admin') {
|
||||||
throw new ForbiddenException('اجازه تغییر محدوده داده را ندارید');
|
throw new ForbiddenException('اجازه تغییر محدوده داده را ندارید');
|
||||||
}
|
}
|
||||||
if (dto.dataAccessOverride === undefined) {
|
if (dto.dataAccessOverride === undefined && dto.treasuryAccessOverride === undefined) {
|
||||||
throw new BadRequestException('تغییری ارسال نشده است');
|
throw new BadRequestException('تغییری ارسال نشده است');
|
||||||
}
|
}
|
||||||
const target = await this.memberships.findUserInOrgById(organizationId, targetId);
|
const target = await this.memberships.findUserInOrgById(organizationId, targetId);
|
||||||
if (target.role === 'owner' || target.role === 'admin') {
|
if (target.role === 'owner' || target.role === 'admin') {
|
||||||
throw new BadRequestException('مالک و مدیر محدودیت عمق داده ندارند');
|
throw new BadRequestException('مالک و مدیر محدودیت عمق داده ندارند');
|
||||||
}
|
}
|
||||||
const next =
|
const data: Prisma.MembershipUpdateInput = {};
|
||||||
dto.dataAccessOverride === null ? {} : parseDataAccessPolicy(dto.dataAccessOverride);
|
if (dto.dataAccessOverride !== undefined) {
|
||||||
|
data.dataAccessOverride =
|
||||||
|
dto.dataAccessOverride === null ? {} : parseDataAccessPolicy(dto.dataAccessOverride);
|
||||||
|
}
|
||||||
|
if (dto.treasuryAccessOverride !== undefined) {
|
||||||
|
data.treasuryAccessOverride =
|
||||||
|
dto.treasuryAccessOverride === null
|
||||||
|
? Prisma.DbNull
|
||||||
|
: (parseUserTreasuryAccess(dto.treasuryAccessOverride) ?? Prisma.DbNull);
|
||||||
|
}
|
||||||
await this.prisma.membership.update({
|
await this.prisma.membership.update({
|
||||||
where: { id: target.id },
|
where: { id: target.id },
|
||||||
data: { dataAccessOverride: next },
|
data,
|
||||||
});
|
});
|
||||||
return this.dtoOf(organizationId, targetId);
|
return this.dtoOf(organizationId, targetId);
|
||||||
}
|
}
|
||||||
@@ -506,6 +527,9 @@ export class UsersService {
|
|||||||
throw new BadRequestException('حداقل یک مالک فعال لازم است');
|
throw new BadRequestException('حداقل یک مالک فعال لازم است');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (isActive && !target.isActive) {
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, targetId);
|
||||||
|
}
|
||||||
await this.prisma.membership.update({
|
await this.prisma.membership.update({
|
||||||
where: { id: target.id },
|
where: { id: target.id },
|
||||||
data: { isActive },
|
data: { isActive },
|
||||||
@@ -533,6 +557,7 @@ export class UsersService {
|
|||||||
userId: string,
|
userId: string,
|
||||||
resolved: { role: UserRole; orgRoleId: string },
|
resolved: { role: UserRole; orgRoleId: string },
|
||||||
): Promise<OrgUserDto> {
|
): Promise<OrgUserDto> {
|
||||||
|
await this.billing.assertSeatAvailable(organizationId, userId);
|
||||||
const existing = await this.prisma.membership.findFirst({
|
const existing = await this.prisma.membership.findFirst({
|
||||||
where: { userId, organizationId },
|
where: { userId, organizationId },
|
||||||
});
|
});
|
||||||
@@ -599,6 +624,10 @@ export class UsersService {
|
|||||||
row.role === 'owner' || row.role === 'admin'
|
row.role === 'owner' || row.role === 'admin'
|
||||||
? {}
|
? {}
|
||||||
: parseDataAccessPolicy(row.dataAccessOverride),
|
: parseDataAccessPolicy(row.dataAccessOverride),
|
||||||
|
treasuryAccessOverride:
|
||||||
|
row.role === 'owner' || row.role === 'admin'
|
||||||
|
? null
|
||||||
|
: parseUserTreasuryAccess(row.treasuryAccessOverride),
|
||||||
...(() => {
|
...(() => {
|
||||||
const effectiveDataAccess = resolveAllSectionAccess({
|
const effectiveDataAccess = resolveAllSectionAccess({
|
||||||
role: row.role,
|
role: row.role,
|
||||||
|
|||||||
@@ -163,6 +163,7 @@ describe('promote from prior', () => {
|
|||||||
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
|
{} as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
const dto = await service.promoteFromPrior(actor, 'act1');
|
const dto = await service.promoteFromPrior(actor, 'act1');
|
||||||
@@ -193,6 +194,7 @@ describe('promote from prior', () => {
|
|||||||
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
{ system: async () => ({}), toSummary: (row: unknown) => row } as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
{} as never,
|
{} as never,
|
||||||
|
{} as never,
|
||||||
);
|
);
|
||||||
|
|
||||||
await assert.rejects(service.promoteFromPrior({ ...actor, priorLens: 'off' }, 'act1'), ForbiddenException);
|
await assert.rejects(service.promoteFromPrior({ ...actor, priorLens: 'off' }, 'act1'), ForbiddenException);
|
||||||
|
|||||||
@@ -3,13 +3,16 @@ import { computed, onMounted, ref, watch } from 'vue';
|
|||||||
import type {
|
import type {
|
||||||
DataAccessPolicy,
|
DataAccessPolicy,
|
||||||
DataAccessSection,
|
DataAccessSection,
|
||||||
|
FinancialAccountDto,
|
||||||
PersonImportSourceStatDto,
|
PersonImportSourceStatDto,
|
||||||
RolePermissionKey,
|
RolePermissionKey,
|
||||||
SectionDataAccess,
|
SectionDataAccess,
|
||||||
|
UserTreasuryAccess,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import {
|
import {
|
||||||
DATA_ACCESS_SECTION_LABELS,
|
DATA_ACCESS_SECTION_LABELS,
|
||||||
DATA_ACCESS_SECTIONS,
|
DATA_ACCESS_SECTIONS,
|
||||||
|
ROLE_PERMISSION_ITEMS,
|
||||||
emptySectionDataAccess,
|
emptySectionDataAccess,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
@@ -21,11 +24,16 @@ const props = defineProps<{
|
|||||||
/** فقط بخشهایی که این مجوزها را دارند نشان بده؛ خالی = همه */
|
/** فقط بخشهایی که این مجوزها را دارند نشان بده؛ خالی = همه */
|
||||||
enabledPermissions?: RolePermissionKey[];
|
enabledPermissions?: RolePermissionKey[];
|
||||||
disabled?: boolean;
|
disabled?: boolean;
|
||||||
|
/** تبهای عمق داده قفل شوند؛ تب مدیریت مالی جدا میماند */
|
||||||
|
dataLocked?: boolean;
|
||||||
|
showTreasury?: boolean;
|
||||||
|
treasuryAccess?: UserTreasuryAccess | null;
|
||||||
compact?: boolean;
|
compact?: boolean;
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
const emit = defineEmits<{
|
const emit = defineEmits<{
|
||||||
'update:modelValue': [DataAccessPolicy];
|
'update:modelValue': [DataAccessPolicy];
|
||||||
|
'update:treasuryAccess': [UserTreasuryAccess | null];
|
||||||
}>();
|
}>();
|
||||||
|
|
||||||
/** بخشهایی که به RolePermissionKey وصلاند؛ بقیه (روتین/پروژه/تیکت) همیشه دیده میشوند */
|
/** بخشهایی که به RolePermissionKey وصلاند؛ بقیه (روتین/پروژه/تیکت) همیشه دیده میشوند */
|
||||||
@@ -47,12 +55,13 @@ const visibleSections = computed(() => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
const active = ref<DataAccessSection>('customers');
|
const treasurySections = ROLE_PERMISSION_ITEMS.filter((item) => item.key.startsWith('treasury_'));
|
||||||
|
const active = ref<DataAccessSection | 'treasury'>('customers');
|
||||||
|
|
||||||
watch(
|
watch(
|
||||||
visibleSections,
|
visibleSections,
|
||||||
(list) => {
|
(list) => {
|
||||||
if (!list.includes(active.value) && list[0]) active.value = list[0];
|
if (active.value !== 'treasury' && !list.includes(active.value) && list[0]) active.value = list[0];
|
||||||
},
|
},
|
||||||
{ immediate: true },
|
{ immediate: true },
|
||||||
);
|
);
|
||||||
@@ -89,6 +98,48 @@ const activityTypes = ref<IdOption[]>([]);
|
|||||||
const projectBoards = ref<IdOption[]>([]);
|
const projectBoards = ref<IdOption[]>([]);
|
||||||
const projectStages = ref<IdOption[]>([]);
|
const projectStages = ref<IdOption[]>([]);
|
||||||
const routineCategories = ref<IdOption[]>([]);
|
const routineCategories = ref<IdOption[]>([]);
|
||||||
|
const treasuryAccounts = ref<FinancialAccountDto[]>([]);
|
||||||
|
const treasuryAccountQuery = ref('');
|
||||||
|
|
||||||
|
const filteredTreasuryAccounts = computed(() => {
|
||||||
|
const query = treasuryAccountQuery.value.trim();
|
||||||
|
if (!query) return treasuryAccounts.value;
|
||||||
|
return treasuryAccounts.value.filter((account) => account.name.includes(query));
|
||||||
|
});
|
||||||
|
|
||||||
|
function emptyTreasuryAccess(): UserTreasuryAccess {
|
||||||
|
return { enabled: true, sections: [], ownAccounts: false, accountIds: [] };
|
||||||
|
}
|
||||||
|
|
||||||
|
function patchTreasury(next: UserTreasuryAccess | null) {
|
||||||
|
emit('update:treasuryAccess', next);
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTreasurySection(key: RolePermissionKey) {
|
||||||
|
const current = props.treasuryAccess ?? emptyTreasuryAccess();
|
||||||
|
const sections = current.sections.includes(key)
|
||||||
|
? current.sections.filter((item) => item !== key)
|
||||||
|
: [...current.sections, key];
|
||||||
|
patchTreasury({ ...current, enabled: true, sections });
|
||||||
|
}
|
||||||
|
|
||||||
|
function toggleTreasuryAccount(id: string) {
|
||||||
|
const current = props.treasuryAccess ?? emptyTreasuryAccess();
|
||||||
|
const accountIds = current.accountIds.includes(id)
|
||||||
|
? current.accountIds.filter((item) => item !== id)
|
||||||
|
: [...current.accountIds, id];
|
||||||
|
patchTreasury({ ...current, enabled: true, accountIds });
|
||||||
|
}
|
||||||
|
|
||||||
|
async function loadTreasuryAccounts() {
|
||||||
|
if (!props.showTreasury) return;
|
||||||
|
try {
|
||||||
|
const { data } = await api.get<FinancialAccountDto[]>('/treasury/accounts');
|
||||||
|
treasuryAccounts.value = data;
|
||||||
|
} catch {
|
||||||
|
treasuryAccounts.value = [];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
async function loadOptions() {
|
async function loadOptions() {
|
||||||
await loadCustomerGroups().catch(() => undefined);
|
await loadCustomerGroups().catch(() => undefined);
|
||||||
@@ -176,8 +227,13 @@ async function loadOptions() {
|
|||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
void loadOptions();
|
void loadOptions();
|
||||||
|
void loadTreasuryAccounts();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const editorSection = computed<DataAccessSection>(() =>
|
||||||
|
active.value === 'treasury' ? 'customers' : active.value,
|
||||||
|
);
|
||||||
|
|
||||||
const stagesForActive = computed(() => {
|
const stagesForActive = computed(() => {
|
||||||
if (active.value === 'leads') return leadStages.value;
|
if (active.value === 'leads') return leadStages.value;
|
||||||
if (active.value === 'sales') return dealStages.value;
|
if (active.value === 'sales') return dealStages.value;
|
||||||
@@ -218,11 +274,94 @@ const typesForActive = computed(() => {
|
|||||||
>
|
>
|
||||||
{{ DATA_ACCESS_SECTION_LABELS[s] }}
|
{{ DATA_ACCESS_SECTION_LABELS[s] }}
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
v-if="showTreasury"
|
||||||
|
type="button"
|
||||||
|
class="tab"
|
||||||
|
:class="{ on: active === 'treasury' }"
|
||||||
|
role="tab"
|
||||||
|
:aria-selected="active === 'treasury'"
|
||||||
|
@click="active = 'treasury'"
|
||||||
|
>
|
||||||
|
مدیریت مالی
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div v-if="active === 'treasury'" class="treasury">
|
||||||
|
<p class="muted">
|
||||||
|
این برگه فقط برای همین کاربر است. «مثل نقش» یعنی همان دسترسی مالی نقش بماند.
|
||||||
|
در حالت سفارشی، اگر هیچ بخش ریزی تیک نخورد همه بخشها بهجز حقوق باز میمانند و حقوق جداست.
|
||||||
|
اگر هیچ حسابی انتخاب نشود همه حسابها باز است.
|
||||||
|
</p>
|
||||||
|
<label class="choice">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="user-treasury"
|
||||||
|
:checked="treasuryAccess == null"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury(null)"
|
||||||
|
/>
|
||||||
|
مثل نقش
|
||||||
|
</label>
|
||||||
|
<label class="choice">
|
||||||
|
<input
|
||||||
|
type="radio"
|
||||||
|
name="user-treasury"
|
||||||
|
:checked="treasuryAccess != null"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury(treasuryAccess ?? emptyTreasuryAccess())"
|
||||||
|
/>
|
||||||
|
سفارشی برای این کاربر
|
||||||
|
</label>
|
||||||
|
<template v-if="treasuryAccess">
|
||||||
|
<label class="choice">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="treasuryAccess.enabled"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury({ ...treasuryAccess, enabled: !treasuryAccess.enabled })"
|
||||||
|
/>
|
||||||
|
دسترسی به مدیریت مالی
|
||||||
|
</label>
|
||||||
|
<template v-if="treasuryAccess.enabled">
|
||||||
|
<label v-for="perm in treasurySections" :key="perm.key" class="choice sub">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="treasuryAccess.sections.includes(perm.key)"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="toggleTreasurySection(perm.key)"
|
||||||
|
/>
|
||||||
|
{{ perm.label }}
|
||||||
|
</label>
|
||||||
|
<label class="choice">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="treasuryAccess.ownAccounts"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="patchTreasury({ ...treasuryAccess, ownAccounts: !treasuryAccess.ownAccounts })"
|
||||||
|
/>
|
||||||
|
حسابهایی که خودش مسئول آنهاست
|
||||||
|
</label>
|
||||||
|
<p class="muted">حسابهای دیگر</p>
|
||||||
|
<input v-model="treasuryAccountQuery" placeholder="جستجوی حساب" :disabled="disabled" />
|
||||||
|
<label v-for="account in filteredTreasuryAccounts" :key="account.id" class="choice">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
:checked="treasuryAccess.accountIds.includes(account.id)"
|
||||||
|
:disabled="disabled"
|
||||||
|
@change="toggleTreasuryAccount(account.id)"
|
||||||
|
/>
|
||||||
|
{{ account.name }}
|
||||||
|
<template v-if="account.responsibleName"> — مسئول: {{ account.responsibleName }}</template>
|
||||||
|
</label>
|
||||||
|
<p v-if="!treasuryAccounts.length" class="muted">حسابی برای انتخاب نیست.</p>
|
||||||
|
</template>
|
||||||
|
</template>
|
||||||
</div>
|
</div>
|
||||||
<DataAccessEditor
|
<DataAccessEditor
|
||||||
|
v-else
|
||||||
:key="active"
|
:key="active"
|
||||||
:section="active"
|
:section="editorSection"
|
||||||
:model-value="sectionValue(active)"
|
:model-value="sectionValue(editorSection)"
|
||||||
:groups="customerGroups"
|
:groups="customerGroups"
|
||||||
:stages="stagesForActive"
|
:stages="stagesForActive"
|
||||||
:pipelines="pipelines"
|
:pipelines="pipelines"
|
||||||
@@ -231,9 +370,9 @@ const typesForActive = computed(() => {
|
|||||||
:import-sources="importSources"
|
:import-sources="importSources"
|
||||||
:import-sources-ready="importSourcesReady"
|
:import-sources-ready="importSourcesReady"
|
||||||
:import-sources-failed="importSourcesFailed"
|
:import-sources-failed="importSourcesFailed"
|
||||||
:disabled="disabled"
|
:disabled="disabled || dataLocked"
|
||||||
:compact="compact"
|
:compact="compact"
|
||||||
@update:model-value="setSection(active, $event)"
|
@update:model-value="setSection(editorSection, $event)"
|
||||||
/>
|
/>
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
@@ -268,4 +407,17 @@ const typesForActive = computed(() => {
|
|||||||
color: #64748b;
|
color: #64748b;
|
||||||
font-size: 0.85rem;
|
font-size: 0.85rem;
|
||||||
}
|
}
|
||||||
|
.treasury {
|
||||||
|
display: grid;
|
||||||
|
gap: 0.45rem;
|
||||||
|
}
|
||||||
|
.choice {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: auto 1fr;
|
||||||
|
gap: 0.4rem;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.choice.sub {
|
||||||
|
padding-inline-start: 1.2rem;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|||||||
@@ -212,9 +212,11 @@ onUnmounted(() => {
|
|||||||
|
|
||||||
.org-btn {
|
.org-btn {
|
||||||
display: inline-flex;
|
display: inline-flex;
|
||||||
align-items: center;
|
align-items: flex-start;
|
||||||
gap: 0.4rem;
|
gap: 0.35rem;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
max-width: 100%;
|
||||||
|
min-width: 0;
|
||||||
border: 0;
|
border: 0;
|
||||||
background: transparent;
|
background: transparent;
|
||||||
color: #94a3b8;
|
color: #94a3b8;
|
||||||
@@ -223,15 +225,20 @@ onUnmounted(() => {
|
|||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
text-align: right;
|
text-align: right;
|
||||||
padding: 0 0.45rem 0.15rem;
|
padding: 0 0.15rem;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.org-btn :deep(.ico) {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-top: 0.05rem;
|
||||||
|
}
|
||||||
|
|
||||||
.org-btn span {
|
.org-btn span {
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
overflow: hidden;
|
white-space: normal;
|
||||||
text-overflow: ellipsis;
|
overflow-wrap: anywhere;
|
||||||
white-space: nowrap;
|
line-height: 1.35;
|
||||||
}
|
}
|
||||||
|
|
||||||
.org-btn:hover {
|
.org-btn:hover {
|
||||||
|
|||||||
@@ -126,6 +126,7 @@ defineExpose({ refresh: load });
|
|||||||
<button type="button" class="charge" @click="chargeOpen = true">شارژ</button>
|
<button type="button" class="charge" @click="chargeOpen = true">شارژ</button>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<Teleport to="body">
|
||||||
<div v-if="chargeOpen" class="layer">
|
<div v-if="chargeOpen" class="layer">
|
||||||
<div class="backdrop" @click="closeCharge" />
|
<div class="backdrop" @click="closeCharge" />
|
||||||
<div class="modal charge-modal" role="dialog" aria-label="شارژ پیامک">
|
<div class="modal charge-modal" role="dialog" aria-label="شارژ پیامک">
|
||||||
@@ -170,7 +171,9 @@ defineExpose({ refresh: load });
|
|||||||
<p v-else class="muted">اطلاعات واریز در دسترس نیست.</p>
|
<p v-else class="muted">اطلاعات واریز در دسترس نیست.</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</Teleport>
|
||||||
|
|
||||||
|
<Teleport to="body">
|
||||||
<div v-if="warnOpen" class="layer">
|
<div v-if="warnOpen" class="layer">
|
||||||
<div class="backdrop" @click="warnOpen = false" />
|
<div class="backdrop" @click="warnOpen = false" />
|
||||||
<div class="modal warn" role="dialog" aria-label="هشدار موجودی منفی">
|
<div class="modal warn" role="dialog" aria-label="هشدار موجودی منفی">
|
||||||
@@ -186,6 +189,7 @@ defineExpose({ refresh: load });
|
|||||||
<button type="button" class="ok" @click="warnOpen = false">متوجه شدم</button>
|
<button type="button" class="ok" @click="warnOpen = false">متوجه شدم</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</Teleport>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -275,9 +279,12 @@ defineExpose({ refresh: load });
|
|||||||
.layer {
|
.layer {
|
||||||
position: fixed;
|
position: fixed;
|
||||||
inset: 0;
|
inset: 0;
|
||||||
z-index: 80;
|
z-index: 120;
|
||||||
display: grid;
|
display: flex;
|
||||||
place-items: center;
|
align-items: center;
|
||||||
|
justify-content: center;
|
||||||
|
padding: 1rem;
|
||||||
|
overflow: auto;
|
||||||
}
|
}
|
||||||
|
|
||||||
.backdrop {
|
.backdrop {
|
||||||
@@ -289,7 +296,8 @@ defineExpose({ refresh: load });
|
|||||||
.modal {
|
.modal {
|
||||||
position: relative;
|
position: relative;
|
||||||
width: min(420px, calc(100vw - 2rem));
|
width: min(420px, calc(100vw - 2rem));
|
||||||
max-height: min(90vh, 640px);
|
max-height: calc(100vh - 2rem);
|
||||||
|
margin: auto;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-radius: 16px;
|
border-radius: 16px;
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import type {
|
|||||||
TeamDto,
|
TeamDto,
|
||||||
TeamMemberRole,
|
TeamMemberRole,
|
||||||
UpdatePriorArchiveCutoffRequest,
|
UpdatePriorArchiveCutoffRequest,
|
||||||
|
UserTreasuryAccess,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import {
|
import {
|
||||||
DATA_ACCESS_SECTION_LABELS,
|
DATA_ACCESS_SECTION_LABELS,
|
||||||
@@ -279,8 +280,13 @@ async function removeTeam(id: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const showTreasury = computed(() => {
|
||||||
|
const modules = auth.user?.enabledModules;
|
||||||
|
return !modules || modules.includes('treasury');
|
||||||
|
});
|
||||||
const expandedAccess = ref<string | null>(null);
|
const expandedAccess = ref<string | null>(null);
|
||||||
const draftAccess = ref<DataAccessPolicy>({});
|
const draftAccess = ref<DataAccessPolicy>({});
|
||||||
|
const draftTreasury = ref<UserTreasuryAccess | null>(null);
|
||||||
const accessMode = ref<'inherit' | 'custom'>('inherit');
|
const accessMode = ref<'inherit' | 'custom'>('inherit');
|
||||||
const accessSaving = ref(false);
|
const accessSaving = ref(false);
|
||||||
|
|
||||||
@@ -323,6 +329,7 @@ function openAccessEditor(u: OrgUserDto) {
|
|||||||
draftAccess.value = hasOverride
|
draftAccess.value = hasOverride
|
||||||
? { ...clonePolicy(u.effectiveDataAccess), ...clonePolicy(override) }
|
? { ...clonePolicy(u.effectiveDataAccess), ...clonePolicy(override) }
|
||||||
: clonePolicy(u.effectiveDataAccess);
|
: clonePolicy(u.effectiveDataAccess);
|
||||||
|
draftTreasury.value = u.treasuryAccessOverride ?? null;
|
||||||
expandedAccess.value = u.id;
|
expandedAccess.value = u.id;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -333,8 +340,8 @@ async function saveUserAccess(userId: string) {
|
|||||||
try {
|
try {
|
||||||
const payload =
|
const payload =
|
||||||
accessMode.value === 'inherit'
|
accessMode.value === 'inherit'
|
||||||
? { dataAccessOverride: null }
|
? { dataAccessOverride: null, treasuryAccessOverride: draftTreasury.value }
|
||||||
: { dataAccessOverride: draftAccess.value };
|
: { dataAccessOverride: draftAccess.value, treasuryAccessOverride: draftTreasury.value };
|
||||||
await api.patch(`/users/${userId}/data-access`, payload);
|
await api.patch(`/users/${userId}/data-access`, payload);
|
||||||
ok.value = 'محدوده داده بهروز شد.';
|
ok.value = 'محدوده داده بهروز شد.';
|
||||||
expandedAccess.value = null;
|
expandedAccess.value = null;
|
||||||
@@ -528,8 +535,10 @@ onMounted(() => {
|
|||||||
سفارشی برای این کاربر
|
سفارشی برای این کاربر
|
||||||
</label>
|
</label>
|
||||||
<DataAccessPolicyPanel
|
<DataAccessPolicyPanel
|
||||||
v-if="accessMode === 'custom'"
|
|
||||||
v-model="draftAccess"
|
v-model="draftAccess"
|
||||||
|
v-model:treasury-access="draftTreasury"
|
||||||
|
:show-treasury="showTreasury"
|
||||||
|
:data-locked="accessMode === 'inherit'"
|
||||||
compact
|
compact
|
||||||
/>
|
/>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ defineProps<{
|
|||||||
| 'pulse'
|
| 'pulse'
|
||||||
| 'sliders'
|
| 'sliders'
|
||||||
| 'camera'
|
| 'camera'
|
||||||
|
| 'clip'
|
||||||
| 'download'
|
| 'download'
|
||||||
| 'upload'
|
| 'upload'
|
||||||
| 'arrow-right'
|
| 'arrow-right'
|
||||||
@@ -423,6 +424,9 @@ defineProps<{
|
|||||||
<path d="M14.5 4h-5L7 7H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-3Z" />
|
<path d="M14.5 4h-5L7 7H4a2 2 0 0 0-2 2v9a2 2 0 0 0 2 2h16a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2h-3Z" />
|
||||||
<circle cx="12" cy="13" r="3" />
|
<circle cx="12" cy="13" r="3" />
|
||||||
</template>
|
</template>
|
||||||
|
<template v-else-if="name === 'clip'">
|
||||||
|
<path d="M21.4 11.6 12.7 20.3a5 5 0 0 1-7.1-7.1l8.5-8.4a3.5 3.5 0 0 1 5 5L10.6 18.2a2 2 0 1 1-2.8-2.8l7.1-7.1" />
|
||||||
|
</template>
|
||||||
</svg>
|
</svg>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, ref, watch } from 'vue';
|
import { computed, ref, watch } from 'vue';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import axios from 'axios';
|
import axios from 'axios';
|
||||||
import type {
|
import type {
|
||||||
ActivityDto,
|
ActivityDto,
|
||||||
@@ -41,7 +41,7 @@ const emit = defineEmits<{
|
|||||||
stagesChanged: [];
|
stagesChanged: [];
|
||||||
add: [stageId: string];
|
add: [stageId: string];
|
||||||
error: [message: string];
|
error: [message: string];
|
||||||
menuDeal: [activity: ActivityDto];
|
menuDeal: [activity: ActivityDto, stageId?: string];
|
||||||
toggleSelect: [activityId: string];
|
toggleSelect: [activityId: string];
|
||||||
bulkDelete: [];
|
bulkDelete: [];
|
||||||
}>();
|
}>();
|
||||||
@@ -120,6 +120,7 @@ function toCard(item: ActivityDto, stageId: string): PipelineDeal {
|
|||||||
assigneeNames,
|
assigneeNames,
|
||||||
ownerId: item.assignee?.id ?? null,
|
ownerId: item.assignee?.id ?? null,
|
||||||
assigneeIds: (item.assignees ?? []).map((a) => a.id),
|
assigneeIds: (item.assignees ?? []).map((a) => a.id),
|
||||||
|
priority: item.priority,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -217,7 +218,7 @@ function findActivity(id: string) {
|
|||||||
|
|
||||||
function onMenuActivity(id: string) {
|
function onMenuActivity(id: string) {
|
||||||
const item = findActivity(id);
|
const item = findActivity(id);
|
||||||
if (item) emit('menuDeal', item);
|
if (item) emit('menuDeal', item, findStageOf(id));
|
||||||
}
|
}
|
||||||
|
|
||||||
function onDragStart(deal: PipelineDeal, event: DragEvent) {
|
function onDragStart(deal: PipelineDeal, event: DragEvent) {
|
||||||
@@ -253,40 +254,54 @@ function onDragOver(stageId: string, event: DragEvent) {
|
|||||||
|
|
||||||
async function moveCard(activityId: string, toStageId: string, index?: number) {
|
async function moveCard(activityId: string, toStageId: string, index?: number) {
|
||||||
const fromStageId = findStageOf(activityId);
|
const fromStageId = findStageOf(activityId);
|
||||||
if (!fromStageId || fromStageId === toStageId) return;
|
if (!fromStageId) return;
|
||||||
const from = columns.value[fromStageId]!;
|
const from = columns.value[fromStageId]!;
|
||||||
const to = columns.value[toStageId];
|
const to = columns.value[toStageId];
|
||||||
if (!to) return;
|
if (!to) return;
|
||||||
const item = from.items.find((i) => i.id === activityId)!;
|
const fromIndex = from.items.findIndex((i) => i.id === activityId);
|
||||||
|
const item = from.items[fromIndex];
|
||||||
|
if (!item) return;
|
||||||
const toStage = props.stages.find((s) => s.id === toStageId)!;
|
const toStage = props.stages.find((s) => s.id === toStageId)!;
|
||||||
|
const same = fromStageId === toStageId;
|
||||||
|
const without = (same ? from.items : to.items).filter((i) => i.id !== activityId);
|
||||||
|
if (same && index == null) return;
|
||||||
|
let insertAt = index == null || index < 0 ? 0 : index;
|
||||||
|
if (same && index != null && index > fromIndex) insertAt -= 1;
|
||||||
|
insertAt = Math.max(0, Math.min(insertAt, without.length));
|
||||||
|
if (same && insertAt === fromIndex) return;
|
||||||
|
|
||||||
const snapshot = {
|
const prevFrom = from.items;
|
||||||
fromItems: from.items,
|
const prevTo = to.items;
|
||||||
fromTotal: from.total,
|
const prevFromTotal = from.total;
|
||||||
toItems: to.items,
|
const prevToTotal = to.total;
|
||||||
toTotal: to.total,
|
|
||||||
};
|
|
||||||
const optimistic: ActivityDto = { ...item, status: toStage.kind, stageId: toStageId };
|
const optimistic: ActivityDto = { ...item, status: toStage.kind, stageId: toStageId };
|
||||||
from.items = from.items.filter((i) => i.id !== activityId);
|
const nextTo = [...without];
|
||||||
from.total = Math.max(0, from.total - 1);
|
nextTo.splice(insertAt, 0, optimistic);
|
||||||
const nextTo = [...to.items];
|
if (same) {
|
||||||
const at = index == null || index < 0 || index > nextTo.length ? 0 : index;
|
from.items = nextTo;
|
||||||
nextTo.splice(at, 0, optimistic);
|
} else {
|
||||||
to.items = nextTo;
|
from.items = from.items.filter((i) => i.id !== activityId);
|
||||||
to.total += 1;
|
from.total = Math.max(0, from.total - 1);
|
||||||
|
to.items = nextTo;
|
||||||
|
to.total += 1;
|
||||||
|
}
|
||||||
|
|
||||||
moving.value = true;
|
moving.value = true;
|
||||||
try {
|
try {
|
||||||
const { data } = await api.patch<ActivityDto>(`/activities/${activityId}/stage`, {
|
const { data } = await api.patch<ActivityDto>(`/activities/${activityId}/stage`, {
|
||||||
stageId: toStageId,
|
stageId: toStageId,
|
||||||
|
position: insertAt,
|
||||||
});
|
});
|
||||||
to.items = to.items.map((i) => (i.id === activityId ? data : i));
|
const column = same ? from : to;
|
||||||
|
column.items = column.items.map((i) => (i.id === activityId ? data : i));
|
||||||
emit('changed');
|
emit('changed');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
from.items = snapshot.fromItems;
|
from.items = prevFrom;
|
||||||
from.total = snapshot.fromTotal;
|
from.total = prevFromTotal;
|
||||||
to.items = snapshot.toItems;
|
if (!same) {
|
||||||
to.total = snapshot.toTotal;
|
to.items = prevTo;
|
||||||
|
to.total = prevToTotal;
|
||||||
|
}
|
||||||
emit('error', apiMessage(e, 'جابهجایی فعالیت ناموفق بود.'));
|
emit('error', apiMessage(e, 'جابهجایی فعالیت ناموفق بود.'));
|
||||||
} finally {
|
} finally {
|
||||||
moving.value = false;
|
moving.value = false;
|
||||||
@@ -389,14 +404,26 @@ async function onAddStage(name: string) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const route = useRoute();
|
|
||||||
|
|
||||||
function openActivity(id: string) {
|
function openActivity(id: string) {
|
||||||
const query: Record<string, string> = {};
|
const query: Record<string, string> = {
|
||||||
for (const key of ['board', 'view', 'desk', 'filter', 'stage', 'q', 'typeDefId', 'status', 'assigneeId', 'title', 'customer', 'due']) {
|
from: 'desk',
|
||||||
const value = route.query[key];
|
nav: crypto.randomUUID(),
|
||||||
if (typeof value === 'string' && value) query[key] = value;
|
view: 'board',
|
||||||
}
|
};
|
||||||
|
const source = props.params;
|
||||||
|
if (source.filter) query.filter = source.filter;
|
||||||
|
if (source.boardId) query.board = source.boardId;
|
||||||
|
if (source.desk) query.desk = source.desk;
|
||||||
|
if (source.q) query.q = source.q;
|
||||||
|
if (source.typeDefId) query.typeDefId = source.typeDefId;
|
||||||
|
else if (source.type) query.type = source.type;
|
||||||
|
if (source.status) query.status = source.status;
|
||||||
|
if (source.assigneeId) query.assigneeId = source.assigneeId;
|
||||||
|
if (source.title) query.title = source.title;
|
||||||
|
if (source.customer) query.customer = source.customer;
|
||||||
|
if (source.due) query.due = source.due;
|
||||||
|
const columnId = findStageOf(id);
|
||||||
|
if (columnId) query.stage = columnId;
|
||||||
void router.push({ name: 'activity-detail', params: { id }, query });
|
void router.push({ name: 'activity-detail', params: { id }, query });
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|||||||
@@ -6,7 +6,8 @@ import {
|
|||||||
formatClockFa,
|
formatClockFa,
|
||||||
formatJalaliDay,
|
formatJalaliDay,
|
||||||
} from '@/lib/jalali';
|
} from '@/lib/jalali';
|
||||||
import { FormFileTooLargeError, prepareFormFieldFile } from '@/lib/form-file-compress';
|
import { prepareActivityAttachment } from '@/lib/activity-attachment';
|
||||||
|
import { startVoiceRecorder, type VoiceRecorder } from '@/lib/voice-note';
|
||||||
import { appendSpokenText } from '@/lib/spoken-text';
|
import { appendSpokenText } from '@/lib/spoken-text';
|
||||||
import UiIcon from '@/components/UiIcon.vue';
|
import UiIcon from '@/components/UiIcon.vue';
|
||||||
import VoiceToTextButton from '@/components/VoiceToTextButton.vue';
|
import VoiceToTextButton from '@/components/VoiceToTextButton.vue';
|
||||||
@@ -29,18 +30,26 @@ const typeIcon: Record<ActivityType, 'phone' | 'users' | 'check' | 'chat'> = {
|
|||||||
note: 'chat',
|
note: 'chat',
|
||||||
};
|
};
|
||||||
|
|
||||||
const PHOTO_TOO_LARGE = 'حجم عکس باید زیر 200 کیلوبایت باشد';
|
|
||||||
const PHOTO_LIMIT = 8;
|
const PHOTO_LIMIT = 8;
|
||||||
|
const VOICE_LIMIT = 5;
|
||||||
|
const FILE_LIMIT = 8;
|
||||||
type PendingPhoto = { localId: string; name: string; dataUrl: string; file: File };
|
type PendingPhoto = { localId: string; name: string; dataUrl: string; file: File };
|
||||||
|
type PendingVoice = { localId: string; name: string; url: string; file: File };
|
||||||
|
type PendingFile = { localId: string; name: string; file: File };
|
||||||
|
|
||||||
const comment = ref('');
|
const comment = ref('');
|
||||||
const textareaRef = ref<HTMLTextAreaElement | null>(null);
|
const textareaRef = ref<HTMLTextAreaElement | null>(null);
|
||||||
const pendingPhotos = ref<PendingPhoto[]>([]);
|
const pendingPhotos = ref<PendingPhoto[]>([]);
|
||||||
|
const pendingVoices = ref<PendingVoice[]>([]);
|
||||||
|
const pendingFiles = ref<PendingFile[]>([]);
|
||||||
const uploadedCount = ref(0);
|
const uploadedCount = ref(0);
|
||||||
const photoBusy = ref(false);
|
const photoBusy = ref(false);
|
||||||
const uploading = ref(false);
|
const uploading = ref(false);
|
||||||
const photoError = ref('');
|
const photoError = ref('');
|
||||||
const photoInput = ref<HTMLInputElement | null>(null);
|
const fileInput = ref<HTMLInputElement | null>(null);
|
||||||
|
const voiceNoteOn = ref(false);
|
||||||
|
const voiceNoteSeconds = ref(0);
|
||||||
|
let voiceNote: VoiceRecorder | null = null;
|
||||||
const orgName = ref('سازمان');
|
const orgName = ref('سازمان');
|
||||||
const users = ref<OrgUserDto[]>([]);
|
const users = ref<OrgUserDto[]>([]);
|
||||||
const mentionOpen = ref(false);
|
const mentionOpen = ref(false);
|
||||||
@@ -72,17 +81,29 @@ const nowLabel = computed(
|
|||||||
() => `${formatJalaliDay(now.value)} ساعت ${formatClockFa(now.value)}`,
|
() => `${formatJalaliDay(now.value)} ساعت ${formatClockFa(now.value)}`,
|
||||||
);
|
);
|
||||||
|
|
||||||
const photoSlotsUsed = computed(
|
function imageCount(kind: 'image' | 'audio' | 'file') {
|
||||||
() => (props.activity.images?.length ?? 0) + uploadedCount.value + pendingPhotos.value.length,
|
return (
|
||||||
);
|
props.activity.images?.filter((image) => {
|
||||||
|
const mime = image.mimeType.toLowerCase();
|
||||||
|
if (kind === 'audio') return mime.startsWith('audio/');
|
||||||
|
if (kind === 'image') return mime.startsWith('image/');
|
||||||
|
return !mime.startsWith('audio/') && !mime.startsWith('image/');
|
||||||
|
}).length ?? 0
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
const canSubmit = computed(
|
const canSubmit = computed(
|
||||||
() =>
|
() =>
|
||||||
(comment.value.trim().length > 0 || pendingPhotos.value.length > 0 || uploadedCount.value > 0) &&
|
(comment.value.trim().length > 0 ||
|
||||||
|
pendingPhotos.value.length > 0 ||
|
||||||
|
pendingVoices.value.length > 0 ||
|
||||||
|
pendingFiles.value.length > 0 ||
|
||||||
|
uploadedCount.value > 0) &&
|
||||||
!props.saving &&
|
!props.saving &&
|
||||||
!voiceBusy.value &&
|
!voiceBusy.value &&
|
||||||
!photoBusy.value &&
|
!photoBusy.value &&
|
||||||
!uploading.value,
|
!uploading.value &&
|
||||||
|
!voiceNoteOn.value,
|
||||||
);
|
);
|
||||||
|
|
||||||
function onVoiceTranscript(text: string) {
|
function onVoiceTranscript(text: string) {
|
||||||
@@ -105,36 +126,45 @@ function apiMessage(error: unknown, fallback: string) {
|
|||||||
return fallback;
|
return fallback;
|
||||||
}
|
}
|
||||||
|
|
||||||
async function onPhotosPicked(event: Event) {
|
async function onFilesPicked(event: Event) {
|
||||||
const input = event.target as HTMLInputElement;
|
const input = event.target as HTMLInputElement;
|
||||||
const files = Array.from(input.files ?? []);
|
const files = Array.from(input.files ?? []);
|
||||||
input.value = '';
|
input.value = '';
|
||||||
if (!files.length) return;
|
if (!files.length) return;
|
||||||
photoError.value = '';
|
photoError.value = '';
|
||||||
for (const file of files) {
|
for (const file of files) {
|
||||||
if (photoSlotsUsed.value >= PHOTO_LIMIT) {
|
|
||||||
photoError.value = `حداکثر ${PHOTO_LIMIT} عکس برای هر فعالیت مجاز است`;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if (!file.type.startsWith('image/')) {
|
|
||||||
photoError.value = 'فقط عکس میتوانید اضافه کنید.';
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
photoBusy.value = true;
|
photoBusy.value = true;
|
||||||
try {
|
try {
|
||||||
const prepared = await prepareFormFieldFile(file);
|
const prepared = await prepareActivityAttachment(file);
|
||||||
pendingPhotos.value = [
|
if (prepared.kind === 'image') {
|
||||||
...pendingPhotos.value,
|
if (imageCount('image') + pendingPhotos.value.length >= PHOTO_LIMIT) {
|
||||||
{
|
photoError.value = `حداکثر ${PHOTO_LIMIT} عکس برای هر فعالیت.`;
|
||||||
localId: crypto.randomUUID(),
|
continue;
|
||||||
name: prepared.name,
|
}
|
||||||
dataUrl: prepared.dataUrl,
|
pendingPhotos.value = [
|
||||||
file: prepared.file,
|
...pendingPhotos.value,
|
||||||
},
|
{ localId: crypto.randomUUID(), name: prepared.name, dataUrl: prepared.previewUrl, file: prepared.file },
|
||||||
];
|
];
|
||||||
|
} else if (prepared.kind === 'audio') {
|
||||||
|
if (imageCount('audio') + pendingVoices.value.length >= VOICE_LIMIT) {
|
||||||
|
URL.revokeObjectURL(prepared.previewUrl);
|
||||||
|
photoError.value = `حداکثر ${VOICE_LIMIT} صوت برای هر فعالیت.`;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
pendingVoices.value = [
|
||||||
|
...pendingVoices.value,
|
||||||
|
{ localId: crypto.randomUUID(), name: prepared.name, url: prepared.previewUrl, file: prepared.file },
|
||||||
|
];
|
||||||
|
} else if (imageCount('file') + pendingFiles.value.length >= FILE_LIMIT) {
|
||||||
|
photoError.value = `حداکثر ${FILE_LIMIT} فایل برای هر فعالیت.`;
|
||||||
|
} else {
|
||||||
|
pendingFiles.value = [
|
||||||
|
...pendingFiles.value,
|
||||||
|
{ localId: crypto.randomUUID(), name: prepared.name, file: prepared.file },
|
||||||
|
];
|
||||||
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
photoError.value =
|
photoError.value = error instanceof Error ? error.message : 'افزودن فایل ناموفق بود.';
|
||||||
error instanceof FormFileTooLargeError ? PHOTO_TOO_LARGE : 'فشردهسازی عکس ناموفق بود.';
|
|
||||||
} finally {
|
} finally {
|
||||||
photoBusy.value = false;
|
photoBusy.value = false;
|
||||||
}
|
}
|
||||||
@@ -143,18 +173,86 @@ async function onPhotosPicked(event: Event) {
|
|||||||
|
|
||||||
function removePendingPhoto(localId: string) {
|
function removePendingPhoto(localId: string) {
|
||||||
pendingPhotos.value = pendingPhotos.value.filter((photo) => photo.localId !== localId);
|
pendingPhotos.value = pendingPhotos.value.filter((photo) => photo.localId !== localId);
|
||||||
if (photoError.value === PHOTO_TOO_LARGE) photoError.value = '';
|
}
|
||||||
|
|
||||||
|
function removePendingVoice(localId: string) {
|
||||||
|
const voice = pendingVoices.value.find((item) => item.localId === localId);
|
||||||
|
if (voice) URL.revokeObjectURL(voice.url);
|
||||||
|
pendingVoices.value = pendingVoices.value.filter((item) => item.localId !== localId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function removePendingFile(localId: string) {
|
||||||
|
pendingFiles.value = pendingFiles.value.filter((item) => item.localId !== localId);
|
||||||
|
}
|
||||||
|
|
||||||
|
function voiceClock(total: number) {
|
||||||
|
return `${Math.floor(total / 60)}:${String(total % 60).padStart(2, '0')}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
function addVoiceNote(file: File) {
|
||||||
|
if (imageCount('audio') + pendingVoices.value.length >= VOICE_LIMIT) {
|
||||||
|
photoError.value = `حداکثر ${VOICE_LIMIT} صوت برای هر فعالیت.`;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
pendingVoices.value = [
|
||||||
|
...pendingVoices.value,
|
||||||
|
{ localId: crypto.randomUUID(), name: file.name, url: URL.createObjectURL(file), file },
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
async function toggleVoiceNote() {
|
||||||
|
photoError.value = '';
|
||||||
|
if (voiceNote) {
|
||||||
|
const handle = voiceNote;
|
||||||
|
voiceNote = null;
|
||||||
|
voiceNoteOn.value = false;
|
||||||
|
try {
|
||||||
|
addVoiceNote(await handle.stop());
|
||||||
|
} catch (error) {
|
||||||
|
photoError.value = error instanceof Error ? error.message : 'ضبط صوت ناموفق بود.';
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
voiceNoteSeconds.value = 0;
|
||||||
|
voiceNote = await startVoiceRecorder({
|
||||||
|
onTick: (seconds) => {
|
||||||
|
voiceNoteSeconds.value = seconds;
|
||||||
|
},
|
||||||
|
onAutoStop: (file) => {
|
||||||
|
voiceNote = null;
|
||||||
|
voiceNoteOn.value = false;
|
||||||
|
addVoiceNote(file);
|
||||||
|
},
|
||||||
|
});
|
||||||
|
voiceNoteOn.value = true;
|
||||||
|
} catch (error) {
|
||||||
|
photoError.value = error instanceof Error ? error.message : 'ضبط صوت ناموفق بود.';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async function uploadQueue(items: Array<{ localId: string; name: string; file: File }>, drop: (localId: string) => void) {
|
||||||
|
for (const item of items) {
|
||||||
|
const form = new FormData();
|
||||||
|
form.append('file', item.file, item.name);
|
||||||
|
await api.post(`/activities/${props.activity.id}/images`, form);
|
||||||
|
drop(item.localId);
|
||||||
|
uploadedCount.value += 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async function uploadPendingPhotos() {
|
async function uploadPendingPhotos() {
|
||||||
const queue = [...pendingPhotos.value];
|
await uploadQueue([...pendingPhotos.value], (localId) => {
|
||||||
for (const photo of queue) {
|
pendingPhotos.value = pendingPhotos.value.filter((item) => item.localId !== localId);
|
||||||
const form = new FormData();
|
});
|
||||||
form.append('file', photo.file, photo.name);
|
await uploadQueue([...pendingVoices.value], (localId) => {
|
||||||
await api.post(`/activities/${props.activity.id}/images`, form);
|
const voice = pendingVoices.value.find((item) => item.localId === localId);
|
||||||
pendingPhotos.value = pendingPhotos.value.filter((item) => item.localId !== photo.localId);
|
if (voice) URL.revokeObjectURL(voice.url);
|
||||||
uploadedCount.value += 1;
|
pendingVoices.value = pendingVoices.value.filter((item) => item.localId !== localId);
|
||||||
}
|
});
|
||||||
|
await uploadQueue([...pendingFiles.value], (localId) => {
|
||||||
|
pendingFiles.value = pendingFiles.value.filter((item) => item.localId !== localId);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
async function submit() {
|
async function submit() {
|
||||||
@@ -162,14 +260,18 @@ async function submit() {
|
|||||||
if (!canSubmit.value) return;
|
if (!canSubmit.value) return;
|
||||||
photoError.value = '';
|
photoError.value = '';
|
||||||
uploading.value = true;
|
uploading.value = true;
|
||||||
const hadPhoto = pendingPhotos.value.length > 0 || uploadedCount.value > 0;
|
const hadPhoto =
|
||||||
|
pendingPhotos.value.length > 0 ||
|
||||||
|
pendingVoices.value.length > 0 ||
|
||||||
|
pendingFiles.value.length > 0 ||
|
||||||
|
uploadedCount.value > 0;
|
||||||
try {
|
try {
|
||||||
await uploadPendingPhotos();
|
await uploadPendingPhotos();
|
||||||
await props.save({ text, photoOnly: hadPhoto && !text });
|
await props.save({ text, photoOnly: hadPhoto && !text });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
photoError.value =
|
photoError.value =
|
||||||
pendingPhotos.value.length > 0
|
pendingPhotos.value.length > 0
|
||||||
? apiMessage(error, 'افزودن عکس ناموفق بود.')
|
? apiMessage(error, 'افزودن فایل ناموفق بود.')
|
||||||
: apiMessage(error, 'ثبت نظر ناموفق بود.');
|
: apiMessage(error, 'ثبت نظر ناموفق بود.');
|
||||||
} finally {
|
} finally {
|
||||||
uploading.value = false;
|
uploading.value = false;
|
||||||
@@ -243,6 +345,8 @@ onMounted(async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
onBeforeUnmount(() => {
|
onBeforeUnmount(() => {
|
||||||
|
voiceNote?.cancel();
|
||||||
|
for (const voice of pendingVoices.value) URL.revokeObjectURL(voice.url);
|
||||||
document.body.style.overflow = '';
|
document.body.style.overflow = '';
|
||||||
window.removeEventListener('keydown', onKeydown);
|
window.removeEventListener('keydown', onKeydown);
|
||||||
clearInterval(clockTimer);
|
clearInterval(clockTimer);
|
||||||
@@ -308,26 +412,6 @@ onBeforeUnmount(() => {
|
|||||||
rows="6"
|
rows="6"
|
||||||
placeholder="متن خود را بنویسید..."
|
placeholder="متن خود را بنویسید..."
|
||||||
/>
|
/>
|
||||||
<div class="photo-row">
|
|
||||||
<button
|
|
||||||
class="photo-add"
|
|
||||||
type="button"
|
|
||||||
:disabled="photoBusy || uploading || recording || photoSlotsUsed >= PHOTO_LIMIT"
|
|
||||||
@click="photoInput?.click()"
|
|
||||||
>
|
|
||||||
<UiIcon name="camera" :size="16" />
|
|
||||||
{{ photoBusy ? 'در حال کمحجم کردن عکس…' : 'افزودن عکس' }}
|
|
||||||
</button>
|
|
||||||
<input
|
|
||||||
ref="photoInput"
|
|
||||||
class="photo-file"
|
|
||||||
type="file"
|
|
||||||
accept="image/*"
|
|
||||||
multiple
|
|
||||||
@change="onPhotosPicked"
|
|
||||||
/>
|
|
||||||
<small>عکس خودکار کمحجم میشود تا زیر ۲۰۰ کیلوبایت بماند.</small>
|
|
||||||
</div>
|
|
||||||
<p v-if="photoError" class="photo-err">{{ photoError }}</p>
|
<p v-if="photoError" class="photo-err">{{ photoError }}</p>
|
||||||
<div v-if="pendingPhotos.length" class="photo-grid">
|
<div v-if="pendingPhotos.length" class="photo-grid">
|
||||||
<figure v-for="photo in pendingPhotos" :key="photo.localId">
|
<figure v-for="photo in pendingPhotos" :key="photo.localId">
|
||||||
@@ -337,13 +421,31 @@ onBeforeUnmount(() => {
|
|||||||
</button>
|
</button>
|
||||||
</figure>
|
</figure>
|
||||||
</div>
|
</div>
|
||||||
|
<div v-if="pendingVoices.length" class="voice-list">
|
||||||
|
<div v-for="voice in pendingVoices" :key="voice.localId" class="voice-item">
|
||||||
|
<audio :src="voice.url" controls preload="metadata" />
|
||||||
|
<button type="button" aria-label="حذف صوت" :disabled="uploading" @click="removePendingVoice(voice.localId)">
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<ul v-if="pendingFiles.length" class="file-list">
|
||||||
|
<li v-for="file in pendingFiles" :key="file.localId">
|
||||||
|
<UiIcon name="document" :size="15" />
|
||||||
|
<span>{{ file.name }}</span>
|
||||||
|
<button type="button" aria-label="حذف فایل" :disabled="uploading" @click="removePendingFile(file.localId)">
|
||||||
|
×
|
||||||
|
</button>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
<div class="tools">
|
<div class="tools">
|
||||||
|
<div class="tool-cluster">
|
||||||
<div class="tool-wrap">
|
<div class="tool-wrap">
|
||||||
<button
|
<button
|
||||||
class="tool"
|
class="tool"
|
||||||
type="button"
|
type="button"
|
||||||
aria-label="منشن"
|
aria-label="منشن"
|
||||||
:disabled="recording"
|
:disabled="recording || voiceNoteOn"
|
||||||
@click="mentionOpen = !mentionOpen"
|
@click="mentionOpen = !mentionOpen"
|
||||||
>
|
>
|
||||||
@
|
@
|
||||||
@@ -357,12 +459,36 @@ onBeforeUnmount(() => {
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
<button
|
||||||
|
class="tool"
|
||||||
|
type="button"
|
||||||
|
aria-label="پیوست"
|
||||||
|
title="پیوست"
|
||||||
|
:disabled="photoBusy || uploading || recording || voiceNoteOn"
|
||||||
|
@click="fileInput?.click()"
|
||||||
|
>
|
||||||
|
<UiIcon name="clip" :size="16" />
|
||||||
|
</button>
|
||||||
|
<input ref="fileInput" class="photo-file" type="file" multiple @change="onFilesPicked" />
|
||||||
|
<button
|
||||||
|
class="tool"
|
||||||
|
type="button"
|
||||||
|
:class="{ 'voice-on': voiceNoteOn }"
|
||||||
|
:aria-label="voiceNoteOn ? 'توقف ضبط پیام صوتی' : 'ضبط پیام صوتی'"
|
||||||
|
:title="voiceNoteOn ? 'توقف ضبط پیام صوتی' : 'ضبط پیام صوتی'"
|
||||||
|
:disabled="photoBusy || uploading || recording"
|
||||||
|
@click="toggleVoiceNote"
|
||||||
|
>
|
||||||
|
<UiIcon name="mic" :size="16" />
|
||||||
|
</button>
|
||||||
|
<span v-if="voiceNoteOn" class="rec-time">{{ voiceClock(voiceNoteSeconds) }}</span>
|
||||||
|
</div>
|
||||||
<div class="tool-wrap">
|
<div class="tool-wrap">
|
||||||
<p v-if="voiceTip && !recording" class="tip">تایپ صوتی را امتحان کنید! 🎙️✨</p>
|
<p v-if="voiceTip && !recording" class="tip">تایپ صوتی را امتحان کنید! 🎙️✨</p>
|
||||||
<VoiceToTextButton
|
<VoiceToTextButton
|
||||||
variant="toolbar"
|
variant="toolbar"
|
||||||
hide-error
|
hide-error
|
||||||
:disabled="saving"
|
:disabled="saving || voiceNoteOn"
|
||||||
@transcript="onVoiceTranscript"
|
@transcript="onVoiceTranscript"
|
||||||
@recording="recording = $event"
|
@recording="recording = $event"
|
||||||
@busy="onVoiceBusy"
|
@busy="onVoiceBusy"
|
||||||
@@ -665,6 +791,73 @@ onBeforeUnmount(() => {
|
|||||||
padding: 0.35rem 0.5rem 0.5rem;
|
padding: 0.35rem 0.5rem 0.5rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.tool-cluster {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tool.voice-on {
|
||||||
|
border-color: #fecaca;
|
||||||
|
background: #fef2f2;
|
||||||
|
color: #b91c1c;
|
||||||
|
}
|
||||||
|
|
||||||
|
.rec-time {
|
||||||
|
color: #b91c1c;
|
||||||
|
font-size: 0.78rem;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-list {
|
||||||
|
display: grid;
|
||||||
|
gap: 0.35rem;
|
||||||
|
padding: 0 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-item {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.35rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-item audio {
|
||||||
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
|
height: 2.1rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.voice-item button,
|
||||||
|
.file-list button {
|
||||||
|
width: 1.4rem;
|
||||||
|
height: 1.4rem;
|
||||||
|
border: 0;
|
||||||
|
border-radius: 999px;
|
||||||
|
background: #e2e8f0;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-list {
|
||||||
|
list-style: none;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0 0.5rem;
|
||||||
|
display: grid;
|
||||||
|
gap: 0.3rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-list li {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.35rem;
|
||||||
|
min-width: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.file-list span {
|
||||||
|
overflow: hidden;
|
||||||
|
text-overflow: ellipsis;
|
||||||
|
white-space: nowrap;
|
||||||
|
}
|
||||||
|
|
||||||
.tool-wrap {
|
.tool-wrap {
|
||||||
position: relative;
|
position: relative;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref, watch } from 'vue';
|
import { computed, ref, watch } from 'vue';
|
||||||
import type {
|
import type {
|
||||||
ActivityChecklistItem,
|
ActivityChecklistItem,
|
||||||
ActivityFieldDef,
|
ActivityFieldDef,
|
||||||
@@ -11,6 +11,8 @@ import type {
|
|||||||
PersonDto,
|
PersonDto,
|
||||||
} from '@mento/shared';
|
} from '@mento/shared';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
|
import { canAssignToOthers } from '@/lib/assign-access';
|
||||||
|
import { useAuthStore } from '@/stores/auth';
|
||||||
import { toFaDigits } from '@/lib/jalali';
|
import { toFaDigits } from '@/lib/jalali';
|
||||||
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
import JalaliDateInput from '@/components/JalaliDateInput.vue';
|
||||||
import UserMultiSelect from '@/components/UserMultiSelect.vue';
|
import UserMultiSelect from '@/components/UserMultiSelect.vue';
|
||||||
@@ -22,6 +24,8 @@ const props = defineProps<{
|
|||||||
}>();
|
}>();
|
||||||
|
|
||||||
const model = defineModel<ActivityFieldValues>({ required: true });
|
const model = defineModel<ActivityFieldValues>({ required: true });
|
||||||
|
const auth = useAuthStore();
|
||||||
|
const canAssignOthers = computed(() => canAssignToOthers(auth.user, 'activities'));
|
||||||
|
|
||||||
function get<T extends ActivityFieldValue>(key: string, fallback: T): T {
|
function get<T extends ActivityFieldValue>(key: string, fallback: T): T {
|
||||||
const v = model.value[key];
|
const v = model.value[key];
|
||||||
@@ -304,6 +308,7 @@ watch(
|
|||||||
<UserMultiSelect
|
<UserMultiSelect
|
||||||
:model-value="participants(f.key).userIds"
|
:model-value="participants(f.key).userIds"
|
||||||
:users="users"
|
:users="users"
|
||||||
|
:disabled="!canAssignOthers"
|
||||||
add-label="افزودن همکار"
|
add-label="افزودن همکار"
|
||||||
empty-label="همکاری انتخاب نشده"
|
empty-label="همکاری انتخاب نشده"
|
||||||
@update:model-value="(ids: string[]) => patchParticipants(f.key, { userIds: ids })"
|
@update:model-value="(ids: string[]) => patchParticipants(f.key, { userIds: ids })"
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ import {
|
|||||||
CalendarOutlined,
|
CalendarOutlined,
|
||||||
CheckOutlined,
|
CheckOutlined,
|
||||||
DeleteOutlined,
|
DeleteOutlined,
|
||||||
|
FlagFilled,
|
||||||
MoreOutlined,
|
MoreOutlined,
|
||||||
} from '@ant-design/icons-vue';
|
} from '@ant-design/icons-vue';
|
||||||
import {
|
import {
|
||||||
@@ -13,10 +14,12 @@ import {
|
|||||||
Flex as AFlex,
|
Flex as AFlex,
|
||||||
Space as ASpace,
|
Space as ASpace,
|
||||||
Tag as ATag,
|
Tag as ATag,
|
||||||
|
Tooltip as ATooltip,
|
||||||
Typography,
|
Typography,
|
||||||
theme,
|
theme,
|
||||||
} from 'ant-design-vue';
|
} from 'ant-design-vue';
|
||||||
import { userAvatarSrc } from '@/lib/userAvatars';
|
import { userAvatarSrc } from '@/lib/userAvatars';
|
||||||
|
import type { ActivityPriority } from '@mento/shared';
|
||||||
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
|
import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board';
|
||||||
import { DEAL_BOARD_COPY, formatCurrencyParts } from '@/lib/pipeline-board';
|
import { DEAL_BOARD_COPY, formatCurrencyParts } from '@/lib/pipeline-board';
|
||||||
|
|
||||||
@@ -60,14 +63,26 @@ const extraAssignees = computed(() =>
|
|||||||
Math.max(0, (props.deal.assigneeNames?.length ?? 0) - 1),
|
Math.max(0, (props.deal.assigneeNames?.length ?? 0) - 1),
|
||||||
);
|
);
|
||||||
const showTrash = computed(() => props.selectMode && props.selected);
|
const showTrash = computed(() => props.selectMode && props.selected);
|
||||||
|
const PRIORITY_FLAG: Record<ActivityPriority, { label: string; color: string }> = {
|
||||||
|
very_high: { label: 'خیلی زیاد', color: '#dc2626' },
|
||||||
|
high: { label: 'زیاد', color: '#ea580c' },
|
||||||
|
medium: { label: 'متوسط', color: '#eab308' },
|
||||||
|
low: { label: 'کم', color: '#16a34a' },
|
||||||
|
very_low: { label: 'خیلی کم', color: '#94a3b8' },
|
||||||
|
};
|
||||||
|
const priorityFlag = computed(() =>
|
||||||
|
props.deal.priority ? PRIORITY_FLAG[props.deal.priority] : null,
|
||||||
|
);
|
||||||
|
|
||||||
const cardStyle = computed(() => ({
|
const cardStyle = computed(() => ({
|
||||||
cursor: props.selectMode ? 'pointer' : 'grab',
|
cursor: props.selectMode ? 'pointer' : 'grab',
|
||||||
opacity: props.dragging ? 0.45 : 1,
|
opacity: props.dragging ? 0.4 : 1,
|
||||||
|
transform: props.dragging ? 'scale(0.98)' : 'none',
|
||||||
|
transition: 'opacity 180ms ease, transform 180ms ease, box-shadow 180ms ease',
|
||||||
margin: 0,
|
margin: 0,
|
||||||
background: props.selected ? token.value.colorPrimaryBg : token.value.colorBgContainer,
|
background: props.selected ? token.value.colorPrimaryBg : token.value.colorBgContainer,
|
||||||
borderColor: props.selected ? token.value.colorPrimary : token.value.colorBorderSecondary,
|
borderColor: props.selected ? token.value.colorPrimary : token.value.colorBorderSecondary,
|
||||||
boxShadow: token.value.boxShadowTertiary,
|
boxShadow: props.dragging ? token.value.boxShadow : token.value.boxShadowTertiary,
|
||||||
}));
|
}));
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
@@ -194,6 +209,11 @@ const cardStyle = computed(() => ({
|
|||||||
{{ money.unit }}
|
{{ money.unit }}
|
||||||
</a-typography-text>
|
</a-typography-text>
|
||||||
</a-typography-text>
|
</a-typography-text>
|
||||||
|
<a-tooltip v-if="priorityFlag" :title="`اولویت: ${priorityFlag.label}`">
|
||||||
|
<span :style="{ display: 'inline-flex', flexShrink: 0, lineHeight: 1 }">
|
||||||
|
<FlagFilled :style="{ color: priorityFlag.color, fontSize: '16px' }" />
|
||||||
|
</span>
|
||||||
|
</a-tooltip>
|
||||||
</a-flex>
|
</a-flex>
|
||||||
</a-flex>
|
</a-flex>
|
||||||
</a-card>
|
</a-card>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import {
|
|||||||
import AddDealButton from './AddDealButton.vue';
|
import AddDealButton from './AddDealButton.vue';
|
||||||
import DealCard from './DealCard.vue';
|
import DealCard from './DealCard.vue';
|
||||||
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
|
import type { PipelineDeal, PipelineStage, PipelineUiCopy } from '@/lib/pipeline-board';
|
||||||
import { DEAL_BOARD_COPY, PIPELINE_ACCENT } from '@/lib/pipeline-board';
|
import { DEAL_BOARD_COPY, PIPELINE_ACCENT, dragScrollColumn, pointerDropIndex, stopDragScroll } from '@/lib/pipeline-board';
|
||||||
|
|
||||||
const props = withDefaults(
|
const props = withDefaults(
|
||||||
defineProps<{
|
defineProps<{
|
||||||
@@ -51,6 +51,8 @@ const emit = defineEmits<{
|
|||||||
const { Text: ATypographyText } = Typography;
|
const { Text: ATypographyText } = Typography;
|
||||||
const { token } = theme.useToken();
|
const { token } = theme.useToken();
|
||||||
|
|
||||||
|
const bodyEl = ref<HTMLElement | null>(null);
|
||||||
|
const insertAt = ref<number | null>(null);
|
||||||
const renaming = ref(false);
|
const renaming = ref(false);
|
||||||
const draft = ref('');
|
const draft = ref('');
|
||||||
const titleInput = ref<{ focus: () => void; select?: () => void } | null>(null);
|
const titleInput = ref<{ focus: () => void; select?: () => void } | null>(null);
|
||||||
@@ -106,16 +108,49 @@ const bodyStyle = computed(() => ({
|
|||||||
margin: 0,
|
margin: 0,
|
||||||
}));
|
}));
|
||||||
|
|
||||||
function onCardDragOver(stageId: string, event: DragEvent) {
|
function trackDrag(event: DragEvent, index: number | null) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
|
dragScrollColumn(bodyEl.value, event.clientY);
|
||||||
|
if (index != null) insertAt.value = index;
|
||||||
|
}
|
||||||
|
|
||||||
|
function clearDragUi() {
|
||||||
|
insertAt.value = null;
|
||||||
|
stopDragScroll();
|
||||||
|
}
|
||||||
|
|
||||||
|
function onCardDragOver(stageId: string, index: number, event: DragEvent) {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
|
trackDrag(event, pointerDropIndex(index, event));
|
||||||
emit('dragOver', stageId, event);
|
emit('dragOver', stageId, event);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function onColumnDrop(event: DragEvent) {
|
||||||
|
const at = insertAt.value ?? undefined;
|
||||||
|
clearDragUi();
|
||||||
|
emit('drop', props.stage.id, event, at);
|
||||||
|
}
|
||||||
|
|
||||||
function onCardDrop(stageId: string, index: number, event: DragEvent) {
|
function onCardDrop(stageId: string, index: number, event: DragEvent) {
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
emit('drop', stageId, event, index);
|
const at = insertAt.value ?? pointerDropIndex(index, event);
|
||||||
|
clearDragUi();
|
||||||
|
emit('drop', stageId, event, at);
|
||||||
|
}
|
||||||
|
|
||||||
|
function slotStyle(active: boolean, collapseGap = false) {
|
||||||
|
return {
|
||||||
|
height: active ? '36px' : '0px',
|
||||||
|
marginTop: !active && collapseGap ? '-12px' : '0',
|
||||||
|
borderRadius: `${token.value.borderRadius}px`,
|
||||||
|
background: active ? token.value.colorPrimaryBg : 'transparent',
|
||||||
|
outline: active ? `1px dashed ${token.value.colorPrimary}` : 'none',
|
||||||
|
outlineOffset: '-1px',
|
||||||
|
transition: 'height 180ms ease, margin-top 180ms ease, background 180ms ease',
|
||||||
|
overflow: 'hidden',
|
||||||
|
flexShrink: 0,
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
function startRename() {
|
function startRename() {
|
||||||
@@ -174,8 +209,8 @@ function onMenuClick({ key }: { key: string | number }) {
|
|||||||
<template>
|
<template>
|
||||||
<section
|
<section
|
||||||
:style="columnStyle"
|
:style="columnStyle"
|
||||||
@dragover.prevent="emit('dragOver', stage.id, $event)"
|
@dragover.prevent="trackDrag($event, null); emit('dragOver', stage.id, $event)"
|
||||||
@drop.prevent="emit('drop', stage.id, $event)"
|
@drop.prevent="onColumnDrop"
|
||||||
>
|
>
|
||||||
<div :style="headStyle">
|
<div :style="headStyle">
|
||||||
<span
|
<span
|
||||||
@@ -260,13 +295,18 @@ function onMenuClick({ key }: { key: string | number }) {
|
|||||||
</a-dropdown>
|
</a-dropdown>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div role="list" :aria-label="stage.title" :style="bodyStyle">
|
<div ref="bodyEl" role="list" :aria-label="stage.title" :style="bodyStyle">
|
||||||
<div
|
<div
|
||||||
v-for="(deal, index) in stage.deals"
|
v-for="(deal, index) in stage.deals"
|
||||||
:key="deal.id"
|
:key="deal.id"
|
||||||
@dragover="onCardDragOver(stage.id, $event)"
|
@dragover="onCardDragOver(stage.id, index, $event)"
|
||||||
@drop="onCardDrop(stage.id, index, $event)"
|
@drop="onCardDrop(stage.id, index, $event)"
|
||||||
>
|
>
|
||||||
|
<div
|
||||||
|
:style="slotStyle(dropActive && insertAt === index)"
|
||||||
|
@dragover.stop.prevent="trackDrag($event, index); emit('dragOver', stage.id, $event)"
|
||||||
|
@drop.stop.prevent="clearDragUi(); emit('drop', stage.id, $event, index)"
|
||||||
|
/>
|
||||||
<DealCard
|
<DealCard
|
||||||
:deal="deal"
|
:deal="deal"
|
||||||
:accent="stage.color"
|
:accent="stage.color"
|
||||||
@@ -275,13 +315,18 @@ function onMenuClick({ key }: { key: string | number }) {
|
|||||||
:select-mode="selectMode"
|
:select-mode="selectMode"
|
||||||
:selected="selectedIds.has(deal.id)"
|
:selected="selectedIds.has(deal.id)"
|
||||||
@drag-start="(d, e) => emit('dragStart', d, e)"
|
@drag-start="(d, e) => emit('dragStart', d, e)"
|
||||||
@drag-end="emit('dragEnd')"
|
@drag-end="clearDragUi(); emit('dragEnd')"
|
||||||
@open="emit('openDeal', $event)"
|
@open="emit('openDeal', $event)"
|
||||||
@menu="emit('menuDeal', $event)"
|
@menu="emit('menuDeal', $event)"
|
||||||
@toggle-select="emit('toggleSelect', $event)"
|
@toggle-select="emit('toggleSelect', $event)"
|
||||||
@bulk-delete="emit('bulkDelete')"
|
@bulk-delete="emit('bulkDelete')"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
<div
|
||||||
|
:style="slotStyle(dropActive && insertAt === stage.deals.length, true)"
|
||||||
|
@dragover.stop.prevent="trackDrag($event, stage.deals.length); emit('dragOver', stage.id, $event)"
|
||||||
|
@drop.stop.prevent="clearDragUi(); emit('drop', stage.id, $event, stage.deals.length)"
|
||||||
|
/>
|
||||||
<a-typography-text
|
<a-typography-text
|
||||||
v-if="!stage.deals.length"
|
v-if="!stage.deals.length"
|
||||||
type="secondary"
|
type="secondary"
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ import {
|
|||||||
todayKey,
|
todayKey,
|
||||||
} from '@/lib/routines';
|
} from '@/lib/routines';
|
||||||
import { useAuthStore } from '@/stores/auth';
|
import { useAuthStore } from '@/stores/auth';
|
||||||
|
import { canAssignToOthers } from '@/lib/assign-access';
|
||||||
|
|
||||||
const { Text: ATypographyText } = Typography;
|
const { Text: ATypographyText } = Typography;
|
||||||
|
|
||||||
@@ -117,7 +118,7 @@ watch(
|
|||||||
|
|
||||||
const assignees = computed(() => {
|
const assignees = computed(() => {
|
||||||
const c = ctx.value;
|
const c = ctx.value;
|
||||||
if (!c?.isManager) return [];
|
if (!c?.isManager || !canAssignToOthers(auth.user, 'routines')) return [];
|
||||||
return c.users;
|
return c.users;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ import {
|
|||||||
UiTextarea,
|
UiTextarea,
|
||||||
} from '@/components/ui';
|
} from '@/components/ui';
|
||||||
import { api } from '@/lib/api';
|
import { api } from '@/lib/api';
|
||||||
|
import { canAssignToOthers } from '@/lib/assign-access';
|
||||||
|
import { useAuthStore } from '@/stores/auth';
|
||||||
import { formatJalaliDayClock } from '@/lib/jalali';
|
import { formatJalaliDayClock } from '@/lib/jalali';
|
||||||
import {
|
import {
|
||||||
ENTITY_TYPE_LABELS,
|
ENTITY_TYPE_LABELS,
|
||||||
@@ -103,7 +105,9 @@ const customerTask = computed(() => {
|
|||||||
return (t.source !== 'routine' && t.source !== 'manual') || t.entities.length > 0;
|
return (t.source !== 'routine' && t.source !== 'manual') || t.entities.length > 0;
|
||||||
});
|
});
|
||||||
const done = computed(() => task.value?.status === 'completed');
|
const done = computed(() => task.value?.status === 'completed');
|
||||||
|
const auth = useAuthStore();
|
||||||
const canManage = computed(() => !!shell?.context.value?.isManager);
|
const canManage = computed(() => !!shell?.context.value?.isManager);
|
||||||
|
const canAssignOthers = computed(() => canAssignToOthers(auth.user, 'routines'));
|
||||||
const priorities = Object.entries(PRIORITY_LABELS) as Array<[ActivityPriority, string]>;
|
const priorities = Object.entries(PRIORITY_LABELS) as Array<[ActivityPriority, string]>;
|
||||||
|
|
||||||
function startEdit() {
|
function startEdit() {
|
||||||
@@ -276,7 +280,7 @@ function eventText(ev: RoutineTaskEventDto): string {
|
|||||||
<JalaliDateInput v-model="edit.time" mode="time" />
|
<JalaliDateInput v-model="edit.time" mode="time" />
|
||||||
</UiField>
|
</UiField>
|
||||||
</template>
|
</template>
|
||||||
<UiField v-if="canManage" label="مسئول" class="span-2">
|
<UiField v-if="canManage && canAssignOthers" label="مسئول" class="span-2">
|
||||||
<UiSelect v-model="edit.assigneeId">
|
<UiSelect v-model="edit.assigneeId">
|
||||||
<option v-for="u in shell?.context.value?.users ?? []" :key="u.id" :value="u.id">
|
<option v-for="u in shell?.context.value?.users ?? []" :key="u.id" :value="u.id">
|
||||||
{{ u.fullName }}
|
{{ u.fullName }}
|
||||||
|
|||||||
@@ -2,31 +2,30 @@
|
|||||||
import { computed } from 'vue';
|
import { computed } from 'vue';
|
||||||
import { useRoute, useRouter } from 'vue-router';
|
import { useRoute, useRouter } from 'vue-router';
|
||||||
import { Segmented as ASegmented } from 'ant-design-vue';
|
import { Segmented as ASegmented } from 'ant-design-vue';
|
||||||
|
import { treasurySectionAllowed, type TreasurySectionKey } from '@mento/shared';
|
||||||
import { useAuthStore } from '@/stores/auth';
|
import { useAuthStore } from '@/stores/auth';
|
||||||
|
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const auth = useAuthStore();
|
const auth = useAuthStore();
|
||||||
|
|
||||||
const canPayroll = computed(
|
const links = computed(() => {
|
||||||
() =>
|
const role = auth.user?.role;
|
||||||
auth.user?.role === 'owner' ||
|
const permissions = auth.user?.permissions;
|
||||||
auth.user?.role === 'admin' ||
|
const all: Array<{ value: string; label: string; exact?: boolean; section: TreasurySectionKey }> = [
|
||||||
Boolean(auth.user?.permissions?.includes('treasury_payroll')),
|
{ value: '/finance', label: 'داشبورد', exact: true, section: 'treasury_dashboard' },
|
||||||
);
|
{ value: '/finance/incomes', label: 'دریافتها و درآمدها', section: 'treasury_incomes' },
|
||||||
|
{ value: '/finance/expenses', label: 'پرداختها و هزینهها', section: 'treasury_expenses' },
|
||||||
const links = computed(() => [
|
{ value: '/finance/receivables', label: 'اقساط و مطالبات', section: 'treasury_receivables' },
|
||||||
{ value: '/finance', label: 'داشبورد', exact: true },
|
{ value: '/finance/accounts', label: 'صندوق و حسابها', section: 'treasury_accounts' },
|
||||||
{ value: '/finance/incomes', label: 'دریافتها و درآمدها' },
|
{ value: '/finance/payroll', label: 'حقوق', section: 'treasury_payroll' },
|
||||||
{ value: '/finance/expenses', label: 'پرداختها و هزینهها' },
|
{ value: '/finance/recurring', label: 'تکرارشونده', section: 'treasury_recurring' },
|
||||||
{ value: '/finance/receivables', label: 'اقساط و مطالبات' },
|
{ value: '/finance/reports', label: 'گزارش', section: 'treasury_reports' },
|
||||||
{ value: '/finance/accounts', label: 'صندوق و حسابها' },
|
{ value: '/finance/audit', label: 'سوابق', section: 'treasury_audit' },
|
||||||
...(canPayroll.value ? [{ value: '/finance/payroll', label: 'حقوق' }] : []),
|
{ value: '/finance/categories', label: 'دستهبندی', section: 'treasury_categories' },
|
||||||
{ value: '/finance/recurring', label: 'تکرارشونده' },
|
];
|
||||||
{ value: '/finance/reports', label: 'گزارش' },
|
return all.filter((link) => treasurySectionAllowed(role, permissions, link.section));
|
||||||
{ value: '/finance/audit', label: 'سوابق' },
|
});
|
||||||
{ value: '/finance/categories', label: 'دستهبندیها' },
|
|
||||||
]);
|
|
||||||
|
|
||||||
const options = computed(() => links.value.map((l) => ({ value: l.value, label: l.label })));
|
const options = computed(() => links.value.map((l) => ({ value: l.value, label: l.label })));
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,52 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed } from 'vue';
|
||||||
|
import { Table as ATable } from 'ant-design-vue';
|
||||||
|
import type { TreasuryPartyBalanceDto } from '@mento/shared';
|
||||||
|
import { toman } from '@/views/treasury/treasury-format';
|
||||||
|
|
||||||
|
const props = defineProps<{
|
||||||
|
rows: TreasuryPartyBalanceDto[];
|
||||||
|
settledLabel: string;
|
||||||
|
}>();
|
||||||
|
|
||||||
|
const kindLabel: Record<string, string> = {
|
||||||
|
person: 'مشتری',
|
||||||
|
company: 'شرکت',
|
||||||
|
user: 'کاربر',
|
||||||
|
};
|
||||||
|
|
||||||
|
const columns = computed(() => [
|
||||||
|
{ title: 'طرف حساب', dataIndex: 'partyName', key: 'partyName' },
|
||||||
|
{
|
||||||
|
title: 'نوع',
|
||||||
|
key: 'partyKind',
|
||||||
|
customRender: ({ record }: { record: TreasuryPartyBalanceDto }) =>
|
||||||
|
(record.partyKind && kindLabel[record.partyKind]) || 'ثبت قبلی',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'مبلغ کل',
|
||||||
|
key: 'amount',
|
||||||
|
customRender: ({ record }: { record: TreasuryPartyBalanceDto }) => toman(record.amount),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: props.settledLabel,
|
||||||
|
key: 'settledAmount',
|
||||||
|
customRender: ({ record }: { record: TreasuryPartyBalanceDto }) => toman(record.settledAmount),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
title: 'مانده',
|
||||||
|
key: 'remaining',
|
||||||
|
customRender: ({ record }: { record: TreasuryPartyBalanceDto }) => toman(record.remaining),
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<a-table
|
||||||
|
:columns="columns"
|
||||||
|
:data-source="rows"
|
||||||
|
:pagination="false"
|
||||||
|
row-key="key"
|
||||||
|
:locale="{ emptyText: 'ماندهای نیست.' }"
|
||||||
|
/>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,225 @@
|
|||||||
|
<script setup lang="ts">
|
||||||
|
import { computed, defineComponent, onMounted, ref } from 'vue';
|
||||||
|
import axios from 'axios';
|
||||||
|
import {
|
||||||
|
Button as AButton,
|
||||||
|
Flex as AFlex,
|
||||||
|
Select as ASelect,
|
||||||
|
Typography,
|
||||||
|
message,
|
||||||
|
} from 'ant-design-vue';
|
||||||
|
import type { CompanyDto, FinancialPartyKind, PersonDto, TreasuryPartySearchDto } from '@mento/shared';
|
||||||
|
import { UiModal } from '@/components/ui';
|
||||||
|
import { api } from '@/lib/api';
|
||||||
|
import CompanyFormView from '@/views/CompanyFormView.vue';
|
||||||
|
import PersonFormView from '@/views/PersonFormView.vue';
|
||||||
|
|
||||||
|
const VNodes = defineComponent({
|
||||||
|
props: { vnodes: { type: Object, required: true } },
|
||||||
|
render() {
|
||||||
|
return this.vnodes;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
const ASelectOption = ASelect.Option;
|
||||||
|
const ASelectOptGroup = ASelect.OptGroup;
|
||||||
|
const { Text: ATypographyText } = Typography;
|
||||||
|
|
||||||
|
const kind = defineModel<FinancialPartyKind | undefined>('kind');
|
||||||
|
const partyId = defineModel<string | undefined>('partyId');
|
||||||
|
|
||||||
|
type Choice = { id: string; name: string };
|
||||||
|
|
||||||
|
const people = ref<Choice[]>([]);
|
||||||
|
const companies = ref<Choice[]>([]);
|
||||||
|
const users = ref<Choice[]>([]);
|
||||||
|
const labels = ref<Record<string, string>>({});
|
||||||
|
const loading = ref(false);
|
||||||
|
const selectOpen = ref(false);
|
||||||
|
const personOpen = ref(false);
|
||||||
|
const companyOpen = ref(false);
|
||||||
|
|
||||||
|
const selectValue = computed(() => {
|
||||||
|
if (kind.value === 'other') return 'other';
|
||||||
|
if (kind.value && partyId.value) return `${kind.value}:${partyId.value}`;
|
||||||
|
return undefined;
|
||||||
|
});
|
||||||
|
|
||||||
|
function withCurrent(list: Choice[], group: 'person' | 'company' | 'user') {
|
||||||
|
if (kind.value !== group || !partyId.value) return list;
|
||||||
|
if (list.some((row) => row.id === partyId.value)) return list;
|
||||||
|
const name = labels.value[`${group}:${partyId.value}`] || 'انتخابشده';
|
||||||
|
return [{ id: partyId.value, name }, ...list];
|
||||||
|
}
|
||||||
|
|
||||||
|
const peopleOptions = computed(() => withCurrent(people.value, 'person'));
|
||||||
|
const companyOptions = computed(() => withCurrent(companies.value, 'company'));
|
||||||
|
const userOptions = computed(() => withCurrent(users.value, 'user'));
|
||||||
|
|
||||||
|
function apiMessage(e: unknown) {
|
||||||
|
if (!axios.isAxiosError(e)) return 'ثبت ناموفق بود.';
|
||||||
|
const msg = (e.response?.data as { message?: string | string[] })?.message;
|
||||||
|
return Array.isArray(msg) ? msg.join('، ') : msg || 'ثبت ناموفق بود.';
|
||||||
|
}
|
||||||
|
|
||||||
|
let timer = 0;
|
||||||
|
function onSearch(value: string) {
|
||||||
|
window.clearTimeout(timer);
|
||||||
|
timer = window.setTimeout(() => {
|
||||||
|
void load(value);
|
||||||
|
}, 250);
|
||||||
|
}
|
||||||
|
|
||||||
|
async function load(q = '') {
|
||||||
|
loading.value = true;
|
||||||
|
try {
|
||||||
|
const { data } = await api.get<TreasuryPartySearchDto>('/treasury/parties', {
|
||||||
|
params: { q: q.trim() || undefined },
|
||||||
|
});
|
||||||
|
people.value = data.people;
|
||||||
|
companies.value = data.companies;
|
||||||
|
users.value = data.users;
|
||||||
|
for (const row of data.people) labels.value[`person:${row.id}`] = row.name;
|
||||||
|
for (const row of data.companies) labels.value[`company:${row.id}`] = row.name;
|
||||||
|
for (const row of data.users) labels.value[`user:${row.id}`] = row.name;
|
||||||
|
} catch (e) {
|
||||||
|
if (!(axios.isAxiosError(e) && e.response?.status === 404)) message.error(apiMessage(e));
|
||||||
|
} finally {
|
||||||
|
loading.value = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function onChange(value: unknown) {
|
||||||
|
if (typeof value !== 'string' || !value) {
|
||||||
|
kind.value = undefined;
|
||||||
|
partyId.value = undefined;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
if (value === 'other') {
|
||||||
|
kind.value = 'other';
|
||||||
|
partyId.value = undefined;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const splitAt = value.indexOf(':');
|
||||||
|
const nextKind = value.slice(0, splitAt) as FinancialPartyKind;
|
||||||
|
const id = value.slice(splitAt + 1);
|
||||||
|
if (nextKind !== 'person' && nextKind !== 'company' && nextKind !== 'user') return;
|
||||||
|
kind.value = nextKind;
|
||||||
|
partyId.value = id;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onDropdown(open: boolean) {
|
||||||
|
selectOpen.value = open;
|
||||||
|
}
|
||||||
|
|
||||||
|
function openPersonForm() {
|
||||||
|
selectOpen.value = false;
|
||||||
|
personOpen.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function openCompanyForm() {
|
||||||
|
selectOpen.value = false;
|
||||||
|
companyOpen.value = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onPersonCreated(person?: PersonDto) {
|
||||||
|
personOpen.value = false;
|
||||||
|
if (!person?.id) return;
|
||||||
|
const name = person.fullName?.trim() || `${person.firstName} ${person.lastName}`.trim();
|
||||||
|
people.value = [{ id: person.id, name }, ...people.value.filter((row) => row.id !== person.id)];
|
||||||
|
labels.value[`person:${person.id}`] = name;
|
||||||
|
kind.value = 'person';
|
||||||
|
partyId.value = person.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
function onCompanyCreated(company?: CompanyDto) {
|
||||||
|
companyOpen.value = false;
|
||||||
|
if (!company?.id) return;
|
||||||
|
companies.value = [{ id: company.id, name: company.name }, ...companies.value.filter((row) => row.id !== company.id)];
|
||||||
|
labels.value[`company:${company.id}`] = company.name;
|
||||||
|
kind.value = 'company';
|
||||||
|
partyId.value = company.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
onMounted(() => {
|
||||||
|
void load();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<template>
|
||||||
|
<a-flex vertical :gap="4">
|
||||||
|
<a-select
|
||||||
|
:open="selectOpen"
|
||||||
|
show-search
|
||||||
|
@dropdownVisibleChange="onDropdown"
|
||||||
|
allow-clear
|
||||||
|
:filter-option="false"
|
||||||
|
:loading="loading"
|
||||||
|
:value="selectValue"
|
||||||
|
placeholder="مشتری، شرکت، کاربر یا سایر"
|
||||||
|
style="width: 100%"
|
||||||
|
@search="onSearch"
|
||||||
|
@change="onChange"
|
||||||
|
>
|
||||||
|
<a-select-option value="other" label="سایر">سایر</a-select-option>
|
||||||
|
<a-select-opt-group v-if="peopleOptions.length" label="مشتریان">
|
||||||
|
<a-select-option
|
||||||
|
v-for="row in peopleOptions"
|
||||||
|
:key="`person:${row.id}`"
|
||||||
|
:value="`person:${row.id}`"
|
||||||
|
:label="row.name"
|
||||||
|
>
|
||||||
|
{{ row.name }}
|
||||||
|
</a-select-option>
|
||||||
|
</a-select-opt-group>
|
||||||
|
<a-select-opt-group v-if="companyOptions.length" label="شرکتها">
|
||||||
|
<a-select-option
|
||||||
|
v-for="row in companyOptions"
|
||||||
|
:key="`company:${row.id}`"
|
||||||
|
:value="`company:${row.id}`"
|
||||||
|
:label="row.name"
|
||||||
|
>
|
||||||
|
{{ row.name }}
|
||||||
|
</a-select-option>
|
||||||
|
</a-select-opt-group>
|
||||||
|
<a-select-opt-group v-if="userOptions.length" label="کاربران">
|
||||||
|
<a-select-option
|
||||||
|
v-for="row in userOptions"
|
||||||
|
:key="`user:${row.id}`"
|
||||||
|
:value="`user:${row.id}`"
|
||||||
|
:label="row.name"
|
||||||
|
>
|
||||||
|
{{ row.name }}
|
||||||
|
</a-select-option>
|
||||||
|
</a-select-opt-group>
|
||||||
|
<template #dropdownRender="{ menuNode }">
|
||||||
|
<v-nodes :vnodes="menuNode" />
|
||||||
|
<a-flex @mousedown.prevent>
|
||||||
|
<a-button type="link" @click="openPersonForm">شخص جدید</a-button>
|
||||||
|
<a-button type="link" @click="openCompanyForm">شرکت جدید</a-button>
|
||||||
|
</a-flex>
|
||||||
|
</template>
|
||||||
|
</a-select>
|
||||||
|
<a-typography-text v-if="kind === 'other'" type="secondary">
|
||||||
|
برای سایر، مبلغ دریافت یا پرداخت با مبلغ کل یکی است و مانده نمیماند.
|
||||||
|
</a-typography-text>
|
||||||
|
</a-flex>
|
||||||
|
|
||||||
|
<UiModal :open="personOpen" title="شخص جدید" @close="personOpen = false">
|
||||||
|
<PersonFormView
|
||||||
|
v-if="personOpen"
|
||||||
|
embedded
|
||||||
|
@saved="onPersonCreated"
|
||||||
|
@cancel="personOpen = false"
|
||||||
|
/>
|
||||||
|
</UiModal>
|
||||||
|
|
||||||
|
<UiModal :open="companyOpen" title="شرکت جدید" @close="companyOpen = false">
|
||||||
|
<CompanyFormView
|
||||||
|
v-if="companyOpen"
|
||||||
|
embedded
|
||||||
|
@saved="onCompanyCreated"
|
||||||
|
@cancel="companyOpen = false"
|
||||||
|
/>
|
||||||
|
</UiModal>
|
||||||
|
</template>
|
||||||
@@ -0,0 +1,52 @@
|
|||||||
|
import { ref, watch, type Ref } from 'vue';
|
||||||
|
|
||||||
|
/** مبلغ دریافت/پرداخت را با مبلغ کل یکی میکند تا کاربر خودش آن را عوض کند. */
|
||||||
|
export function useSettleDefault(
|
||||||
|
form: Ref<{ amount: string; settleAmount: string; partyKind?: string }>,
|
||||||
|
) {
|
||||||
|
const dirty = ref(false);
|
||||||
|
let mirroring = false;
|
||||||
|
|
||||||
|
function locked() {
|
||||||
|
return form.value.partyKind === 'other';
|
||||||
|
}
|
||||||
|
|
||||||
|
function copy() {
|
||||||
|
mirroring = true;
|
||||||
|
form.value.settleAmount = form.value.amount;
|
||||||
|
mirroring = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => form.value.amount,
|
||||||
|
() => {
|
||||||
|
if (locked() || !dirty.value) copy();
|
||||||
|
},
|
||||||
|
{ flush: 'sync' },
|
||||||
|
);
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => form.value.settleAmount,
|
||||||
|
() => {
|
||||||
|
if (!mirroring && !locked()) dirty.value = true;
|
||||||
|
},
|
||||||
|
{ flush: 'sync' },
|
||||||
|
);
|
||||||
|
|
||||||
|
watch(
|
||||||
|
() => form.value.partyKind,
|
||||||
|
(kind) => {
|
||||||
|
if (kind === 'other') {
|
||||||
|
dirty.value = false;
|
||||||
|
copy();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{ flush: 'sync' },
|
||||||
|
);
|
||||||
|
|
||||||
|
return {
|
||||||
|
reset() {
|
||||||
|
dirty.value = false;
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -20,6 +20,10 @@ const pageTitle = computed(() => {
|
|||||||
return 'محیطها';
|
return 'محیطها';
|
||||||
case 'adm-users':
|
case 'adm-users':
|
||||||
return 'کاربران';
|
return 'کاربران';
|
||||||
|
case 'adm-chat':
|
||||||
|
return 'گفتگو';
|
||||||
|
case 'adm-billing':
|
||||||
|
return 'اشتراک';
|
||||||
case 'adm-admins':
|
case 'adm-admins':
|
||||||
return 'ادمینها';
|
return 'ادمینها';
|
||||||
case 'adm-sms':
|
case 'adm-sms':
|
||||||
@@ -33,6 +37,8 @@ const tabs = [
|
|||||||
{ name: 'adm-dashboard', label: 'خانه', icon: 'home' as const },
|
{ name: 'adm-dashboard', label: 'خانه', icon: 'home' as const },
|
||||||
{ name: 'adm-organizations', label: 'محیطها', icon: 'building' as const },
|
{ name: 'adm-organizations', label: 'محیطها', icon: 'building' as const },
|
||||||
{ name: 'adm-users', label: 'کاربران', icon: 'users' as const },
|
{ name: 'adm-users', label: 'کاربران', icon: 'users' as const },
|
||||||
|
{ name: 'adm-chat', label: 'گفتگو', icon: 'chat' as const },
|
||||||
|
{ name: 'adm-billing', label: 'اشتراک', icon: 'crown' as const },
|
||||||
{ name: 'adm-sms', label: 'پیامک', icon: 'mail' as const },
|
{ name: 'adm-sms', label: 'پیامک', icon: 'mail' as const },
|
||||||
{ name: 'adm-admins', label: 'ادمینها', icon: 'lock' as const },
|
{ name: 'adm-admins', label: 'ادمینها', icon: 'lock' as const },
|
||||||
];
|
];
|
||||||
@@ -372,7 +378,10 @@ function onLogout() {
|
|||||||
position: sticky;
|
position: sticky;
|
||||||
bottom: 0;
|
bottom: 0;
|
||||||
z-index: 30;
|
z-index: 30;
|
||||||
grid-template-columns: repeat(4, 1fr);
|
grid-template-columns: none;
|
||||||
|
grid-auto-flow: column;
|
||||||
|
grid-auto-columns: minmax(4.4rem, 1fr);
|
||||||
|
overflow-x: auto;
|
||||||
gap: 0.15rem;
|
gap: 0.15rem;
|
||||||
padding: 0.45rem 0.55rem calc(0.45rem + env(safe-area-inset-bottom));
|
padding: 0.45rem 0.55rem calc(0.45rem + env(safe-area-inset-bottom));
|
||||||
background: rgba(255, 255, 255, 0.92);
|
background: rgba(255, 255, 255, 0.92);
|
||||||
|
|||||||
@@ -46,6 +46,31 @@ const showOwnRecordsBanner = computed(
|
|||||||
);
|
);
|
||||||
const todayLabel = computed(() => formatJalaliShort(new Date()));
|
const todayLabel = computed(() => formatJalaliShort(new Date()));
|
||||||
|
|
||||||
|
function formatBytes(bytes: number): string {
|
||||||
|
const n = Math.max(0, bytes);
|
||||||
|
const units: Array<[number, string]> = [
|
||||||
|
[1024 ** 3, 'گیگابایت'],
|
||||||
|
[1024 ** 2, 'مگابایت'],
|
||||||
|
[1024, 'کیلوبایت'],
|
||||||
|
];
|
||||||
|
for (const [size, label] of units) {
|
||||||
|
if (n >= size) {
|
||||||
|
const value = n / size;
|
||||||
|
const text = value >= 10 ? value.toFixed(0) : value.toFixed(1);
|
||||||
|
return `${toFaDigits(text)} ${label}`;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return `${toFaDigits(Math.round(n))} بایت`;
|
||||||
|
}
|
||||||
|
|
||||||
|
const storageBanner = computed(() => {
|
||||||
|
const storage = auth.user?.storage;
|
||||||
|
if (!storage || storage.level === 'ok' || storage.level === 'unlimited' || storage.quotaBytes == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return storage;
|
||||||
|
});
|
||||||
|
|
||||||
const SIDEBAR_KEY = 'mento_sidebar_collapsed';
|
const SIDEBAR_KEY = 'mento_sidebar_collapsed';
|
||||||
|
|
||||||
function readSidebarCollapsed() {
|
function readSidebarCollapsed() {
|
||||||
@@ -178,11 +203,14 @@ function cardAllowedForNav(card: {
|
|||||||
to?: string;
|
to?: string;
|
||||||
}) {
|
}) {
|
||||||
if (card.ownerOnly && auth.user?.role !== 'owner') return false;
|
if (card.ownerOnly && auth.user?.role !== 'owner') return false;
|
||||||
|
const perms = auth.user?.permissions ?? [];
|
||||||
const canTreasury = auth.user?.role === 'owner'
|
const canTreasury = auth.user?.role === 'owner'
|
||||||
|| auth.user?.role === 'admin'
|
|| auth.user?.role === 'admin'
|
||||||
|| Boolean(auth.user?.permissions?.includes('treasury'))
|
|| perms.includes('treasury')
|
||||||
|| Boolean(auth.user?.permissions?.includes('treasury_payroll'));
|
|| perms.some((key) => key.startsWith('treasury_'));
|
||||||
if (card.to?.startsWith('/finance')) return canTreasury;
|
if (card.to?.startsWith('/finance')) {
|
||||||
|
return moduleAllowed(card.module ?? 'treasury') && canTreasury;
|
||||||
|
}
|
||||||
const section = card.to ? sectionPermissionForPath(card.to) : null;
|
const section = card.to ? sectionPermissionForPath(card.to) : null;
|
||||||
const hasSection = section
|
const hasSection = section
|
||||||
? hasSectionPermission(auth.user?.role, auth.user?.permissions, section)
|
? hasSectionPermission(auth.user?.role, auth.user?.permissions, section)
|
||||||
@@ -585,13 +613,13 @@ onUnmounted(() => {
|
|||||||
<button
|
<button
|
||||||
class="nav-item nav-fold-btn"
|
class="nav-item nav-fold-btn"
|
||||||
type="button"
|
type="button"
|
||||||
title="کارها"
|
title="فعالیتها"
|
||||||
:class="{ 'router-link-active': activitiesActive || openHubKey === 'activities', 'hub-on': openHubKey === 'activities' }"
|
:class="{ 'router-link-active': activitiesActive || openHubKey === 'activities', 'hub-on': openHubKey === 'activities' }"
|
||||||
:aria-expanded="openHubKey === 'activities'"
|
:aria-expanded="openHubKey === 'activities'"
|
||||||
@click="onHubClick('activities')"
|
@click="onHubClick('activities')"
|
||||||
>
|
>
|
||||||
<UiIcon name="check" :size="collapsed ? 20 : 18" />
|
<UiIcon name="check" :size="collapsed ? 20 : 18" />
|
||||||
<span>کارها</span>
|
<span>فعالیتها</span>
|
||||||
<span v-if="activityBadge" class="nav-badge">{{ toFaDigits(activityBadge) }}</span>
|
<span v-if="activityBadge" class="nav-badge">{{ toFaDigits(activityBadge) }}</span>
|
||||||
<i class="chev" aria-hidden="true" />
|
<i class="chev" aria-hidden="true" />
|
||||||
</button>
|
</button>
|
||||||
@@ -914,6 +942,21 @@ onUnmounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<p
|
||||||
|
v-if="storageBanner"
|
||||||
|
class="storage-banner"
|
||||||
|
:class="storageBanner.level === 'full' ? 'full' : 'warn'"
|
||||||
|
>
|
||||||
|
<template v-if="storageBanner.level === 'full'">
|
||||||
|
سقف حجم فایل پر شده است ({{ formatBytes(storageBanner.usedBytes) }} از
|
||||||
|
{{ formatBytes(storageBanner.quotaBytes ?? 0) }}). تا شارژ حجم، آپلود جدید ممکن نیست.
|
||||||
|
</template>
|
||||||
|
<template v-else>
|
||||||
|
حجم فایل به {{ toFaDigits(storageBanner.percent ?? 80) }}٪ رسیده
|
||||||
|
({{ formatBytes(storageBanner.usedBytes) }} از {{ formatBytes(storageBanner.quotaBytes ?? 0) }}).
|
||||||
|
</template>
|
||||||
|
</p>
|
||||||
|
|
||||||
<main class="content">
|
<main class="content">
|
||||||
<RouterView />
|
<RouterView />
|
||||||
<GamificationToaster v-if="moduleAllowed('gamification')" />
|
<GamificationToaster v-if="moduleAllowed('gamification')" />
|
||||||
@@ -978,13 +1021,14 @@ onUnmounted(() => {
|
|||||||
type="button"
|
type="button"
|
||||||
:class="{ on: !moreOpen && (activitiesActive || openHubKey === 'activities') }"
|
:class="{ on: !moreOpen && (activitiesActive || openHubKey === 'activities') }"
|
||||||
:aria-expanded="openHubKey === 'activities'"
|
:aria-expanded="openHubKey === 'activities'"
|
||||||
|
title="فعالیتها"
|
||||||
@click="openTabHub('activities')"
|
@click="openTabHub('activities')"
|
||||||
>
|
>
|
||||||
<span class="tab-ico">
|
<span class="tab-ico">
|
||||||
<UiIcon name="check" :size="20" />
|
<UiIcon name="check" :size="20" />
|
||||||
<span v-if="activityBadge" class="tab-badge">{{ toFaDigits(activityBadge) }}</span>
|
<span v-if="activityBadge" class="tab-badge">{{ toFaDigits(activityBadge) }}</span>
|
||||||
</span>
|
</span>
|
||||||
<span>کارها</span>
|
<span>فعالیت</span>
|
||||||
</button>
|
</button>
|
||||||
<button
|
<button
|
||||||
class="tab"
|
class="tab"
|
||||||
@@ -1182,6 +1226,7 @@ onUnmounted(() => {
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
min-width: 0;
|
||||||
min-height: 0;
|
min-height: 0;
|
||||||
gap: 0.85rem;
|
gap: 0.85rem;
|
||||||
}
|
}
|
||||||
@@ -1408,17 +1453,36 @@ onUnmounted(() => {
|
|||||||
font-size: 0.75rem;
|
font-size: 0.75rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.storage-banner {
|
||||||
|
margin: 0 0 0.75rem;
|
||||||
|
padding: 0.7rem 0.9rem;
|
||||||
|
border-radius: 12px;
|
||||||
|
font-size: 0.88rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.storage-banner.warn {
|
||||||
|
background: #fff7ed;
|
||||||
|
color: #9a3412;
|
||||||
|
}
|
||||||
|
|
||||||
|
.storage-banner.full {
|
||||||
|
background: #fef2f2;
|
||||||
|
color: #991b1b;
|
||||||
|
}
|
||||||
|
|
||||||
.sidebar-foot {
|
.sidebar-foot {
|
||||||
margin-top: auto;
|
margin-top: auto;
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.85rem;
|
gap: 0.85rem;
|
||||||
flex-shrink: 0;
|
flex-shrink: 0;
|
||||||
|
min-width: 0;
|
||||||
padding-top: 0.35rem;
|
padding-top: 0.35rem;
|
||||||
}
|
}
|
||||||
|
|
||||||
.foot-actions {
|
.foot-actions {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.55rem;
|
gap: 0.55rem;
|
||||||
|
min-width: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.prior-switch {
|
.prior-switch {
|
||||||
@@ -1453,6 +1517,8 @@ onUnmounted(() => {
|
|||||||
.foot-meta {
|
.foot-meta {
|
||||||
display: grid;
|
display: grid;
|
||||||
gap: 0.15rem;
|
gap: 0.15rem;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-card {
|
.profile-card {
|
||||||
@@ -1679,12 +1745,30 @@ onUnmounted(() => {
|
|||||||
.sidebar:not(.collapsed) .foot-meta {
|
.sidebar:not(.collapsed) .foot-meta {
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 0.45rem;
|
gap: 0.35rem;
|
||||||
|
min-width: 0;
|
||||||
|
max-width: 100%;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar:not(.collapsed) .foot-meta :deep(.org-switch) {
|
.sidebar:not(.collapsed) .foot-meta :deep(.org-switch),
|
||||||
flex: 1;
|
.sidebar:not(.collapsed) .foot-meta :deep(.org-btn) {
|
||||||
|
flex: 1 1 auto;
|
||||||
min-width: 0;
|
min-width: 0;
|
||||||
|
max-width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar:not(.collapsed) .foot-meta :deep(.org-btn) {
|
||||||
|
align-items: flex-start;
|
||||||
|
height: auto;
|
||||||
|
padding: 0.2rem 0.15rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar:not(.collapsed) .foot-meta :deep(.org-btn span) {
|
||||||
|
white-space: normal;
|
||||||
|
overflow: visible;
|
||||||
|
text-overflow: unset;
|
||||||
|
line-height: 1.35;
|
||||||
|
overflow-wrap: anywhere;
|
||||||
}
|
}
|
||||||
|
|
||||||
.sidebar:not(.collapsed) .logout-link {
|
.sidebar:not(.collapsed) .logout-link {
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
import { FormFileTooLargeError, prepareFormFieldFile } from '@/lib/form-file-compress';
|
||||||
|
import { compressVoiceFile } from '@/lib/voice-note';
|
||||||
|
|
||||||
|
export const ACTIVITY_FILE_MAX_BYTES = 10 * 1024 * 1024;
|
||||||
|
|
||||||
|
const FILE_MIME_BY_EXT: 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',
|
||||||
|
};
|
||||||
|
|
||||||
|
const IMAGE_EXT = new Set(['jpg', 'jpeg', 'png', 'gif', 'webp']);
|
||||||
|
const AUDIO_EXT = new Set(['webm', 'ogg', 'mp3', 'm4a', 'aac', 'wav', 'mpeg']);
|
||||||
|
|
||||||
|
export type PreparedAttachment = {
|
||||||
|
kind: 'image' | 'audio' | 'file';
|
||||||
|
name: string;
|
||||||
|
file: File;
|
||||||
|
previewUrl: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
function extensionOf(name: string): string {
|
||||||
|
return name.split('.').pop()?.toLowerCase().replace(/[^a-z0-9]/g, '') ?? '';
|
||||||
|
}
|
||||||
|
|
||||||
|
function kindOf(file: File): 'image' | 'audio' | 'file' {
|
||||||
|
const type = file.type.toLowerCase().split(';')[0] ?? '';
|
||||||
|
const ext = extensionOf(file.name);
|
||||||
|
if (type.startsWith('image/') || IMAGE_EXT.has(ext)) return 'image';
|
||||||
|
if (type.startsWith('audio/') || AUDIO_EXT.has(ext)) return 'audio';
|
||||||
|
return 'file';
|
||||||
|
}
|
||||||
|
|
||||||
|
export async function prepareActivityAttachment(file: File): Promise<PreparedAttachment> {
|
||||||
|
const kind = kindOf(file);
|
||||||
|
if (kind === 'image') {
|
||||||
|
try {
|
||||||
|
const prepared = await prepareFormFieldFile(file);
|
||||||
|
return { kind, name: prepared.name, file: prepared.file, previewUrl: prepared.dataUrl };
|
||||||
|
} catch (error) {
|
||||||
|
if (error instanceof FormFileTooLargeError) {
|
||||||
|
throw new Error('حجم عکس باید زیر ۲۰۰ کیلوبایت باشد');
|
||||||
|
}
|
||||||
|
throw new Error('فشردهسازی عکس ناموفق بود.');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (kind === 'audio') {
|
||||||
|
const compressed = await compressVoiceFile(file);
|
||||||
|
return {
|
||||||
|
kind,
|
||||||
|
name: compressed.name,
|
||||||
|
file: compressed,
|
||||||
|
previewUrl: URL.createObjectURL(compressed),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
const ext = extensionOf(file.name);
|
||||||
|
const mime = FILE_MIME_BY_EXT[ext];
|
||||||
|
if (!mime) throw new Error('این نوع فایل مجاز نیست.');
|
||||||
|
if (file.size > ACTIVITY_FILE_MAX_BYTES) throw new Error('حجم فایل باید زیر ۱۰ مگابایت باشد');
|
||||||
|
const named = file.type === mime ? file : new File([file], file.name, { type: mime });
|
||||||
|
return { kind: 'file', name: named.name, file: named, previewUrl: '' };
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
import {
|
||||||
|
ASSIGN_SECTION_PERMISSION,
|
||||||
|
type AssignSection,
|
||||||
|
type RolePermissionKey,
|
||||||
|
} from '@mento/shared';
|
||||||
|
|
||||||
|
export function canAssignToOthers(
|
||||||
|
user:
|
||||||
|
| {
|
||||||
|
role?: string | null;
|
||||||
|
permissions?: Array<RolePermissionKey | string> | null;
|
||||||
|
}
|
||||||
|
| null
|
||||||
|
| undefined,
|
||||||
|
section: AssignSection,
|
||||||
|
): boolean {
|
||||||
|
if (!user) return false;
|
||||||
|
if (user.role === 'owner' || user.role === 'admin') return true;
|
||||||
|
return (user.permissions ?? []).includes(ASSIGN_SECTION_PERMISSION[section]);
|
||||||
|
}
|
||||||
@@ -50,7 +50,78 @@ export function parseLeadFormNotes(raw: string | null | undefined): LeadNoteView
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function leadNoteFileIsImage(file: LeadNoteFile): boolean {
|
export function leadNoteFileIsImage(file: LeadNoteFile): boolean {
|
||||||
return file.mime.startsWith('image/') || (file.dataUrl ?? '').startsWith('data:image/');
|
return (
|
||||||
|
file.mime.startsWith('image/') ||
|
||||||
|
(file.dataUrl ?? '').startsWith('data:image/') ||
|
||||||
|
/\.(png|jpe?g|gif|webp)$/i.test(file.name)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
export type NoteChip =
|
||||||
|
| { kind: 'text'; text: string }
|
||||||
|
| { kind: 'image'; src: string; name: string }
|
||||||
|
| { kind: 'link'; href: string; label: string };
|
||||||
|
|
||||||
|
const FILE_BLOB = /\{[^{}]*"dataUrl"\s*:\s*"data:[^"]+"[^{}]*\}/gi;
|
||||||
|
const DATA_IMAGE = /data:image\/[a-z0-9.+-]+;base64,[a-z0-9+/=]+/gi;
|
||||||
|
const HTTP_URL = /https?:\/\/[^\s<>"']+/gi;
|
||||||
|
|
||||||
|
/** متن یادداشت را به نوشته، لینک کوتاه و تصویر جدا میکند. */
|
||||||
|
export function noteChips(raw: string | null | undefined): NoteChip[] {
|
||||||
|
const text = raw ?? '';
|
||||||
|
if (!text.trim()) return [];
|
||||||
|
const chips: NoteChip[] = [];
|
||||||
|
const token = new RegExp(
|
||||||
|
`${FILE_BLOB.source}|${DATA_IMAGE.source}|${HTTP_URL.source}`,
|
||||||
|
'gi',
|
||||||
|
);
|
||||||
|
let cursor = 0;
|
||||||
|
for (const match of text.matchAll(token)) {
|
||||||
|
const index = match.index ?? 0;
|
||||||
|
pushText(chips, text.slice(cursor, index));
|
||||||
|
chips.push(chipForToken(match[0]));
|
||||||
|
cursor = index + match[0].length;
|
||||||
|
}
|
||||||
|
pushText(chips, text.slice(cursor));
|
||||||
|
return chips;
|
||||||
|
}
|
||||||
|
|
||||||
|
function pushText(chips: NoteChip[], value: string) {
|
||||||
|
if (!value) return;
|
||||||
|
const prev = chips[chips.length - 1];
|
||||||
|
if (prev?.kind === 'text') prev.text += value;
|
||||||
|
else chips.push({ kind: 'text', text: value });
|
||||||
|
}
|
||||||
|
|
||||||
|
function chipForToken(token: string): NoteChip {
|
||||||
|
if (token.startsWith('{')) {
|
||||||
|
const file = readFileValue(token);
|
||||||
|
if (file?.dataUrl && leadNoteFileIsImage(file)) {
|
||||||
|
return { kind: 'image', src: file.dataUrl, name: file.name };
|
||||||
|
}
|
||||||
|
if (file?.dataUrl) return { kind: 'link', href: file.dataUrl, label: file.name };
|
||||||
|
return { kind: 'text', text: file?.name || 'فایل پیوست' };
|
||||||
|
}
|
||||||
|
if (token.startsWith('data:image/')) {
|
||||||
|
return { kind: 'image', src: token, name: 'تصویر پیوست' };
|
||||||
|
}
|
||||||
|
if (isImageUrl(token)) return { kind: 'image', src: token, name: shortUrl(token) };
|
||||||
|
return { kind: 'link', href: token, label: shortUrl(token) };
|
||||||
|
}
|
||||||
|
|
||||||
|
function isImageUrl(href: string): boolean {
|
||||||
|
return /\.(png|jpe?g|gif|webp)(\?.*)?$/i.test(href);
|
||||||
|
}
|
||||||
|
|
||||||
|
function shortUrl(href: string): string {
|
||||||
|
try {
|
||||||
|
const url = new URL(href);
|
||||||
|
const file = decodeURIComponent(url.pathname.split('/').filter(Boolean).pop() ?? '');
|
||||||
|
const label = file || url.hostname;
|
||||||
|
return label.length > 42 ? `${label.slice(0, 24)}…${label.slice(-10)}` : label;
|
||||||
|
} catch {
|
||||||
|
return href.length > 42 ? `${href.slice(0, 28)}…` : href;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/** فیلد تاریخ تولد روی خود لید هست؛ جواب فرم نباید دوباره ردیف بسازد. */
|
/** فیلد تاریخ تولد روی خود لید هست؛ جواب فرم نباید دوباره ردیف بسازد. */
|
||||||
@@ -111,7 +182,8 @@ function readFileValue(value: string): LeadNoteFile | null {
|
|||||||
return asFile(JSON.parse(value));
|
return asFile(JSON.parse(value));
|
||||||
} catch {
|
} catch {
|
||||||
const name = value.match(/"name"\s*:\s*"([^"]+)"/)?.[1]?.trim();
|
const name = value.match(/"name"\s*:\s*"([^"]+)"/)?.[1]?.trim();
|
||||||
if (name) return { name, mime: '', dataUrl: null };
|
const mime = value.match(/"mime"\s*:\s*"([^"]+)"/)?.[1]?.trim() ?? '';
|
||||||
|
if (name) return { name, mime, dataUrl: null };
|
||||||
if (value.includes('data:')) return { name: 'فایل پیوست', mime: '', dataUrl: null };
|
if (value.includes('data:')) return { name: 'فایل پیوست', mime: '', dataUrl: null };
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
import { currencySuffix } from '@/lib/money';
|
import { currencySuffix } from '@/lib/money';
|
||||||
import { matchesSearch } from '@/lib/search';
|
import { matchesSearch } from '@/lib/search';
|
||||||
|
import type { ActivityPriority } from '@mento/shared';
|
||||||
|
|
||||||
export type PipelineAccent = 'green' | 'orange' | 'purple' | 'blue' | 'rose' | 'slate';
|
export type PipelineAccent = 'green' | 'orange' | 'purple' | 'blue' | 'rose' | 'slate';
|
||||||
|
|
||||||
@@ -21,6 +22,8 @@ export type PipelineDeal = {
|
|||||||
assigneeIds?: string[];
|
assigneeIds?: string[];
|
||||||
/** متنهای قابل جستجو (مشتری، شرکت، یادداشت، مسئولان …) */
|
/** متنهای قابل جستجو (مشتری، شرکت، یادداشت، مسئولان …) */
|
||||||
searchFields?: Array<string | null | undefined>;
|
searchFields?: Array<string | null | undefined>;
|
||||||
|
/** اولویت فعالیت؛ فقط روی کارت فعالیت نشان داده میشود */
|
||||||
|
priority?: ActivityPriority;
|
||||||
};
|
};
|
||||||
|
|
||||||
export type PipelineUiCopy = {
|
export type PipelineUiCopy = {
|
||||||
@@ -344,18 +347,16 @@ export function updateDealStage(
|
|||||||
return without.map((stage) => {
|
return without.map((stage) => {
|
||||||
if (stage.id !== stageId) return stage;
|
if (stage.id !== stageId) return stage;
|
||||||
const next = [...stage.deals];
|
const next = [...stage.deals];
|
||||||
let insertAt =
|
let insertAt = toIndex == null || toIndex < 0 ? next.length : toIndex;
|
||||||
toIndex == null || toIndex < 0 || toIndex > next.length
|
|
||||||
? next.length
|
|
||||||
: toIndex;
|
|
||||||
if (
|
if (
|
||||||
fromStageId === stageId &&
|
fromStageId === stageId &&
|
||||||
fromIndex >= 0 &&
|
fromIndex >= 0 &&
|
||||||
toIndex != null &&
|
toIndex != null &&
|
||||||
toIndex > fromIndex
|
toIndex > fromIndex
|
||||||
) {
|
) {
|
||||||
insertAt = Math.max(0, insertAt - 1);
|
insertAt -= 1;
|
||||||
}
|
}
|
||||||
|
insertAt = Math.max(0, Math.min(insertAt, next.length));
|
||||||
next.splice(insertAt, 0, { ...moving!, stageId });
|
next.splice(insertAt, 0, { ...moving!, stageId });
|
||||||
return { ...stage, deals: next };
|
return { ...stage, deals: next };
|
||||||
});
|
});
|
||||||
@@ -422,6 +423,51 @@ export function toFaDealCount(n: number): string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** جابهجایی یک ستون به ایندکس جدید */
|
/** جابهجایی یک ستون به ایندکس جدید */
|
||||||
|
/** نیمهٔ پایین کارت یعنی «بعد از این کارت». ایندکس نسبت به فهرست فعلی ستون است. */
|
||||||
|
export function pointerDropIndex(index: number, event: DragEvent): number {
|
||||||
|
const el = event.currentTarget as HTMLElement | null;
|
||||||
|
const rect = el?.getBoundingClientRect();
|
||||||
|
if (!rect || rect.height <= 0) return index;
|
||||||
|
return index + (event.clientY >= rect.top + rect.height / 2 ? 1 : 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
const DRAG_SCROLL_EDGE = 72;
|
||||||
|
const DRAG_SCROLL_MAX = 16;
|
||||||
|
let dragScrollEl: HTMLElement | null = null;
|
||||||
|
let dragScrollY = 0;
|
||||||
|
let dragScrollRaf = 0;
|
||||||
|
|
||||||
|
function dragScrollTick() {
|
||||||
|
dragScrollRaf = 0;
|
||||||
|
const el = dragScrollEl;
|
||||||
|
if (!el) return;
|
||||||
|
const rect = el.getBoundingClientRect();
|
||||||
|
let delta = 0;
|
||||||
|
if (dragScrollY < rect.top + DRAG_SCROLL_EDGE) {
|
||||||
|
const closeness = (rect.top + DRAG_SCROLL_EDGE - dragScrollY) / DRAG_SCROLL_EDGE;
|
||||||
|
delta = -Math.ceil(DRAG_SCROLL_MAX * Math.min(1, Math.max(0, closeness)));
|
||||||
|
} else if (dragScrollY > rect.bottom - DRAG_SCROLL_EDGE) {
|
||||||
|
const closeness = (dragScrollY - (rect.bottom - DRAG_SCROLL_EDGE)) / DRAG_SCROLL_EDGE;
|
||||||
|
delta = Math.ceil(DRAG_SCROLL_MAX * Math.min(1, Math.max(0, closeness)));
|
||||||
|
}
|
||||||
|
if (!delta || el.scrollHeight <= el.clientHeight) return;
|
||||||
|
el.scrollTop += delta;
|
||||||
|
dragScrollRaf = requestAnimationFrame(dragScrollTick);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** نزدیک لبهٔ بالا یا پایین ستون، فهرست خودش حرکت میکند تا مقصد دیده شود. */
|
||||||
|
export function dragScrollColumn(el: HTMLElement | null, clientY: number) {
|
||||||
|
dragScrollEl = el;
|
||||||
|
dragScrollY = clientY;
|
||||||
|
if (!dragScrollRaf) dragScrollRaf = requestAnimationFrame(dragScrollTick);
|
||||||
|
}
|
||||||
|
|
||||||
|
export function stopDragScroll() {
|
||||||
|
dragScrollEl = null;
|
||||||
|
if (dragScrollRaf) cancelAnimationFrame(dragScrollRaf);
|
||||||
|
dragScrollRaf = 0;
|
||||||
|
}
|
||||||
|
|
||||||
export function moveStageToIndex(
|
export function moveStageToIndex(
|
||||||
stages: PipelineStage[],
|
stages: PipelineStage[],
|
||||||
stageId: string,
|
stageId: string,
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user