mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/shipping-portal.git
synced 2026-08-19 04:24:12 +00:00
Merge branch 'dillon/83-yd-order-tracking-query-ui' into vapor/development
This commit is contained in:
@@ -5,6 +5,7 @@ namespace App\Http\Resources;
|
||||
use App\Classes\ValueObjects\Constants\PackingListType;
|
||||
use App\Classes\ValueObjects\Constants\RoleTypes;
|
||||
use App\Models\PackingList;
|
||||
use Carbon\Carbon;
|
||||
use Illuminate\Http\Resources\Json\JsonResource;
|
||||
use Illuminate\Support\Facades\Log;
|
||||
|
||||
@@ -39,7 +40,7 @@ class OrderTrackingResource extends JsonResource
|
||||
'order_id' => $packingList->owner->reference,
|
||||
'tracking' => $tracking . ($remark ? " (" . $remark . ")" : ''),
|
||||
'tracking_english' => $tracking_english . ($remark_english ? " (" . $remark_english . ")" : ''),
|
||||
'tracking_time' => $this->tracking_time,
|
||||
'tracking_date' => Carbon::parse($this->tracking_time)->format('Y-m-d'),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<div class="font-heading all-caps fs-12">{{item.tracking_time}}</div>
|
||||
<div class="font-heading all-caps fs-12">{{item.tracking_date}}</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user