diff --git a/apps/api/src/activities/activities.service.ts b/apps/api/src/activities/activities.service.ts index 35207e3..188db41 100644 --- a/apps/api/src/activities/activities.service.ts +++ b/apps/api/src/activities/activities.service.ts @@ -5,6 +5,7 @@ import { NotFoundException, } from '@nestjs/common'; import type { + ActivityAccountBalanceDto, ActivityDto, ActivityFieldValues, ActivityFilter, @@ -15,6 +16,12 @@ import type { PaginatedResponse, UpdateActivityRequest, } from '@mento/shared'; +import { + ACCOUNT_BALANCE_CLAIMS_TAG, + ACCOUNT_BALANCE_WEIGHT_KEYS, + ACCOUNT_BALANCE_WEIGHT_LABELS, + parseAccountBalanceWeightFields, +} from '@mento/shared'; import { Prisma } from '@prisma/client'; import { randomUUID } from 'node:crypto'; import * as path from 'node:path'; @@ -38,6 +45,7 @@ import { tehranDayKey } from '../routines/routine-dates'; import { buildSearchWhere, ci } from '../common/search'; import { activityPriorWhere } from '../common/prior-archive'; import { leadsDeepWhere } from '../common/data-access'; +import { extractMandehRaw } from '../integrations/tahesab/tahesab-methods'; import { ActivityStagesService, type BoardStageContext } from './activity-stages.service'; import { ActivityTypesService, @@ -363,10 +371,24 @@ export class ActivitiesService { ]); const ctx = await this.ctx(organizationId); + const [todayDto, overdueDto, upcomingDto] = await Promise.all([ + this.withAccountBalances( + organizationId, + today.map((row) => this.toDto(row, ctx)), + ), + this.withAccountBalances( + organizationId, + overdue.map((row) => this.toDto(row, ctx)), + ), + this.withAccountBalances( + organizationId, + upcoming.map((row) => this.toDto(row, ctx)), + ), + ]); return { - today: today.map((row) => this.toDto(row, ctx)), - overdue: overdue.map((row) => this.toDto(row, ctx)), - upcoming: upcoming.map((row) => this.toDto(row, ctx)), + today: todayDto, + overdue: overdueDto, + upcoming: upcomingDto, todayCount, overdueCount, }; @@ -418,7 +440,10 @@ export class ActivitiesService { ]); return { - items: rows.map((row) => this.toDto(row, ctx)), + items: await this.withAccountBalances( + organizationId, + rows.map((row) => this.toDto(row, ctx)), + ), total, page, limit: take, @@ -689,7 +714,8 @@ export class ActivitiesService { orderBy: { fullName: 'asc' }, }); } - return dto; + const [enriched] = await this.withAccountBalances(organizationId, [dto]); + return enriched; } async create( @@ -1635,6 +1661,105 @@ export class ActivitiesService { } } + /** فقط فعالیت‌های تگ مطالبات؛ مانده از کش ته‌حساب بدون فراخوانی زنده */ + private async withAccountBalances( + organizationId: string, + items: ActivityDto[], + ): Promise { + if (!items.length) return items; + const claimItems = items.filter((item) => + (item.tags ?? []).includes(ACCOUNT_BALANCE_CLAIMS_TAG), + ); + if (!claimItems.length) return items; + + const personIds = [ + ...new Set( + claimItems + .map((item) => item.person?.id) + .filter((id): id is string => Boolean(id)), + ), + ]; + const balanceByPerson = new Map(); + if (personIds.length) { + const links = await this.prisma.personAccountingLink.findMany({ + where: { + personId: { in: personIds }, + person: { organizationId }, + }, + include: { + balanceCache: true, + connection: { select: { isDefault: true } }, + }, + orderBy: [{ linkedAt: 'desc' }], + }); + const bestByPerson = new Map(); + for (const link of links) { + const prev = bestByPerson.get(link.personId); + if (!prev) { + bestByPerson.set(link.personId, link); + continue; + } + const prevScore = + (prev.balanceCache ? 2 : 0) + (prev.connection.isDefault ? 1 : 0); + const nextScore = + (link.balanceCache ? 2 : 0) + (link.connection.isDefault ? 1 : 0); + if (nextScore > prevScore) bestByPerson.set(link.personId, link); + } + for (const personId of personIds) { + const link = bestByPerson.get(personId); + balanceByPerson.set( + personId, + link?.balanceCache + ? this.cacheToAccountBalance(link.balanceCache) + : null, + ); + } + } + + return items.map((item) => { + if (!(item.tags ?? []).includes(ACCOUNT_BALANCE_CLAIMS_TAG)) return item; + const personId = item.person?.id; + return { + ...item, + accountBalance: personId + ? (balanceByPerson.get(personId) ?? null) + : null, + }; + }); + } + + private cacheToAccountBalance(cache: { + rialBalance: number | null; + goldBalance: number | null; + rawResponse: unknown; + fetchedAt: Date; + }): ActivityAccountBalanceDto { + const fields = parseAccountBalanceWeightFields( + extractMandehRaw(cache.rawResponse).fields, + ); + const weights = ACCOUNT_BALANCE_WEIGHT_KEYS.map((key) => { + const value = + fields[key] ?? + (key === 'MandeyeVazni' ? cache.goldBalance : null) ?? + null; + if (value == null || !Number.isFinite(value)) return null; + return { + key, + label: ACCOUNT_BALANCE_WEIGHT_LABELS[key] ?? key, + value, + }; + }).filter((row): row is NonNullable => row != null); + + return { + rialBalance: + cache.rialBalance != null && Number.isFinite(cache.rialBalance) + ? cache.rialBalance + : null, + weights, + fetchedAt: cache.fetchedAt.toISOString(), + }; + } + private toDto(row: ActivityRow, ctx?: DtoContext): ActivityDto { const fields = row.fields && typeof row.fields === 'object' && !Array.isArray(row.fields) diff --git a/apps/web/src/components/activities/ActivitiesKanban.vue b/apps/web/src/components/activities/ActivitiesKanban.vue index 0a21942..97ba685 100644 --- a/apps/web/src/components/activities/ActivitiesKanban.vue +++ b/apps/web/src/components/activities/ActivitiesKanban.vue @@ -158,6 +158,7 @@ function toCard(item: ActivityDto, stageId: string): PipelineDeal { assigneeIds: (item.assignees ?? []).map((a) => a.id), priority: item.priority, activityStatus: item.status, + accountBalance: item.accountBalance ?? null, }; } diff --git a/apps/web/src/components/activities/ActivityAccountBalances.vue b/apps/web/src/components/activities/ActivityAccountBalances.vue new file mode 100644 index 0000000..8d2867a --- /dev/null +++ b/apps/web/src/components/activities/ActivityAccountBalances.vue @@ -0,0 +1,94 @@ + + + diff --git a/apps/web/src/components/activities/ActivityQuickView.vue b/apps/web/src/components/activities/ActivityQuickView.vue index d0af29f..faa524a 100644 --- a/apps/web/src/components/activities/ActivityQuickView.vue +++ b/apps/web/src/components/activities/ActivityQuickView.vue @@ -31,6 +31,7 @@ import { import { useAuthStore } from '@/stores/auth'; import { canCollaborateOnActivity, canMutateActivity } from '@/lib/activity-access'; import ActivityCommentSheet from '@/components/activities/ActivityCommentSheet.vue'; +import ActivityAccountBalances from '@/components/activities/ActivityAccountBalances.vue'; import JalaliDateInput from '@/components/JalaliDateInput.vue'; const props = defineProps<{ @@ -555,6 +556,16 @@ function openFull() { +
+ + مانده حساب + + +
+ یادداشت diff --git a/apps/web/src/components/pipeline/DealCard.vue b/apps/web/src/components/pipeline/DealCard.vue index 1ce28c1..16684fe 100644 --- a/apps/web/src/components/pipeline/DealCard.vue +++ b/apps/web/src/components/pipeline/DealCard.vue @@ -20,6 +20,7 @@ import { theme, } from 'ant-design-vue'; import DealQuickActivityPopover from '@/components/pipeline/DealQuickActivityPopover.vue'; +import ActivityAccountBalances from '@/components/activities/ActivityAccountBalances.vue'; import { calendarDaysBetween, formatJalaliNumeric } from '@/lib/jalali'; import { userAvatarSrc } from '@/lib/userAvatars'; import type { PipelineAccent, PipelineDeal, PipelineUiCopy } from '@/lib/pipeline-board'; @@ -244,6 +245,12 @@ const cardStyle = computed(() => ({ > {{ deal.description }} + diff --git a/apps/web/src/lib/pipeline-board.ts b/apps/web/src/lib/pipeline-board.ts index d77912d..220159e 100644 --- a/apps/web/src/lib/pipeline-board.ts +++ b/apps/web/src/lib/pipeline-board.ts @@ -1,6 +1,7 @@ import { currencySuffix } from '@/lib/money'; import { matchesSearch } from '@/lib/search'; import type { + ActivityAccountBalanceDto, ActivityPriority, ActivityStatus, DealActivityCue, @@ -39,6 +40,8 @@ export type PipelineDeal = { activityCue?: DealActivityCue; /** خلاصه فعالیت‌ها برای پاپ‌آپ دکمهٔ تقویم */ activitySummaries?: DealActivitySummaryDto[]; + /** مانده ریالی/وزنی فقط برای کارت‌های کاریز مطالبات */ + accountBalance?: ActivityAccountBalanceDto | null; }; export type PipelineUiCopy = { diff --git a/apps/web/src/views/ActivitiesView.vue b/apps/web/src/views/ActivitiesView.vue index f5d258f..67f8af9 100644 --- a/apps/web/src/views/ActivitiesView.vue +++ b/apps/web/src/views/ActivitiesView.vue @@ -21,6 +21,7 @@ import { import UiIcon from '@/components/UiIcon.vue'; import ExcelImportFlow from '@/components/ExcelImportFlow.vue'; import ActivitiesKanban from '@/components/activities/ActivitiesKanban.vue'; +import ActivityAccountBalances from '@/components/activities/ActivityAccountBalances.vue'; import ActivityDeskFilters from '@/components/activities/ActivityDeskFilters.vue'; import ActivityStagesManager from '@/components/activities/ActivityStagesManager.vue'; import ActivityTypesManager from '@/components/activities/ActivityTypesManager.vue'; @@ -1773,6 +1774,11 @@ onUnmounted(() => { {{ item.title }}

{{ subtitle(item) }}

+

#{{ t }} +{{ toFaDigits(item.tags.length - 3) }} @@ -1905,6 +1911,11 @@ onUnmounted(() => {

{{ subtitle(item) }}

+

diff --git a/apps/web/src/views/ActivityDetailView.vue b/apps/web/src/views/ActivityDetailView.vue index d5af3e9..f76ed54 100644 --- a/apps/web/src/views/ActivityDetailView.vue +++ b/apps/web/src/views/ActivityDetailView.vue @@ -17,6 +17,7 @@ import JalaliDateInput from '@/components/JalaliDateInput.vue'; import ActivityCommentSheet from '@/components/activities/ActivityCommentSheet.vue'; import ActivityPostponeSheet from '@/components/activities/ActivityPostponeSheet.vue'; import ActivityFieldsView from '@/components/activities/ActivityFieldsView.vue'; +import ActivityAccountBalances from '@/components/activities/ActivityAccountBalances.vue'; import StagePathStrip from '@/components/StagePathStrip.vue'; import { Button as AButton, message, Modal } from 'ant-design-vue'; import type { @@ -1237,6 +1238,9 @@ onUnmounted(() => { #{{ t }} +

+ +
@@ -2030,6 +2034,10 @@ onUnmounted(() => { margin-top: 0.5rem; } +.claim-balances { + margin-top: 0.65rem; +} + .tag { background: #f0fdfa; color: #0f766e; diff --git a/apps/web/src/views/ActivityFormView.vue b/apps/web/src/views/ActivityFormView.vue index 8810269..5733000 100644 --- a/apps/web/src/views/ActivityFormView.vue +++ b/apps/web/src/views/ActivityFormView.vue @@ -35,6 +35,7 @@ import ActivityFieldsEditor from '@/components/activities/ActivityFieldsEditor.v import { useActivityPriorities } from '@/lib/activity-priorities'; import { typeColorStyle, useActivityTypes } from '@/lib/activity-types'; import type { + ActivityAccountBalanceDto, ActivityBoardDto, ActivityDto, ActivityImageDto, @@ -51,6 +52,7 @@ import type { PipelineBoardDto, TeamDto, } from '@mento/shared'; +import ActivityAccountBalances from '@/components/activities/ActivityAccountBalances.vue'; const props = withDefaults( defineProps<{ @@ -101,6 +103,8 @@ const keepTypeId = ref(''); const priority = ref('medium'); const description = ref(''); const tagsRaw = ref(''); +/** فقط فعالیت‌های کاریز مطالبات از API می‌آید */ +const accountBalance = ref(null); const PHOTO_TOO_LARGE = 'حجم عکس باید زیر 200 کیلوبایت باشد'; const PHOTO_LIMIT = 8; type PendingPhoto = { localId: string; name: string; dataUrl: string; file: File }; @@ -438,6 +442,7 @@ function resetForm() { priority.value = 'medium'; description.value = ''; tagsRaw.value = ''; + accountBalance.value = null; clearPhotos(); createdActivityId.value = ''; defaultDue(); @@ -515,6 +520,7 @@ async function load() { description.value = data.description ?? ''; needsNote.value = Boolean(data.description?.trim()); tagsRaw.value = (data.tags ?? []).join('، '); + accountBalance.value = data.accountBalance ?? null; splitDue(data.dueAt); durationMinutes.value = data.durationMinutes ?? 30; reminderAt.value = data.reminderAt @@ -1641,6 +1647,12 @@ watch([id, isNew], () => void load(), { immediate: true });
مشتری مرتبط
{{ selectedPerson?.fullName || '—' }}
+
+
مانده حساب
+
+ +
+
وضعیت انجام
diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts index 301504b..14b760f 100644 --- a/packages/shared/src/index.ts +++ b/packages/shared/src/index.ts @@ -2253,6 +2253,19 @@ export const ACTIVITY_EDIT_POLICY_LABELS: Record = { assignees: "همهٔ مسئولان", }; +/** ماندهٔ کش‌شدهٔ ته‌حساب برای کارت/جزئیات فعالیت مطالبات */ +export interface ActivityAccountBalanceWeightDto { + key: string; + label: string; + value: number; +} + +export interface ActivityAccountBalanceDto { + rialBalance: number | null; + weights: ActivityAccountBalanceWeightDto[]; + fetchedAt: string | null; +} + export interface ActivityDto { id: string; type: ActivityType; @@ -2280,6 +2293,11 @@ export interface ActivityDto { importSource?: string; promotedFromPriorAt?: string | null; tags: string[]; + /** + * فقط برای فعالیت‌های کاریز مطالبات (تگ balance_claims): + * مانده ریالی/وزنی از کش ته‌حساب؛ null یعنی لینک/کش نیست. + */ + accountBalance?: ActivityAccountBalanceDto | null; person: PersonSummaryDto | null; company: CompanySummaryDto | null; deal: DealSummaryDto | null;