shareneus 1.5.20 → 1.5.22

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

@@ -479,7 +479,7 @@ export declare class ReceiptPDFService {
             }[];
         })[];
     };
-    static GetTowards(Ids: any, IsRepairOrder: boolean): {
+    static GetTowards(Ids: any, IsRepairOrder: boolean, Sts: any, RemAmt: 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),
+                this.GetTowards(ReceiptData.Ids, ReceiptData.RepairOrder, ReceiptData.Sts, ReceiptData.RemAmt),
                 this.GetAmount(ReceiptData.PaymentType, ReceiptData.TypeNumber, ReceiptData.PaidDate),
                 // this.GetDrawDate(ReceiptData.PaymentType,ReceiptData.PaidDate),
                 this.GetCompanyName(ReceiptData.Entity.CName),
@@ -180,7 +180,7 @@ class ReceiptPDFService {
             ]
         };
     }
-    static GetTowards(Ids, IsRepairOrder) {
+    static GetTowards(Ids, IsRepairOrder, Sts, RemAmt) {
         let data = '';
         let toward = '';
         for (let i = 0; i < Ids.length; i++) {
@@ -197,6 +197,9 @@ class ReceiptPDFService {
             }
             else {
                 toward = 'INVOICE - ' + data;
+                if (RemAmt > 0) {
+                    toward += ' (remaining Rs.' + RemAmt + ' as advance)';
+                }
             }
         }
         else {

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

@@ -24,6 +24,7 @@ class ReceiptPrintService {
             ReceiptData.TypeNumber = '';
         }
         ReceiptData.TotalAmount = PaymentViewData.Amt;
+        ReceiptData.RemAmt = PaymentViewData.RemAmt;
         ReceiptData.PaidDate = my_date_1.MyDate.ConvertUTCDateToReadable(PaymentViewData.Date);
         ReceiptData.Ids = this.GetRecordIds(PaymentViewData);
         ReceiptData.Type = 'Receipt';
@@ -35,11 +36,11 @@ class ReceiptPrintService {
     static GetRecordIds(PaymentViewData) {
         let IdList = [];
         var i = 0;
-        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 + ')';
+        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 + ')';
                 }
                 IdList.push(Id);
             }

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

@@ -160,6 +160,7 @@ function SalesTotalCalculations(items = [], ops = [], isTaxable = false, taxCode
         returnSubtotal,
         returnTax,
         returnTotal,
+        returnTotalDiscount,
         nonReturnSubTotal,
         nonReturnTax,
         nonReturnTotal,
@@ -205,10 +206,12 @@ function SalesTotalCalculationsWithDecimals(items = [], ops = [], isTaxable = fa
         subtotalOnLabor: roundToDecimals(result.subtotalOnLabor),
         totalDiscountOnItems: roundToDecimals(result.totalDiscountOnItems),
         totalDiscountOnLabor: roundToDecimals(result.totalDiscountOnLabor),
+        // returned related fields
         netAmountAfterDiscount: roundToDecimals(result.netAmountAfterDiscount),
         returnSubtotal: roundToDecimals(result.returnSubtotal),
         returnTax: roundToDecimals(result.returnTax),
         returnTotal: roundToDecimals(result.returnTotal),
+        returnTotalDiscount: roundToDecimals(result.returnTotalDiscount),
         nonReturnSubTotal: roundToDecimals(result.nonReturnSubTotal),
         nonReturnTax: roundToDecimals(result.nonReturnTax),
         nonReturnTotal: roundToDecimals(result.nonReturnTotal),

package/package.json

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