shareneus 1.4.63 → 1.4.66

package/dist/accounting/invoice/hc-inv-pdf.service.js

@@ -765,7 +765,7 @@ class HCInvoiceprintService {
     static CommonTotalDetails(ROPrintData, index, numberofCopies, withPass, isAuto, moreDiscDetails) {
         // console.log('ROPrintData', ROPrintData);
         let CommonDetails = [
-            shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupDataByPerc, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, ROPrintData.CustLaborTaxGroupDataByPerc, ROPrintData.STotal, isAuto, moreDiscDetails),
+            shared_pdf_service_1.SharedPDFService.GetFinalTotalDetails1(ROPrintData, ROPrintData.CustLaborTotalAfterDisc, ROPrintData.CustLaborDiscTotal, ROPrintData.CustLaborCGST, ROPrintData.CustLaborSGST, ROPrintData.CustLaborIGST, ROPrintData.CustPartIGST, ROPrintData.ShowIGST, ROPrintData.ShowTaxColumn, ROPrintData.CustPartsTotalAfterDisc, ROPrintData.CustPartsDiscTotal, ROPrintData.CustPartCGST, ROPrintData.CustPartSGST, ROPrintData.CustTaxGroupDataByPerc, ROPrintData.ShowAccParts, ROPrintData.CustLaborAfterTax, ROPrintData.CustPartAfterTax, ROPrintData.FixedDisc, ROPrintData.For, ROPrintData.FixedTotal, ROPrintData.CustTotalRoundedBy, ROPrintData.CustRoundedTotal, ROPrintData.ShowTaxColumn, ROPrintData.ShowTaxColumn, tr_utils_1.TrUtils.isTaxable(ROPrintData.Settings.Tax), ROPrintData.CustLaborITax, ROPrintData.CustPartITax, ROPrintData.Consolidate, ROPrintData.From, ROPrintData.Adj, ROPrintData.TaxSummary, ROPrintData.STotal, isAuto, moreDiscDetails),
             this.GetNumberInWords(ROPrintData.CustRoundedTotal),
             this.InvoiceDueStatus(ROPrintData.Type, ROPrintData.Paid, ROPrintData.Due, ROPrintData.Sts, ROPrintData.isCountersale, ROPrintData.Entity.DecimalsNumber),
             shared_pdf_service_1.SharedPDFService.GetTemsAndConditions(ROPrintData.Entity.Terms),
@@ -789,13 +789,12 @@ class HCInvoiceprintService {
             return {
                 // lineHeight: 0.7,
                 fontSize: 9,
-                marginTop: 10,
+                marginTop: 5,
                 marginBottom: 5,
                 table: {
-                    widths: [187, 170, 170],
+                    widths: ['*', 'auto'],
                     body: [[{ text: 'Paid : ' + tr_utils_1.TrUtils.FixPriceValue(Paid, DecimalsNumber) },
-                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) },
-                            { text: 'Status : ' + Status }]]
+                            { text: 'Due : ' + tr_utils_1.TrUtils.FixPriceValue(Due, DecimalsNumber) }]]
                 },
                 layout: shared_pdf_service_1.SharedPDFService.LayOutStyle(),
             };

package/dist/accounting/invoice/invoice-total.service.d.ts

@@ -17,6 +17,7 @@ export declare class InvoiceTotalsService {
     static GetRetPartsTotalAfterDiscount(PartsList: any): any;
     static GetNonRetPartsTotalAfterDiscount(PartsList: any): any;
     static GetDetailedTotalsData(finalTotalsData: any, IsIndependentTax: boolean, opCodesList: any, PartsList: any, TaxCodes: any, DecimalsNumber: any): any;
+    static groupTaxData(items: any[], ops: any[]): any[];
     static GetTaxGroupingForLaborByPerc(opCodesList: any, TaxCodes: any, DecimalsNumber: any): any[];
     static GetTaxGroupingForPartsByPerc(Parts: any, TaxCodes: any, DecimalsNumber: any): any[];
     static GetTaxGroupingInfoBySAC(FinalMatchedLabors: any, TaxCodes: any, DecimalsNumber: any): any[];

package/dist/accounting/invoice/invoice-total.service.js

@@ -246,6 +246,7 @@ class InvoiceTotalsService {
         finalTotalsData.CustTaxGroupData = this.GetTaxGroupingForPartsByHSN(PartsList, TaxCodes, DecimalsNumber);
         finalTotalsData.CustTaxGroupDataByPerc = this.GetTaxGroupingForPartsByPerc(PartsList, TaxCodes, DecimalsNumber);
         finalTotalsData.CustLaborTaxGroupDataByPerc = this.GetTaxGroupingForLaborByPerc(opCodesList, TaxCodes, DecimalsNumber);
+        finalTotalsData.TaxSummary = this.groupTaxData(finalTotalsData.CustTaxGroupData, finalTotalsData.CustLaborTaxGroupDataByPerc);
         finalTotalsData.CustTotalRoundedBy = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Round, DecimalsNumber);
         finalTotalsData.CustRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.Total, DecimalsNumber);
         finalTotalsData.CustRetRoundedTotal = tr_utils_1.TrUtils.FixedTo(finalTotalsData.RetTotal, DecimalsNumber);
@@ -260,6 +261,28 @@ class InvoiceTotalsService {
         }
         return finalTotalsData;
     }
+    static groupTaxData(items, ops) {
+        const combined = [...items, ...ops];
+        const groupedMap = new Map();
+        combined.forEach(item => {
+            if (groupedMap.has(item.CombinedTaxPercentage)) {
+                const existing = groupedMap.get(item.CombinedTaxPercentage);
+                existing.CGSTAmt = (0, aggregation_1.addition)(existing.CGSTAmt, item.CGSTAmt);
+                existing.SGSTAmt = (0, aggregation_1.addition)(existing.SGSTAmt, item.SGSTAmt);
+                // Sum IGST if present
+                if (item.IGSTAmt !== undefined) {
+                    existing.IGSTAmt = (0, aggregation_1.addition)(existing.IGSTAmt || 0, item.IGSTAmt);
+                }
+                existing.TotalTaxAmount = (0, aggregation_1.addition)(existing.TotalTaxAmount || 0, item.TotalTaxAmount || 0);
+                existing.TotalTaxableAmount = (0, aggregation_1.addition)(existing.TotalTaxableAmount || 0, item.TotalTaxableAmount || 0);
+            }
+            else {
+                // Clone the object to avoid mutation
+                groupedMap.set(item.CombinedTaxPercentage, Object.assign({}, item));
+            }
+        });
+        return Array.from(groupedMap.values());
+    }
     static GetTaxGroupingForLaborByPerc(opCodesList, TaxCodes, DecimalsNumber) {
         opCodesList = this.GetCombinedTaxPercentage(tr_utils_1.TrUtils.Stringify(opCodesList), TaxCodes);
         // opCodesList = this.ResetPartsHSNIfInvalid(opCodesList);

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

@@ -468,6 +468,7 @@ export declare class SharedPDFService {
         fontSize: number;
         lineHeight: number;
         Field: string;
+        alignment: string;
     }[];
     static CreateHSNTaxTable1(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
     static CreateHSNTaxTable(PartsTaxInfo: any, ShowAccParts: any, ShowIGST: any, ShowTaxColumn: any): any;
@@ -496,10 +497,6 @@ export declare class SharedPDFService {
                         hLineColor: (i: any, node: any) => string;
                     };
                 }[];
-            } | {
-                text: string;
-                fontSize: number;
-                opacity: number;
             })[];
         })[];
         marginLeft: number;
@@ -653,39 +650,57 @@ export declare class SharedPDFService {
     static GetSignatures(CName: any, For: any, Type: any): {
         columns: {
             stack: ({
-                style: string;
-                text: (string | {
-                    text: any;
-                    bold: string;
-                })[];
+                text: {
+                    style: string;
+                    text: (string | {
+                        text: any;
+                        bold: string;
+                    })[];
+                };
+                alignment: string;
+                columns?: undefined;
             } | {
                 columns: any[];
+                text?: undefined;
+                alignment?: undefined;
             })[];
         }[];
     };
     static GetInvSignatures(CName: any, isCounterSale: boolean): {
         columns: {
             stack: ({
-                style: string;
-                text: (string | {
-                    text: any;
-                    bold: string;
-                })[];
+                text: {
+                    style: string;
+                    text: (string | {
+                        text: any;
+                        bold: string;
+                    })[];
+                };
+                alignment: string;
+                columns?: undefined;
             } | {
                 columns: any[];
+                text?: undefined;
+                alignment?: undefined;
             })[];
         }[];
     };
     static GetHCInvSignatures(CName: any, isCounterSale: boolean): {
         columns: {
             stack: ({
-                style: string;
-                text: (string | {
-                    text: any;
-                    bold: string;
-                })[];
+                text: {
+                    style: string;
+                    text: (string | {
+                        text: any;
+                        bold: string;
+                    })[];
+                };
+                alignment: string;
+                columns?: undefined;
             } | {
                 columns: any[];
+                text?: undefined;
+                alignment?: undefined;
             })[];
         }[];
     };
@@ -700,21 +715,22 @@ export declare class SharedPDFService {
     static Authorizedsignature(): {
         style: string;
         text: string[];
+        width: string;
     };
     static Accountantsignature(): {
         style: string;
         text: string[];
-        marginLeft: number;
+        width: string;
     };
     static CustomerSignature(): {
         style: string;
         text: string[];
-        marginLeft: number;
+        width: string;
     };
     static PatientSignature(): {
         style: string;
         text: string[];
-        marginLeft: number;
+        width: string;
     };
     static SurveyorSignature(For: any, Type: any): any;
     static GetHeadersWithDiffDisc(ROData: any, PrintPartNumber: any): any;

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

@@ -848,7 +848,7 @@ class SharedPDFService {
     static textToSvgBarcode(text) {
         const svgElement = document.createElementNS("http://www.w3.org/2000/svg", "svg");
         (0, jsbarcode_1.default)(svgElement, text, {
-            format: "CODE128", width: 1.25, height: 25, margin: 0, marginTop: 8,
+            format: "CODE128", width: 1.25, height: 20, margin: 0, marginTop: 8,
             displayValue: true, fontSize: 7, textMargin: 0, fontOptions: 'bold'
         });
         return { svg: svgElement.outerHTML };
@@ -999,9 +999,9 @@ class SharedPDFService {
         if (tr_utils_1.TrUtils.IsNull(Customer)) {
             return this.emptyObject();
         }
-        let Data = [{ text: CustHeader + ':', style: 'hed' },
-            { text: Customer.Code, marginTop: 2, bold: true, fontSize: 15 },
-            { text: Customer.Name, marginTop: 2 },
+        let Data = [{ text: CustHeader + ':', style: 'hed2' },
+            { text: Customer.Code, fontSize: 12 },
+            { text: Customer.Name, fontSize: 12 },
             { text: this.GetAddress(Customer), marginTop: 3 },
             this.GetCustPhoneNumber(Customer, Type), this.GetCustomerGSTIN(Customer), this.GetCustomerDLNo(Customer),
             ,
@@ -1397,7 +1397,7 @@ class SharedPDFService {
         return {
             style: 'tableExample',
             table: {
-                widths: [20, 20, 40, 40],
+                widths: [20, 60, 40, 40],
                 body: this.ALLPartsCGSTTaxListTable(PartsTaxInfo, ShowAccParts, ShowTaxColumn)
             },
             layout: this.HeaderLineStyle(),
@@ -1488,18 +1488,19 @@ class SharedPDFService {
             // { text: 'CGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'CGST' },
             // { text: 'SGST', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'SGST' },
             // { text: 'Count', style: 'tableheader', fontSize: 6, lineHeight: 0.3, Field: 'PartsCount' },
-            { text: 'Taxable Value', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxableAmount' },
-            { text: 'Tax Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxAmount' },
+            { text: 'Tax Rate', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CombinedTaxPercentage', alignment: 'center' },
+            { text: 'Taxable Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxableAmount', alignment: 'right' },
+            // { text: 'Tax Amount', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'TotalTaxAmount' },
         ];
         if (ShowIGST) {
-            HeaderNames.splice(1, 0, { text: 'IGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'IGST' });
-            HeaderNames.splice(2, 0, { text: 'IGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'IGSTAmt' });
+            // HeaderNames.splice(1, 0, { text: 'IGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'IGST' });
+            HeaderNames.splice(2, 0, { text: 'IGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'IGSTAmt', alignment: 'right' });
         }
         else {
-            HeaderNames.splice(1, 0, { text: 'CGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
-            HeaderNames.splice(2, 0, { text: 'CGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGSTAmt' });
-            HeaderNames.splice(3, 0, { text: 'SGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
-            HeaderNames.splice(4, 0, { text: 'SGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'SGSTAmt' });
+            // HeaderNames.splice(1, 0, { text: 'CGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
+            HeaderNames.splice(2, 0, { text: 'CGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGSTAmt', alignment: 'right' });
+            // HeaderNames.splice(3, 0, { text: 'SGST(%)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'CGST' });
+            HeaderNames.splice(3, 0, { text: 'SGST(Rs.)', style: 'tableheader2', fontSize: 6, lineHeight: 0.3, Field: 'SGSTAmt', alignment: 'right' });
         }
         return HeaderNames;
     }
@@ -1514,9 +1515,12 @@ class SharedPDFService {
                     if (!tr_utils_1.TrUtils.IsFixedZero(part[column.Field]) &&
                         !tr_utils_1.TrUtils.IsNull(part[column.Field]) || column.Field === 'SGST' || column.Field === 'CGST' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt'
                         || column.Field === 'TotalTaxAmount') {
-                        if (column.Field === 'SGSTLaborAmt') {
+                        if (column.Field === 'TotalTaxAmount' || column.Field === 'SGSTAmt' || column.Field === 'CGSTAmt' || column.Field === 'IGSTAmt') {
                             dataRow.push({ text: part[column.Field].toString(), alignment: 'right', opacity: 0.7, nowrap: true, fontSize: 6 });
                         }
+                        else if (column.Field === 'CombinedTaxPercentage') {
+                            dataRow.push({ text: part[column.Field].toString() + '%', alignment: 'center', opacity: 0.7, nowrap: true, fontSize: 6 });
+                        }
                         else {
                             dataRow.push({ text: part[column.Field].toString(), alignment: 'center', opacity: 0.7, nowrap: true, fontSize: 6 });
                         }
@@ -1613,16 +1617,15 @@ class SharedPDFService {
                 totalDisc = tr_utils_1.TrUtils.FixPriceValue((0, aggregation_1.addition)(Number(OverAllMainLaborDiscount), Number(OverAllMainPartsDiscount)), RecordData.Entity.DecimalsNumber);
             }
         }
-        let serviceName;
-        let itemName;
-        if (isAuto) {
-            serviceName = 'Labor Tax';
-            itemName = 'Parts Tax';
-        }
-        else {
-            serviceName = 'Service Tax';
-            itemName = 'Items Tax';
-        }
+        // let serviceName: string;
+        // let itemName: string;
+        // if (isAuto) {
+        //   serviceName = 'Labor Tax';
+        //   itemName = 'Parts Tax';
+        // } else {
+        //   serviceName = 'Service Tax';
+        //   itemName = 'Items Tax';
+        // }
         return {
             columns: [
                 // this.GetTaxOnLabor(BasicLaborTotal, OverAllMainLaborDiscount, LCGST,
@@ -1632,10 +1635,11 @@ class SharedPDFService {
                     stack: [
                         // this.GetTaxOnParts(BasicPartsTotal, OverAllMainPartsDiscount, PCGST,
                         //   PSGST, ShowAccParts, PIGST, ShowIGST, ShowTaxColumn, ShowDetailedPartTaxInfo, From),
-                        { text: (istaxable && CustLaborTaxGroupDataByPerc.length !== 0) ? serviceName : '', fontSize: 7, opacity: 0.8 },
+                        // { text: (istaxable && CustLaborTaxGroupDataByPerc.length !== 0) ? serviceName : '', fontSize: 7, opacity: 0.8 },
                         this.PartsTaxAmounts1(CustLaborTaxGroupDataByPerc, ShowAccParts, ShowIGST, ShowTaxColumn),
-                        { text: (istaxable && PartsTaxInfo.length !== 0) ? itemName : '', fontSize: 7, opacity: 0.8 },
-                        this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST, ShowTaxColumn)
+                        // { text: (istaxable && PartsTaxInfo.length !== 0) ? itemName : '', fontSize: 7, opacity: 0.8 },
+                        // this.PartsTaxAmounts1(PartsTaxInfo, ShowAccParts, ShowIGST,
+                        //   ShowTaxColumn)
                     ]
                 },
                 // { text: '', width: 60 },
@@ -2228,8 +2232,8 @@ class SharedPDFService {
         return {
             columns: [{
                     stack: [
-                        this.CompanyName(CName),
-                        { columns: [this.Authorizedsignature(), this.SurveyorSignature(For, Type), this.CustomerSignature()] }
+                        { text: this.CompanyName(CName), alignment: 'right' },
+                        { columns: [this.CustomerSignature(), this.SurveyorSignature(For, Type), this.Authorizedsignature()] }
                     ]
                 }],
         };
@@ -2238,8 +2242,8 @@ class SharedPDFService {
         return {
             columns: [{
                     stack: [
-                        this.CompanyName(CName),
-                        { columns: [this.Authorizedsignature(), this.SparesSignature(isCounterSale), this.CustomerSignature()] }
+                        { text: this.CompanyName(CName), alignment: 'right' },
+                        { columns: [this.CustomerSignature(), this.SparesSignature(isCounterSale), this.Authorizedsignature()] }
                     ]
                 }],
         };
@@ -2248,8 +2252,8 @@ class SharedPDFService {
         return {
             columns: [{
                     stack: [
-                        this.CompanyName(CName),
-                        { columns: [this.Authorizedsignature(), this.SparesSignature(isCounterSale), this.PatientSignature()] }
+                        { text: this.CompanyName(CName), alignment: 'right' },
+                        { columns: [this.PatientSignature(), this.SparesSignature(isCounterSale), this.Authorizedsignature()] }
                     ]
                 }],
         };
@@ -2258,7 +2262,7 @@ class SharedPDFService {
         if (CounterSale) {
             return {
                 style: 'Sign',
-                text: ['Parts Incharge Signature'], marginLeft: 90
+                text: ['Parts Incharge Signature'], width: '*'
             };
         }
         else {
@@ -2275,33 +2279,33 @@ class SharedPDFService {
     static Authorizedsignature() {
         return {
             style: 'Sign',
-            text: ['Authorized Signature'],
+            text: ['Authorized Signature'], width: 'auto'
         };
     }
     static Accountantsignature() {
         return {
             style: 'Sign',
             text: ['Accountant Signature'],
-            marginLeft: 90
+            width: '*'
         };
     }
     static CustomerSignature() {
         return {
             style: 'Sign',
-            text: ['Customer Signature'], marginLeft: 90
+            text: ['Customer Signature'], width: '*'
         };
     }
     static PatientSignature() {
         return {
             style: 'Sign',
-            text: ['Patient Signature'], marginLeft: 90
+            text: ['Patient Signature'], width: '*'
         };
     }
     static SurveyorSignature(For, Type) {
         if (For === enums_1.PayTypeEnum.Insurance && Type === 'Estimate') {
             return {
                 style: 'Sign',
-                text: ['Surveyor Signature'], marginLeft: 90
+                text: ['Surveyor Signature'], width: '*'
             };
         }
         else {

package/package.json

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