diff --git a/app/Http/Resources/AddressResource.php b/app/Http/Resources/AddressResource.php index e6753cf2..4c6b8a39 100644 --- a/app/Http/Resources/AddressResource.php +++ b/app/Http/Resources/AddressResource.php @@ -25,7 +25,6 @@ class AddressResource extends JsonResource 'post_code' => $this->postcode, 'country' => $this->country, 'default' => (int) $this->default, - 'owner' => $this->when($this->owner instanceof Order, new OrderResource($this->whenLoaded('owner'))) ]; } } diff --git a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue index 5c5e1cbe..ab58d626 100644 --- a/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue +++ b/resources/assets/vue/components/addresses/elements/AddressVerificationComponent.vue @@ -2,120 +2,120 @@
-
-
- -
-
-
-
-
-
-
Original Address
-
-
-
-
-
{{item.owner.address.street_one+' '+(item.owner.address.street_two ? item.owner.address.street_two : '')+', '+ item.owner.address.district.name+', '+item.owner.address.post_code+' '+item.owner.address.state.name+', '+item.owner.address.country.name}}
-
-
-
-
-
-
-
-
-
New Address
-
-
-
-
-
{{item.street_one+' '+(item.street_two ? item.street_two : '')+', '+ item.district.name+', '+item.post_code+' '+item.state.name+', '+item.country.name}}
-
-
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
Reject Address Change Request
-
Are you sure you want to reject order delivery address change request?
-
-
-
-
-
Cancel
-
-
-
Reject
-
-
-
-
-
-
-
-
- -
- -
-
-
-
-
-
-
Approve Address Change Request
-
Are you sure you want to approve this order delivery address change request?
-
-
-
-
-
Cancel
-
-
-
Approve
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +