cief/shipping-portal
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git synced 2026-08-19 04:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix previously marked TODO

Browse Source
This commit is contained in:
Dillon Ngo
2026-07-08 02:12:40 +08:00
parent f1d5de226f
commit f05ce01a40
2 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/OrderPackagesOriginWarehouseResource.php
+1 -1
View File
@@ -23,7 +23,7 @@ class OrderPackagesOriginWarehouseResource extends JsonResource
'reference_contract' => (int) $this->type,
'type' => (int) $this->type,
'status' => (int) $this->status,
'origin_warehouse_packages' => PackingListForPackagesReceivedResource::collection($origin_warehouse_packages), //cief todo: 150 - to update with new resource
'origin_warehouse_packages' => PackingListForOriginWarehouseResource::collection($origin_warehouse_packages),
'created_at' => $this->created_at->format('d-m-Y')
];
}
app/Http/Resources/PackingListForOriginWarehouseResource.php
+41
View File
@@ -0,0 +1,41 @@
<?php
namespace App\Http\Resources;
use App\Classes\ValueObjects\Constants\RoleTypes;
use App\Models\Order;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Log;
class PackingListForOriginWarehouseResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param \Illuminate\Http\Request $request
* @return array
*/
public function toArray($request)
{
// $exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
$userType = Auth() && Auth()->user() ? Auth()->user()->type : RoleTypes::USER;
$exceptionUsers = in_array($userType, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
$data = [
'id' => $this->id,
'claimant_id' => $this->claimant_id,
'status' => $this->status,
'transport' => new TransportResource($this->transports()->first()),
'type' => $this->type,
'container' => new ContainerResource($this->containers->first()),
$this->mergeWhen($this->owner instanceof Order, [
'order' => New OrderResource($this->owner)
]),
];
$packages = !$this->packingLists()->exists() || $exceptionUsers ? $this->packages : $this->packingLists->first()->packages;
$data['packages'] = PackageReceivedResource::collection($packages);
return $data;
}
}