From b2d8fdc8a09c2f10fcc1157b7c419bdc7bbb3362 Mon Sep 17 00:00:00 2001 From: ahasani194 Date: Mon, 1 Jun 2026 16:22:35 +0330 Subject: [PATCH] some updates --- src/common/constants/translates/enums.ts | 10 +++++++++- src/common/queryConstants/saleInvoice.ts | 1 + .../pos/sales-invoices/sales-invoices.service.ts | 8 +++++++- src/modules/pos/statistics/statistics.service.ts | 8 ++++---- 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/common/constants/translates/enums.ts b/src/common/constants/translates/enums.ts index 047b875..df6a381 100644 --- a/src/common/constants/translates/enums.ts +++ b/src/common/constants/translates/enums.ts @@ -1,4 +1,7 @@ -import { TspProviderResponseStatus } from '@/generated/prisma/enums' +import { + InvoiceSettlementType, + TspProviderResponseStatus, +} from '@/generated/prisma/enums' export default { PaymentMethodType: { @@ -144,6 +147,11 @@ export default { [TspProviderResponseStatus.FISCAL_QUEUED]: 'در انتظار تایید سازمان', [TspProviderResponseStatus.SEND_FAILURE]: 'خطا در ارسال', }, + InvoiceSettlementType: { + [InvoiceSettlementType.CASH]: 'نقدی', + [InvoiceSettlementType.CREDIT]: 'نسیه', + [InvoiceSettlementType.MIXED]: 'نقدی / نسیه', + }, TspProviderRequestType: { ORIGINAL: 'اصلی', CORRECTION: 'اصلاح', diff --git a/src/common/queryConstants/saleInvoice.ts b/src/common/queryConstants/saleInvoice.ts index ffa68ff..7c254e0 100644 --- a/src/common/queryConstants/saleInvoice.ts +++ b/src/common/queryConstants/saleInvoice.ts @@ -11,6 +11,7 @@ export const summarySelect: SalesInvoiceSelect = { type: true, notes: true, created_at: true, + settlement_type: true, customer: { select: { type: true, diff --git a/src/modules/pos/sales-invoices/sales-invoices.service.ts b/src/modules/pos/sales-invoices/sales-invoices.service.ts index d05399e..92c839b 100644 --- a/src/modules/pos/sales-invoices/sales-invoices.service.ts +++ b/src/modules/pos/sales-invoices/sales-invoices.service.ts @@ -81,6 +81,10 @@ export class SalesInvoicesService { 'TspProviderResponseStatus', invoice.tsp_attempts?.[0]?.status || TspProviderResponseStatus.NOT_SEND, ), + settlement_type: translateEnumValue( + 'InvoiceSettlementType', + invoice.settlement_type, + ), } return ResponseMapper.single(mappedInvoice) @@ -290,7 +294,9 @@ export class SalesInvoicesService { if (query.status) { if (query.status === TspProviderResponseStatus.NOT_SEND) { - where.tsp_attempts = undefined + where.tsp_attempts = { + none: {}, + } } else { where.tsp_attempts = { some: { diff --git a/src/modules/pos/statistics/statistics.service.ts b/src/modules/pos/statistics/statistics.service.ts index 076f41e..2cc5415 100644 --- a/src/modules/pos/statistics/statistics.service.ts +++ b/src/modules/pos/statistics/statistics.service.ts @@ -47,9 +47,9 @@ export class StatisticsService { SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FAILURE} THEN si.total_amount ELSE 0 END) AS failure_amount_sum, SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FAILURE} THEN si.tax_amount ELSE 0 END) AS failure_tax_sum, SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FAILURE} THEN 1 ELSE 0 END) AS failure_count, - SUM(CASE WHEN la.status = ${TspProviderResponseStatus.QUEUED} THEN si.total_amount ELSE 0 END) AS pending_amount_sum, - SUM(CASE WHEN la.status = ${TspProviderResponseStatus.QUEUED} THEN si.tax_amount ELSE 0 END) AS pending_tax_sum, - SUM(CASE WHEN la.status = ${TspProviderResponseStatus.QUEUED} THEN 1 ELSE 0 END) AS pending_count, + SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FISCAL_QUEUED} THEN si.total_amount ELSE 0 END) AS pending_amount_sum, + SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FISCAL_QUEUED} THEN si.tax_amount ELSE 0 END) AS pending_tax_sum, + SUM(CASE WHEN la.status = ${TspProviderResponseStatus.FISCAL_QUEUED} THEN 1 ELSE 0 END) AS pending_count, SUM(CASE WHEN la.status IS NULL THEN si.total_amount ELSE 0 END) AS not_sended_amount_sum, SUM(CASE WHEN la.status IS NULL THEN si.tax_amount ELSE 0 END) AS not_sended_tax_sum, SUM(CASE WHEN la.status IS NULL THEN 1 ELSE 0 END) AS not_sended_count, @@ -104,7 +104,7 @@ export class StatisticsService { tax_amount: Number(item?.pending_tax_sum || 0), count: Number(item?.pending_count || 0), }, - not_sended: { + not_send: { total_amount: Number(item?.not_sended_amount_sum || 0), tax_amount: Number(item?.not_sended_tax_sum || 0), count: Number(item?.not_sended_count || 0),