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

New UI to show YD Order Tracking infomation - fixes for feedback on 20250408

Browse Source
This commit is contained in:
Dillon Ngo
2025-04-16 22:13:50 +08:00
parent d093b774c2
commit f25f5ebb41
11 changed files with 121 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Resources/OrderTrackingResource.php
+22 -3
View File
@@ -2,7 +2,11 @@
namespace App\Http\Resources;
use App\Classes\ValueObjects\Constants\PackingListType;
use App\Classes\ValueObjects\Constants\RoleTypes;
use App\Models\PackingList;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Log;
class OrderTrackingResource extends JsonResource
{
@@ -15,11 +19,26 @@ class OrderTrackingResource extends JsonResource
*/
public function toArray($request)
{
$exceptionUsers = in_array(Auth()->user()->type, [RoleTypes::SHADOW_ADMIN, RoleTypes::SUPER_ADMIN]);
$packingList = PackingList::where('reference', $this->tracking_no)->where('type', PackingListType::SHIPPING_PACKING_LIST)->first();
$tracking = $this->tracking;
$remark = $this->remark;
$tracking_english = $this->tracking_english;
$remark_english = $this->remark_english;
if($tracking === '第三方提货') {
$tracking = '安排派送中';
$tracking_english = 'Arranging Delivery';
$remark = '';
$remark_english = '';
}
return [
'id' => $this->id,
// 'tracking_no' => $this->tracking_no,
'tracking' => $this->tracking . ($this->remark ? " (" . $this->remark . ")" : ''),
'tracking_english' => $this->tracking_english . ($this->remark_english ? " (" . $this->remark_english . ")" : ''),
'tracking_no' => $exceptionUsers ? $this->tracking_no : '',
'order_id' => $packingList->owner->reference,
'tracking' => $tracking . ($remark ? " (" . $remark . ")" : ''),
'tracking_english' => $tracking_english . ($remark_english ? " (" . $remark_english . ")" : ''),
'tracking_time' => $this->tracking_time,
];
}