shareneus 1.6.29 → 1.6.30

package/.vscode/settings.json

@@ -0,0 +1,2 @@
+{
+}

package/dist/accounting/invoice/invoice-letterhead-pdf.service.d.ts

@@ -226,7 +226,7 @@ export declare class InvoiceLetterheadPdfService {
         } | {
             text: any;
             alignment: string;
-            width: string;
+            width?: undefined;
         })[];
         style: string;
     } | {

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

@@ -97,7 +97,7 @@ function GetFileName(invoicePdfData) {
 function CommonHeaderDetails(invoicePdfData, text, isotherIndustry, orientation = 'portrait') {
     const headerDetails = [
         GetMainHeaderDetails(invoicePdfData.Entity, invoicePdfData.HeaderName, invoicePdfData.Image, invoicePdfData.HColor, invoicePdfData.AColor, text, orientation),
-        shared_pdf_service_1.SharedPDFService.GetCustomerAndVehicleDetails(invoicePdfData._id, invoicePdfData.CrDate, invoicePdfData.PrDate, invoicePdfData.MOut, invoicePdfData.MIn, invoicePdfData.Product, invoicePdfData.PrintType, invoicePdfData.For, invoicePdfData.SurName, invoicePdfData.SurPhone, invoicePdfData.Type, invoicePdfData.SurEmail, invoicePdfData.InsComp, invoicePdfData.PolNo, invoicePdfData.PolType, invoicePdfData.Customer, invoicePdfData.IsProforma, invoicePdfData.Settings, invoicePdfData.Location, isotherIndustry, invoicePdfData.BL, invoicePdfData.ROCode, invoicePdfData.TypeName, invoicePdfData.AdmNo, invoicePdfData.DoS, invoicePdfData.Entity.PrCustBar, orientation),
+        shared_pdf_service_1.SharedPDFService.GetNewCustomerAndVehicleDetails(invoicePdfData._id, invoicePdfData.CrDate, invoicePdfData.PrDate, invoicePdfData.MOut, invoicePdfData.MIn, invoicePdfData.Product, invoicePdfData.PrintType, invoicePdfData.For, invoicePdfData.SurName, invoicePdfData.SurPhone, invoicePdfData.Type, invoicePdfData.SurEmail, invoicePdfData.InsComp, invoicePdfData.PolNo, invoicePdfData.PolType, invoicePdfData.Customer, invoicePdfData.IsProforma, invoicePdfData.Settings, invoicePdfData.Location, isotherIndustry, invoicePdfData.BL, invoicePdfData.ROCode, invoicePdfData.TypeName, invoicePdfData.AdmNo, invoicePdfData.DoS, invoicePdfData.Entity.PrCustBar, orientation),
         shared_pdf_service_1.SharedPDFService.GetOwnerDetails(invoicePdfData.Cust, invoicePdfData.Type, invoicePdfData.For),
         CustomerAndVehicleDetailsAfterLine(orientation),
         shared_pdf_service_1.SharedPDFService.GetDisplayTable(),
@@ -106,7 +106,7 @@ function CommonHeaderDetails(invoicePdfData, text, isotherIndustry, orientation
 }
 function GetMainHeaderDetails(Entity, HeaderName, Image, HColor, AColor, text, orientation = 'portrait') {
     return [
-        shared_pdf_service_1.SharedPDFService.GetMainHeader(Entity, Image, AColor, HColor, text, orientation),
+        shared_pdf_service_1.SharedPDFService.GetNewMainHeader(Entity, Image, AColor, HColor, text, orientation),
         shared_pdf_service_1.SharedPDFService.GetPrintType(HeaderName),
         HeaderAfterLine(orientation)
     ];
@@ -643,13 +643,13 @@ function CommonTotalDetails(invoicePdfData, index, numberofCopies, withPass, mor
         shared_pdf_service_1.SharedPDFService.InvoiceDueStatus(invoicePdfData.Type, invoicePdfData.Paid, invoicePdfData.Due, invoicePdfData.Sts, invoicePdfData.isCountersale, invoicePdfData.Entity.DecimalsNumber),
         shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(invoicePdfData.Entity.Terms),
         GetBanckdetailswithQRCode(invoicePdfData),
-        shared_pdf_service_1.SharedPDFService.GetUnderLine(orientation),
+        shared_pdf_service_1.SharedPDFService.GetNewUnderLine(orientation),
         shared_pdf_service_1.SharedPDFService.GetInvSignatures(invoicePdfData.Entity.CName, invoicePdfData.isCountersale),
-        shared_pdf_service_1.SharedPDFService.GetUnderLine1(withPass, orientation),
+        shared_pdf_service_1.SharedPDFService.GetNewUnderLine1(withPass, orientation),
         GetGatePass(withPass, invoicePdfData)
     ];
     if (invoicePdfData.Type !== 'Invoice') {
-        CommonDetails.splice(2, 0, shared_pdf_service_1.SharedPDFService.GetUnderLine(orientation));
+        CommonDetails.splice(2, 0, shared_pdf_service_1.SharedPDFService.GetNewUnderLine(orientation));
     }
     if (!tr_utils_1.TrUtils.IsNull(numberofCopies) && numberofCopies.length !== 0 && (index !== (numberofCopies.length - 1))) {
         CommonDetails.push({ text: '', pageBreak: 'after' });

package/dist/services/ro-totals.service.js

@@ -436,6 +436,7 @@ class ROTotalsService {
         argRecordData.CustPartsTotalBeforeDisc = (0, math_operations_1.Add)(argRecordData.CustPartsTotalAfterDisc, argRecordData.CustPartsDiscTotal);
         argRecordData.SubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(dupRecordData, CustLaborTaxTotal, CustPartTaxTotal, dupRecordData.Ops, dupRecordData.Parts, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
+        argRecordData.TaxTotal = (0, math_operations_1.Add)(CustLaborTaxTotal, CustPartTaxTotal);
         if (detailedInfo) {
             argRecordData.FixedSubTotal = tr_utils_1.TrUtils.FixedTo(CustomerAfterDiscTotals, DecimalsNumber);
             argRecordData.FixedTotal = tr_utils_1.TrUtils.FixedTo(CustTotal, DecimalsNumber);
@@ -564,6 +565,7 @@ class ROTotalsService {
         let InsLaborTaxTotal = this.GetInsLaborTaxTotal(dupRecordData.Ops, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
         let InsPartTaxTotal = this.GetInsPartsTaxTotal(dupRecordData.Parts, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax), isWorkOrder);
         let InsTotal = this.GetInsuranceTotalBasedOnTaxType(InsuranceAfterDiscTotals, InsLaborTaxTotal, InsPartTaxTotal, tr_utils_1.TrUtils.isTaxable(dupRecordData.Settings.Tax));
+        argRecordData.InsTaxTotal = (0, math_operations_1.Add)(InsLaborTaxTotal, InsPartTaxTotal);
         argRecordData.InsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal, DecimalsNumber);
         if (detailedInfo) {
             argRecordData.FixedInsTotal = tr_utils_1.TrUtils.FixedTo(InsTotal, DecimalsNumber);

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

@@ -6,7 +6,7 @@ export declare class SharedPDFService {
     static MainHeading(CName: any, Entity: any, Image: any, HColor: any, CopyName: any): any;
     static HeaderAlignmentBasedOnCondition(CName: any, Image: any, HColor: any, headerstyle: any, MainHeaderStyle: any, Entity: any, CopyName: any): any;
     static GetLeftMArgin(WorkShopName: any): "center" | "left";
-    static GetMainHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): {
+    static GetMainHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any): {
         columns: any;
     };
     static GetConsultationMainHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any): {
@@ -17,8 +17,8 @@ export declare class SharedPDFService {
     static ConsultHeaderAlignmentBasedOnCondition(CName: any, Image: any, HColor: any, headerstyle: any, MainHeaderStyle: any, Entity: any, CopyName: any): any;
     static GetConsultationLeftAlignmentHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any): any;
     static GetWatermarkImage(Image: any, pageSize: any, Wmark: boolean): any;
-    static GetLeftAlignmentHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): any;
-    static GetAddresDetailsAndLogo(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): any;
+    static GetLeftAlignmentHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any): any;
+    static GetAddresDetailsAndLogo(Entity: any, Image: any, AColor: any, HColor: any, text: any): any;
     static GetHeader(Entity: any, HColor: string): any;
     static GetMainHeaderStyleForLeftAlignHeader(WorkShopName: string): any;
     static GetEntityDetails(Entity: any): {
@@ -55,11 +55,11 @@ export declare class SharedPDFService {
         } | {
             text: any;
             alignment: string;
-            width: string;
+            width?: undefined;
         })[];
         style: string;
     };
-    static GetUnderLine(orientation?: 'portrait' | 'landscape'): {
+    static GetNewUnderLine(orientation?: 'portrait' | 'landscape'): {
         marginTop: number;
         canvas: {
             type: string;
@@ -71,7 +71,25 @@ export declare class SharedPDFService {
             lineWidth: number;
         }[];
     };
-    static GetUnderLine1(withPass: boolean, orientation?: 'portrait' | 'landscape'): any;
+    static GetNewUnderLine1(withPass: boolean, orientation?: 'portrait' | 'landscape'): any;
+    static GetNewMainHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): {
+        columns: any;
+    };
+    static GetNewLeftAlignmentHeader(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): any;
+    static GetNewAddresDetailsAndLogo(Entity: any, Image: any, AColor: any, HColor: any, text: any, orientation?: 'portrait' | 'landscape'): any;
+    static GetUnderLine(): {
+        marginTop: number;
+        canvas: {
+            type: string;
+            color: string;
+            x1: number;
+            y1: number;
+            x2: number;
+            y2: number;
+            lineWidth: number;
+        }[];
+    };
+    static GetUnderLine1(withPass: boolean): any;
     static GetLightUnderLine(width: number, color: string): {
         canvas: {
             type: string;
@@ -163,7 +181,7 @@ export declare class SharedPDFService {
         layout: string;
     };
     static GetDataTable(data: any, istotal: boolean): any;
-    static GetCustomerAndVehicleDetails(Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Customer: any, IsProforma: boolean, Settings: any, Location: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any, PrCustBar?: boolean, orientation?: 'portrait' | 'landscape'): {
+    static GetCustomerAndVehicleDetails(Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Customer: any, IsProforma: boolean, Settings: any, Location: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any, PrCustBar?: boolean): {
         style: string;
         marginLeft: number;
         columns: ({
@@ -192,6 +210,62 @@ export declare class SharedPDFService {
             width: number;
         })[];
     };
+    static GetNewCustomerAndVehicleDetails(Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Customer: any, IsProforma: boolean, Settings: any, Location: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any, PrCustBar?: boolean, orientation?: 'portrait' | 'landscape'): {
+        style: string;
+        marginLeft: number;
+        columns: ({
+            stack: any[];
+            width: number;
+            marginLeft: number;
+        } | {
+            stack: any[];
+            width: number;
+            marginRight: number;
+            text?: undefined;
+        } | {
+            text: string;
+            width: number;
+            stack?: undefined;
+            marginRight?: undefined;
+        } | {
+            stack: {
+                lineHeight: number;
+                fontSize: number;
+                table: {
+                    body: any;
+                };
+                layout: string;
+            }[];
+            width: number;
+        })[];
+    };
+    static GetNewCustomer(Customer: any, Type: any, For: any, Vehicle: any, Settings: any, Headding: any, isOtherIndustry: boolean, orientation?: 'portrait' | 'landscape'): {
+        stack: any[];
+        width: number;
+        marginLeft: number;
+    };
+    static GetNewInsurence(For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Location: any, isOtherIndustry: boolean, Code?: any, PrCustBar?: boolean, orientation?: 'portrait' | 'landscape'): {
+        stack: any[];
+        width: number;
+        marginRight: number;
+        text?: undefined;
+    } | {
+        text: string;
+        width: number;
+        stack?: undefined;
+        marginRight?: undefined;
+    };
+    static GetNewVehicle(Type: any, Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, IsProforma: boolean, Settings: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any, orientation?: 'portrait' | 'landscape'): {
+        stack: {
+            lineHeight: number;
+            fontSize: number;
+            table: {
+                body: any;
+            };
+            layout: string;
+        }[];
+        width: number;
+    };
     static GetReceiptCustomerAndVehicleDetails(Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Customer: any, IsProforma: boolean, Settings: any, Location: any, isOtherIndustry: boolean): {
         style: string;
         marginLeft: number;
@@ -257,12 +331,12 @@ export declare class SharedPDFService {
         marginLeft: number;
     };
     static GetReceiptCustomerDetails(Customer: any, Type: any, Vehicle: any, Settings: any, CustHeader: string): any;
-    static GetCustomer(Customer: any, Type: any, For: any, Vehicle: any, Settings: any, Headding: any, isOtherIndustry: boolean, orientation?: 'portrait' | 'landscape'): {
+    static GetCustomer(Customer: any, Type: any, For: any, Vehicle: any, Settings: any, Headding: any, isOtherIndustry: boolean): {
         stack: any[];
         width: number;
         marginLeft: number;
     };
-    static GetInsurence(For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Location: any, isOtherIndustry: boolean, Code?: any, PrCustBar?: boolean, orientation?: 'portrait' | 'landscape'): {
+    static GetInsurence(For: any, SurName: any, SurPhone: any, Type: any, SurEmail: any, InsComp: any, PolNo: any, PolType: any, Location: any, isOtherIndustry: boolean, Code?: any, PrCustBar?: boolean): {
         stack: any[];
         width: number;
         marginRight: number;
@@ -279,7 +353,7 @@ export declare class SharedPDFService {
         svg?: undefined;
     };
     static textToSvgBarcode(text: string): any;
-    static GetVehicle(Type: any, Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, IsProforma: boolean, Settings: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any, orientation?: 'portrait' | 'landscape'): {
+    static GetVehicle(Type: any, Id: any, CrDate: any, PrDate: any, MOut: any, MIn: any, Vehicle: any, PrintType: any, For: any, IsProforma: boolean, Settings: any, isOtherIndustry: boolean, BL: any, ROCode: any, TypeName: any, AdmNo: any, DoS: any): {
         stack: {
             lineHeight: number;
             fontSize: number;

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

@@ -48,15 +48,15 @@ class SharedPDFService {
             return 'left';
         }
     }
-    static GetMainHeader(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
+    static GetMainHeader(Entity, Image, AColor, HColor, text) {
         if (Entity.Header === 1) {
             return {
-                columns: this.GetAddresDetailsAndLogo(Entity, Image, AColor, HColor, text, orientation)
+                columns: this.GetAddresDetailsAndLogo(Entity, Image, AColor, HColor, text)
             };
         }
         else {
             return {
-                columns: this.GetLeftAlignmentHeader(Entity, Image, AColor, HColor, text, orientation)
+                columns: this.GetLeftAlignmentHeader(Entity, Image, AColor, HColor, text)
             };
         }
     }
@@ -150,9 +150,7 @@ class SharedPDFService {
             return this.emptyObject();
         }
     }
-    static GetLeftAlignmentHeader(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
-        const headerWidth = orientation === 'landscape' ? 420 : 290;
-        const noImageWidth = orientation === 'landscape' ? 550 : 420;
+    static GetLeftAlignmentHeader(Entity, Image, AColor, HColor, text) {
         let Details = [
             {
                 stack: [{ columns: [this.MainHeading(Entity.CName, Entity, Image, HColor, text)] },
@@ -166,7 +164,7 @@ class SharedPDFService {
         ];
         if (!tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo) {
             Details[0].stack[1].columns.unshift({
-                width: headerWidth,
+                width: 290,
                 margin: [10, 0, 0, 5],
                 stack: this.GetHeader(Entity, HColor),
                 color: AColor,
@@ -179,7 +177,7 @@ class SharedPDFService {
         }
         else {
             Details[0].stack[1].columns.unshift({
-                width: noImageWidth,
+                width: 420,
                 margin: [0, 0, 0, 5],
                 stack: this.GetHeader(Entity, HColor),
                 color: AColor,
@@ -191,39 +189,40 @@ class SharedPDFService {
         }
         return Details;
     }
-    static GetAddresDetailsAndLogo(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
-        const logoWidth = 120;
-        const logoHeight = 80;
-        const headerStyle = this.GetMainHeaderStyleForLeftAlignHeader(Entity.CName || '');
-        const extras = [];
-        if (!tr_utils_1.TrUtils.IsNull(Entity.PageCount)) {
-            extras.push({ text: 'Page: ' + Entity.PageCount, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
-        }
-        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra1)) {
-            extras.push({ text: Entity.Extra1, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
-        }
-        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra2)) {
-            extras.push({ text: Entity.Extra2, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
-        }
-        const centerStack = [
-            { text: '' + (Entity.CName || '') + '', color: HColor, fontSize: headerStyle.fontSize, bold: true, alignment: 'center' },
+    static GetAddresDetailsAndLogo(Entity, Image, AColor, HColor, text) {
+        let Details = [
             {
-                stack: this.GetHeader(Entity, HColor),
-                color: AColor,
-                style: 'header',
-                alignment: 'center',
-                margin: [0, 0, 0, 2]
+                stack: [
+                    { columns: [this.MainHeading(Entity.CName, Entity, Image, HColor, text)] },
+                    {
+                        columns: [{
+                                width: 300,
+                                margin: [0, 0, 0, 5],
+                                stack: this.GetHeader(Entity, HColor),
+                                color: AColor,
+                                style: 'header'
+                            },
+                            this.emptyObject()]
+                    }
+                ]
             }
         ];
-        if (!tr_utils_1.TrUtils.IsNull(text)) {
-            centerStack.push({ text: text, color: 'grey', alignment: 'center', fontSize: 7, margin: [0, 0, 0, 1] });
+        if (!tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo) {
+            // Details.unshift({ text: '', width: 120 });
+            if (Entity.CName.length < 28) {
+                Details[0].stack[0].columns.push({ text: '', width: 150 });
+            }
+            if (!tr_utils_1.TrUtils.IsNull(text)) {
+                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 7 });
+            }
+            Details.unshift({ image: Image, width: 120, height: 80 });
+        }
+        else {
+            Details[0].stack[1].columns.unshift({ text: '', width: 130 });
+            if (!tr_utils_1.TrUtils.IsNull(text)) {
+                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 7 });
+            }
         }
-        extras.forEach((row) => centerStack.push(row));
-        let Details = [
-            !tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo ? { image: Image, width: logoWidth, height: logoHeight } : { text: '', width: logoWidth },
-            { width: '*', stack: centerStack },
-            { text: '', width: logoWidth }
-        ];
         return Details;
     }
     static GetHeader(Entity, HColor) {
@@ -395,15 +394,14 @@ class SharedPDFService {
     }
     static GetPrintType(type) {
         return {
-            columns: [
-                { text: '', width: 120 },
-                { text: type, alignment: 'center', width: '*' },
-                { text: '', width: 120 }
+            // marginLeft: 10,
+            columns: [{ text: '', width: 120 },
+                { text: type, alignment: 'center' }, { text: '', width: 140 }
             ],
             style: 'Receiptheader1'
         };
     }
-    static GetUnderLine(orientation = 'portrait') {
+    static GetNewUnderLine(orientation = 'portrait') {
         const lineWidth = orientation === 'landscape' ? 820 : 575;
         return {
             marginTop: 10,
@@ -420,7 +418,7 @@ class SharedPDFService {
             ]
         };
     }
-    static GetUnderLine1(withPass, orientation = 'portrait') {
+    static GetNewUnderLine1(withPass, orientation = 'portrait') {
         if (withPass) {
             const lineWidth = orientation === 'landscape' ? 820 : 575;
             return {
@@ -443,6 +441,132 @@ class SharedPDFService {
             return this.emptyObject();
         }
     }
+    static GetNewMainHeader(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
+        if (Entity.Header === 1) {
+            return {
+                columns: this.GetNewAddresDetailsAndLogo(Entity, Image, AColor, HColor, text, orientation)
+            };
+        }
+        else {
+            return {
+                columns: this.GetNewLeftAlignmentHeader(Entity, Image, AColor, HColor, text, orientation)
+            };
+        }
+    }
+    static GetNewLeftAlignmentHeader(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
+        const headerWidth = orientation === 'landscape' ? 420 : 290;
+        const noImageWidth = orientation === 'landscape' ? 550 : 420;
+        let Details = [
+            {
+                stack: [{ columns: [this.MainHeading(Entity.CName, Entity, Image, HColor, text)] },
+                    {
+                        columns: [
+                            this.emptyObject()
+                        ]
+                    }
+                ]
+            }
+        ];
+        if (!tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo) {
+            Details[0].stack[1].columns.unshift({
+                width: headerWidth,
+                margin: [10, 0, 0, 5],
+                stack: this.GetHeader(Entity, HColor),
+                color: AColor,
+                style: 'temp2header'
+            });
+            if (!tr_utils_1.TrUtils.IsNull(text)) {
+                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 10 });
+            }
+            Details.unshift({ image: Image, width: 120, height: 80 });
+        }
+        else {
+            Details[0].stack[1].columns.unshift({
+                width: noImageWidth,
+                margin: [0, 0, 0, 5],
+                stack: this.GetHeader(Entity, HColor),
+                color: AColor,
+                style: 'temp2header'
+            });
+            if (!tr_utils_1.TrUtils.IsNull(text)) {
+                Details[0].stack.unshift({ text: text, color: 'grey', alignment: 'right', width: 100, marginBottom: -15, fontSize: 10 });
+            }
+        }
+        return Details;
+    }
+    static GetNewAddresDetailsAndLogo(Entity, Image, AColor, HColor, text, orientation = 'portrait') {
+        const logoWidth = 120;
+        const logoHeight = 80;
+        const headerStyle = this.GetMainHeaderStyleForLeftAlignHeader(Entity.CName || '');
+        const extras = [];
+        if (!tr_utils_1.TrUtils.IsNull(Entity.PageCount)) {
+            extras.push({ text: 'Page: ' + Entity.PageCount, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra1)) {
+            extras.push({ text: Entity.Extra1, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        if (!tr_utils_1.TrUtils.IsEmpty(Entity.Extra2)) {
+            extras.push({ text: Entity.Extra2, color: 'grey', alignment: 'center', fontSize: this.TermsandCond, margin: [0, 1, 0, 0] });
+        }
+        const centerStack = [
+            { text: '' + (Entity.CName || '') + '', color: HColor, fontSize: headerStyle.fontSize, bold: true, alignment: 'center' },
+            {
+                stack: this.GetHeader(Entity, HColor),
+                color: AColor,
+                style: 'header',
+                alignment: 'center',
+                margin: [0, 0, 0, 2]
+            }
+        ];
+        if (!tr_utils_1.TrUtils.IsNull(text)) {
+            centerStack.push({ text: text, color: 'grey', alignment: 'center', fontSize: 7, margin: [0, 0, 0, 1] });
+        }
+        extras.forEach((row) => centerStack.push(row));
+        let Details = [
+            !tr_utils_1.TrUtils.IsNull(Image) && Entity.PrLogo ? { image: Image, width: logoWidth, height: logoHeight } : { text: '', width: logoWidth },
+            { width: '*', stack: centerStack },
+            { text: '', width: logoWidth }
+        ];
+        return Details;
+    }
+    static GetUnderLine() {
+        return {
+            marginTop: 10,
+            canvas: [
+                {
+                    type: 'line',
+                    color: 'grey',
+                    x1: 0,
+                    y1: 0,
+                    x2: 575,
+                    y2: 0,
+                    lineWidth: 0.9
+                }
+            ]
+        };
+    }
+    static GetUnderLine1(withPass) {
+        if (withPass) {
+            return {
+                marginTop: 10,
+                canvas: [
+                    {
+                        type: 'line',
+                        color: 'grey',
+                        x1: 0,
+                        y1: 0,
+                        x2: 575,
+                        y2: 0,
+                        dash: { length: 5, space: 10 },
+                        lineWidth: 0.9
+                    }
+                ]
+            };
+        }
+        else {
+            return this.emptyObject();
+        }
+    }
     static GetLightUnderLine(width, color) {
         return {
             canvas: [
@@ -744,17 +868,61 @@ class SharedPDFService {
         });
         return body;
     }
-    static GetCustomerAndVehicleDetails(Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Customer, IsProforma, Settings, Location, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, PrCustBar = false, orientation = 'portrait') {
+    static GetCustomerAndVehicleDetails(Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Customer, IsProforma, Settings, Location, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, PrCustBar = false) {
+        return {
+            style: 'textcust',
+            marginLeft: 5,
+            columns: [
+                this.GetCustomer(Customer, Type, For, Vehicle, Settings, 'Bill To', isOtherIndustry),
+                this.GetInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Customer.Code, PrCustBar),
+                this.GetVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)
+            ],
+        };
+    }
+    static GetNewCustomerAndVehicleDetails(Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Customer, IsProforma, Settings, Location, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, PrCustBar = false, orientation = 'portrait') {
         return {
             style: 'textcust',
             marginLeft: 5,
             columns: [
-                this.GetCustomer(Customer, Type, For, Vehicle, Settings, 'Bill To', isOtherIndustry, orientation),
-                this.GetInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Customer.Code, PrCustBar, orientation),
-                this.GetVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, orientation)
+                this.GetNewCustomer(Customer, Type, For, Vehicle, Settings, 'Bill To', isOtherIndustry, orientation),
+                this.GetNewInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Customer.Code, PrCustBar, orientation),
+                this.GetNewVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, orientation)
             ],
         };
     }
+    static GetNewCustomer(Customer, Type, For, Vehicle, Settings, Headding, isOtherIndustry, orientation = 'portrait') {
+        const insuranceWidth = orientation === 'landscape' ? 220 : 170;
+        const normalWidth = orientation === 'landscape' ? 280 : 230;
+        if (For === enums_1.PayTypeEnum.Insurance || isOtherIndustry) {
+            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: insuranceWidth, marginLeft: 2 };
+        }
+        else {
+            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: normalWidth, marginLeft: 4 };
+        }
+    }
+    static GetNewInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Code = null, PrCustBar = false, orientation = 'portrait') {
+        const insuranceWidth = orientation === 'landscape' ? 260 : 210;
+        const emptyWidth = orientation === 'landscape' ? 100 : 70;
+        if (isOtherIndustry || ((For === enums_1.PayTypeEnum.Insurance) && Type !== 'Invoice')) {
+            return { stack: [this.GetInsurenceDetails(For, SurName, SurPhone, SurEmail, InsComp, PolNo, PolType, Type, Location, isOtherIndustry)], width: insuranceWidth, marginRight: 2 };
+        }
+        else if (!tr_utils_1.TrUtils.IsNull(Code)) {
+            return { stack: [this.GetBarCode(Code, PrCustBar)], width: insuranceWidth, marginRight: 2 };
+        }
+        else {
+            return { text: '', width: emptyWidth };
+        }
+    }
+    static GetNewVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, orientation = 'portrait') {
+        const insuranceWidth = orientation === 'landscape' ? 250 : 200;
+        const normalWidth = orientation === 'landscape' ? 300 : 250;
+        if (For === enums_1.PayTypeEnum.Insurance) {
+            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: insuranceWidth };
+        }
+        else {
+            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: normalWidth };
+        }
+    }
     static GetReceiptCustomerAndVehicleDetails(Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Customer, IsProforma, Settings, Location, isOtherIndustry) {
         return {
             style: 'textcust',
@@ -825,27 +993,23 @@ class SharedPDFService {
                 { text: 'Doctor : ' + Customer.Doctor, marginTop: 2 },]
         };
     }
-    static GetCustomer(Customer, Type, For, Vehicle, Settings, Headding, isOtherIndustry, orientation = 'portrait') {
-        const insuranceWidth = orientation === 'landscape' ? 220 : 170;
-        const normalWidth = orientation === 'landscape' ? 280 : 230;
+    static GetCustomer(Customer, Type, For, Vehicle, Settings, Headding, isOtherIndustry) {
         if (For === enums_1.PayTypeEnum.Insurance || isOtherIndustry) {
-            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: insuranceWidth, marginLeft: 2 };
+            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: 170, marginLeft: 2 };
         }
         else {
-            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: normalWidth, marginLeft: 4 };
+            return { stack: [this.GetCustomerDetails(Customer, Type, Vehicle, Settings, Headding)], width: 230, marginLeft: 4 };
         }
     }
-    static GetInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Code = null, PrCustBar = false, orientation = 'portrait') {
-        const insuranceWidth = orientation === 'landscape' ? 260 : 210;
-        const emptyWidth = orientation === 'landscape' ? 100 : 70;
+    static GetInsurence(For, SurName, SurPhone, Type, SurEmail, InsComp, PolNo, PolType, Location, isOtherIndustry, Code = null, PrCustBar = false) {
         if (isOtherIndustry || ((For === enums_1.PayTypeEnum.Insurance) && Type !== 'Invoice')) {
-            return { stack: [this.GetInsurenceDetails(For, SurName, SurPhone, SurEmail, InsComp, PolNo, PolType, Type, Location, isOtherIndustry)], width: insuranceWidth, marginRight: 2 };
+            return { stack: [this.GetInsurenceDetails(For, SurName, SurPhone, SurEmail, InsComp, PolNo, PolType, Type, Location, isOtherIndustry)], width: 210, marginRight: 2 };
         }
         else if (!tr_utils_1.TrUtils.IsNull(Code)) {
-            return { stack: [this.GetBarCode(Code, PrCustBar)], width: insuranceWidth, marginRight: 2 };
+            return { stack: [this.GetBarCode(Code, PrCustBar)], width: 210, marginRight: 2 };
         }
         else {
-            return { text: '', width: emptyWidth };
+            return { text: '', width: 70 };
         }
     }
     static GetBarCode(code, PrCustBar) {
@@ -864,14 +1028,12 @@ class SharedPDFService {
         });
         return { svg: svgElement.outerHTML };
     }
-    static GetVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS, orientation = 'portrait') {
-        const insuranceWidth = orientation === 'landscape' ? 250 : 200;
-        const normalWidth = orientation === 'landscape' ? 300 : 250;
+    static GetVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS) {
         if (For === enums_1.PayTypeEnum.Insurance) {
-            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: insuranceWidth };
+            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: 200 };
         }
         else {
-            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: normalWidth };
+            return { stack: [this.GetVehicleDetails(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, IsProforma, Settings, isOtherIndustry, BL, ROCode, TypeName, AdmNo, DoS)], width: 250 };
         }
     }
     static GetReceiptVehicle(Type, Id, CrDate, PrDate, MOut, MIn, Vehicle, PrintType, For, IsProforma, Settings, isOtherIndustry) {
@@ -1665,6 +1827,7 @@ class SharedPDFService {
         };
     }
     static GetNotes(RecordData) {
+        console.log('RecordData.Notes shared', RecordData.Notes);
         if (!tr_utils_1.TrUtils.IsNull(RecordData.Notes)) {
             return {
                 stack: [
@@ -2001,6 +2164,7 @@ class SharedPDFService {
         //   { name: 'Labor Total', value: LaborAfterGST },
         // { name: 'Part Total', value: PartsAfterGST },
         ];
+        console.log('shared Consolidate', Consolidate);
         if (moreDiscDetails) {
             if (!tr_utils_1.TrUtils.IsZero(RecordData.PDisc)) {
                 AccountFields.push({ name: 'Items Discount', value: tr_utils_1.TrUtils.FixPriceValue(RecordData.PDisc, DecimalsNumber) });
@@ -2023,6 +2187,7 @@ class SharedPDFService {
                 AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST))), DecimalsNumber) });
             }
             else {
+                console.log('Test', tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber));
                 AccountFields.unshift({ name: 'SubTotal', value: tr_utils_1.TrUtils.FixPriceValue((0, math_operations_1.Add)(tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(LaborAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(PartsAfterGST)), tr_utils_1.TrUtils.SetValueToZeroIfNull(Number(totalTax))), DecimalsNumber) });
             }
         }

package/package.json

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