merdan
/
sarga
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4678 from nikolayandreev/master 

Fix issue #4677
This commit is contained in:
Glenn Hermans 2021-02-26 11:48:43 +01:00 committed by GitHub
parent db28d93b71 feac9533e8
commit 14decf014e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
packages/Webkul/API/Http/Controllers/Shop/AddressController.php
View File

@ -31,7 +31,7 @@ class AddressController extends Controller
/** /**
* Controller instance * Controller instance
* *
* @param Webkul\Customer\Repositories\CustomerAddressRepository $customerAddressRepository * @param CustomerAddressRepository $customerAddressRepository
*/ */
public function __construct(CustomerAddressRepository $customerAddressRepository) public function __construct(CustomerAddressRepository $customerAddressRepository)
{ {
@ -49,12 +49,12 @@ class AddressController extends Controller
/** /**
* Get user address. * Get user address.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Resources\Json\AnonymousResourceCollection
*/ */
public function get() public function get()
{ {
$customer = auth($this->guard)->user(); $customer = auth($this->guard)->user();
$addresses = $customer->addresses()->get(); $addresses = $customer->addresses()->get();
return CustomerAddressResource::collection($addresses); return CustomerAddressResource::collection($addresses);
@ -63,13 +63,14 @@ class AddressController extends Controller
/** /**
* Store a newly created resource in storage. * Store a newly created resource in storage.
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function store() public function store()
{ {
$customer = auth($this->guard)->user(); $customer = auth($this->guard)->user();
if (request()->input('address1') && ! is_array(json_decode(request()->input('address1')))) { if (request()->input('address1') && ! is_array(request()->input('address1'))) {
return response()->json([ return response()->json([
'message' => 'address1 must be an array.', 'message' => 'address1 must be an array.',
]); ]);
@ -77,18 +78,20 @@ class AddressController extends Controller
if (request()->input('address1')) { if (request()->input('address1')) {
request()->merge([ request()->merge([
'address1' => implode(PHP_EOL, array_filter(json_decode(request()->input('address1')))), 'address1' => implode(PHP_EOL, array_filter(request()->input('address1'))),
'customer_id' => $customer->id, 'customer_id' => $customer->id,
]); ]);
} }
$this->validate(request(), [ $this->validate(request(), [
'address1' => 'string|required', 'address1' => 'string|required',
'country' => 'string|required', 'company' => 'string|nullable',
'state' => 'string|required', 'vat_id' => 'string|nullable',
'city' => 'string|required', 'country' => 'string|required',
'state' => 'string|nullable',
'city' => 'string|required',
'postcode' => 'required', 'postcode' => 'required',
'phone' => 'required', 'phone' => 'required',
]); ]);
$customerAddress = $this->customerAddressRepository->create(request()->all()); $customerAddress = $this->customerAddressRepository->create(request()->all());
@ -101,29 +104,37 @@ class AddressController extends Controller
/** /**
* Update the specified resource in storage. * Update the specified resource in storage.
* * @param int $id
* @return \Illuminate\Http\Response *
* @return \Illuminate\Http\JsonResponse
* @throws \Illuminate\Validation\ValidationException
*/ */
public function update() public function update(int $id)
{ {
$customer = auth($this->guard)->user(); if (request()->input('address1') && ! is_array(request()->input('address1'))) {
return response()->json([
'message' => 'address1 must be an array.',
]);
}
request()->merge(['address1' => implode(PHP_EOL, array_filter(request()->input('address1')))]); request()->merge(['address1' => implode(PHP_EOL, array_filter(request()->input('address1')))]);
$this->validate(request(), [ $this->validate(request(), [
'address1' => 'string|required', 'address1' => 'string|required',
'country' => 'string|required', 'company' => 'string|nullable',
'state' => 'string|required', 'vat_id' => 'string|nullable',
'city' => 'string|required', 'country' => 'string|required',
'state' => 'string|nullable',
'city' => 'string|required',
'postcode' => 'required', 'postcode' => 'required',
'phone' => 'required', 'phone' => 'required',
]); ]);
$this->customerAddressRepository->update(request()->all(), request()->input('id')); $customerAddress = $this->customerAddressRepository->update(request()->all(), $id);
return response()->json([ return response()->json([
'message' => 'Your address has been updated successfully.', 'message' => 'Your address has been updated successfully.',
'data' => new CustomerAddressResource($this->customerAddressRepository->find(request()->input('id'))), 'data' => new CustomerAddressResource($customerAddress),
]); ]);
} }
} }

2
packages/Webkul/API/Http/Resources/Customer/CustomerAddress.php
View File

@ -19,6 +19,7 @@ class CustomerAddress extends JsonResource
'first_name' => $this->first_name, 'first_name' => $this->first_name,
'last_name' => $this->last_name, 'last_name' => $this->last_name,
'company_name' => $this->company_name, 'company_name' => $this->company_name,
'vat_id' => $this->vat_id,
'address1' => explode(PHP_EOL, $this->address1), 'address1' => explode(PHP_EOL, $this->address1),
'country' => $this->country, 'country' => $this->country,
'country_name' => core()->country_name($this->country), 'country_name' => core()->country_name($this->country),
@ -26,6 +27,7 @@ class CustomerAddress extends JsonResource
'city' => $this->city, 'city' => $this->city,
'postcode' => $this->postcode, 'postcode' => $this->postcode,
'phone' => $this->phone, 'phone' => $this->phone,
'is_default' => $this->default_address,
'created_at' => $this->created_at, 'created_at' => $this->created_at,
'updated_at' => $this->updated_at, 'updated_at' => $this->updated_at,
]; ];

1
packages/Webkul/Core/src/Models/Address.php
View File

@ -72,6 +72,7 @@ abstract class Address extends Model implements AddressContract
protected $casts = [ protected $casts = [
'additional' => 'array', 'additional' => 'array',
'default_address' => 'boolean',
]; ];
/** /**