jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enhance addresses

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-01-01 22:45:27 +01:00
parent ea5350a0a6
commit b42ae14428
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -48,7 +48,7 @@ class RegisterController extends Controller
public function showRegistrationForm() public function showRegistrationForm()
{ {
return view('Shop.auth.register', $data ?? []); return view('Shop.auth.register');
} }
protected function create(array $data) protected function create(array $data)

3
app/Repositories/Shop/CustomerAddresses.php
View File

@@ -23,9 +23,11 @@ class CustomerAddresses
public static function add($user_id, $data) public static function add($user_id, $data)
{ {
$name = $data['company'] ? $data['company'] : $data['first_name'] . ' ' . $data['last_name'];
if ($data['use_for_delivery'] ?? false) { if ($data['use_for_delivery'] ?? false) {
return self::store([ return self::store([
'customer_id' => $user_id, 'customer_id' => $user_id,
'name' => $name,
'address' => $data['delivery_address'], 'address' => $data['delivery_address'],
'address2' => $data['delivery_address2'], 'address2' => $data['delivery_address2'],
'zipcode' => $data['delivery_zipcode'], 'zipcode' => $data['delivery_zipcode'],
@@ -34,6 +36,7 @@ class CustomerAddresses
} else { } else {
return self::store([ return self::store([
'customer_id' => $user_id, 'customer_id' => $user_id,
'name' => $name,
'address' => $data['address'], 'address' => $data['address'],
'address2' => $data['address2'], 'address2' => $data['address2'],
'zipcode' => $data['zipcode'], 'zipcode' => $data['zipcode'],

2
resources/views/Shop/Orders/order.blade.php
View File

@@ -24,7 +24,7 @@
<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif> <div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
<x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true> <x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses') @include('Shop.Orders.partials.addresses', ['addresses' => $customer['addresses'] ?? false])
</x-layout.collapse> </x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true> <x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>

25
resources/views/Shop/Orders/partials/addresses.blade.php
View File

@@ -1,10 +1,17 @@
@foreach ($addresses ?? [] as $address) @if ($addresses)
<div class="row"> @foreach ($addresses ?? [] as $address)
<div class="col-1"> <div class="row">
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/> <div class="col-1">
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
</div>
<div class="col-11">
{{ $address['name'] }}<br/>
{{ $address['address'] }}<br/>
@if ($address['address2'])
{{ $address['address2'] }}<br/>
@endif
{{ $address['zipcode'] }} {{ $address['city'] }}<br/>
</div>
</div> </div>
<div class="col-11"> @endforeach
@endif
</div>
</div>
@endforeach