diff --git a/app/Http/Resources/OrderResource.php b/app/Http/Resources/OrderResource.php index 183536e3..91e1c4b5 100644 --- a/app/Http/Resources/OrderResource.php +++ b/app/Http/Resources/OrderResource.php @@ -28,6 +28,7 @@ class OrderResource extends JsonResource 'company_module' => new CompanyModuleResource($this->companyModule), 'warehouse' => new CompanyModuleResource($this->orderRoles()->where('role_id', '=', OrderRoleTypes::ORIGIN_WAREHOUSE)->first()->appointee), 'address' => new AddressResource($this->addresses()->first()), + 'address_change_request' => new AddressResource($this->addressesPendingVerification()->first()), $this->mergeWhen($this->relationLoaded('parcels'), [ 'origin_warehouse_packages' => PackageResource::collection($this->parcels()->whereHas('packingList', function($query){ return $query->where('type', PackingListType::SHIPPING_PACKING_LIST)->whereDoesntHave('containers', function($query) { diff --git a/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue new file mode 100644 index 00000000..e8c2636d --- /dev/null +++ b/resources/assets/vue/components/orders/elements/ChangeAddressComponent.vue @@ -0,0 +1,22 @@ + + diff --git a/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue new file mode 100644 index 00000000..8e6c3d7b --- /dev/null +++ b/resources/assets/vue/components/orders/forms/ChangeOrderAddressFormComponent.vue @@ -0,0 +1,74 @@ + + \ No newline at end of file diff --git a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue index 84525c41..ad49af1c 100644 --- a/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue +++ b/resources/assets/vue/components/orders/sections/OrderProfileSectionComponent.vue @@ -23,7 +23,8 @@
-
Delivery Address: {{order.address.reference}}
+
Delivery Address: {{order.address.reference}} +
Warehouse: {{order.warehouse.id === 3 ? 'Guang Zhou' : 'Yiwu'}}