From d413bd771b8079f0d788e5c2c8a7d31932cc601c Mon Sep 17 00:00:00 2001
From: Aswin Ashar Abdullah <asharaswin@gmail.com>
Date: Thu, 1 Aug 2024 17:25:12 +0700
Subject: [PATCH] fix(SPG-735) Ketika recap di click berkali kali, transaksi
 menggunakan tipe cash jadi duplicate

---
 .../managers/index-reconciliation.manager.ts  |  1 +
 .../managers/recap-reconciliation.manager.ts  | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
index 72a21e8..ebb2c92 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/index-reconciliation.manager.ts
@@ -48,6 +48,7 @@ export class IndexReconciliationManager extends BaseIndexManager<TransactionEnti
       `${this.tableName}.customer_name`,
       `${this.tableName}.creator_counter_no`,
 
+      `${this.tableName}.invoice_code`,
       `${this.tableName}.booking_date`,
       `${this.tableName}.payment_type`,
       `${this.tableName}.payment_type_method_id`,
diff --git a/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts b/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts
index 9034f70..82343a2 100644
--- a/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts
+++ b/src/modules/transaction/reconciliation/domain/usecases/managers/recap-reconciliation.manager.ts
@@ -72,16 +72,22 @@ export class RecapReconciliationManager extends BaseCustomManager<TransactionEnt
       const { creator_counter_no, payment_type, payment_type_method_id } =
         first_transaction;
 
+      let query = {
+        is_recap_transaction: true,
+        created_at: Between(this.startOfDay, this.endOfDay),
+        creator_counter_no: creator_counter_no,
+        payment_type: payment_type,
+      };
+
+      if (payment_type != 'cash')
+        query['payment_type_method_id'] = payment_type_method_id ?? EMPTY_UUID;
+
       const exist = await this.dataService.getOneByOptions({
-        where: {
-          is_recap_transaction: true,
-          created_at: Between(this.startOfDay, this.endOfDay),
-          creator_counter_no: creator_counter_no,
-          payment_type: payment_type,
-          payment_type_method_id: payment_type_method_id ?? EMPTY_UUID,
-        },
+        where: query,
       });
 
+      if (payment_type == 'cash') console.log(exist, 'das', query);
+
       const new_recap = new TransactionModel();
       const total = _.sumBy(this.recapTransactions[recap], (recap) =>
         parseFloat(recap.payment_total),
@@ -89,9 +95,8 @@ export class RecapReconciliationManager extends BaseCustomManager<TransactionEnt
 
       if (exist) {
         Object.assign(exist, {
-          payment_total: Number(exist.payment_total) + total,
-          payment_total_net_profit:
-            Number(exist.payment_total_net_profit) + total,
+          payment_total: total,
+          payment_total_net_profit: total,
           editor_id: this.user.id,
           editor_name: this.user.name,
           updated_at: new Date().getTime(),