From 4ba32b6e9f37e551929a95d335b2c76aff9a9963 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Mar 2022 15:24:27 +0800
Subject: [PATCH 1/5] fix timer

---
 app/Http/Resources/TransactionResource.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 58f17072..3c61942d 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -17,7 +17,7 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
-        $days = $this->updated_at->endOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
+        $days = $this->updated_at->startOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,

From 8a5a05f950fa0994af83596d5302e1bf1effa4c4 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Mar 2022 15:28:17 +0800
Subject: [PATCH 2/5] fix timer

---
 app/Http/Resources/TransactionResource.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 3c61942d..35c29908 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -16,8 +16,9 @@ class TransactionResource extends JsonResource
      */
     public function toArray($request)
     {
+
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
-        $days = $this->updated_at->startOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
+        $days = $this->updated_at->endOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,

From 12c3398eef67879440bdba6cb253a5764eb19b9b Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Mar 2022 15:38:46 +0800
Subject: [PATCH 3/5] fix wallet transaction component

---
 .../elements/WalletTransactionComponent.vue        | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
index d3709d1e..f2705d5c 100644
--- a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
@@ -40,6 +40,18 @@
                 </div>
             </div>
         </div>
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading fs-10 muted all-caps">Description</div>
+                </div>
+            </div>
+            <div class="row">
+                <div class="col">
+                    <div class="font-heading all-caps fs-11">{{data.description}}</div>
+                </div>
+            </div>
+        </div>
         <div class="col">
             <div class="row">
                 <div class="col">
@@ -60,7 +72,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div class="font-heading fs-11">{{data.payment_reference == null ? '&nbsp;' : data.payment_reference }}</div>
+                    <div class="font-heading fs-11">{{data.reference == null ? '&nbsp;' : data.reference }}</div>
                 </div>
             </div>
         </div>

From bf167c8321b56a877e154dca6f9e17c3a0899151 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Mar 2022 17:03:56 +0800
Subject: [PATCH 4/5] fix wallet transaction component

---
 .../wallets/elements/WalletTransactionComponent.vue       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
index f2705d5c..a681d71c 100644
--- a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
@@ -48,7 +48,7 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div class="font-heading all-caps fs-11">{{data.description}}</div>
+                    <div class="font-heading all-caps fs-11" v-html="data.description"></div>
                 </div>
             </div>
         </div>
@@ -72,7 +72,11 @@
             </div>
             <div class="row">
                 <div class="col">
-                    <div class="font-heading fs-11">{{data.reference == null ? '&nbsp;' : data.reference }}</div>
+                    <a :href="route('billplz.bill', data.reference)" target="_blank" v-if="data.reference">
+                        <div class="icon-thumbnail fs-11 text-white icon-25 bg-complete btn-rounded float-left m-r-5">
+                            Bz
+                        </div>
+                    </a>
                 </div>
             </div>
         </div>

From 4e5680fd13ac326095e97c561d524febbfe24a19 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Fri, 11 Mar 2022 17:10:16 +0800
Subject: [PATCH 5/5] fix wallet transaction component

---
 .../components/wallets/elements/WalletTransactionComponent.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
index a681d71c..eaff3042 100644
--- a/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletTransactionComponent.vue
@@ -64,7 +64,7 @@
                 </div>
             </div>
         </div>
-        <div class="col">
+        <div class="col" v-if="data.type === 5">
             <div class="row">
                 <div class="col">
                     <div class="font-heading fs-10 muted all-caps">Payment Reference</div>