diff --git a/app/Http/Resources/TransactionResource.php b/app/Http/Resources/TransactionResource.php index 74fa69ad..0da7bccb 100644 --- a/app/Http/Resources/TransactionResource.php +++ b/app/Http/Resources/TransactionResource.php @@ -24,11 +24,14 @@ class TransactionResource extends JsonResource { $order = null; $groupTransactions = null; + $packingListReference = null; if ($this->owner instanceof Transaction) { $order = new OrderResource($this->owner->owner->owner); + $packingListReference = $this->owner->owner->reference; } else if (!($this->owner instanceof Transaction) && !($this->owner instanceof Wallet)) { $order = new OrderResource($this->owner->owner); + $packingListReference = $this->owner->reference; } else { $group = Group::where('reference', $this->payment_reference)->first(); if ($group) { @@ -41,6 +44,7 @@ class TransactionResource extends JsonResource 'id' => $this->id, 'owner_type' => $this->owner_type, 'order' => $order, + 'packing_list_reference' => $packingListReference, 'group_transactions' => $groupTransactions, 'group_reference' => $groupTransactions ? $group->reference : null, 'documents' => $groupTransactions ? DocumentResource::collection($this->documents->where('status', ApprovalStatus::PENDING_VERIFICATION)) : DocumentResource::collection($this->documents), diff --git a/resources/assets/vue/components/orders/elements/PackageComponent.vue b/resources/assets/vue/components/orders/elements/PackageComponent.vue index 92cc77c9..62b60567 100644 --- a/resources/assets/vue/components/orders/elements/PackageComponent.vue +++ b/resources/assets/vue/components/orders/elements/PackageComponent.vue @@ -19,7 +19,7 @@
{{item.description}}
-Reference
{{item.reference}}
@@ -58,7 +58,7 @@ Status{{item.container ? item.container.transport.schedule_complete && status === 'Shipping' ? 'Custom Clearance' : status : status}}
{{item.container ? item.container.container_reference : '-'}}
Est. CBM
{{((parseFloat(item.cbm) * 1000) / 1000).toFixed(3)}}
Warehouse
{{item.order.warehouse.reference}}
Unclaimed @@ -75,7 +75,7 @@Reference
Invoice No
+Reference
+Invoice Date
Status
Amount
Billing Question
Invoice No
Reference
+Order