shareneus 1.5.64 → 1.5.65

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

@@ -1,6 +1,10 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildInvoicePartyDetailsSection = buildInvoicePartyDetailsSection;
+const jsbarcode_1 = __importDefault(require("jsbarcode"));
 const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
 function buildInvoicePartyDetailsSection(PDFInvoiceData) {
     const invoiceData = PDFInvoiceData || {};
@@ -9,12 +13,17 @@ function buildInvoicePartyDetailsSection(PDFInvoiceData) {
     const insurance = resolveInsuranceDetails(invoiceData);
     const useInsurance = !!insurance.name;
     const secondaryParty = useInsurance ? insurance : shipTo;
+    const showBarCode = resolveShowBarCode(invoiceData);
+    const billToCode = resolveBillToCode(invoiceData);
     const otherDetails = resolveOtherDetails(invoiceData);
+    const shouldShowSecondaryBarcode = !secondaryParty.hasData && showBarCode && !!billToCode;
     const billToStack = billTo.hasData ? buildPartyStack('Bill To', billTo) : [{ text: '' }];
     const secondaryTitle = useInsurance ? 'Insurance' : 'Ship To';
-    const secondaryStack = secondaryParty.hasData ? buildPartyStack(secondaryTitle, secondaryParty) : [{ text: '' }];
+    const secondaryStack = secondaryParty.hasData
+        ? buildPartyStack(secondaryTitle, secondaryParty)
+        : (shouldShowSecondaryBarcode ? buildBarcodeStack(billToCode) : [{ text: '' }]);
     const otherDetailsStack = otherDetails.hasData ? buildOtherDetailsStack(otherDetails) : [{ text: '' }];
-    const hasAnyData = billTo.hasData || secondaryParty.hasData || otherDetails.hasData;
+    const hasAnyData = billTo.hasData || secondaryParty.hasData || shouldShowSecondaryBarcode || otherDetails.hasData;
     if (!hasAnyData) {
         return [{
                 text: '',
@@ -32,7 +41,7 @@ function buildInvoicePartyDetailsSection(PDFInvoiceData) {
         }];
 }
 function resolveBillToDetails(invoiceData) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const billTo = (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.BillTo) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Customer) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Cust) || {};
     const address = normalizeAddress((billTo === null || billTo === void 0 ? void 0 : billTo.Adrs)
         || ((_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.BillTo) === null || _a === void 0 ? void 0 : _a.Adrs)
@@ -44,12 +53,14 @@ function resolveBillToDetails(invoiceData) {
     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 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 = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Cust) === null || _g === void 0 ? void 0 : _g.Name);
     return {
         name,
         addressLines: billTo === null || billTo === void 0 ? void 0 : billTo.Adrs,
         gstin,
         phoneType: contactInfo.type,
         phoneNumber: contactInfo.number || directPhone,
+        ownerName,
         hasData: !!(name || gstin || contactInfo.number || directPhone || hasAddress(address))
     };
 }
@@ -80,20 +91,30 @@ function resolveInsuranceDetails(invoiceData) {
     };
 }
 function resolveOtherDetails(invoiceData) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const invoiceDate = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.DDate, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.InvDt, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Date, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CrDate);
     const invoiceNumber = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData._id, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Code, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.InvNo, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.No);
-    const vehicleDetails = (0, pdf_shared_utils_1.firstValue)((_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Veh) === null || _a === void 0 ? void 0 : _a.RegNo, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehNo, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehicleNo, (_b = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _b === void 0 ? void 0 : _b.RegNo, (_c = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _c === void 0 ? void 0 : _c.No, (_d = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _d === void 0 ? void 0 : _d.Details, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehicleDetails);
-    const RegnNo = (_e = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Prod) === null || _e === void 0 ? void 0 : _e.RegnNo;
-    const EngNo = (_f = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Prod) === null || _f === void 0 ? void 0 : _f.EngNo;
-    const ChassisNo = (_g = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Prod) === null || _g === void 0 ? void 0 : _g.CIN;
+    const productName = [
+        (_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _a === void 0 ? void 0 : _a.Make,
+        (_b = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _b === void 0 ? void 0 : _b.Model,
+        (_c = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _c === void 0 ? void 0 : _c.Var
+    ]
+        .map((value) => String(value !== null && value !== void 0 ? value : '').trim())
+        .filter((value) => !!value)
+        .join(' ');
+    const vehicleDetails = (0, pdf_shared_utils_1.firstValue)(productName, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehNo, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehicleNo, (_d = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _d === void 0 ? void 0 : _d.RegNo, (_e = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _e === void 0 ? void 0 : _e.No, (_f = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Vehicle) === null || _f === void 0 ? void 0 : _f.Details, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.VehicleDetails);
+    const Milage = (0, pdf_shared_utils_1.firstValue)(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.MIn, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.MOut, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Milage);
+    const RegnNo = (_g = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _g === void 0 ? void 0 : _g.RegNo;
+    const EngNo = (_h = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _h === void 0 ? void 0 : _h.EngNo;
+    const ChassisNo = (_j = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Product) === null || _j === void 0 ? void 0 : _j.VIN;
     const lines = [
         { label: 'Invoice#', value: invoiceNumber },
         { label: 'Date', value: invoiceDate ? formatDisplayDate(invoiceDate) : '' },
+        { label: 'Vehicle', value: vehicleDetails },
         { label: 'Regn. No', value: (0, pdf_shared_utils_1.firstValue)(RegnNo) },
         { label: 'Engine No', value: (0, pdf_shared_utils_1.firstValue)(EngNo) },
         { label: 'Chassis No', value: (0, pdf_shared_utils_1.firstValue)(ChassisNo) },
-        { label: 'Vehicle', value: vehicleDetails }
+        { label: 'Milage', value: Milage }
     ].filter((line) => !!line.value);
     return {
         lines,
@@ -130,6 +151,24 @@ function buildPartyStack(title, party) {
         const phoneLabel = (party === null || party === void 0 ? void 0 : party.phoneType) ? `Phone(${party.phoneType})` : 'Phone';
         stack.push({ text: `${phoneLabel} : ${party.phoneNumber}`, fontSize: 8, lineHeight: 1.05 });
     }
+    if (title === 'Bill To' && (party === null || party === void 0 ? void 0 : party.ownerName)) {
+        stack.push({
+            text: [
+                { text: 'Owner Details', bold: true },
+                { text: ' : ', bold: true },
+                { text: party.ownerName, bold: false }
+            ],
+            fontSize: 8.5,
+            color: '#111827',
+            margin: [0, 3, 0, 1]
+        });
+        stack.push({
+            canvas: [
+                { type: 'line', x1: 0, y1: 0, x2: 170, y2: 0, lineWidth: 0.5, lineColor: '#111827' }
+            ],
+            margin: [0, 2, 0, 0]
+        });
+    }
     return stack;
 }
 function buildOtherDetailsStack(otherDetails) {
@@ -150,6 +189,19 @@ function buildOtherDetailsStack(otherDetails) {
     }
     return stack;
 }
+function buildBarcodeStack(code) {
+    const svg = textToSvgBarcode(code);
+    if (!svg) {
+        return [{ text: '' }];
+    }
+    return [
+        {
+            svg,
+            width: 160,
+            margin: [0, 8, 0, 0]
+        }
+    ];
+}
 function hasAddress(address) {
     const normalizedAddress = normalizeAddress(address);
     if (!normalizedAddress) {
@@ -225,6 +277,45 @@ function formatDisplayDate(value) {
     }
     return value;
 }
+function resolveShowBarCode(invoiceData) {
+    var _a;
+    return isTruthy(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.ShowBarCode) || isTruthy((_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _a === void 0 ? void 0 : _a.PrCustBar) || isTruthy(invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.PrCustBar);
+}
+function resolveBillToCode(invoiceData) {
+    var _a, _b, _c;
+    return (0, pdf_shared_utils_1.firstValue)((_a = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.BillTo) === null || _a === void 0 ? void 0 : _a.Code, (_b = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Customer) === null || _b === void 0 ? void 0 : _b.Code, (_c = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Cust) === null || _c === void 0 ? void 0 : _c.Code);
+}
+function isTruthy(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    if (typeof value === 'number') {
+        return value !== 0;
+    }
+    if (typeof value === 'string') {
+        const normalized = value.trim().toLowerCase();
+        return normalized === 'true' || normalized === '1' || normalized === 'yes';
+    }
+    return false;
+}
+function textToSvgBarcode(text) {
+    if (!text || typeof document === 'undefined') {
+        return '';
+    }
+    const svgElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
+    (0, jsbarcode_1.default)(svgElement, text, {
+        format: "CODE128",
+        width: 1.25,
+        height: 24,
+        margin: 0,
+        marginTop: 6,
+        displayValue: true,
+        fontSize: 7,
+        textMargin: 0,
+        fontOptions: 'bold'
+    });
+    return svgElement.outerHTML;
+}
 function resolvePhoneFromContacts(contacts) {
     if (!Array.isArray(contacts)) {
         return { type: '', number: '' };

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

@@ -5,6 +5,7 @@ exports.getFirstFieldValue = getFirstFieldValue;
 exports.getNumericAlignment = getNumericAlignment;
 exports.getCellAlignment = getCellAlignment;
 const pdf_table_config_1 = require("./pdf-table.config");
+const my_date_1 = require("../../utils/my-date");
 function buildDataRow(item, index, headerConfig, fixedTo = 2) {
     return headerConfig.map((column) => {
         var _a;
@@ -18,10 +19,10 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
             const serial = String(index + 1);
             return { text: serial, fontSize: pdf_table_config_1.pdfTableStyleConfig.bodyFontSize, alignment: getNumericAlignment(serial) };
         }
-        const mainValue = formatNumericLikeValue(getFirstFieldValue(item, header.dbFields), fixedTo, shouldSkipFixedTo(header));
+        const mainValue = formatFieldValue(item, header, fixedTo);
         const stackedLines = ((_a = header.stackFields) !== null && _a !== void 0 ? _a : [])
             .map((stackField) => {
-            const stackValue = formatNumericLikeValue(getFirstFieldValue(item, stackField.dbFields), fixedTo, shouldSkipFixedTo(stackField));
+            const stackValue = formatFieldValue(item, stackField, fixedTo);
             if (!stackValue) {
                 return null;
             }
@@ -43,6 +44,13 @@ function buildDataRow(item, index, headerConfig, fixedTo = 2) {
         };
     });
 }
+function formatFieldValue(item, fieldConfig, fixedTo) {
+    const rawValue = getFirstFieldValue(item, fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields);
+    if (isExpiryField(fieldConfig)) {
+        return formatExpiryDateValue(rawValue);
+    }
+    return formatNumericLikeValue(rawValue, fixedTo, shouldSkipFixedTo(fieldConfig));
+}
 function getTaxValue(item, taxName, taxKind) {
     const fields = taxKind === 'rate'
         ? [`${taxName}Perc`, taxName]
@@ -126,6 +134,35 @@ function formatNumericLikeValue(value, fixedTo, skipFixedTo = false) {
     }
     return normalized.toFixed(fixedTo);
 }
+function isExpiryField(fieldConfig) {
+    var _a;
+    const text = String((_a = fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.text) !== null && _a !== void 0 ? _a : '').trim().toUpperCase();
+    if (text === 'EXPIRY' || text === 'EXPIRY DATE' || text === 'EXDT') {
+        return true;
+    }
+    const dbFields = Array.isArray(fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields) ? fieldConfig.dbFields : [];
+    return dbFields.some((field) => {
+        const normalized = String(field !== null && field !== void 0 ? field : '').trim().toUpperCase();
+        return normalized === 'EXDT' || normalized.endsWith('.EXDT') || normalized.endsWith('.EXPIRY');
+    });
+}
+function formatExpiryDateValue(value) {
+    if (!value) {
+        return value;
+    }
+    const input = String(value).trim();
+    if (!input) {
+        return '';
+    }
+    if (/^\d{2}\/\d{2}$/.test(input)) {
+        return input;
+    }
+    const parsed = new Date(input);
+    if (Number.isNaN(parsed.getTime())) {
+        return input;
+    }
+    return my_date_1.MyDate.ConvertUTCDateToReadableExDate(input) || input;
+}
 function shouldSkipFixedTo(header) {
     var _a;
     const text = String((_a = header === null || header === void 0 ? void 0 : header.text) !== null && _a !== void 0 ? _a : '').trim().toUpperCase();

package/package.json

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