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

Issue #3981 fixed

This commit is contained in:
vishal.kushwaha650 2020-10-05 19:44:33 +05:30
parent bee024ad2f
commit 6757255aa5
1 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,6 +2,9 @@
namespace Webkul\API\Http\Controllers\Shop; namespace Webkul\API\Http\Controllers\Shop;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Validator;
use Webkul\Customer\Repositories\CustomerAddressRepository; use Webkul\Customer\Repositories\CustomerAddressRepository;
use Webkul\API\Http\Resources\Customer\CustomerAddress as CustomerAddressResource; use Webkul\API\Http\Resources\Customer\CustomerAddress as CustomerAddressResource;
@ -65,16 +68,24 @@ class AddressController extends Controller
* *
* @return \Illuminate\Http\Response * @return \Illuminate\Http\Response
*/ */
public function store() public function store(Request $request)
{ {
$customer = auth($this->guard)->user(); $customer = auth($this->guard)->user();
request()->merge([ if (request()->input('address1') && ! is_array(json_decode(request()->input('address1')))) {
'address1' => implode(PHP_EOL, array_filter(request()->input('address1'))), return response()->json([
'customer_id' => $customer->id, 'message' => 'address1 must be an array.',
]); ]);
}
$this->validate(request(), [ if (request()->input('address1')) {
request()->merge([
'address1' => implode(PHP_EOL, array_filter(json_decode(request()->input('address1')))),
'customer_id' => $customer->id,
]);
}
$validator = Validator::make($request->all(), [
'address1' => 'string|required', 'address1' => 'string|required',
'country' => 'string|required', 'country' => 'string|required',
'state' => 'string|required', 'state' => 'string|required',
@ -83,6 +94,10 @@ class AddressController extends Controller
'phone' => 'required', 'phone' => 'required',
]); ]);
if ($validator->fails()) {
return response($validator->errors(), Response::HTTP_BAD_REQUEST);
}
$customerAddress = $this->customerAddressRepository->create(request()->all()); $customerAddress = $this->customerAddressRepository->create(request()->all());
return response()->json([ return response()->json([