From 5e08579b61db9a28e0fb9483ae4112ef86e7be52 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 13:37:34 +0800
Subject: [PATCH 01/24] fix download documents

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

diff --git a/resources/assets/vue/components/bookings/elements/BillingComponent.vue b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
index bfa8b2d9..617b06dc 100644
--- a/resources/assets/vue/components/bookings/elements/BillingComponent.vue
+++ b/resources/assets/vue/components/bookings/elements/BillingComponent.vue
@@ -77,7 +77,7 @@ export default {
                 endDate: '',
                 type: 'INVOICE',
             },
-            documents: ['INVOICE', 'PURCHASE_ORDER', 'DELIVERY_ORDER', 'SUPPLIER_DELIVERY_ORDER'],
+            documents: ['INVOICE', 'PURCHASE_ORDER', 'DELIVER_ORDER', 'SUPPLIER_DELIVER_ORDER'],
             selectedDocumentStatus: false
         }
     },

From cd4739a1d13fe3a94406e6dca992ffa975fba43e Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 16:22:03 +0800
Subject: [PATCH 02/24] fix wallet balance

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index 87e6866f..332c9104 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -122,6 +122,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             $wallet = $booking->company->wallets()->first();
 
             if($wallet->amount < round($amount, 2)){
+                dd($wallet->amount, round($amount, 2));
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

From 545b1917352fe12bc91b57b7eec7ef75a102b51c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 16:23:06 +0800
Subject: [PATCH 03/24] fix wallet balance

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index 332c9104..ba568543 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -121,7 +121,7 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             /** @var Wallet $wallet */
             $wallet = $booking->company->wallets()->first();
 
-            if($wallet->amount < round($amount, 2)){
+            if(round($wallet->amount) < round($amount, 2)){
                 dd($wallet->amount, round($amount, 2));
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }

From 055d71358c0dd0bd3c3f219a5ec77721d1089b2d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Wed, 9 Mar 2022 16:24:50 +0800
Subject: [PATCH 04/24] fix wallet balance

---
 .../Bookings/ControllersLogic/CreateBookingPaymentLogic.php      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
index ba568543..ecb6a87c 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/CreateBookingPaymentLogic.php
@@ -122,7 +122,6 @@ class CreateBookingPaymentLogic extends AbstractControllerLogic
             $wallet = $booking->company->wallets()->first();
 
             if(round($wallet->amount) < round($amount, 2)){
-                dd($wallet->amount, round($amount, 2));
                 throw new MalformedRequestException('Insufficient wallet balance. Please Top up your wallet.');
             }
 

From a1437069c4d80567d4dfea54bd21f9cd2dd52cc0 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 10:53:49 +0800
Subject: [PATCH 05/24] update xpo to sep

---
 .../Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
index 161b57f5..6ed08994 100644
--- a/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
+++ b/app/Classes/Modules/Bookings/ControllersLogic/AutoPurchaseOrderFillLogic.php
@@ -64,7 +64,7 @@ class AutoPurchaseOrderFillLogic extends AbstractControllerLogic
      */
     public function logic(Request $request) : JsonResponse
     {
-        $bookings = Booking::whereMonth('created_at', 8)
+        $bookings = Booking::whereMonth('created_at', 9)
             ->whereYear('created_at', 2021)
             ->whereDoesntHave('transactions', function($q){
                 $q->where('type', TransactionType::PURCHASE_ORDER);

From f852d11d128bee5a37a499c09ea775b9e6fe003f Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 17:30:30 +0800
Subject: [PATCH 06/24] update transaction 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 26b1590f..6c4c0f60 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->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3);
+        $days = Carbon::parse($this->created_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,

From ba7ce445703f0a488ce80a59cb70ae2a1aad0f15 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 17:31:43 +0800
Subject: [PATCH 07/24] update transaction 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 6c4c0f60..26b1590f 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->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 1 : 3);
+        $days = Carbon::parse($this->created_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3);
 
         return [
             'id' => $this->id,

From 12677d9d151eec570221e897d19503d22cc2b0a1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 18:58:10 +0800
Subject: [PATCH 08/24] update transaction 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 26b1590f..6ed68489 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->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3);
+        $days = Carbon::parse($this->updated_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3);
 
         return [
             'id' => $this->id,

From 99cada8334eb40cd6a5b967bbbeab437f64760d5 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 18:59:52 +0800
Subject: [PATCH 09/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 6ed68489..605d9f90 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
+            'service_id' => $booking->service_id,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 04cbc1514ca86ac5fdbd05dfa8aa36bf514af70d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:00:44 +0800
Subject: [PATCH 10/24] update transaction 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 605d9f90..27d4b4df 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'service_id' => $booking->service_id,
+            'service_id' => $booking->service_id === 1 ? 2 : 3,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 525f2320aeed6131141396e185cd891d1cd9bdd2 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:01:14 +0800
Subject: [PATCH 11/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 27d4b4df..a29d5eab 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -17,12 +17,11 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
-        $days = Carbon::parse($this->updated_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3);
+        $days = Carbon::parse($this->updated_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'service_id' => $booking->service_id === 1 ? 2 : 3,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 7e5a638d61e8477ea4aa8c1e23d1668a97b8c651 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:02:36 +0800
Subject: [PATCH 12/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index a29d5eab..516a3324 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
+            'day' => $days,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 4552c79618e1d5b11268e8ca212b809210d2d879 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:04:34 +0800
Subject: [PATCH 13/24] update transaction 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 516a3324..9aaaba0d 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' => $days,
+            'day' => $this->updated_at->addWeekdays($booking->service_id === 1 ? 1 : 3),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From f9f0c167f64b0182c82d3099eab9402649be56ff Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:05:18 +0800
Subject: [PATCH 14/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 9aaaba0d..8002bbb7 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -17,12 +17,11 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
-        $days = Carbon::parse($this->updated_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 1 : 3);
+        $days = $this->updated_at->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' => $this->updated_at->addWeekdays($booking->service_id === 1 ? 1 : 3),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From f1dc50e22c46a53d180d2caae282e4e3ce0428e9 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:06:20 +0800
Subject: [PATCH 15/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 8002bbb7..2a3b1410 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,6 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
+            'day' => $days,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 62494c812f88d49e7eaf31795cd75449de6b0a13 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:07:44 +0800
Subject: [PATCH 16/24] update transaction 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 2a3b1410..47cfaa46 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' => $days,
+            'day' => $days->startOfDay(),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From b89647e732437970f253b90fb58f3c0d87b5f332 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:08:03 +0800
Subject: [PATCH 17/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 47cfaa46..2317e1f6 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -17,12 +17,12 @@ class TransactionResource extends JsonResource
     public function toArray($request)
     {
         $booking = (int)$this->type === TransactionType::BILL ? $this->owner->owner : $this->booking;
-        $days = $this->updated_at->addWeekdays($booking->service_id === 1 ? 1 : 3);
+        $days = $this->updated_at->startOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' => $days->startOfDay(),
+            'day' => $days,
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 951a2135979235a393a0e28ae088145417f33113 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:09:03 +0800
Subject: [PATCH 18/24] update transaction 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 2317e1f6..c2481b30 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->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 460912ebc3ad5ba4d9c3606b1d9c81a39d93d8d1 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:11:49 +0800
Subject: [PATCH 19/24] update transaction 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 c2481b30..8fce3890 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' => $days,
+            'day' =>  $this->updated_at->endOfDay(),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From ac435065394a8e90dd80c8acfc655f8c55e1a1ea Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:13:30 +0800
Subject: [PATCH 20/24] update transaction 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 8fce3890..86c3ae88 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,7 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' =>  $this->updated_at->endOfDay(),
+            'day' =>  $this->updated_at->endOfDay()->format('d-m-Y H:i'),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From 621058855ea9bac7d8fa6869582c7a783b851806 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:14:45 +0800
Subject: [PATCH 21/24] update transaction timer

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

diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php
index 86c3ae88..58f17072 100644
--- a/app/Http/Resources/TransactionResource.php
+++ b/app/Http/Resources/TransactionResource.php
@@ -22,7 +22,6 @@ class TransactionResource extends JsonResource
         return [
             'id' => $this->id,
             'booking' => new BookingResource($booking),
-            'day' =>  $this->updated_at->endOfDay()->format('d-m-Y H:i'),
             'type' => (int) $this->type,
             'bill_no' => $this->bill_no,
             'payment_reference' => $this->payment_reference,

From cdbd59bb239886d6e656ea5aece8174b982c718d Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:16:25 +0800
Subject: [PATCH 22/24] update transaction 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..f913cf91 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 ? 2 : 4);
 
         return [
             'id' => $this->id,

From 1a4cb0a7430dfd9c8ae6f9dbe9a4d85e65a04646 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:17:36 +0800
Subject: [PATCH 23/24] update transaction 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 f913cf91..58f17072 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->startOfDay()->addWeekdays($booking->service_id === 1 ? 2 : 4);
+        $days = $this->updated_at->endOfDay()->addWeekdays($booking->service_id === 1 ? 1 : 3);
 
         return [
             'id' => $this->id,

From ca6c81c27b4010944eb1200a58d94be95e2c6d43 Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Thu, 10 Mar 2022 19:19:40 +0800
Subject: [PATCH 24/24] update transaction timer

---
 .../bookings/sections/SupplierPendingOrdersSectionComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
index 897ab360..07b1eda0 100644
--- a/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
+++ b/resources/assets/vue/components/bookings/sections/SupplierPendingOrdersSectionComponent.vue
@@ -114,7 +114,7 @@
                             </div>
                             <div class="row">
                                 <div class="col">
-                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 10000, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], service_type_id_in: [selectedService.id]}">
+                                    <list-component ref="pendingOrdersList" section="pendingOrdersSection" :endpoint="route('api.transaction.list')" :options="{per_page: 10000, status: 2,  owner_type: 'App\\Models\\Booking', type: 1, original_currency_id_in: [selectedCurrency.id], transaction_service_id: selectedService.id}">
                                         <template slot="list" slot-scope="{data}">
                                             <supplier-pending-order-component :data="data" v-on:input="updateOrder($event)"></supplier-pending-order-component>
                                         </template>