From 2dd659ca8ee3d6ce813750a7c4b67a10ea50919c Mon Sep 17 00:00:00 2001
From: ilham <ilhamdwips@gmail.com>
Date: Fri, 31 Dec 2021 01:11:02 +0700
Subject: [PATCH] fix: history transaction

---
 src/transaction/entities/transactions.entity.ts |  5 +++++
 src/transaction/transaction.service.ts          | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/transaction/entities/transactions.entity.ts b/src/transaction/entities/transactions.entity.ts
index a768cc5..a8b00c0 100644
--- a/src/transaction/entities/transactions.entity.ts
+++ b/src/transaction/entities/transactions.entity.ts
@@ -50,6 +50,11 @@ export class Transactions extends BaseModel {
   })
   partner_trx_id: string;
 
+  @Column({
+    nullable: true,
+  })
+  seri_number: string;
+
   @Column({
     nullable: true,
   })
diff --git a/src/transaction/transaction.service.ts b/src/transaction/transaction.service.ts
index 3993474..fb6b51f 100644
--- a/src/transaction/transaction.service.ts
+++ b/src/transaction/transaction.service.ts
@@ -393,7 +393,7 @@ export class TransactionService {
         transactionData.product_price = product_price;
         transactionData.destination = orderTransactionDto.destination;
         transactionData.partner_trx_id = orderTransactionDto.trx_id;
-        transactionData.partner_trx_id = trxId;
+        transactionData.supplier_trx_id = trxId;
         await manager.insert(Transactions, transactionData);
 
         await this.accountingTransaction({
@@ -709,7 +709,8 @@ export class TransactionService {
       relations: ['product_price'],
     });
 
-    dataTransaction.status = statusTransaction.FAILED;
+    dataTransaction.status = statusTransaction.SUCCESS;
+    dataTransaction.seri_number = callback['sn'];
     dataTransaction.callback_json = callback;
 
     const userData = await this.userService.findExist(dataTransaction.user);
@@ -899,6 +900,11 @@ export class TransactionService {
       .leftJoin('transaction.product_price', 'product_price')
       .leftJoin('product_price.product', 'product')
       .addSelect('transaction.amount', 'price')
+      .addSelect('transaction.destination')
+      .addSelect('transaction.seri_number','seri_number')
+      .addSelect('transaction.supplier_trx_id', 'transaction_code')
+      .addSelect('transaction.status', 'status')
+      .addSelect('transaction.partner_trx_id', 'partner_transaction_code')
       .addSelect('userData.name', 'buyer')
       .addSelect('product.name', 'name')
       .addSelect('product.id', 'product_id');