diff --git a/app/Http/Controllers/Orders/FetchOrderPackagesV2Controller.php b/app/Http/Controllers/Orders/FetchOrderPackagesV2Controller.php index 44b9f519..819c5d16 100644 --- a/app/Http/Controllers/Orders/FetchOrderPackagesV2Controller.php +++ b/app/Http/Controllers/Orders/FetchOrderPackagesV2Controller.php @@ -9,6 +9,8 @@ use Illuminate\Http\Request; class FetchOrderPackagesV2Controller { + //cief todo: 150 - fetchOriginWarehouse + /** * @param Request $request * @param FetchOrderPackagesReceivedV2Logic $logic @@ -19,6 +21,7 @@ class FetchOrderPackagesV2Controller return $logic->execute($request); } + /** * @param Request $request * @param FetchOrderPackagesV2Logic $logic diff --git a/app/Http/Resources/OrderPackagesReceivedResource.php b/app/Http/Resources/OrderPackagesReceivedResource.php index 500fbb10..21cf1d56 100644 --- a/app/Http/Resources/OrderPackagesReceivedResource.php +++ b/app/Http/Resources/OrderPackagesReceivedResource.php @@ -17,7 +17,7 @@ class OrderPackagesReceivedResource extends JsonResource public function toArray($request) { $received_packages = $this->packingLists()->where('type', PackingListType::WAREHOUSE_RECEIVE_LIST)->whereHas('packages')->get(); - + $origin_warehouse_packages = $this->originWarehousePackages()->get(); //cief todo: 150 return [ 'id' => $this->id, // 'reference' => $this->reference, @@ -25,6 +25,7 @@ class OrderPackagesReceivedResource extends JsonResource 'type' => (int) $this->type, 'status' => (int) $this->status, 'received_packages' => PackingListForPackagesReceivedResource::collection($received_packages), + 'origin_warehouse_packages' => PackingListForPackagesReceivedResource::collection($origin_warehouse_packages), 'created_at' => $this->created_at->format('d-m-Y') ]; } diff --git a/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue b/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue index e3586e4b..27c2ea50 100644 --- a/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue +++ b/resources/assets/vue/components/orders/elements/OrderPackagesComponent.vue @@ -54,19 +54,20 @@