shareneus 1.6.97 → 1.6.99

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

@@ -51,6 +51,7 @@ 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);
+    console.log('rawValue for fieldConfig', fieldConfig === null || fieldConfig === void 0 ? void 0 : fieldConfig.dbFields, 'is', rawValue);
     if (isExpiryField(fieldConfig)) {
         return formatExpiryDateValue(rawValue);
     }
@@ -142,6 +143,9 @@ function getNumericAlignment(value) {
     return isNumericLike(value) ? 'right' : 'left';
 }
 function getCellAlignment(headerText, value) {
+    if (isRightAlignedHeader(headerText)) {
+        return 'right';
+    }
     if (isLeftAlignedHeader(headerText)) {
         return 'left';
     }
@@ -155,7 +159,11 @@ function isNumericLike(value) {
     return /^-?\d+(\.\d+)?$/.test(normalized);
 }
 function isLeftAlignedHeader(headerText) {
-    return headerText === 'Qty' || headerText === 'Offer Qty';
+    return false;
+}
+function isRightAlignedHeader(headerText) {
+    const normalizedHeader = String(headerText !== null && headerText !== void 0 ? headerText : '').replace(/\s+/g, '').trim().toUpperCase();
+    return normalizedHeader === 'QTY' || normalizedHeader === 'OFFERQTY';
 }
 function formatNumericLikeValue(value, fixedTo, skipFixedTo = false) {
     if (skipFixedTo) {

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

@@ -384,7 +384,10 @@ function shouldNegateFallbackHeaderValue(item, headerText) {
         || normalized === 'LINE TOTAL';
 }
 function getDisplayValueForFallbackRow(item, dbFields = [], shouldNegate = false) {
+    console.log(item, dbFields, shouldNegate);
+    console.log((0, pdf_table_row_1.getFirstFieldValue)(item, dbFields));
     const value = (0, pdf_table_row_1.getFirstFieldValue)(item, dbFields);
+    console.log('value', value);
     if (!shouldNegate) {
         return value;
     }

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

@@ -8,10 +8,11 @@ const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
 const math_operations_1 = require("../math-operations");
 const pdf_table_section_1 = require("../table-section/pdf-table.section");
 function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintConfigData = {}) {
-    var _a;
+    var _a, _b, _c;
     const normalizedInvoice = invoiceData || {};
     const sType = (0, pdf_shared_utils_1.firstValue)(normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.SType);
-    const hideTopSection = isTruthy((_a = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Settings) === null || _a === void 0 ? void 0 : _a.NoPr);
+    const companyName = (0, pdf_shared_utils_1.firstValue)((_a = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Entity) === null || _a === void 0 ? void 0 : _a.CName, (_b = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Entity) === null || _b === void 0 ? void 0 : _b.Name, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.CName, normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.CompanyName);
+    const hideTopSection = isTruthy((_c = normalizedInvoice === null || normalizedInvoice === void 0 ? void 0 : normalizedInvoice.Settings) === null || _c === void 0 ? void 0 : _c.NoPr);
     const isPoSPrint = isTruthy(PrintConfigData === null || PrintConfigData === void 0 ? void 0 : PrintConfigData.IsPoSPrint);
     const shouldShowTaxSummary = resolveShowTaxSummary(normalizedInvoice, PrintConfigData);
     const taxSummary = resolveTaxSummary(normalizedInvoice, shouldShowTaxSummary);
@@ -36,7 +37,7 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         margin: [0, 5, 0, 5]
     };
     const topColumns = {
-        columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals),
+        columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords),
         columnGap: 20,
         margin: [0, 0, 0, 8]
     };
@@ -44,10 +45,12 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         totalInWords,
         notes,
         terms,
+        companyName,
         paidAmount: dueInfo.paid,
         dueAmount: dueInfo.due,
         qrPayload,
         upiPhone: resolveUpiPhone(normalizedInvoice),
+        showInWords: taxSummary.hasData || showBankDetails,
         showDueSection,
         isPoSPrint
     });
@@ -59,7 +62,8 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     }
     return [dividerLine, bottomColumns];
 }
-function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals) {
+function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords) {
+    const inWords = totalInWords || '-';
     if (taxSummary.hasData) {
         return [
             { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows, sType) },
@@ -74,24 +78,34 @@ function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails,
         ];
     }
     return [
-        { width: '*', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
+        {
+            width: '70%',
+            columns: [
+                { width: 'auto', text: 'In Words :', bold: true, fontSize: 9, color: '#111827' },
+                { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
+            ],
+            columnGap: 6,
+            margin: [0, 0, 0, 4]
+        },
+        { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
     ];
 }
 function buildPostTotalsInfoSection(data) {
     const hasQr = !!(0, pdf_shared_utils_1.firstValue)(data.qrPayload);
     const inWords = data.totalInWords || '-';
     const termsText = (0, pdf_shared_utils_1.firstValue)(data.terms);
-    const leftStack = [
-        {
+    const leftStack = [];
+    if (data.showInWords) {
+        leftStack.push({
             columns: [
                 { width: 'auto', text: 'In Words :', bold: true, fontSize: 9, color: '#111827' },
                 { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
             ],
             columnGap: 6,
             margin: [0, 0, 0, 4]
-        }
-    ];
-    if (data.showDueSection) {
+        });
+    }
+    if (data.showDueSection && !data.isPoSPrint) {
         const paidText = `Paid : Rs.${formatAmountFixed2(data.paidAmount)}`;
         const dueText = `Due : Rs.${formatAmountFixed2(data.dueAmount)}`;
         leftStack.push({
@@ -113,14 +127,27 @@ function buildPostTotalsInfoSection(data) {
     }
     if (data.isPoSPrint) {
         leftStack.push({
-            stack: [
-                '* Goods once sold will not be taken back or exchanged',
-                '* PLEASE GET YOUR MEDICINES CHECKED BY YOUR DOCTOR BEFORE USE *'
+            columns: [
+                {
+                    width: '60%',
+                    stack: [
+                        { text: '* Goods once sold will not be taken back or exchanged', fontSize: 6, color: '#111827' },
+                        { text: '* PLEASE GET YOUR MEDICINES CHECKED BY YOUR DOCTOR BEFORE USE *', fontSize: 6, color: '#111827' }
+                    ],
+                    margin: [5, 0, 0, 6],
+                    lineHeight: 1.1
+                },
+                {
+                    width: '40%',
+                    text: `For ${data.companyName || ''}`.trim(),
+                    fontSize: 9,
+                    bold: true,
+                    color: '#111827',
+                    alignment: 'right'
+                }
             ],
-            fontSize: 6,
-            margin: [5, 0, 0, 6],
-            lineHeight: 1.1,
-            color: '#111827'
+            columnGap: 6,
+            margin: [0, 4, 0, 0]
         });
     }
     if (termsText) {
@@ -174,6 +201,9 @@ function buildSignatureSection(PrintConfig, invoiceData, availableWidth) {
     const isPoSPrint = isTruthy((_b = PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.IsPoSPrint) !== null && _b !== void 0 ? _b : PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.isPoSPrint);
     const companyName = (0, pdf_shared_utils_1.firstValue)((_c = headerData === null || headerData === void 0 ? void 0 : headerData.organization) === null || _c === void 0 ? void 0 : _c.cName, (_d = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _d === void 0 ? void 0 : _d.CName, (_e = invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.Entity) === null || _e === void 0 ? void 0 : _e.Name, invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.CName);
     const withPass = !!((PrintConfig === null || PrintConfig === void 0 ? void 0 : PrintConfig.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.withPass) || (invoiceData === null || invoiceData === void 0 ? void 0 : invoiceData.WithPass));
+    if (isPoSPrint) {
+        return [];
+    }
     const signatureRows = [
         {
             columns: [

package/package.json

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

package/tsconfig.json

@@ -14,7 +14,7 @@
 
     /* Language and Environment */
     "target": "es2016",                                  /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */
-    // "lib": [],                                        /* Specify a set of bundled library declaration files that describe the target runtime environment. */
+    "lib": ["es2017", "dom"],
     // "jsx": "preserve",                                /* Specify what JSX code is generated. */
     // "experimentalDecorators": true,                   /* Enable experimental support for legacy experimental decorators. */
     // "emitDecoratorMetadata": true,                    /* Emit design-type metadata for decorated declarations in source files. */
@@ -28,7 +28,7 @@
 
     /* Modules */
     "module": "commonjs",                                /* Specify what module code is generated. */
-    // "rootDir": "./",                                  /* Specify the root folder within your source files. */
+    "rootDir": "./src",
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */