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

fix on customer auth, fix filters on shelves, refactor for article_nature, add slug

Browse Source
This commit is contained in:
ludo
2023-10-17 17:20:30 +02:00
parent 50d5d6944d
commit f3b9db1a6f
30 changed files with 1205 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,25 +18,30 @@
<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@else
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<div id="registred">
<x-layout.collapse id="adresses" title="Adresse de facturation" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['invoicing_addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries')
</x-layout.collapse>
<x-layout.collapse id="adresses" title="Adresse de livraison" class="rounded-lg mb-3 d-none" uncollapsed=true>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['delivery_addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments')
</x-layout.collapse>
</div>
{!! Form::close() !!}
@endif
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<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>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries')
</x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments')
</x-layout.collapse>
</div>
{!! Form::close() !!}
</div>
@if ($basket['count'])

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

@@ -2,7 +2,12 @@
@foreach ($addresses ?? [] as $address)
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
@include('components.form.radios.icheck', [
'name' => 'address_id',
'val' => $address['id'],
'id' => 'address_' . $address['id'],
'value' => (count($addresses) === 1) ? $address['id'] : false,
])
</div>
<div class="col-11">
{{ $address['name'] }}<br/>
@@ -14,4 +19,4 @@
</div>
</div>
@endforeach
@endif
@endif

11
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -1,7 +1,12 @@
@foreach ($deliveries as $delivery)
<div class="row">
<div class="col-1">
<x-form.radios.icheck name="delivery_id" val="{{ $delivery['id'] }}" id="delivery_{{ $delivery['id'] }}"/>
@include('components.form.radios.icheck', [
'name' => 'delivery_id',
'val' => $delivery['id'],
'id' => 'delivery_' . $delivery['id'],
'class' => $delivery['at_house'] ? 'at_house' : '',
])
</div>
<div class="col-11">
<strong>{{ $delivery['name'] }} - Tarif appliqué {{ $delivery['sale_channel']['name'] }}</strong><br/>
@@ -12,4 +17,6 @@
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs ci-contre
<textarea name="comment" class="form-control"></textarea>
@include('components.form.textarea', [
'name' => 'content',
])