shareneus 1.7.316 → 1.7.318

package/package.json

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

package/src/accounting/invoice/inv-print.service.ts

@@ -415,7 +415,7 @@ export function GetBillNameForInvoicePrint(argInvoiceData: any, InvoicePrintData
                     Customer.Adrs.push(city);
                 }
             }
-            Customer.GSTIN = argInvoiceData.BillTo.GSTIN;
+            Customer.GSTIN = argInvoiceData.BillTo.TaxId?.GSTIN;
             if (!TrUtils.IsNull(argInvoiceData.BillTo.DLNo)) {
                 Customer.DLNo = argInvoiceData.BillTo.DLNo;
             }

package/src/shared/party-details-section/pdf-party-details.section.ts

@@ -8,6 +8,7 @@ export function buildInvoicePartyDetailsSection(PDFInvoiceData: any, customerLay
 
 export function buildSalesPartyDetailsSection(PDFInvoiceData: any, customerLayout: any, printConfig: any = {}) {
     const transactionData = PDFInvoiceData || {};
+    console.log('Transaction Data for Party Details Section:', transactionData);
     const billTo = resolveSalesBillToDetails(transactionData);
     const shipTo = resolveSalesShipToDetails(transactionData);
     const insurance = resolveInsuranceDetails(transactionData);
@@ -104,8 +105,8 @@ function resolveSalesBillToDetails(transactionData: any) {
         transactionData?.CustomerName
     );
     const gstin = firstValue(
-        billTo?.GSTIN,
-        billTo?.GSTNo
+        billTo?.TaxId?.GSTIN,
+        billTo?.TaxId?.GSTNo
     );
     const contactInfo = resolvePhoneFromContacts(billTo?.Cons);
     const directPhone = firstValue(billTo?.Ph, billTo?.Phone, billTo?.Mobile);
@@ -129,7 +130,7 @@ function resolveSalesShipToDetails(transactionData: any) {
         || transactionData?.ShipToAddress
     );
     const name = firstValue(shipTo?.Name, shipTo?.CName);
-    const gstin = firstValue(shipTo?.GSTIN, shipTo?.GSTNo);
+    const gstin = firstValue(shipTo?.TaxId?.GSTIN, shipTo?.TaxId?.GSTNo);
     return {
         name,
         addressLines: buildAddressLines(address),
@@ -163,8 +164,8 @@ function resolvePurchaseBFromDetails(transactionData: any) {
         transactionData?.VendorName
     );
     const gstin = firstValue(
-        billTo?.GSTIN,
-        billTo?.GSTNo
+        billTo?.TaxId?.GSTIN,
+        billTo?.TaxId?.GSTNo
     );
     const contactInfo = resolvePhoneFromContacts(billTo?.Contact);
     const directPhone = firstValue(billTo?.Ph, billTo?.Phone, billTo?.Mobile);
@@ -237,7 +238,7 @@ function resolvePurchaseShipFromDetails(transactionData: any) {
         transactionData?.SFromName,
         transactionData?.ShipFromName
     );
-    const gstin = firstValue(shipFrom?.GSTIN, shipFrom?.GSTNo);
+    const gstin = firstValue(shipFrom?.TaxId?.GSTIN, shipFrom?.TaxId?.GSTNo);
 
     return {
         name,
@@ -256,7 +257,7 @@ function resolveInsuranceDetails(transactionData: any) {
         insurance?.Provider,
         insurance?.InsName
     );
-    const gstin = firstValue(insurance?.GSTIN, insurance?.GSTNo);
+    const gstin = firstValue(insurance?.TaxId?.GSTIN, insurance?.TaxId?.GSTNo);
     return {
         name,
         addressLines: buildAddressLines(address),

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

@@ -113,25 +113,25 @@ export function getRenderableColumns(headerConfig: any[], sType: string = '') {
             continue;
         }
 
-        if (isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
-            columns.push({
-                type: 'tax',
-                taxKind: 'rate',
-                dbField: 'GST',
-                width: header.width,
-            });
-            continue;
-        }
-
-        if (isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
-            columns.push({
-                type: 'tax',
-                taxKind: 'amount',
-                dbField: 'GST',
-                width: header.width,
-            });
-            continue;
-        }
+        if (isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'rate',
+                dbField: 'GST',
+                width: header.width,
+            });
+            continue;
+        }
+
+        if (isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'amount',
+                dbField: 'GST',
+                width: header.width,
+            });
+            continue;
+        }
 
         // --- Intra / CGST + SGST ---
         if (!isInter && hasTaxGroup && isTaxPercentHeader(header)) {
@@ -170,25 +170,25 @@ export function getRenderableColumns(headerConfig: any[], sType: string = '') {
             continue;
         }
 
-        if (!isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
-            columns.push({
-                type: 'tax',
-                taxKind: 'rate',
-                dbField: 'GST',
-                width: header.width,
-            });
-            continue;
-        }
-
-        if (!isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
-            columns.push({
-                type: 'tax',
-                taxKind: 'amount',
-                dbField: 'GST',
-                width: header.width,
-            });
-            continue;
-        }
+        if (!isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'rate',
+                dbField: 'GST',
+                width: header.width,
+            });
+            continue;
+        }
+
+        if (!isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
+            columns.push({
+                type: 'tax',
+                taxKind: 'amount',
+                dbField: 'GST',
+                width: header.width,
+            });
+            continue;
+        }
 
         columns.push({
             type: 'normal',
@@ -207,16 +207,16 @@ export function buildHeaderRows(headerConfig: any[], sType: string = '') {
     const hasDiscPercent = headerConfig.some((header: any) => header.text === 'Disc %');
     const hasDiscAmount = headerConfig.some((header: any) => isDiscountAmountHeader(header.text));
     const hasDiscGroup = hasDiscPercent && hasDiscAmount;
-    const hasGroupedHeaders = hasTaxGroup || hasDiscGroup;
-
-    if (!hasGroupedHeaders) {
-        const singleRow = headerConfig.map((header: any) => ({
-            text: getSingleTaxHeaderText(header),
-            alignment: header.alignment,
-            dbFields: header.dbFields,
-            stackFields: header.stackFields,
-            ...getHeaderCellStyle()
-        }));
+    const hasGroupedHeaders = hasTaxGroup || hasDiscGroup;
+
+    if (!hasGroupedHeaders) {
+        const singleRow = headerConfig.map((header: any) => ({
+            text: getSingleTaxHeaderText(header),
+            alignment: header.alignment,
+            dbFields: header.dbFields,
+            stackFields: header.stackFields,
+            ...getHeaderCellStyle()
+        }));
         return [singleRow];
     }
 
@@ -242,17 +242,17 @@ export function buildHeaderRows(headerConfig: any[], sType: string = '') {
             continue;
         }
 
-        if (isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
-            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
-            subRow.push({});
-            continue;
-        }
-
-        if (isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
-            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
-            subRow.push({});
-            continue;
-        }
+        if (isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
+            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
+            subRow.push({});
+            continue;
+        }
+
+        if (isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
+            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
+            subRow.push({});
+            continue;
+        }
 
         // --- Intra / CGST + SGST ---
         if (!isInter && hasTaxGroup && isTaxPercentHeader(header)) {
@@ -279,17 +279,17 @@ export function buildHeaderRows(headerConfig: any[], sType: string = '') {
             continue;
         }
 
-        if (!isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
-            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
-            subRow.push({});
-            continue;
-        }
-
-        if (!isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
-            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
-            subRow.push({});
-            continue;
-        }
+        if (!isInter && !hasTaxGroup && isTaxPercentHeader(header)) {
+            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
+            subRow.push({});
+            continue;
+        }
+
+        if (!isInter && !hasTaxGroup && isTaxAmountHeader(header)) {
+            topRow.push({ text: getSingleTaxHeaderText(header), rowSpan: 2, alignment: 'center', ...getHeaderCellStyle() });
+            subRow.push({});
+            continue;
+        }
 
         if (hasDiscGroup && header.text === 'Disc %') {
             topRow.push(
@@ -330,22 +330,22 @@ function isTaxPercentHeader(header: any) {
     return normalizeHeaderText(header?.text) === 'TAX%';
 }
 
-function isTaxAmountHeader(header: any) {
-    return normalizeHeaderText(header?.text) === 'TAXAMOUNT';
-}
-
-function getSingleTaxHeaderText(header: any) {
-    if (isTaxPercentHeader(header)) {
-        return 'GST(%)';
-    }
-    if (isTaxAmountHeader(header)) {
-        return 'GST Amt';
-    }
-    return header.text;
-}
+function isTaxAmountHeader(header: any) {
+    return normalizeHeaderText(header?.text) === 'TAXAMOUNT';
+}
+
+function getSingleTaxHeaderText(header: any) {
+    if (isTaxPercentHeader(header)) {
+        return 'GST(%)';
+    }
+    if (isTaxAmountHeader(header)) {
+        return 'GST Amt';
+    }
+    return header.text;
+}
 
 function isTaxHeaderConfig(header: any) {
-    const title = header?.title ?? header?.CustTitle ?? header?.Tital ?? header?.text;
+    const title = header?.Title ?? header?.Tital ?? header?.CustTitle ?? header?.Tital ?? header?.text;
     const normalizedTitle = normalizeHeaderText(title);
     return normalizedTitle === 'TAX%' || normalizedTitle === 'TAXAMOUNT';
 }

package/dist/accounting/counter-sales/auto-sales-receipt-pdf.service.d.ts

@@ -1,290 +0,0 @@
-export declare class SalesReceiptprintService {
-    FontSize: number;
-    static GetInvoicePrint(ROPrintData: any, numberofCopies: any, isotherIndustry: boolean, withPass: boolean, isAuto: boolean, moreDiscDetails: boolean): {
-        info: {
-            title: string;
-        };
-        background: (currentPage: any, pageSize: any) => any;
-        header: (currentPage: any, pageCount: any) => {
-            text: string;
-            alignment: string;
-            marginRight: number;
-            fontSize: number;
-            marginTop: number;
-        };
-        pageBreakBefore: (currentNode: any, followingNodesOnPage: any, nodesOnNextPage: any, previousNodesOnPage: any) => boolean;
-        pageMargins: number[];
-        content: any[];
-        styles: {
-            temp2header: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-            };
-            tableheader1: {
-                bold: boolean;
-                fontFamily: string;
-                margin: number[];
-                alignment: string;
-            };
-            header: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-            };
-            meetingHeader: {
-                fontSize: number;
-                bold: boolean;
-            };
-            Receiptheader: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-                margin: number[];
-            };
-            InlineHeader: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-                margin: number[];
-            };
-            TaskHeading: {
-                fontSize: number;
-                bold: boolean;
-                margin: number[];
-            };
-            lettersSize: {
-                fontSize: number;
-                margin: number[];
-            };
-            tablexample: {
-                margin: number[];
-            };
-            hedstyl: {
-                margin: number[];
-            };
-            header2: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-                margin: number[];
-            };
-            header1: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-                decoration: string;
-                margin: number[];
-            };
-            ws_adrs_center: {
-                fontSize: number;
-                alignment: string;
-            };
-            ws_adrs_center1: {
-                fontSize: number;
-                alignment: string;
-            };
-            ws_adrs_left: {
-                fontSize: number;
-                alignment: string;
-            };
-            ws_adrs_left1: {
-                fontSize: number;
-                alignment: string;
-            };
-            columnheader: {
-                margin: number[];
-            };
-            tableExample: {
-                margin: number[];
-                fontSize: number;
-            };
-            tableExamplemargin: {
-                margin: number[];
-                fontSize: number;
-            };
-            textcust: {
-                fontSize: number;
-                margin: number[];
-            };
-            column: {
-                margin: number[];
-            };
-            tableheader: {
-                bold: boolean;
-                fontSize: number;
-                margin: number[];
-                alignment: string;
-            };
-            tableheader2: {
-                fontSize: number;
-                margin: number[];
-                alignment: string;
-                opacity: number;
-            };
-            hed: {
-                fontSize: number;
-                bold: boolean;
-            };
-            hed2: {
-                fontSize: number;
-            };
-            TotalsStyles: {
-                marginTop: number;
-                lineHeight: number;
-                fontSize: number;
-                margin: number[];
-            };
-            colum1: {
-                fontSize: number;
-                lineHeight: number;
-            };
-            colum2: {
-                fontSize: number;
-                lineHeight: number;
-                margin: number[];
-            };
-            colum3: {
-                lineHeight: number;
-            };
-            Receiptheader1: {
-                fontSize: number;
-                bold: boolean;
-                alignment: string;
-                margin: number[];
-            };
-            Row1: {
-                fontSize: number;
-                margin: number[];
-            };
-            rowdata: {
-                margin: number[];
-                fontSize: number;
-            };
-            forCompany: {
-                margin: number[];
-                fontSize: number;
-            };
-            forCompany1: {
-                margin: number[];
-                fontSize: number;
-            };
-            Rupees: {
-                margin: number[];
-                fontSize: number;
-            };
-            Signature: {
-                margin: number[];
-                alignment: string;
-                fontSize: number;
-            };
-            withApp: {
-                alignment: string;
-                lineHeight: number;
-            };
-            withOutApp: {
-                alignment: string;
-                lineHeight: number;
-            };
-            Sign: {
-                fontSize: number;
-                margin: number[];
-            };
-            Sign1: {
-                fontSize: number;
-                margin: number[];
-            };
-            'margin-all': {
-                margin: number[];
-            };
-            'margin-top': {
-                margin: number[];
-            };
-            'margin-bottom': {
-                margin: number[];
-            };
-            fontSize: {
-                fontSize: number;
-            };
-        };
-    };
-    static GetFileName(ROPrintData: any): string;
-    static CommonHeaderDetails(ROPrintData: any, text: any, isotherIndustry: boolean): any[];
-    static GetMainHeaderDetails(Entity: any, HeaderName: any, Image: any, HColor: any, AColor: any, text: any): ({
-        columns: any;
-    } | {
-        canvas: {
-            type: string;
-            lineColor: string;
-            x1: number;
-            y1: number;
-            x2: number;
-            y2: number;
-            lineWidth: number;
-        }[];
-    })[];
-    static PreparesparePartsTable(ROPrintData: any, isAuto: boolean): any;
-    static GetLaborPartsTableForView(Parts: any, Ops: any, PrintPartNo: any): any;
-    static WithOutDiscountFieldTable(Parts: any, Ops: any, PrintPartNo: any, ShowTaxColumn: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): any;
-    static BuildTableBodyForLaborAndParts(Parts: any, Labor: any, PrintPartNo: any, ShowTaxColumn: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): any;
-    static GetWithOutDiscAndTaxFieldHeader(Parts: any, Ops: any, ShowTaxColumn: any, PrintPartNo: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): any;
-    static TaxDataTable(Parts: any, Ops: any, PrintPartNo: any, ShowTaxColumn: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): {
-        style: string;
-        table: {
-            widths: (string | number)[];
-            body: any;
-        };
-        layout: {
-            hLineWidth: (i: any, node: any) => number;
-            vLineWidth: (i: any, node: any) => number;
-            hLineColor: (i: any, node: any) => string;
-            vLineColor: (i: any, node: any) => string;
-        };
-    };
-    static ConsolidateDataTable(Parts: any, Ops: any, PrintPartNo: any, ShowTaxColumn: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): {
-        style: string;
-        table: {
-            widths: number[];
-            body: any;
-        };
-        layout: {
-            hLineWidth: (i: any, node: any) => number;
-            vLineWidth: (i: any, node: any) => number;
-            hLineColor: (i: any, node: any) => string;
-            vLineColor: (i: any, node: any) => string;
-        };
-    };
-    static NoTaxDataTable(Parts: any, Ops: any, PrintPartNo: any, ShowTaxColumn: any, Body: any, ShowIGST: any, ConsolidateGST: any, ShowDiscountColumn: any, isAuto: boolean): {
-        style: string;
-        table: {
-            widths: number[];
-            body: any;
-        };
-        layout: {
-            hLineWidth: (i: any, node: any) => number;
-            vLineWidth: (i: any, node: any) => number;
-            hLineColor: (i: any, node: any) => string;
-            vLineColor: (i: any, node: any) => string;
-        };
-    };
-    static buildTableForCustomerLabor(Parts: any, Ops: any, PrintPartNo: any, customerorInsurance: any): any;
-    static getSummaryHeaders(permission: boolean): any;
-    static CommonTotalDetails(ROPrintData: any, index: any, numberofCopies: any, withPass: boolean, moreDiscDetails: boolean): any[];
-    static GetGatePass(isGatepass: boolean, ROPrintData: any): any;
-    static GetCustomerDetails(ROPrintData: any, isOtherIndustry: boolean): {
-        lineHeight: number;
-        fontSize: number;
-        table: {
-            body: any;
-        };
-        layout: string;
-    };
-    static GetVehicleDetails(Vehicle: any, isOtherIndustry: boolean): {
-        lineHeight: number;
-        fontSize: number;
-        table: {
-            body: any;
-        };
-        layout: string;
-    };
-}