shareneus 1.5.80 → 1.5.82

package/dist/accounting/invoice/invoice-pdf/invoice-pdf.service.js

@@ -75,7 +75,7 @@ function buildPdfDocDefinition(PDFInvoiceData = {}, PrintConfigData = {}, printC
     copyLabels.forEach((copyLabel, index) => {
         const invoiceHeaderContent = (0, pdf_header_footer_section_1.buildDocumentHeaderSection)(PrintConfig, PDFInvoiceData);
         const invoiceHeadingContent = (0, pdf_header_footer_section_1.buildDocumentHeadingSection)(PDFInvoiceData, PrintConfig, availableWidth);
-        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildInvoicePartyDetailsSection)(PDFInvoiceData, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Customer);
+        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildInvoicePartyDetailsSection)(PDFInvoiceData, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Customer, PrintConfig);
         const invoiceTotalsAndNotesContent = (0, pdf_totals_section_1.buildInvoiceTotalsAndNotesSection)(PDFInvoiceData, availableWidth, PrintConfigData);
         const signatureContent = (0, pdf_totals_section_1.buildSignatureSection)(PrintConfig, PDFInvoiceData, availableWidth);
         const tableData = (0, pdf_table_section_1.buildInvoiceTableData)(PDFInvoiceData, PrintConfig, availableWidth);

package/dist/purchases/bills/bill-pdf/bill-pdf.service.js

@@ -75,7 +75,7 @@ function buildPdfDocDefinition(PDFInvoiceData = {}, PrintConfigData = {}, printC
     copyLabels.forEach((copyLabel, index) => {
         const invoiceHeaderContent = (0, pdf_header_footer_section_1.buildDocumentHeaderSection)(PrintConfig, PDFInvoiceData);
         const invoiceHeadingContent = (0, pdf_header_footer_section_1.buildDocumentHeadingSection)(PDFInvoiceData, PrintConfig, availableWidth);
-        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildPurchasePartyDetailsSection)(PDFInvoiceData, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Customer);
+        const invoicePartyDetailsContent = (0, pdf_party_details_section_1.buildPurchasePartyDetailsSection)(PDFInvoiceData, PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.Customer, PrintConfig);
         const invoiceTotalsAndNotesContent = (0, pdf_totals_section_1.buildInvoiceTotalsAndNotesSection)(PDFInvoiceData, availableWidth, PrintConfigData);
         const signatureContent = (0, pdf_totals_section_1.buildSignatureSection)(PrintConfig, PDFInvoiceData, availableWidth);
         const tableData = (0, pdf_table_section_1.buildInvoiceTableData)(PDFInvoiceData, PrintConfig, availableWidth);

package/dist/shared/party-details-section/pdf-party-details.section.d.ts

@@ -1,4 +1,4 @@
-export declare function buildInvoicePartyDetailsSection(PDFInvoiceData: any, customerLayout: any): {
+export declare function buildInvoicePartyDetailsSection(PDFInvoiceData: any, customerLayout: any, printConfig?: any): {
     text: string;
     margin: number[];
 }[] | {
@@ -9,7 +9,7 @@ export declare function buildInvoicePartyDetailsSection(PDFInvoiceData: any, cus
     columnGap: number;
     margin: number[];
 }[];
-export declare function buildSalesPartyDetailsSection(PDFInvoiceData: any, customerLayout: any): {
+export declare function buildSalesPartyDetailsSection(PDFInvoiceData: any, customerLayout: any, printConfig?: any): {
     text: string;
     margin: number[];
 }[] | {
@@ -20,7 +20,7 @@ export declare function buildSalesPartyDetailsSection(PDFInvoiceData: any, custo
     columnGap: number;
     margin: number[];
 }[];
-export declare function buildPurchasePartyDetailsSection(PDFInvoiceData: any, customerLayout: any): {
+export declare function buildPurchasePartyDetailsSection(PDFInvoiceData: any, customerLayout: any, printConfig?: any): {
     text: string;
     margin: number[];
 }[] | {

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

@@ -8,10 +8,10 @@ exports.buildSalesPartyDetailsSection = buildSalesPartyDetailsSection;
 exports.buildPurchasePartyDetailsSection = buildPurchasePartyDetailsSection;
 const jsbarcode_1 = __importDefault(require("jsbarcode"));
 const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
-function buildInvoicePartyDetailsSection(PDFInvoiceData, customerLayout) {
-    return buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout);
+function buildInvoicePartyDetailsSection(PDFInvoiceData, customerLayout, printConfig = {}) {
+    return buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout, printConfig);
 }
-function buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout) {
+function buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout, printConfig = {}) {
     const transactionData = PDFInvoiceData || {};
     const billTo = resolveSalesBillToDetails(transactionData);
     const shipTo = resolveSalesShipToDetails(transactionData);
@@ -20,7 +20,7 @@ function buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout) {
     const secondaryParty = useInsurance ? insurance : shipTo;
     const showBarCode = resolveShowBarCode(transactionData);
     const billToCode = resolveBillToCode(transactionData);
-    const otherDetails = resolveOtherDetails(transactionData);
+    const otherDetails = resolveOtherDetails(transactionData, printConfig);
     const shouldShowSecondaryBarcode = !secondaryParty.hasData && showBarCode && !!billToCode;
     const secondaryTitle = useInsurance ? 'Insurance' : 'Ship To';
     return buildPartyDetailsSectionLayout({
@@ -34,13 +34,13 @@ function buildSalesPartyDetailsSection(PDFInvoiceData, customerLayout) {
         secondaryBarcodeCode: billToCode
     });
 }
-function buildPurchasePartyDetailsSection(PDFInvoiceData, customerLayout) {
+function buildPurchasePartyDetailsSection(PDFInvoiceData, customerLayout, printConfig = {}) {
     const transactionData = PDFInvoiceData || {};
     const billTo = resolvePurchaseBFromDetails(transactionData);
     const shipFrom = resolvePurchaseShipFromDetails(transactionData);
     const showBarCode = resolveShowBarCode(transactionData);
     const billToCode = resolvePurchaseBillToCode(transactionData);
-    const otherDetails = resolvePurchaseOtherDetails(transactionData);
+    const otherDetails = resolvePurchaseOtherDetails(transactionData, printConfig);
     const shouldShowSecondaryBarcode = !shipFrom.hasData && showBarCode && !!billToCode;
     return buildPartyDetailsSectionLayout({
         primaryTitle: 'Vendor Details',
@@ -109,7 +109,7 @@ function resolveSalesBillToDetails(transactionData) {
 }
 function resolveSalesShipToDetails(transactionData) {
     console.log('Resolving Ship To Details from Transaction Data:', transactionData);
-    const shipTo = (transactionData === null || transactionData === void 0 ? void 0 : transactionData.ShipTo) || {};
+    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));
@@ -149,9 +149,10 @@ function resolvePurchaseBFromDetails(transactionData) {
         hasData: !!(name || gstin || contactInfo.number || directPhone || hasAddress(address))
     };
 }
-function resolvePurchaseOtherDetails(transactionData) {
+function resolvePurchaseOtherDetails(transactionData, printConfig = {}) {
     const billDate = (0, pdf_shared_utils_1.firstValue)(transactionData === null || transactionData === void 0 ? void 0 : transactionData.CrDate, transactionData === null || transactionData === void 0 ? void 0 : transactionData.InvDt, transactionData === null || transactionData === void 0 ? void 0 : transactionData.Date, transactionData === null || transactionData === void 0 ? void 0 : transactionData.CrDate);
     const billNumber = (0, pdf_shared_utils_1.firstValue)(transactionData === null || transactionData === void 0 ? void 0 : transactionData.Id, transactionData === null || transactionData === void 0 ? void 0 : transactionData.Code, transactionData === null || transactionData === void 0 ? void 0 : transactionData.InvNo, transactionData === null || transactionData === void 0 ? void 0 : transactionData.No);
+    const documentNumberLabel = resolveDocumentNumberLabel(printConfig, 'Bill');
     // const productName = [
     //     transactionData?.Product?.Make,
     //     transactionData?.Product?.Model,
@@ -174,7 +175,7 @@ function resolvePurchaseOtherDetails(transactionData) {
     // const EngNo = transactionData?.Product?.EngNo;
     // const ChassisNo = transactionData?.Product?.VIN;
     const lines = [
-        { label: 'Bill#', value: billNumber },
+        { label: documentNumberLabel, value: billNumber },
         { label: 'Date', value: billDate ? formatDisplayDate(billDate) : '' },
         // { label: 'Vehicle', value: vehicleDetails },
         // { label: 'Regn. No', value: firstValue(RegnNo) },
@@ -214,10 +215,11 @@ function resolveInsuranceDetails(transactionData) {
         hasData: !!(name || gstin || hasAddress(address))
     };
 }
-function resolveOtherDetails(transactionData) {
+function resolveOtherDetails(transactionData, printConfig = {}) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const invoiceDate = (0, pdf_shared_utils_1.firstValue)(transactionData === null || transactionData === void 0 ? void 0 : transactionData.DDate, transactionData === null || transactionData === void 0 ? void 0 : transactionData.InvDt, transactionData === null || transactionData === void 0 ? void 0 : transactionData.Date, transactionData === null || transactionData === void 0 ? void 0 : transactionData.CrDate);
     const invoiceNumber = (0, pdf_shared_utils_1.firstValue)(transactionData === null || transactionData === void 0 ? void 0 : transactionData._id, transactionData === null || transactionData === void 0 ? void 0 : transactionData.Code, transactionData === null || transactionData === void 0 ? void 0 : transactionData.InvNo, transactionData === null || transactionData === void 0 ? void 0 : transactionData.No);
+    const documentNumberLabel = resolveDocumentNumberLabel(printConfig, 'Invoice');
     const productName = [
         (_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Product) === null || _a === void 0 ? void 0 : _a.Make,
         (_b = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Product) === null || _b === void 0 ? void 0 : _b.Model,
@@ -232,7 +234,7 @@ function resolveOtherDetails(transactionData) {
     const EngNo = (_h = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Product) === null || _h === void 0 ? void 0 : _h.EngNo;
     const ChassisNo = (_j = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Product) === null || _j === void 0 ? void 0 : _j.VIN;
     const lines = [
-        { label: 'Invoice#', value: invoiceNumber },
+        { label: documentNumberLabel, value: invoiceNumber },
         { label: 'Date', value: invoiceDate ? formatDisplayDate(invoiceDate) : '' },
         { label: 'Vehicle', value: vehicleDetails },
         { label: 'Regn. No', value: (0, pdf_shared_utils_1.firstValue)(RegnNo) },
@@ -413,6 +415,15 @@ function resolvePurchaseBillToCode(transactionData) {
     var _a, _b, _c, _d, _e;
     return (0, pdf_shared_utils_1.firstValue)((_a = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BFrom) === null || _a === void 0 ? void 0 : _a.Code, (_b = transactionData === null || transactionData === void 0 ? void 0 : transactionData.BillTo) === null || _b === void 0 ? void 0 : _b.Code, (_c = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vendor) === null || _c === void 0 ? void 0 : _c.Code, (_d = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Vnd) === null || _d === void 0 ? void 0 : _d.Code, (_e = transactionData === null || transactionData === void 0 ? void 0 : transactionData.Supplier) === null || _e === void 0 ? void 0 : _e.Code);
 }
+function resolveDocumentNumberLabel(printConfig, fallbackType) {
+    const typeValue = (0, pdf_shared_utils_1.firstValue)(printConfig === null || printConfig === void 0 ? void 0 : printConfig.Type, fallbackType);
+    const normalizedType = String(typeValue !== null && typeValue !== void 0 ? typeValue : '').trim();
+    if (!normalizedType) {
+        return `${fallbackType}#`;
+    }
+    const withoutHash = normalizedType.replace(/#+$/g, '').trim();
+    return `${withoutHash || fallbackType}#`;
+}
 function isTruthy(value) {
     if (typeof value === 'boolean') {
         return value;

package/dist/shared/totals-section/pdf-totals.section.js

@@ -29,11 +29,7 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         margin: [0, 10, 0, 10]
     };
     const topColumns = {
-        columns: [
-            { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows) },
-            { width: '28%', stack: showBankDetails ? buildInfoCardStack('Bank Details', bankDetails.lines) : [{ text: '' }] },
-            { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
-        ],
+        columns: buildTopSectionColumns(taxSummary, showBankDetails, bankDetails, totals),
         columnGap: 20,
         margin: [0, 0, 0, 8]
     };
@@ -54,6 +50,24 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     }
     return [dividerLine, bottomColumns];
 }
+function buildTopSectionColumns(taxSummary, showBankDetails, bankDetails, totals) {
+    if (taxSummary.hasData) {
+        return [
+            { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows) },
+            { width: '28%', stack: showBankDetails ? buildInfoCardStack('Bank Details', bankDetails.lines) : [{ text: '' }] },
+            { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
+        ];
+    }
+    if (showBankDetails) {
+        return [
+            { width: '40%', stack: buildInfoCardStack('Bank Details', bankDetails.lines) },
+            { width: '60%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
+        ];
+    }
+    return [
+        { width: '*', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
+    ];
+}
 function buildPostTotalsInfoSection(data) {
     const hasQr = !!(0, pdf_shared_utils_1.firstValue)(data.qrPayload);
     const inWords = data.totalInWords || '-';
@@ -411,7 +425,7 @@ function shouldShowDueSection(printConfigData = {}) {
         return false;
     }
     const normalizedType = String(type).trim().toLowerCase();
-    return normalizedType === 'invoice' || normalizedType === 'bill';
+    return normalizedType === 'Invoice' || normalizedType === 'Bill';
 }
 function isTruthy(value) {
     if (typeof value === 'boolean') {
@@ -451,7 +465,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         ? itemsDiscount + servicesDiscount + overallDiscount
         : (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Disc', 'Discount', 'TotDisc']);
     const roundOff = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['Round', 'RoundOff']);
-    const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal']);
+    const taxFromInvoice = (0, pdf_table_section_1.readNumericValue)(invoiceData, ['TotalTax', 'TaxTotal', 'TaxAmt', 'GSTTotal', 'CustItemITax']);
     const totalTaxValue = taxFromInvoice !== 0 ? taxFromInvoice : totalTax;
     const finalTotalRaw = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.FinalTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Total, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.GrandTotal, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.NetTotal);
     const finalTotal = parseNumber(finalTotalRaw);
@@ -477,19 +491,22 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
         : [
             { label: 'Discount', amount: discount }
         ])
-        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0)
-        .map((line) => ({ label: line.label, value: formatAmountFixed2(line.amount) }));
-    const lines = [
-        { label: 'SubTotal', value: formatAmountFixed2(subtotal) },
+        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0);
+    const totalLines = [
+        { label: 'SubTotal', amount: subtotal },
         ...discountLines,
-        { label: 'Total Tax', value: formatAmountFixed2(totalTaxValue) },
-        { label: 'Total', value: formatAmountFixed2(totalBeforeRound) },
-        { label: 'Rounding', value: formatAmountFixed2(roundOff) },
-        { label: 'Final Total', value: formatAmountFixed2(resolvedFinalTotal) }
+        { label: 'Total Tax', amount: totalTaxValue },
+        { label: 'Total', amount: totalBeforeRound },
+        { label: 'Rounding', amount: roundOff },
+        { label: 'Final Total', amount: resolvedFinalTotal }
     ];
+    const lines = totalLines
+        .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0)
+        .map((line) => ({ label: line.label, value: formatAmountFixed2(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) }));
+    const hasData = lines.some((line) => hasDisplayValue(line === null || line === void 0 ? void 0 : line.value));
     return {
         lines,
-        hasData: lines.some((line) => hasDisplayValue(line === null || line === void 0 ? void 0 : line.value))
+        hasData
     };
 }
 function resolveDueInfo(invoiceData, totals) {

package/package.json

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