From f30a0cf7eedf60cdb388d76354921ee4e0856567 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sat, 18 Mar 2023 23:34:38 +0800
Subject: [PATCH] wallet top up logic

---
 .../ControllersLogic/CallbackBillplzLogic.php    |  2 +-
 .../elements/WalletTopUpHistoryComponent.vue     | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
index f674e67f..18986b1d 100644
--- a/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
+++ b/app/Classes/Modules/Billplzs/ControllersLogic/CallbackBillplzLogic.php
@@ -106,7 +106,7 @@ class CallbackBillplzLogic
         $request->headers->set('Authorization', 'Bearer '.$token);
 
         // check if is wallet top up
-        if($transaction->owner instanceof Wallet && $transaction->status !== ApprovalStatus::APPROVED) {
+        if($transaction->owner instanceof Wallet && $status === ApprovalStatus::APPROVED) {
             $this->updatesWalletBalance->execute($transaction->owner, $transaction->amount);
         }
         
diff --git a/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue
index f827134d..29219ff1 100644
--- a/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletTopUpHistoryComponent.vue
@@ -95,7 +95,7 @@
                                                 <div class="col-auto">
                                                     <div class="font-heading fs-8 muted all-caps">Status</div>
                                                     <div class="font-heading fs-10 bold text-danger">
-                                                        Rejected
+                                                        {{ item.payment_method === 5 ? 'Failed' : 'Rejected' }}
                                                     </div>
                                                 </div>
                                                 <div class="col-auto p-l-0">
@@ -107,11 +107,21 @@
                                             </div>
                                             <div class="row">
                                                 <div class="col">
-                                                    <div class="font-heading fs-8 all-caps" >Rejected On: {{ item.updated_at }}</div>
+                                                    <!-- <div class="font-heading fs-8 all-caps" >Rejected On: {{ item.updated_at }}</div> -->
+                                                    <div class="font-heading fs-8 all-caps" >{{ item.payment_method === 5 ? 'Failed' : 'Rejected' }} On: {{ item.updated_at }}</div>
                                                 </div>
                                             </div>
                                         </div>
-                                        <div class="col-auto">
+                                        <div class="col-auto p-l-5 p-r-5 bg-success pointer" v-if="item.payment_method === 5">
+                                            <a :href="route('billplz.bill', item.reference)">
+                                                <div class="row align-items-center h-100">
+                                                    <div class="col">
+                                                        <i class="fa fa-repeat fs-20 text-white p-l-10 p-r-10"></i>
+                                                    </div>
+                                                </div>
+                                            </a>
+                                        </div>
+                                        <div class="col-auto" v-else>
                                             <div class="row align-items-center h-100">
                                                 <div class="col">
                                                     <i class="fa fa-ban text-danger"></i>