From 798660abb2cd230a9a8c5bc74bdd26260d3598e1 Mon Sep 17 00:00:00 2001
From: AbleKSaju <126228406+AbleKSaju@users.noreply.github.com>
Date: Tue, 29 Jul 2025 11:04:17 +0530
Subject: [PATCH] refactor: improve loyalty points handling for invoice returns

---
 models/baseModels/Invoice/Invoice.ts | 48 ++++++++++++++++------------
 1 file changed, 28 insertions(+), 20 deletions(-)

diff --git a/models/baseModels/Invoice/Invoice.ts b/models/baseModels/Invoice/Invoice.ts
index b07f28c4..6dcccfea 100644
--- a/models/baseModels/Invoice/Invoice.ts
+++ b/models/baseModels/Invoice/Invoice.ts
@@ -59,6 +59,13 @@ export type TaxDetail = {
   rate: number;
 };
 
+export type ReturnedItemData =
+  | number
+  | {
+      quantity?: number;
+      batches?: Record<string, number>;
+    };
+
 export type InvoiceTaxItem = {
   details: TaxDetail;
   exchangeRate?: number;
@@ -684,34 +691,30 @@ export abstract class Invoice extends Transactional {
     );
 
     for (const item of docItems) {
-      const itemName = item.item as string;
-
-      let balQuantity: number;
-      if (!returnBalanceItemsQty) {
+      if (totalQtyOfReturnedItems) {
         if (item.batch) {
           const returnData = totalQtyOfReturnedItems[item.item as string];
-
           if (typeof returnData === 'object' && returnData?.batches) {
-            balQuantity = -returnData.batches[item.batch as string] || 0;
+            returnDocItems = docItems.map((docItem) => ({
+              ...docItem,
+              name: undefined,
+              quantity: -returnData?.batches![docItem.batch as string] || 0,
+            }));
           }
         } else {
-          balQuantity = -(totalQtyOfReturnedItems[itemName] || 0);
+          returnDocItems = docItems.map((docItem) => ({
+            ...docItem,
+            name: undefined,
+            quantity: -(totalQtyOfReturnedItems[docItem.item as string] || 0),
+          }));
         }
 
-        const returnDocs = docItems.map((docItem) => ({
-          ...docItem,
-          name: undefined,
-          quantity: balQuantity,
-        }));
-
-        returnDocItems.push(returnDocs[0]);
-
         for (const row of returnDocItems) {
           row.itemDiscountedTotal = await this.getItemsDiscountedTotal(
             row as InvoiceItem
           );
         }
-        continue;
+        break;
       }
 
       const isItemExist = !!returnDocItems.filter(
@@ -723,7 +726,7 @@ export abstract class Invoice extends Transactional {
       }
 
       const returnedItem: ReturnDocItem | undefined =
-        returnBalanceItemsQty[item.item as string];
+        returnBalanceItemsQty![item.item as string];
 
       if (!returnedItem) {
         continue;
@@ -746,12 +749,15 @@ export abstract class Invoice extends Transactional {
               '\n'
             );
         }
-        const returnedItemsData = totalQtyOfReturnedItems[itemName];
+        const returnedItemsData = totalQtyOfReturnedItems[
+          item.item as string
+        ] as ReturnedItemData;
+
         if (
           typeof returnedItemsData === 'object' &&
-          returnedItemsData?.batches
+          returnedItemsData.batches
         ) {
-          quantity = -returnedItemsData?.batches?.[item.batch as string];
+          quantity = -returnedItemsData?.batches[item.batch as string];
           transferQuantity = quantity / (item.unitConversionFactor as number);
         }
       }
@@ -925,6 +931,7 @@ export abstract class Invoice extends Transactional {
 
       return baseTotal.sub(totalLoyaltyAmount);
     }
+
     if (this.isReturn) {
       const loyaltyAmount = await getReturnLoyaltyPoints(this);
 
@@ -941,6 +948,7 @@ export abstract class Invoice extends Transactional {
 
     return baseTotal;
   }
+
   formulas: FormulaMap = {
     account: {
       formula: async () => {