shareneus 1.7.316 → 1.7.317

package/dist/shared/party-details-section/pdf-party-details.section.js

@@ -85,7 +85,7 @@ function buildPartyDetailsSectionLayout(config) {
         }];
 }
 function resolveSalesBillToDetails(transactionData) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const billTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) || {};
     const address = normalizeAddress((billTo === null || billTo === void 0 ? void 0 : billTo.Adrs)
         || ((_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _a === void 0 ? void 0 : _a.Adrs)
@@ -94,10 +94,10 @@ function resolveSalesBillToDetails(transactionData) {
         || ((_b = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) === null || _b === void 0 ? void 0 : _b.Adrs)
         || ((_c = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _c === void 0 ? void 0 : _c.Adrs));
     const name = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Name, billTo === null || billTo === void 0 ? void 0 : billTo.CName, (_d = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _d === void 0 ? void 0 : _d.Name, (_e = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Customer) === null || _e === void 0 ? void 0 : _e.Name, (_f = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _f === void 0 ? void 0 : _f.Name, transactionData === null || transactionData === void 0 ? void 0 : transactionData.CustomerName);
-    const gstin = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.GSTIN, billTo === null || billTo === void 0 ? void 0 : billTo.GSTNo);
+    const gstin = (0, pdf_shared_utils_1.firstValue)((_g = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _g === void 0 ? void 0 : _g.GSTIN, (_h = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _h === void 0 ? void 0 : _h.GSTNo);
     const contactInfo = resolvePhoneFromContacts(billTo === null || billTo === void 0 ? void 0 : billTo.Cons);
     const directPhone = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Ph, billTo === null || billTo === void 0 ? void 0 : billTo.Phone, billTo === null || billTo === void 0 ? void 0 : billTo.Mobile);
-    const ownerName = (0, pdf_shared_utils_1.firstValue)((_g = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _g === void 0 ? void 0 : _g.Name);
+    const ownerName = (0, pdf_shared_utils_1.firstValue)((_j = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Cust) === null || _j === void 0 ? void 0 : _j.Name);
     return {
         name,
         addressLines: buildAddressLines(address),
@@ -109,12 +109,13 @@ function resolveSalesBillToDetails(transactionData) {
     };
 }
 function resolveSalesShipToDetails(transactionData) {
+    var _a, _b;
     const shipTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShippmentTo) || {};
     const address = normalizeAddress((shipTo === null || shipTo === void 0 ? void 0 : shipTo.Adrs)
         || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipAddress)
         || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipToAddress));
     const name = (0, pdf_shared_utils_1.firstValue)(shipTo === null || shipTo === void 0 ? void 0 : shipTo.Name, shipTo === null || shipTo === void 0 ? void 0 : shipTo.CName);
-    const gstin = (0, pdf_shared_utils_1.firstValue)(shipTo === null || shipTo === void 0 ? void 0 : shipTo.GSTIN, shipTo === null || shipTo === void 0 ? void 0 : shipTo.GSTNo);
+    const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _a === void 0 ? void 0 : _a.GSTIN, (_b = shipTo === null || shipTo === void 0 ? void 0 : shipTo.TaxId) === null || _b === void 0 ? void 0 : _b.GSTNo);
     return {
         name,
         addressLines: buildAddressLines(address),
@@ -123,7 +124,7 @@ function resolveSalesShipToDetails(transactionData) {
     };
 }
 function resolvePurchaseBFromDetails(transactionData) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     const billTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vendor) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) || {};
     const address = normalizeAddress((billTo === null || billTo === void 0 ? void 0 : billTo.Adrs)
         || ((_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) === null || _a === void 0 ? void 0 : _a.Adrs)
@@ -135,7 +136,7 @@ function resolvePurchaseBFromDetails(transactionData) {
         || ((_d = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) === null || _d === void 0 ? void 0 : _d.Adrs)
         || ((_e = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) === null || _e === void 0 ? void 0 : _e.Adrs));
     const name = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Name, billTo === null || billTo === void 0 ? void 0 : billTo.CName, (_f = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) === null || _f === void 0 ? void 0 : _f.Name, (_g = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _g === void 0 ? void 0 : _g.Name, (_h = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vendor) === null || _h === void 0 ? void 0 : _h.Name, (_j = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) === null || _j === void 0 ? void 0 : _j.Name, (_k = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) === null || _k === void 0 ? void 0 : _k.Name, transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFromName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.VendorName);
-    const gstin = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.GSTIN, billTo === null || billTo === void 0 ? void 0 : billTo.GSTNo);
+    const gstin = (0, pdf_shared_utils_1.firstValue)((_l = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _l === void 0 ? void 0 : _l.GSTIN, (_m = billTo === null || billTo === void 0 ? void 0 : billTo.TaxId) === null || _m === void 0 ? void 0 : _m.GSTNo);
     const contactInfo = resolvePhoneFromContacts(billTo === null || billTo === void 0 ? void 0 : billTo.Contact);
     const directPhone = (0, pdf_shared_utils_1.firstValue)(billTo === null || billTo === void 0 ? void 0 : billTo.Ph, billTo === null || billTo === void 0 ? void 0 : billTo.Phone, billTo === null || billTo === void 0 ? void 0 : billTo.Mobile);
     return {
@@ -188,13 +189,14 @@ function resolvePurchaseOtherDetails(transactionData, printConfig = {}) {
     };
 }
 function resolvePurchaseShipFromDetails(transactionData) {
+    var _a, _b;
     const shipFrom = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFrom) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.From) || {};
     const address = normalizeAddress((shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.Adrs)
         || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFromAddress)
         || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFromAddress)
         || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.FromAddress));
     const name = (0, pdf_shared_utils_1.firstValue)(shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.Name, shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.CName, shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.WhName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.SFromName, transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipFromName);
-    const gstin = (0, pdf_shared_utils_1.firstValue)(shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.GSTIN, shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.GSTNo);
+    const gstin = (0, pdf_shared_utils_1.firstValue)((_a = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _a === void 0 ? void 0 : _a.GSTIN, (_b = shipFrom === null || shipFrom === void 0 ? void 0 : shipFrom.TaxId) === null || _b === void 0 ? void 0 : _b.GSTNo);
     return {
         name,
         addressLines: buildAddressLines(address),
@@ -203,10 +205,11 @@ function resolvePurchaseShipFromDetails(transactionData) {
     };
 }
 function resolveInsuranceDetails(transactionData) {
+    var _a, _b;
     const insurance = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Insurance) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Ins) || (transactionData === null || transactionData === void 0 ? void 0 : transactionData.Insurer) || {};
     const address = normalizeAddress((insurance === null || insurance === void 0 ? void 0 : insurance.Adrs) || (insurance === null || insurance === void 0 ? void 0 : insurance.Address));
     const name = (0, pdf_shared_utils_1.firstValue)(insurance === null || insurance === void 0 ? void 0 : insurance.Name, insurance === null || insurance === void 0 ? void 0 : insurance.Company, insurance === null || insurance === void 0 ? void 0 : insurance.Provider, insurance === null || insurance === void 0 ? void 0 : insurance.InsName);
-    const gstin = (0, pdf_shared_utils_1.firstValue)(insurance === null || insurance === void 0 ? void 0 : insurance.GSTIN, insurance === null || insurance === void 0 ? void 0 : insurance.GSTNo);
+    const gstin = (0, pdf_shared_utils_1.firstValue)((_a = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _a === void 0 ? void 0 : _a.GSTIN, (_b = insurance === null || insurance === void 0 ? void 0 : insurance.TaxId) === null || _b === void 0 ? void 0 : _b.GSTNo);
     return {
         name,
         addressLines: buildAddressLines(address),

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

@@ -272,8 +272,8 @@ function getSingleTaxHeaderText(header) {
     return header.text;
 }
 function isTaxHeaderConfig(header) {
-    var _a, _b, _c;
-    const title = (_c = (_b = (_a = header === null || header === void 0 ? void 0 : header.title) !== null && _a !== void 0 ? _a : header === null || header === void 0 ? void 0 : header.CustTitle) !== null && _b !== void 0 ? _b : header === null || header === void 0 ? void 0 : header.Tital) !== null && _c !== void 0 ? _c : header === null || header === void 0 ? void 0 : header.text;
+    var _a, _b, _c, _d;
+    const title = (_d = (_c = (_b = (_a = header === null || header === void 0 ? void 0 : header.Title) !== null && _a !== void 0 ? _a : header === null || header === void 0 ? void 0 : header.Tital) !== null && _b !== void 0 ? _b : header === null || header === void 0 ? void 0 : header.CustTitle) !== null && _c !== void 0 ? _c : header === null || header === void 0 ? void 0 : header.Tital) !== null && _d !== void 0 ? _d : header === null || header === void 0 ? void 0 : header.text;
     const normalizedTitle = normalizeHeaderText(title);
     return normalizedTitle === 'TAX%' || normalizedTitle === 'TAXAMOUNT';
 }

package/package.json

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

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

@@ -104,8 +104,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 +129,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 +163,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 +237,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 +256,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';
 }