shareneus 1.5.22 → 1.5.24

package/dist/accounting/payment-receive/payment-pdf.service.d.ts

@@ -479,7 +479,7 @@ export declare class ReceiptPDFService {
             }[];
         })[];
     };
-    static GetTowards(Ids: any, IsRepairOrder: boolean, Sts: any, RemAmt: any): {
+    static GetTowards(Ids: any, IsRepairOrder: boolean, Sts: any, RemAmt: any, RefundAmt: any): {
         columns: {
             stack: ({
                 text: ({

package/dist/accounting/payment-receive/payment-pdf.service.js

@@ -25,7 +25,7 @@ class ReceiptPDFService {
                 this.GetPayment(ReceiptData.PaymentId, isHC),
                 this.GetName(ReceiptData.FullName),
                 this.GetRupee(ReceiptData.TotalAmount),
-                this.GetTowards(ReceiptData.Ids, ReceiptData.RepairOrder, ReceiptData.Sts, ReceiptData.RemAmt),
+                this.GetTowards(ReceiptData.Ids, ReceiptData.RepairOrder, ReceiptData.Sts, ReceiptData.RemAmt, ReceiptData.RefundAmount),
                 this.GetAmount(ReceiptData.PaymentType, ReceiptData.TypeNumber, ReceiptData.PaidDate),
                 // this.GetDrawDate(ReceiptData.PaymentType,ReceiptData.PaidDate),
                 this.GetCompanyName(ReceiptData.Entity.CName),
@@ -180,12 +180,12 @@ class ReceiptPDFService {
             ]
         };
     }
-    static GetTowards(Ids, IsRepairOrder, Sts, RemAmt) {
+    static GetTowards(Ids, IsRepairOrder, Sts, RemAmt, RefundAmt) {
         let data = '';
         let toward = '';
         for (let i = 0; i < Ids.length; i++) {
             if (i + 1 < Ids.length) {
-                data = data + Ids[i] + ',';
+                data = data + Ids[i] + ', ';
             }
             else {
                 data = data + Ids[i];
@@ -197,6 +197,9 @@ class ReceiptPDFService {
             }
             else {
                 toward = 'INVOICE - ' + data;
+                if (RefundAmt > 0) {
+                    toward += ' (refunded Rs.' + RefundAmt + ' )';
+                }
                 if (RemAmt > 0) {
                     toward += ' (remaining Rs.' + RemAmt + ' as advance)';
                 }

package/dist/accounting/payment-receive/receipt-print.service.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReceiptPrintService = void 0;
+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");
 class ReceiptPrintService {
     static GetReceiptPrint(argPaymentViewData, EntityData, image) {
+        var _a;
         let PaymentViewData = tr_utils_1.TrUtils.Stringify(argPaymentViewData);
         let ReceiptData = {};
         ReceiptData.Entity = shared_print_service_1.PrintSharedService.GetFormattedEntityDataForPrint(EntityData, "Receipt", argPaymentViewData);
@@ -25,6 +27,14 @@ class ReceiptPrintService {
         }
         ReceiptData.TotalAmount = PaymentViewData.Amt;
         ReceiptData.RemAmt = PaymentViewData.RemAmt;
+        let Refunds = (_a = PaymentViewData === null || PaymentViewData === void 0 ? void 0 : PaymentViewData.AllocRefs) === null || _a === void 0 ? void 0 : _a.filter((ref) => ref.Type === 'CR');
+        if (!tr_utils_1.TrUtils.IsNull(Refunds) && Refunds.length > 0) {
+            let Amount = 0;
+            for (let i = 0; i < Refunds.length; i++) {
+                Amount = (0, math_operations_1.Add)(Amount, Refunds[i].Amt);
+            }
+            ReceiptData.RefundAmount = Amount;
+        }
         ReceiptData.PaidDate = my_date_1.MyDate.ConvertUTCDateToReadable(PaymentViewData.Date);
         ReceiptData.Ids = this.GetRecordIds(PaymentViewData);
         ReceiptData.Type = 'Receipt';
@@ -34,13 +44,24 @@ class ReceiptPrintService {
         return ReceiptData;
     }
     static GetRecordIds(PaymentViewData) {
+        var _a;
         let IdList = [];
         var i = 0;
         if (!tr_utils_1.TrUtils.IsNull(PaymentViewData.AllocRefs) && PaymentViewData.AllocRefs.length !== 0) {
-            for (i = 0; i < PaymentViewData.AllocRefs.length; i++) {
-                let Id = PaymentViewData.AllocRefs[i].Code;
-                if (!tr_utils_1.TrUtils.IsNull(PaymentViewData.AllocRefs[i].RegNo)) {
-                    Id = Id + '(' + PaymentViewData.AllocRefs[i].RegNo + ')';
+            let Invoices = (_a = PaymentViewData === null || PaymentViewData === void 0 ? void 0 : PaymentViewData.AllocRefs) === null || _a === void 0 ? void 0 : _a.filter((ref) => ref.Type === 'INV');
+            for (i = 0; i < Invoices.length; i++) {
+                let Id = Invoices[i].Code;
+                if (!tr_utils_1.TrUtils.IsNull(Invoices[i].RegNo)) {
+                    Id = Id + '(' + Invoices[i].RegNo + ')';
+                }
+                IdList.push(Id);
+            }
+        }
+        if (!tr_utils_1.TrUtils.IsNull(PaymentViewData.Invs) && PaymentViewData.Invs.length !== 0) {
+            for (i = 0; i < PaymentViewData.Invs.length; i++) {
+                let Id = PaymentViewData.Invs[i].Code;
+                if (!tr_utils_1.TrUtils.IsNull(PaymentViewData.Invs[i].RegNo)) {
+                    Id = Id + '(' + PaymentViewData.Invs[i].RegNo + ')';
                 }
                 IdList.push(Id);
             }

package/package.json

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