From 0d592ce84f4878686f6eb8ce5f4c71e81351ffcb Mon Sep 17 00:00:00 2001 From: Dillon Ngo Date: Mon, 30 Sep 2024 19:24:32 +0800 Subject: [PATCH] Laravel Vapor - sync code from Shipping Portal --- .../Bookings/Processors/ListBookingsJobProcessor.php | 11 +++++++++++ .../Processors/ListDocumentsJobProcessor.php | 11 +++++++++++ .../Processors/ListTransactionsJobProcessor.php | 11 +++++++++++ resources/views/pages/billings.blade.php | 1 + 4 files changed, 34 insertions(+) diff --git a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php index 71160d78..ad9a8b8c 100644 --- a/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php +++ b/app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php @@ -7,6 +7,7 @@ use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor; use App\Classes\General\Helper; use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject; use App\Http\Resources\V2\ListBookingJobResource; +use Illuminate\Pagination\Paginator; class ListBookingsJobProcessor { @@ -37,6 +38,16 @@ class ListBookingsJobProcessor public function execute(JobSubmissionObject $jobSubmissionObject) { $query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]); + + if (isset($jobSubmissionObject->getPayload()['page'])) { + $page = (int)$jobSubmissionObject->getPayload()['page']; + } else { + $page = 1; + } + Paginator::currentPageResolver(function () use ($page) { + return $page; + }); + foreach ($query->items() as $item) { $item['userInfo'] = $jobSubmissionObject->getUserInfo(); } diff --git a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php index 02b82736..f67bb4c3 100644 --- a/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php +++ b/app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php @@ -7,6 +7,7 @@ use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor; use App\Classes\General\Helper; use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject; use App\Http\Resources\V2\ListDocumentJobResource; +use Illuminate\Pagination\Paginator; class ListDocumentsJobProcessor { @@ -37,6 +38,16 @@ class ListDocumentsJobProcessor public function execute(JobSubmissionObject $jobSubmissionObject) { $query = $this->listsDocuments->execute($this->listsDocuments->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]); + + if (isset($jobSubmissionObject->getPayload()['page'])) { + $page = (int)$jobSubmissionObject->getPayload()['page']; + } else { + $page = 1; + } + Paginator::currentPageResolver(function () use ($page) { + return $page; + }); + foreach ($query->items() as $item) { $item['userInfo'] = $jobSubmissionObject->getUserInfo(); } diff --git a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php index cb14f0a0..bad2d588 100644 --- a/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php +++ b/app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php @@ -7,6 +7,7 @@ use App\Classes\Modules\Jobs\Processors\UpdateJobResultProcessor; use App\Classes\General\Helper; use App\Classes\Modules\Jobs\DataTransferObjects\JobSubmissionObject; use App\Http\Resources\V2\ListTransactionJobResource; +use Illuminate\Pagination\Paginator; class ListTransactionsJobProcessor { @@ -37,6 +38,16 @@ class ListTransactionsJobProcessor public function execute(JobSubmissionObject $jobSubmissionObject) { $query = $this->listsTransactions->execute($this->listsTransactions->deserializeFilters($jobSubmissionObject->getPayload()['filters']), ['page' => $jobSubmissionObject->getPayload()['page']]); + + if (isset($jobSubmissionObject->getPayload()['page'])) { + $page = (int)$jobSubmissionObject->getPayload()['page']; + } else { + $page = 1; + } + Paginator::currentPageResolver(function () use ($page) { + return $page; + }); + foreach ($query->items() as $item) { $item['userInfo'] = $jobSubmissionObject->getUserInfo(); } diff --git a/resources/views/pages/billings.blade.php b/resources/views/pages/billings.blade.php index da84f8b9..535c5839 100644 --- a/resources/views/pages/billings.blade.php +++ b/resources/views/pages/billings.blade.php @@ -4,6 +4,7 @@
+
@endsection