amacocian/monica
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

fix: fix validation fails with Services (#2258)

Browse Source
This commit is contained in:
Alexis Saettler
2019-01-05 16:24:09 +01:00
committed by GitHub
parent 555515d1c4
commit 95df53135d
88 changed files with 317 additions and 336 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Contacts/AddressesController.php
+34 -27
View File
@@ -9,6 +9,7 @@ use App\Models\Contact\Contact;
use App\Helpers\CountriesHelper;
use App\Http\Controllers\Controller;
use Illuminate\Support\Facades\Auth;
use App\Traits\JsonRespondController;
use Illuminate\Support\Facades\Cache;
use App\Services\Contact\Address\CreateAddress;
use App\Services\Contact\Address\UpdateAddress;
@@ -16,6 +17,8 @@ use App\Services\Contact\Address\DestroyAddress;
class AddressesController extends Controller
{
use JsonRespondController;
/**
* Get all the addresses for this contact.
*/
@@ -66,20 +69,21 @@ class AddressesController extends Controller
*/
public function store(Request $request, Contact $contact)
{
$request = [
'account_id' => auth()->user()->account->id,
$datas = [
'account_id' => auth()->user()->account_id,
'contact_id' => $contact->id,
'name' => $request->get('name'),
'country' => $request->get('country'),
'street' => $request->get('street'),
'city' => $request->get('city'),
'province' => $request->get('province'),
'postal_code' => $request->get('postal_code'),
'latitude' => $request->get('latitude'),
'longitude' => $request->get('longitude'),
];
] + $request->only([
'name',
'country',
'street',
'city',
'province',
'postal_code',
'latitude',
'longitude',
]);
return (new CreateAddress)->execute($request);
return (new CreateAddress)->execute($datas);
}
/**
@@ -87,21 +91,22 @@ class AddressesController extends Controller
*/
public function edit(Request $request, Contact $contact, Address $address)
{
$request = [
'account_id' => auth()->user()->account->id,
$datas = [
'account_id' => auth()->user()->account_id,
'contact_id' => $contact->id,
'address_id' => $address->id,
'name' => $request->get('name'),
'country' => $request->get('country'),
'street' => $request->get('street'),
'city' => $request->get('city'),
'province' => $request->get('province'),
'postal_code' => $request->get('postal_code'),
'latitude' => $request->get('latitude'),
'longitude' => $request->get('longitude'),
];
] + $request->only([
'name',
'country',
'street',
'city',
'province',
'postal_code',
'latitude',
'longitude',
]);
return (new UpdateAddress)->execute($request);
return (new UpdateAddress)->execute($datas);
}
/**
@@ -114,11 +119,13 @@ class AddressesController extends Controller
*/
public function destroy(Request $request, Contact $contact, Address $address)
{
$request = [
'account_id' => auth()->user()->account->id,
$datas = [
'account_id' => auth()->user()->account_id,
'address_id' => $address->id,
];
(new DestroyAddress)->execute($request);
if ((new DestroyAddress)->execute($datas)) {
return $this->respondObjectDeleted($address->id);
}
}
}