mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git
synced 2026-08-23 14:33:59 +00:00
Vue Polling - Code sycn with fixes from Shipping Portal (dillon/51-vue-polling-experimental-1)
This commit is contained in:
@@ -39,10 +39,12 @@ class ListBookingJobProcessor
|
||||
public function execute(ListGenericJobObject $listGenericJobObject) {
|
||||
|
||||
$query = $this->listsBookings->execute($this->listsBookings->deserializeFilters($listGenericJobObject->getPayload()['filters']), ['page' => $listGenericJobObject->getPayload()['page']]);
|
||||
foreach ($query->items() as &$item) {
|
||||
$item['userInfo'] = $listGenericJobObject->getUserInfo();
|
||||
}
|
||||
|
||||
//cief todo: remove comments
|
||||
// $result = $this->collectionResponse(BookingResource::collection($query)->userInfo($listGenericJobObject->getuserInfo()));
|
||||
$result = $this->collectionResponse(BookingResource::customResourceCollection($query, $listGenericJobObject->getuserInfo()));
|
||||
$result = $this->collectionResponse(BookingResource::collection($query));
|
||||
|
||||
// $result = new JobBookingCollectionResponse($query, $listGenericJobObject->getuserInfo());
|
||||
// $result = $this->collectionResponse(new BookingResourceCollection(BookingResource::collection($query), $listGenericJobObject->getuserInfo()));
|
||||
|
||||
@@ -16,15 +16,6 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
class BookingResource extends JsonResource
|
||||
{
|
||||
// protected $userInfo;
|
||||
private static $userInfo;
|
||||
|
||||
public function userInfo($resource, $userInfo = null)
|
||||
{
|
||||
parent::__construct($resource);
|
||||
self::$userInfo = $userInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
* Transform the resource into an array.
|
||||
*
|
||||
@@ -36,7 +27,7 @@ class BookingResource extends JsonResource
|
||||
{
|
||||
return [
|
||||
'id' => $this->id,
|
||||
'company' => new CompanyResource($this->company, self::$userInfo),
|
||||
'company' => new CompanyResource($this->company, $this->userInfo),
|
||||
'bank' => new BankResource($this->bank),
|
||||
'service' => new ServiceTypeResource($this->service),
|
||||
'marking' => $this->marking,
|
||||
@@ -81,10 +72,4 @@ class BookingResource extends JsonResource
|
||||
])
|
||||
];
|
||||
}
|
||||
|
||||
public static function customResourceCollection($resource, $userInfo): AnonymousResourceCollection
|
||||
{
|
||||
self::$userInfo = $userInfo;
|
||||
return parent::collection($resource);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -19,7 +19,7 @@ use Illuminate\Support\Facades\Log;
|
||||
|
||||
class CompanyResource extends JsonResource
|
||||
{
|
||||
protected $userInfo;
|
||||
private $userInfo;
|
||||
|
||||
public function __construct($resource, $userInfo = null)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user