shareneus 1.5.12 → 1.5.14

package/dist/purchases/purchase-order/purchase-order-totals.service.js

@@ -105,9 +105,7 @@ class PurchaseOrderTotalsService {
             if (tr_utils_1.TrUtils.IsNull(Part.Ind)) {
                 Part.DiscountedPrice = this.GetPartDiscountedPrice(Part.Disc, Part.RecDisc);
                 // Part.AfterDiscountPrice = Part.NetAmt;
-                console.log('Part total', Part.UnAmt, Part.Disc, Part.RecDisc);
                 Part.AfterDiscountPrice = (0, math_operations_1.Subtract)(Part.UnAmt, Part.Disc, Part.RecDisc);
-                console.log('After discount', Part.AfterDiscountPrice);
             }
             Part.GSTAmt = (0, math_operations_1.Add)(Part.SGST, Part.CGST, Part.IGST);
             Part.Desc = Part.Name;
@@ -161,7 +159,6 @@ class PurchaseOrderTotalsService {
     static GetTotalsInfo(PartsList, LaborList, IsTaxable, TaxCodes, HasNoTax, GetSubTotal, Discount, DiscInPerc, Adjust, DecimalsNumber) {
         let finalTotalsData = {};
         let PartsInfo = this.GetPartsTotalTaxAndAfterDiscount(PartsList);
-        console.log('PartsInfo', tr_utils_1.TrUtils.Stringify(PartsInfo));
         let PartsTotalAfterDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartsInfo[0]);
         let PartsDiscTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartsInfo[1]);
         let PartsTaxTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(PartsInfo[2]);
@@ -169,7 +166,6 @@ class PurchaseOrderTotalsService {
         let ServicesTotalAfterDisc = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[0]);
         let ServicesDiscTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[1]);
         let ServicesTaxTotal = tr_utils_1.TrUtils.SetValueToZeroIfNull(ServicesInfo[2]);
-        console.log('Subtotal', PartsTotalAfterDisc, PartsDiscTotal, ServicesTotalAfterDisc, ServicesDiscTotal);
         finalTotalsData.SubTotal = (0, math_operations_1.Add)(PartsTotalAfterDisc, PartsDiscTotal, ServicesTotalAfterDisc, ServicesDiscTotal);
         finalTotalsData.Adj = tr_utils_1.TrUtils.FixPriceValue(Adjust, DecimalsNumber);
         // if (GetSubTotal) {
@@ -208,7 +204,6 @@ class PurchaseOrderTotalsService {
         let PartsDiscountedTotal = 0;
         let TotalTaxAmt = 0;
         PartsList.forEach((Part) => {
-            console.log('Part', Part.AfterDiscountPrice, Part.DiscountedPrice, Part.GSTAmt);
             PartsTotalAfterDisc = (0, math_operations_1.Add)(PartsTotalAfterDisc, Part.AfterDiscountPrice);
             PartsDiscountedTotal = (0, math_operations_1.Add)(PartsDiscountedTotal, Part.DiscountedPrice);
             TotalTaxAmt = (0, math_operations_1.Add)(TotalTaxAmt, Part.GSTAmt);

package/dist/sales-receive/sales-total-calculation.d.ts

@@ -1,6 +1,6 @@
-export declare function SalesTotalCalculations(items?: any[], ops?: any[], isTaxable?: boolean, taxCodes?: any[]): any;
+export declare function SalesTotalCalculations(items?: any[], ops?: any[], isTaxable?: boolean, taxCodes?: any[], Adjust?: number): any;
 /**
  * Enhanced version with decimal places control
  */
-export declare function SalesTotalCalculationsWithDecimals(items?: any[], ops?: any[], isTaxable?: boolean, taxCodes?: any[], decimalPlaces?: number): any;
+export declare function SalesTotalCalculationsWithDecimals(items: any[] | undefined, ops: any[] | undefined, isTaxable: boolean | undefined, taxCodes: any[] | undefined, Adjust: number, decimalPlaces?: number): any;
 export declare function CalculateTaxSummary(items: any[], taxCodes: any[]): unknown[];

package/dist/sales-receive/sales-total-calculation.js

@@ -11,7 +11,7 @@ const util_1 = require("../shared/util");
 function safeArray(arr) {
     return Array.isArray(arr) ? arr : [];
 }
-function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCodes = []) {
+function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCodes = [], Adjust = 0) {
     // Handle null/undefined arrays
     const safeItems = safeArray(items);
     const safeOps = safeArray(ops);
@@ -92,6 +92,7 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
     const netAmountAfterDiscount = (0, math_operations_1.Subtract)(subtotal, totalDiscount);
     // Step 2: Add tax if taxable
     total = isTaxable ? (0, math_operations_1.Add)(netAmountAfterDiscount, totalTax) : netAmountAfterDiscount;
+    total = (0, math_operations_1.Add)(total, (0, util_1.GetNumber)(Adjust));
     // FIXED ROUNDING: Use Math.round instead of Math.floor
     const roundedTotal = Math.round(total);
     roundOff = (0, math_operations_1.Subtract)(roundedTotal, total);
@@ -133,8 +134,8 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
 /**
  * Enhanced version with decimal places control
  */
-function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = false, taxCodes = [], decimalPlaces = 2) {
-    const result = SalesTotalCalculations(items, ops, isTaxable, taxCodes);
+function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = false, taxCodes = [], Adjust, decimalPlaces = 2) {
+    const result = SalesTotalCalculations(items, ops, isTaxable, taxCodes, Adjust);
     // Round all values to specified decimal places
     const roundToDecimals = (num) => Math.round(num * Math.pow(10, decimalPlaces)) / Math.pow(10, decimalPlaces);
     // Base rounded result

package/dist/services/reports/excel/next-service-date-excel.service.d.ts

@@ -17,6 +17,7 @@ export declare class NextServiceDateXlsxFileService {
     static GetTotals(MainData: any): any;
     static setHeadingInCell(HeaderName: any, showSearch: any, isDetails: boolean): void;
     static setInvoiceDetailsInCell(MainData: any, isDetails: boolean, DecimalsNumber: number): void;
+    static PhoneGetter(Customer: any): any;
     static SetInvoiceDataInExcel(InvoiceInfo: any, isDetails: boolean, DecimalsNumber: number): void;
     static ConvertDateToReadableFormat(DateObject: any): any;
     static ConvertToString(Text: any, IsString: any, DecimalsNumber: number): any;

package/dist/services/reports/excel/next-service-date-excel.service.js

@@ -96,6 +96,12 @@ class NextServiceDateXlsxFileService {
                 bold: true,
                 ChildHeadings: [],
             },
+            {
+                text: 'Mobile No',
+                ColRange: 1,
+                bold: true,
+                ChildHeadings: [],
+            },
             {
                 text: 'Reg. No',
                 ColRange: 1,
@@ -194,6 +200,15 @@ class NextServiceDateXlsxFileService {
             this.SetInvoiceDataInExcel(InvoiceList, isDetails, DecimalsNumber);
         });
     }
+    static PhoneGetter(Customer) {
+        if (!tr_utils_1.TrUtils.IsEmpty(Customer) && !tr_utils_1.TrUtils.IsEmpty(Customer.Cons) &&
+            !tr_utils_1.TrUtils.IsNull(Customer.Cons.Phones)) {
+            return Customer.Cons.Phones.Main;
+        }
+        else {
+            return '';
+        }
+    }
     static SetInvoiceDataInExcel(InvoiceInfo, isDetails, DecimalsNumber) {
         var _a;
         InvoiceInfo.LSDate = this.ConvertDateToReadableFormat(InvoiceInfo.LSDate);
@@ -201,6 +216,7 @@ class NextServiceDateXlsxFileService {
         InvoiceInfo.DDate = this.ConvertDateToReadableFormat(InvoiceInfo.DDate);
         let InvoiceData = [
             { text: (_a = InvoiceInfo.Customer) === null || _a === void 0 ? void 0 : _a.DName, ColRange: 1, IsString: true },
+            { text: this.PhoneGetter(InvoiceInfo.Customer), ColRange: 1, IsString: true },
             { text: InvoiceInfo.RegNo, ColRange: 1, IsString: true },
             { text: InvoiceInfo.Make + '' + InvoiceInfo.Model + '' + InvoiceInfo.Var, ColRange: 1, IsString: false },
             { text: InvoiceInfo.DDate, ColRange: 1, IsString: false },

package/dist/services/reports/pdf/next-service-date-pdf.service.d.ts

@@ -223,6 +223,7 @@ export declare class NextServiceDatePDFService {
             vLineColor: (i: any, node: any) => string;
         };
     };
+    static PhoneGetter(Customer: any): any;
     static BuildTableBodyForLaborAndParts(InvoiceData: any): any;
     static GetHeaderNames(): any;
 }

package/dist/services/reports/pdf/next-service-date-pdf.service.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NextServiceDatePDFService = void 0;
 const shared_pdf_service_1 = require("../../../shared/shared-pdf.service");
 const my_date_1 = require("../../../utils/my-date");
+const tr_utils_1 = require("../../../utils/tr-utils");
 class NextServiceDatePDFService {
     static GetNextServiceDatePrint(InvoicesData, CName, searchValue) {
         var dd = {
@@ -34,7 +35,7 @@ class NextServiceDatePDFService {
         // if (isHC) {
         //     return [25, '*', '*', '*', '*'];
         // } else {
-        return [25, '*', '*', '*', '*', '*', '*', '*'];
+        return [20, '*', '*', '*', '*', '*', '*', '*', '*'];
         // }
     }
     static GetItemsTable(InvoiceData) {
@@ -69,6 +70,15 @@ class NextServiceDatePDFService {
         };
         // });
     }
+    static PhoneGetter(Customer) {
+        if (!tr_utils_1.TrUtils.IsEmpty(Customer) && !tr_utils_1.TrUtils.IsEmpty(Customer.Cons) &&
+            !tr_utils_1.TrUtils.IsNull(Customer.Cons.Phones)) {
+            return Customer.Cons.Phones.Main;
+        }
+        else {
+            return '';
+        }
+    }
     static BuildTableBodyForLaborAndParts(InvoiceData) {
         let body = this.GetHeaderNames();
         // let Row: any = [{ text: InvoiceData.Name, alignment: 'left', colSpan: isHC ? 5 : 8, bold: true, fontSize: 12 }, {}, {}, {}, {}];
@@ -104,6 +114,7 @@ class NextServiceDatePDFService {
             // } else {
             dataRow.push({ text: index + 1 });
             dataRow.push({ text: invoice.Customer.DName });
+            dataRow.push({ text: this.PhoneGetter(invoice.Customer) });
             dataRow.push({ text: invoice.RegNo });
             dataRow.push({ text: invoice.Make + '' + invoice.Model + '' + invoice.Var });
             // if(!isHC){
@@ -147,6 +158,7 @@ class NextServiceDatePDFService {
         // } else {
         HeadingNames = [[{ text: 'S.No', style: 'tableheader1', Field: 'SNo', alignment: 'left', line: true },
                 { text: 'Customer Name', style: 'tableheader1', Field: 'Desc', alignment: 'left' },
+                { text: 'Mobile No', style: 'tableheader1', Field: 'MobileNo', alignment: 'left' },
                 { text: 'Reg. No', style: 'tableheader1', Field: 'Batch', alignment: 'left' },
                 { text: 'Vehicle', style: 'tableheader1', Field: 'Round', alignment: 'left' },
                 { text: 'Sale Date', style: 'tableheader1', Field: 'Total', alignment: 'left' },

package/package.json

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