shareneus 1.4.66 → 1.4.68

package/dist/accounting/invoice/inv-print.service.js

@@ -338,6 +338,9 @@ class InvPrintService {
         let Customer = {};
         if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo)) {
             Customer.Name = argInvoiceData.BillTo.Name;
+            if (!tr_utils_1.TrUtils.IsNull(argInvoiceData.BillTo.Sltn)) {
+                Customer.Name = argInvoiceData.BillTo.Sltn + ' ' + Customer.Name;
+            }
             Customer.Code = (_a = argInvoiceData.Cust) === null || _a === void 0 ? void 0 : _a.Code;
             Customer.Adrs = [];
             Customer.Cons = [];
@@ -347,7 +350,11 @@ class InvPrintService {
                     Customer.Adrs.push(argInvoiceData.BillTo.Adrs.A2);
                 }
                 if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Ct)) {
-                    Customer.Adrs.push(argInvoiceData.BillTo.Adrs.Ct);
+                    let city = argInvoiceData.BillTo.Adrs.Ct;
+                    if (!tr_utils_1.TrUtils.IsEmpty(argInvoiceData.BillTo.Adrs.Pin)) {
+                        city = city + ', ' + argInvoiceData.BillTo.Adrs.StCode + '-' + argInvoiceData.BillTo.Adrs.Pin;
+                    }
+                    Customer.Adrs.push(city);
                 }
             }
             Customer.GSTIN = argInvoiceData.BillTo.GSTIN;

package/dist/shared/shared-pdf.service.d.ts

@@ -370,7 +370,7 @@ export declare class SharedPDFService {
         stack: {
             style: string;
             table: {
-                widths: number[];
+                widths: (string | number)[];
                 headerRows: number;
                 body: any;
             };
@@ -399,7 +399,7 @@ export declare class SharedPDFService {
     static AllHSNPartCGSTTaxListTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): {
         style: string;
         table: {
-            widths: number[];
+            widths: (string | number)[];
             headerRows: number;
             body: any;
         };
@@ -487,7 +487,7 @@ export declare class SharedPDFService {
                 stack: {
                     style: string;
                     table: {
-                        widths: number[];
+                        widths: (string | number)[];
                         headerRows: number;
                         body: any;
                     };

package/dist/shared/shared-pdf.service.js

@@ -999,10 +999,10 @@ class SharedPDFService {
         if (tr_utils_1.TrUtils.IsNull(Customer)) {
             return this.emptyObject();
         }
-        let Data = [{ text: CustHeader + ':', style: 'hed2' },
-            { text: Customer.Code, fontSize: 12 },
-            { text: Customer.Name, fontSize: 12 },
-            { text: this.GetAddress(Customer), marginTop: 3 },
+        let Data = [{ text: CustHeader + ':', fontSize: 7 },
+            { text: Customer.Code, fontSize: 11, bold: true },
+            { text: Customer.Name, fontSize: 10 },
+            { text: this.GetAddress(Customer), marginTop: 2 },
             this.GetCustPhoneNumber(Customer, Type), this.GetCustomerGSTIN(Customer), this.GetCustomerDLNo(Customer),
             ,
             this.GetCustomerName(Customer.CustName)];
@@ -1073,7 +1073,7 @@ class SharedPDFService {
         if (Type !== 'Technician Copy') {
             var contact = this.GetFormatContact(Customer);
             if (contact.length !== 0) {
-                return { columns: [{ text: 'Phone', width: 27, style: 'hed' }, contact] };
+                return { columns: [{ text: 'Phone', width: 'auto', style: 'hed' }, { text: contact, width: '*' }] };
             }
             else {
                 return this.emptyObject();
@@ -1350,7 +1350,7 @@ class SharedPDFService {
             return {
                 style: 'tableExample',
                 table: {
-                    widths: [40, 30, 45, 45],
+                    widths: [40, 'auto', 50],
                     headerRows: 1,
                     body: this.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
                 },
@@ -1361,7 +1361,7 @@ class SharedPDFService {
             return {
                 style: 'tableExample',
                 table: {
-                    widths: [50, 25, 45, 25, 45, 50],
+                    widths: [50, '*', 50, 50],
                     headerRows: 1,
                     body: this.CreateHSNTaxTable1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
                 },

package/package.json

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