shareneus 1.7.0 → 1.7.2

package/dist/accounting/counter-sales/pos-receipt-pdf.js

@@ -449,7 +449,7 @@ class PosReceiptPrintService {
             if (ShowTaxColumn) {
                 dataRow.push({ text: item.HSN, alignment: 'center', style: ['headerstyle'], });
             }
-            dataRow.push({ text: item.Batch, alignment: 'center', style: ['headerstyle'], });
+            dataRow.push({ text: item.BN, alignment: 'center', style: ['headerstyle'], });
             dataRow.push({ text: item.ExDt, alignment: 'center', style: ['headerstyle'], });
             dataRow.push({ text: item.Make, alignment: 'center', style: ['headerstyle'], });
             dataRow.push({ text: item.Sch, alignment: 'center', style: ['headerstyle'], });

package/dist/accounting/counter-sales/sales-receipt-print.service.js

@@ -214,7 +214,7 @@ class SaleReceiptPrintService {
                 Item.UnPr = tr_utils_1.TrUtils.FixPriceValue(Item.UnPr, DecimalsNumber);
             }
             Item.ExDt = this.GetExpiryDate(Item);
-            Item.Batch = this.GetBatchesData(Item, OBN);
+            Item.BN = this.GetBatchesData(Item, OBN);
             Item.TCode = this.GetTCodeFromTaxes(Item);
             Item.CGSTAmt = tr_utils_1.TrUtils.FixedTo(itemCGST, DecimalsNumber);
             if (tr_utils_1.TrUtils.IsNull(Item.ConUt)) {

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

@@ -95,6 +95,7 @@ function negateNumericLikeValue(value) {
     return String(normalized === 0 ? 0 : -Math.abs(normalized));
 }
 function getFirstFieldValue(item, dbFields = []) {
+    console.log('Getting first field value from item', item, 'using dbFields', dbFields);
     for (const field of dbFields) {
         const value = readValue(item, field);
         if (value !== undefined && value !== null && value !== '') {
@@ -104,14 +105,15 @@ function getFirstFieldValue(item, dbFields = []) {
     return '';
 }
 function readValue(item, field) {
+    console.log('Reading value for field', field, 'from item', item);
+    console.log('Direct value', item[field]);
     if (!item || !field) {
         return undefined;
     }
     if (item[field] !== undefined) {
         return item[field];
     }
-    const pathSegments = field.split('.');
-    const dottedPathValue = pathSegments.reduce((current, key) => {
+    const dottedPathValue = field.split('.').reduce((current, key) => {
         console.log('Current value for key', key, 'is', current);
         if (current && current[key] !== undefined) {
             return current[key];
@@ -122,17 +124,6 @@ function readValue(item, field) {
     if (dottedPathValue !== undefined) {
         return dottedPathValue;
     }
-    if (pathSegments.length > 1) {
-        const rootValue = item[pathSegments[0]];
-        if (rootValue !== undefined && rootValue !== null && typeof rootValue !== 'object') {
-            return rootValue;
-        }
-        const leafField = pathSegments[pathSegments.length - 1];
-        const leafValue = deepFindByKey(item, leafField);
-        if (leafValue !== undefined) {
-            return leafValue;
-        }
-    }
     return deepFindByKey(item, field);
 }
 function deepFindByKey(source, field) {

package/dist/shared/totals-section/pdf-totals.section.d.ts

@@ -1,17 +1,6 @@
-export declare function buildInvoiceTotalsAndNotesSection(invoiceData: any, availableWidth: number, PrintConfigData?: any): ({
-    canvas: {
-        type: string;
-        x1: number;
-        y1: number;
-        x2: number;
-        y2: number;
-        lineWidth: number;
-        lineColor: string;
-    }[];
-    margin: number[];
-} | {
+export declare function buildInvoiceTotalsAndNotesSection(invoiceData: any, availableWidth: number, PrintConfigData?: any): {
     columns: any[];
     columnGap: number;
     margin: number[];
-})[];
+}[];
 export declare function buildSignatureSection(PrintConfig: any, invoiceData: any, availableWidth: number): any[];

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

@@ -30,16 +30,16 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
     if (!hasTopSection && !hasBottomSection) {
         return [];
     }
-    const dividerLine = {
-        canvas: [
-            { type: 'line', x1: 0, y1: 0, x2: Math.max(1, availableWidth), y2: 0, lineWidth: 1, lineColor: '#1f2937' }
-        ],
-        margin: [0, 5, 0, 5]
-    };
+    // const dividerLine = {
+    //     canvas: [
+    //         { type: 'line', x1: 0, y1: 0, x2: Math.max(1, availableWidth), y2: 0, lineWidth: 1, lineColor: '#1f2937' }
+    //     ],
+    //     margin: [0, 5, 0, 5]
+    // };
     const topColumns = {
         columns: buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords),
         columnGap: 20,
-        margin: [0, 0, 0, 8]
+        margin: [0, 2, 0, 8]
     };
     const bottomColumns = buildPostTotalsInfoSection({
         totalInWords,
@@ -55,18 +55,18 @@ function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintCon
         isPoSPrint
     });
     if (hasTopSection && hasBottomSection) {
-        return [dividerLine, topColumns, bottomColumns];
+        return [topColumns, bottomColumns];
     }
     if (hasTopSection) {
-        return [dividerLine, topColumns];
+        return [topColumns];
     }
-    return [dividerLine, bottomColumns];
+    return [bottomColumns];
 }
 function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails, totals, totalInWords) {
     const inWords = totalInWords || '-';
     if (taxSummary.hasData) {
         return [
-            { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows, sType) },
+            { width: '42%', stack: buildTaxSummaryTableStack(null, taxSummary.rows, sType), marginTop: 2 },
             { width: '28%', stack: showBankDetails ? buildInfoCardStack('Bank Details', bankDetails.lines) : [{ text: '' }] },
             { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
         ];
@@ -85,7 +85,7 @@ function buildTopSectionColumns(taxSummary, sType, showBankDetails, bankDetails,
                 { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
             ],
             columnGap: 6,
-            margin: [0, 0, 0, 4]
+            margin: [0, 2, 0, 4]
         },
         { width: '30%', stack: buildInfoCardStack(null, totals.lines, { rightAlign: true }) }
     ];
@@ -102,7 +102,7 @@ function buildPostTotalsInfoSection(data) {
                 { width: '*', text: inWords, bold: true, fontSize: 9, color: '#111827' }
             ],
             columnGap: 6,
-            margin: [0, 0, 0, 4]
+            margin: [0, 2, 0, 4]
         });
     }
     if (data.showDueSection && !data.isPoSPrint) {
@@ -132,7 +132,7 @@ function buildPostTotalsInfoSection(data) {
                     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' }
+                        { text: '* PLEASE GET YOUR MEDICINES CHECKED BY YOUR DOCTOR BEFORE USE', fontSize: 6, color: '#111827' }
                     ],
                     margin: [5, 0, 0, 6],
                     lineHeight: 1.1
@@ -147,7 +147,7 @@ function buildPostTotalsInfoSection(data) {
                 }
             ],
             columnGap: 6,
-            margin: [0, 4, 0, 0]
+            margin: [0, 2, 0, 0]
         });
     }
     if (termsText) {

package/package.json

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