cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-22 14:04:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dillon/34.6-jenkins-vapor' into vapor/development

Browse Source
This commit is contained in:
Dillon Ngo
2024-09-30 19:25:12 +08:00
parent c82af69a05 0d592ce84f
commit e06e7db97b
4 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Classes/Modules/Bookings/Processors/ListBookingsJobProcessor.php
+11
View File
@@ -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();
}
app/Classes/Modules/Documents/Processors/ListDocumentsJobProcessor.php
+11
View File
@@ -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();
}
app/Classes/Modules/Transactions/Processors/ListTransactionsJobProcessor.php
+11
View File
@@ -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();
}
resources/views/pages/billings.blade.php
+1 -1
View File
@@ -3,7 +3,7 @@
<div class="row" v-if="$store.getters.isAdmin">
<div class="col p-t-15 p-b-15">
<billing-component></billing-component>
<admin-payments-billing-section-polling-component></admin-payments-billing-section-polling-component>
<admin-payments-billing-section-component></admin-payments-billing-section-component>
</div>
</div>
@endsection