shareneus 1.6.53 → 1.6.55

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

@@ -182,7 +182,7 @@ class InvoiceTotalsService {
         let CustPartsTotalAfterDisc1 = this.GetPartsAfterDiscount1(PartsList);
         let AmtAfterIndvidualItemDisc = (0, math_operations_1.Add)(CustLaborTotalAfterDisc1, CustPartsTotalAfterDisc1);
         finalTotalsData.SIndTotal = AmtAfterIndvidualItemDisc;
-        finalTotalsData.Disc = !tr_utils_1.TrUtils.IsZero(finalTotalsData.Perc) ? tr_utils_1.TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
+        // finalTotalsData.Disc = !TrUtils.IsZero(finalTotalsData.Perc) ? TrUtils.ConvertPercToVal(finalTotalsData.Perc, AmtAfterIndvidualItemDisc, DecimalsNumber) : finalTotalsData.Disc;
         let CustTotal = this.GetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, CustPartTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust);
         let RetCustTotal = this.GetRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, RetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);
         let NonRetCustTotal = this.GetNonRetCustomerTotalBasedOnTaxType(finalTotalsData, CustLaborTaxTotal, NonRetCustParrtTaxTotal, LaborList, PartsList, IsIndependentTax, Adjust, DecimalsNumber);

package/dist/purchases/purchase-order/purchase-order-print.service.d.ts

@@ -1,6 +1,7 @@
 export declare class PurchaseOrderPrintService {
     static GetDataForPurchaseOrderPrint(argPurchaseOrderData: any, EntityData: any, image: any, VendorData: any, TaxCodes: any, IsFormPO: boolean): any;
     static GetLaborPrintInfo(LaborList: any, TaxCodes: any, LineTotal: string, DecimalsNumber: number): any;
+    static GetPaymentsTotal(Credits: any, BillPayments: any, Total: number, BillStatus: string, DecimalsNumber: number): any;
     static GetVendorDataForPrint(argVendorData: any): any;
     static GetQtyWithUoM(Items: any): any;
     static ConcatTotalsInfo(PurchaseOrderPDFData: any, DetailedTotalsInfo: any): any;

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PurchaseOrderPrintService = void 0;
 const aggregation_1 = require("../../aggregation/aggregation");
 const code_enums_1 = require("../../enums/code-enums");
+const enums_1 = require("../../enums/enums");
+const math_operations_1 = require("../../shared/math-operations");
 const shared_print_service_1 = require("../../shared/shared-print.service");
 const my_date_1 = require("../../utils/my-date");
 const tr_utils_1 = require("../../utils/tr-utils");
@@ -65,7 +67,9 @@ class PurchaseOrderPrintService {
                 PurchaseOrderPDFData.HeaderName = 'Expense';
             }
             else {
+                let PaymentData = this.GetPaymentsTotal(PurchaseOrderData.Credits, PurchaseOrderData.Payments, PurchaseOrderData.Total, PurchaseOrderData.Sts, PurchaseOrderData.Entity.DecimalsNumber);
                 PurchaseOrderPDFData.HeaderName = 'Bill';
+                PurchaseOrderPDFData.Due = PaymentData.Due;
             }
         }
         PurchaseOrderPDFData.Vendor = this.GetVendorDataForPrint(tr_utils_1.TrUtils.Stringify(VendorData));
@@ -104,6 +108,26 @@ class PurchaseOrderPrintService {
         });
         return LaborList;
     }
+    static GetPaymentsTotal(Credits, BillPayments, Total, BillStatus, DecimalsNumber) {
+        const payments = Array.isArray(BillPayments) ? BillPayments : [];
+        const credits = Array.isArray(Credits) ? Credits : [];
+        const paymentsTotal = payments.reduce((total, payment) => total + tr_utils_1.TrUtils.SetValueToZeroIfNull(payment === null || payment === void 0 ? void 0 : payment.Paid), 0);
+        const creditsTotal = credits.reduce((total, credit) => total + tr_utils_1.TrUtils.SetValueToZeroIfNull(credit === null || credit === void 0 ? void 0 : credit.Amt), 0);
+        const paidTotal = paymentsTotal + creditsTotal;
+        const isPaid = BillStatus === enums_1.BillStatusEnum.Paid;
+        let due = isPaid ? 0 : tr_utils_1.TrUtils.FixedTo((0, math_operations_1.Subtract)(Total, paidTotal), DecimalsNumber);
+        if (due < 0) {
+            due = 0;
+        }
+        const data = {
+            Due: due,
+            Paid: tr_utils_1.TrUtils.FixedTo(paidTotal, DecimalsNumber)
+        };
+        if (due === 0) {
+            data.Sts = enums_1.BillStatusEnum.Closed;
+        }
+        return data;
+    }
     static GetVendorDataForPrint(argVendorData) {
         if (tr_utils_1.TrUtils.IsNull(argVendorData)) {
             return null;

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

@@ -801,7 +801,7 @@ class PrintSharedService {
         }
         else {
             if (ShowDiscountColumn) {
-                return [25, 210, 40, 70, 40, 40, 70];
+                return [25, 210, 40, 75, 40, 40, 80];
             }
             else {
                 return [25, 308, 52, 65, 80];

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

@@ -4,6 +4,7 @@ exports.buildInvoiceTotalsAndNotesSection = buildInvoiceTotalsAndNotesSection;
 exports.buildSignatureSection = buildSignatureSection;
 const pdf_header_footer_section_1 = require("../header-footer-section/pdf-header-footer.section");
 const pdf_shared_utils_1 = require("../header-footer-section/pdf-shared.utils");
+const math_operations_1 = require("../math-operations");
 const pdf_table_section_1 = require("../table-section/pdf-table.section");
 function buildInvoiceTotalsAndNotesSection(invoiceData, availableWidth, PrintConfigData = {}) {
     var _a;
@@ -507,7 +508,7 @@ function resolveTotals(invoiceData, totalTax, printConfigData = {}) {
             { label: 'Overall Discount', amount: overallDiscount }
         ]
         : [
-            { label: 'Discount', amount: overalItemsDiscount + overalServicesDiscount }
+            { label: 'Discount', amount: (0, math_operations_1.Add)(overalItemsDiscount, overalServicesDiscount) }
         ])
         .filter((line) => Math.abs(parseNumber(line === null || line === void 0 ? void 0 : line.amount)) > 0);
     const totalLines = [

package/package.json

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