From e540a52844e13e44ada03b3cdff6f4d280ccdf43 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 11:07:41 +0800
Subject: [PATCH 1/5] JY BADGE

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

diff --git a/resources/assets/vue/components/wallets/elements/WalletComponent.vue b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
index 486f821d..44e744d2 100644
--- a/resources/assets/vue/components/wallets/elements/WalletComponent.vue
+++ b/resources/assets/vue/components/wallets/elements/WalletComponent.vue
@@ -10,7 +10,7 @@
                         <div class="col text-center">
                             <div class="row m-b-50">
                                 <div class="col bg-white padding-15">
-                                    <h5 class="text-center text-success bold">Congratulation! You've earned and achievement</h5>
+                                    <h5 class="text-center text-success bold">Congratulation! You've earned an achievement</h5>
                                 </div>
                             </div>
                             <div class="row justify-content-center">

From 6209f13ffa5b1d960a8ccbbaf9fd16f4440049c1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 13:02:17 +0800
Subject: [PATCH 2/5] fix wallet

---
 .../vue/components/wallets/forms/WalletTopUpFormComponent.vue  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
index 23f56c46..dc995b94 100644
--- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
+++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
@@ -120,9 +120,6 @@
                     amount: {
                         required,
                         minValue: minValue(this.minValue),
-                    },
-                    reference: {
-                        required: requiredIf(function () { return this.parameters.transaction_type !== 0 })
                     }
                 }
             }

From 628ccd2bcb7e2074b1981459ca637f35f2b216cc Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 13:04:06 +0800
Subject: [PATCH 3/5] fix wallet

---
 .../components/wallets/forms/WalletTopUpFormComponent.vue    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
index dc995b94..7e2cfd47 100644
--- a/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
+++ b/resources/assets/vue/components/wallets/forms/WalletTopUpFormComponent.vue
@@ -119,7 +119,10 @@
                 parameters: {
                     amount: {
                         required,
-                        minValue: minValue(this.minValue),
+                        minValue: 0,
+                    },
+                    reference: {
+                        required: requiredIf(function () { return this.parameters.transaction_type !== 0 })
                     }
                 }
             }

From fc67c720f81bdbb30fb8b4653e6821277b925215 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 14:09:58 +0800
Subject: [PATCH 4/5] fix timer for transaction

---
 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 efcdb99c..b3bc19ad 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 = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 1 : 2);
+        $days = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 2 : 3);
 
         return [
             'id' => $this->id,

From 9ff3f3ab5bdc28e128cea026372d1d89456367d1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 3 Mar 2022 14:12:52 +0800
Subject: [PATCH 5/5] fix timer for transaction

---
 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 b3bc19ad..6676fc0b 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 = Carbon::parse($this->created_at)->addDays($booking->service_id === 1 ? 2 : 3);
+        $days = Carbon::parse($this->created_at->format('d-m-Y'))->addDays($booking->service_id === 1 ? 2 : 3);
 
         return [
             'id' => $this->id,