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

fixes

Browse Source
This commit is contained in:
ludo
2025-01-03 03:46:45 +01:00
parent b3fbfc38e7
commit befaa40b48
44 changed files with 442 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
resources/views/Shop/Orders/confirmed.blade.php
View File

@@ -1,11 +1,11 @@
@extends('Shop.layout.layout', [
'title' => __('Commande confirmée'),
'title' => __('Commande confirmée'),
])
@section('content')
<div class="row">
<div class="col-8">
Votre commande a été confirmée
</div>
</div>
<div class="row">
<div class="col-12">
{!! $content !!}
</div>
</div>
@endsection

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

@@ -3,6 +3,15 @@
])
@section('content')
@php
if ($errors->registration) {
$classIdent = 'd-none';
$classRegister = '';
} else {
$classIdent = '';
$classRegister = 'd-none';
}
@endphp
<div class="row">
<div class="@if ($basket['count']) col-sm-12 col-lg-8 @else col-12 @endif">
@if (App\Repositories\Shop\Customers::isNotConnected())
@@ -11,12 +20,13 @@
<button class="btn btn-secondary" id="register">Créez mon compte</button>
</p>
<x-layout.collapse id="identification" title="Déjà client" class="identification rounded-lg" uncollapsed=true>
<x-layout.collapse id="identification" title="Déjà client"
class="{{ $classIdent }} identification rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.login')
</x-layout.collapse>
<x-layout.collapse id="personal_data" title="Informations personnelles"
class="d-none personal_data rounded-lg" uncollapsed=true>
class="{{ $classRegister }} personal_data rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@else

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

@@ -6,7 +6,8 @@
'name' => $name,
'val' => $address['id'],
'id' => $prefix . '_address_' . $address['id'],
'value' => $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
'value' =>
old($name) ?? $address['priority'] || count($addresses) === 1 ? $address['id'] : false,
])
</div>
<div class="col-11">

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

@@ -4,6 +4,7 @@
@include('components.form.radios.icheck', [
'name' => 'delivery_id',
'val' => $delivery['id'],
'value' => (int) old('delivery_id') === $delivery['id'] ? $delivery['id'] : null,
'id' => 'delivery_' . $delivery['id'],
'class' => 'delivery_mode' . ($delivery['at_house'] ? ' at_house' : ''),
])
@@ -15,11 +16,14 @@
</div>
@endforeach
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs
{!! $errors->first('delivery_id', '<p class="text-danger"><strong>:message</strong></p>') !!}
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champ
ci-contre
@include('components.form.textarea', [
'name' => 'comment',
'value' => old('comment') ?? '',
])
@push('js')

13
resources/views/Shop/Orders/partials/payments.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="1" id="payment_card"/>
<x-form.radios.icheck name="payment_type" val="1" id="payment_card" :value="old('payment_type') === '1' ? 1 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR CARTE BANCAIRE
@@ -9,7 +9,7 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="2" id="payment_check"/>
<x-form.radios.icheck name="payment_type" val="2" id="payment_check" :value="old('payment_type') === '2' ? 2 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR CHEQUE
@@ -18,20 +18,23 @@
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="payment_type" val="3" id="payment_transfer"/>
<x-form.radios.icheck name="payment_type" val="3" id="payment_transfer" :value="old('payment_type') === '3' ? 3 : null" />
</div>
<div class="col-11 pt-2">
PAIEMENT PAR VIREMENT BANCAIRE
</div>
</div>
{!! $errors->first('payment_type', '<p class="text-danger"><strong>:message</strong></p>') !!}
<div class="row pt-5">
<div class="col-1">
<x-form.checkboxes.icheck name="agree" val="1" required=true/>
<x-form.checkboxes.icheck name="agree" val="1" required=true />
</div>
<div class="col-11 pt-2">
J'ai lu les conditions générales de vente et j'y adhère sans réserve
</div>
{!! $errors->first('agree', '<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
<button type="submit" class="btn btn-primary mt-5">COMMANDE AVEC OBLIGATION DE PAIEMENT</button>
<button type="submit" class="btn btn-primary mt-5">COMMANDE AVEC OBLIGATION DE PAIEMENT</button>