shareneus 1.7.324 → 1.7.326

package/dist/accounting/debit-note/debit-note-print.service.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebitNotePrintService = void 0;
 const shared_print_service_1 = require("../../shared/shared-print.service");
-const debit_note_totals_service_1 = require("./debit-note-totals.service");
 const code_enums_1 = require("../../enums/code-enums");
 const tr_utils_1 = require("../../utils/tr-utils");
 const enums_1 = require("../../enums/enums");
 const my_date_1 = require("../../utils/my-date");
 const math_operations_1 = require("../../shared/math-operations");
+const invoice_total_service_1 = require("../invoice/invoice-total.service");
 class DebitNotePrintService {
     static GetDebitNotePrintInfo(OriginalInvoiceData, OriginalEntityData, image, IncludeGST, ConsolidateGST, TaxCodes, IsProforma, IsCustBillTo) {
         var _a, _b, _c, _d, _e, _f;
@@ -25,13 +25,13 @@ class DebitNotePrintService {
         InvoicePrintData = shared_print_service_1.PrintSharedService.GetEntityHeaderStyles(InvoicePrintData, OriginalEntityData, image);
         InvoicePrintData = this.GetInvoiceOtherDetailsForPrint(InvoicePrintData, argInvoiceData, IsCustBillTo);
         let IsTaxable = (IncludeGST && tr_utils_1.TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
-        let finalTotalsData = debit_note_totals_service_1.DebitNoteTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable, true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity);
+        let finalTotalsData = invoice_total_service_1.InvoiceTotalsService.GetTotalsValue(argInvoiceData.Services, argInvoiceData.Items, IsTaxable, true, null, '', null, '', argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, true, InvoicePrintData.Entity);
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
             finalTotalsData.CustPartsTotalBeforeDisc = finalTotalsData.CustPartAfterTax;
         }
         InvoicePrintData = tr_utils_1.TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
-        InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Services, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, InvoicePrintData.Entity.DecimalsNumber);
+        InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Ops, ConsolidateGST, TaxCodes, (_b = (_a = OriginalEntityData.Entity.Settings) === null || _a === void 0 ? void 0 : _a.Acc) === null || _b === void 0 ? void 0 : _b.LTot, InvoicePrintData.Entity.DecimalsNumber);
         InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, (_d = (_c = OriginalEntityData.Entity.Settings) === null || _c === void 0 ? void 0 : _c.Acc) === null || _d === void 0 ? void 0 : _d.LTot, (_e = InvoicePrintData.Entity) === null || _e === void 0 ? void 0 : _e.DecimalsNumber);
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
         InvoicePrintData.PrintInfo = this.PrepareFormatForInvoicePrint(InvoicePrintData, code_enums_1.ROTypeEnum.Invoice, argInvoiceData.Sts);
@@ -203,12 +203,14 @@ class DebitNotePrintService {
         return Items;
     }
     static ReverseItemsForInvoicePrint(argInvoiceData) {
-        argInvoiceData.Items = argInvoiceData.Items.reverse();
+        argInvoiceData.Services = argInvoiceData.Services;
+        argInvoiceData.Items = argInvoiceData.Items;
         return argInvoiceData;
     }
     static PrepareFormatForInvoicePrint(InvoicePrintData, ROType, InvoiceStatus) {
         let PrintInfo = [];
         let ROLaborParts = {};
+        ROLaborParts.Services = InvoicePrintData.Services;
         ROLaborParts.Items = InvoicePrintData.Items;
         ROLaborParts.Sts = InvoiceStatus;
         ROLaborParts.Type = ROType;

package/dist/shared/table-section/pdf-table.row.js

@@ -124,6 +124,7 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
+    console.log('getFirstFieldValue', item, dbFields);
     for (const field of dbFields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shareneus",
-  "version": "1.7.324",
+  "version": "1.7.326",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/accounting/debit-note/debit-note-print.service.ts

@@ -7,6 +7,7 @@ import { TrUtils } from '../../utils/tr-utils';
 import { InvoiceStatusEnum, PayTypeEnum } from '../../enums/enums';
 import { MyDate } from '../../utils/my-date';
 import { Add, Divide, Multiply, Subtract } from '../../shared/math-operations';
+import { InvoiceTotalsService } from '../invoice/invoice-total.service';
 
 export class DebitNotePrintService {
 
@@ -38,8 +39,8 @@ export class DebitNotePrintService {
 
         let IsTaxable: boolean = (IncludeGST && TrUtils.isTaxable(argInvoiceData.Settings.Tax)) ? true : false;
 
-        let finalTotalsData: any = DebitNoteTotalsService.GetTotalsValue(argInvoiceData.Items, IsTaxable,
-            true, argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, InvoicePrintData.Entity);
+        let finalTotalsData: any = InvoiceTotalsService.GetTotalsValue(argInvoiceData.Services, argInvoiceData.Items, IsTaxable,
+            true, null, '', null, '', argInvoiceData.Disc, argInvoiceData.Perc, TaxCodes, true, argInvoiceData.Settings, argInvoiceData.Adjust, true, InvoicePrintData.Entity);
 
         if (ConsolidateGST) {
             finalTotalsData.CustLaborTotalBeforeDisc = finalTotalsData.CustLaborAfterTax;
@@ -47,7 +48,7 @@ export class DebitNotePrintService {
         }
 
         InvoicePrintData = TrUtils.ConcatObjects(InvoicePrintData, finalTotalsData);
-        InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Services, ConsolidateGST, TaxCodes, OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity.DecimalsNumber);
+        InvoicePrintData.Ops = this.GetLaborPrintInfo(InvoicePrintData.Ops, ConsolidateGST, TaxCodes, OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity.DecimalsNumber);
         InvoicePrintData.Items = this.GetItemsPrintInfo(InvoicePrintData.Items, ConsolidateGST, TaxCodes, OriginalEntityData.Entity.Settings?.Acc?.LTot, InvoicePrintData.Entity?.DecimalsNumber);
 
         argInvoiceData = this.ReverseItemsForInvoicePrint(argInvoiceData);
@@ -238,7 +239,8 @@ export class DebitNotePrintService {
     }
 
     static ReverseItemsForInvoicePrint(argInvoiceData: any) {
-        argInvoiceData.Items = argInvoiceData.Items.reverse();
+         argInvoiceData.Services = argInvoiceData.Services;
+        argInvoiceData.Items = argInvoiceData.Items;
         return argInvoiceData;
     }
 
@@ -246,7 +248,7 @@ export class DebitNotePrintService {
         let PrintInfo: any[] = [];
 
         let ROLaborParts: any = {};
-
+        ROLaborParts.Services = InvoicePrintData.Services;
         ROLaborParts.Items = InvoicePrintData.Items;
 
         ROLaborParts.Sts = InvoiceStatus;

package/src/shared/table-section/pdf-table.row.ts

@@ -59,53 +59,53 @@ function formatFieldValue(item: any, fieldConfig: any, fixedTo: number) {
     return formatNumericLikeValue(signedValue, fixedTo, shouldSkipFixedTo(fieldConfig));
 }
 
-function getTaxValue(item: any, taxName: 'CGST' | 'SGST' | 'IGST' | 'GST', taxKind: 'rate' | 'amount') {
-    if (taxName === 'GST') {
-        if (taxKind === 'rate') {
-            return getCombinedTaxValue(item, ['CombinedTaxPercentage', 'GSTPerc'], [
-                ['CGSTPerc', 'CGST'],
-                ['SGSTPerc', 'SGST'],
-                ['IGSTPerc', 'IGST']
-            ]);
-        }
-        return getCombinedTaxValue(item, ['TotalTaxAmount', 'TaxAmount', 'GSTAmt'], [
-            ['CGSTAmt', 'CGST'],
-            ['SGSTAmt', 'SGST'],
-            ['IGSTAmt', 'IGST']
-        ]);
-    }
-
-    if (taxName === 'IGST') {
-        const fields = taxKind === 'rate' ? ['IGSTPerc'] : ['IGSTAmt'];
-        return getFirstFieldValue(item, fields);
-    }
+function getTaxValue(item: any, taxName: 'CGST' | 'SGST' | 'IGST' | 'GST', taxKind: 'rate' | 'amount') {
+    if (taxName === 'GST') {
+        if (taxKind === 'rate') {
+            return getCombinedTaxValue(item, ['CombinedTaxPercentage', 'GSTPerc'], [
+                ['CGSTPerc', 'CGST'],
+                ['SGSTPerc', 'SGST'],
+                ['IGSTPerc', 'IGST']
+            ]);
+        }
+        return getCombinedTaxValue(item, ['TotalTaxAmount', 'TaxAmount', 'GSTAmt'], [
+            ['CGSTAmt', 'CGST'],
+            ['SGSTAmt', 'SGST'],
+            ['IGSTAmt', 'IGST']
+        ]);
+    }
+
+    if (taxName === 'IGST') {
+        const fields = taxKind === 'rate' ? ['IGSTPerc'] : ['IGSTAmt'];
+        return getFirstFieldValue(item, fields);
+    }
     const fields = taxKind === 'rate'
         ? [`${taxName}Perc`, taxName]
         : [`${taxName}Amt`, taxName];
-    return getFirstFieldValue(item, fields);
-}
-
-function getCombinedTaxValue(item: any, combinedFields: string[], componentFieldGroups: string[][]) {
-    const combinedValue = getFirstFieldValue(item, combinedFields);
-    if (combinedValue) {
-        return combinedValue;
-    }
-
-    const values = componentFieldGroups
-        .map((fields: string[]) => getFirstFieldValue(item, fields))
-        .filter((value: string) => value !== '');
-
-    if (values.length === 0) {
-        return '';
-    }
-
-    const numericValues = values.map((value: string) => Number(value.replace(/,/g, '').trim()));
-    if (numericValues.some((value: number) => !Number.isFinite(value))) {
-        return values[0];
-    }
-
-    return String(numericValues.reduce((sum: number, value: number) => sum + value, 0));
-}
+    return getFirstFieldValue(item, fields);
+}
+
+function getCombinedTaxValue(item: any, combinedFields: string[], componentFieldGroups: string[][]) {
+    const combinedValue = getFirstFieldValue(item, combinedFields);
+    if (combinedValue) {
+        return combinedValue;
+    }
+
+    const values = componentFieldGroups
+        .map((fields: string[]) => getFirstFieldValue(item, fields))
+        .filter((value: string) => value !== '');
+
+    if (values.length === 0) {
+        return '';
+    }
+
+    const numericValues = values.map((value: string) => Number(value.replace(/,/g, '').trim()));
+    if (numericValues.some((value: number) => !Number.isFinite(value))) {
+        return values[0];
+    }
+
+    return String(numericValues.reduce((sum: number, value: number) => sum + value, 0));
+}
 
 function shouldRenderNegativeTaxAmount(item: any, column: any) {
     return !!item?.Ret && column?.taxKind === 'amount';
@@ -137,6 +137,7 @@ function negateNumericLikeValue(value: string) {
 }
 
 export function getFirstFieldValue(item: any, dbFields: string[] = []) {
+    console.log('getFirstFieldValue', item, dbFields);
     for (const field of dbFields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {
@@ -274,23 +275,23 @@ function formatExpiryDateValue(value: string) {
 function shouldSkipFixedTo(header: any) {
     const text = String(header?.text ?? '').trim().toUpperCase();
     const normalizedText = text.replace(/\s+/g, '');
-    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%') || normalizedText === 'QTY' || normalizedText === 'OFFERQTY' || normalizedText === 'OFQTY' || normalizedText === 'MPN') {
-        return true;
-    }
+    if (text === 'HSN/SAC' || text === 'BN' || text === 'BNO' || text.includes('%') || normalizedText === 'QTY' || normalizedText === 'OFFERQTY' || normalizedText === 'OFQTY' || normalizedText === 'MPN') {
+        return true;
+    }
 
     const dbFields = Array.isArray(header?.dbFields) ? header.dbFields : [];
     return dbFields.some((field: any) => {
         const normalized = String(field ?? '').trim().toUpperCase();
         return normalized === 'BN'
-            || normalized === 'BNO'
-            || normalized === 'QTY'
-            || normalized === 'OFQTY'
-            || normalized === 'MPN'
-            || normalized.endsWith('.BN')
-            || normalized.endsWith('.QTY')
-            || normalized.endsWith('.OFQTY')
-            || normalized.endsWith('.MPN')
-            || normalized.endsWith('PERC')
-            || normalized.endsWith('.PERC');
+            || normalized === 'BNO'
+            || normalized === 'QTY'
+            || normalized === 'OFQTY'
+            || normalized === 'MPN'
+            || normalized.endsWith('.BN')
+            || normalized.endsWith('.QTY')
+            || normalized.endsWith('.OFQTY')
+            || normalized.endsWith('.MPN')
+            || normalized.endsWith('PERC')
+            || normalized.endsWith('.PERC');
     });
 }