From 3a27c80e7a2b128aba96ffee3c0b68da0ce4add3 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 7 Mar 2022 11:26:25 +0800 Subject: [PATCH 1/3] exclude weekend for transaction time limit --- 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 6676fc0b..fcff3f2b 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'))->addDays($booking->service_id === 1 ? 2 : 3); + $days = Carbon::parse($this->created_at->format('d-m-Y'))->addWeekday($booking->service_id === 1 ? 2 : 3); return [ 'id' => $this->id, From 4d31c7244d8ab33991613470bb5f0f605caef5f4 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Mon, 7 Mar 2022 11:26:42 +0800 Subject: [PATCH 2/3] exclude weekend for transaction time limit --- 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 fcff3f2b..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'))->addWeekday($booking->service_id === 1 ? 2 : 3); + $days = Carbon::parse($this->created_at->format('d-m-Y'))->addWeekdays($booking->service_id === 1 ? 2 : 3); return [ 'id' => $this->id, From 594b3b615c94bddfba7e068d7f5bbe05048cadd7 Mon Sep 17 00:00:00 2001 From: omair saleh Date: Tue, 8 Mar 2022 12:30:08 +0800 Subject: [PATCH 3/3] xpo aug --- .../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 ed9ec6d8..161b57f5 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', 7) + $bookings = Booking::whereMonth('created_at', 8) ->whereYear('created_at', 2021) ->whereDoesntHave('transactions', function($q){ $q->where('type', TransactionType::PURCHASE_ORDER);