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

Fix on addresses

Browse Source
This commit is contained in:
ludo
2023-11-13 00:02:21 +01:00
parent 37f1ebbb59
commit 741f389620
29 changed files with 660 additions and 447 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,75 +1,66 @@
@extends('Shop.layout.layout', [
'title' => __('Commande'),
'title' => __('Commande'),
])
@section('content')
<div class="row">
<div class="@if ($basket['count']) col-8 @else col-12 @endif">
@if (!App\Repositories\Shop\Customers::isConnected())
<p>
<a href="#" id="customer" class="pr-5">Déja client ?</a>
<button class="btn btn-secondary" id="register">Créez mon compte</button>
</p>
<div class="row">
<div class="@if ($basket['count']) col-8 @else col-12 @endif">
@if (App\Repositories\Shop\Customers::isNotConnected())
<p>
<a href="#" id="customer" class="pr-5">Déja client ?</a>
<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>
@include('Shop.auth.partials.login')
</x-layout.collapse>
<x-layout.collapse id="identification" title="Déjà client" class="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>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@else
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<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']) }}
@include('Shop.Orders.partials.registered')
{!! Form::close() !!}
@endif
<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
</div>
@if ($basket['count'])
<div class="col-4">
<x-card class='shadow'>
@include('Shop.Baskets.partials.basketTotal')
</x-card>
</div>
@endif
</div>
</div>
@if ($basket['count'])
<div class="col-4">
<x-card class='shadow'>
@include('Shop.Baskets.partials.basketTotal')
</x-card>
</div>
@endif
</div>
@endsection
@include('load.layout.chevron')
@push('js')
<script>
$('#customer').click(function() {
$(".personal_data").addClass('d-none');
$('.identification').removeClass('d-none');
$('#identification').collapse('show');
});
$('#register').click(function() {
$('.identification').addClass('d-none');
$(".personal_data").removeClass('d-none');
$('#personal_data').collapse('show');
});
<script>
$('#customer').click(function() {
$(".personal_data").addClass('d-none');
$('.identification').removeClass('d-none');
$('#identification').collapse('show');
});
initChevron();
$('#register').click(function() {
$('.identification').addClass('d-none');
$(".personal_data").removeClass('d-none');
$('#personal_data').collapse('show');
});
</script>
@endpush
$('#delivery_mode .delivery_mode').click(function() {
var test = $(this).hasClass('at_house');
if ($(this).hasClass('at_house')) {
$('#delivery_addresses').closest('.card').removeClass('d-none');
} else {
$('#delivery_addresses').closest('.card').addClass('d-none');
}
});
initChevron();
</script>
@endpush

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

@@ -6,17 +6,17 @@
'name' => 'address_id',
'val' => $address['id'],
'id' => 'address_' . $address['id'],
'value' => (count($addresses) === 1) ? $address['id'] : false,
'value' => count($addresses) === 1 ? $address['id'] : false,
])
</div>
<div class="col-11">
{{ $address['name'] }}<br/>
{{ $address['address'] }}<br/>
{{ $address['name'] }}<br />
{{ $address['address'] }}<br />
@if ($address['address2'])
{{ $address['address2'] }}<br/>
{{ $address['address2'] }}<br />
@endif
{{ $address['zipcode'] }} {{ $address['city'] }}<br/>
{{ $address['zipcode'] }} {{ $address['city'] }}<br />
</div>
</div>
@endforeach
@endif
@endif

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

@@ -5,17 +5,18 @@
'name' => 'delivery_id',
'val' => $delivery['id'],
'id' => 'delivery_' . $delivery['id'],
'class' => $delivery['at_house'] ? 'at_house' : '',
'class' => 'delivery_mode' . ($delivery['at_house'] ? ' at_house' : ''),
])
</div>
<div class="col-11">
<strong>{{ $delivery['name'] }} - Tarif appliqué {{ $delivery['sale_channel']['name'] }}</strong><br/>
<strong>{{ $delivery['name'] }} - Tarif appliqué {{ $delivery['sale_channel']['name'] }}</strong><br />
{!! $delivery['sale_channel']['description'] !!}
</div>
</div>
@endforeach
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs ci-contre
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs
ci-contre
@include('components.form.textarea', [
'name' => 'content',

23
resources/views/Shop/Orders/partials/registered.blade.php Normal file
View File

@@ -0,0 +1,23 @@
<div id="registred">
<x-layout.collapse id="invoice_addresses" title="Adresse de facturation" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses', [
'addresses' => $customer['invoice_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="delivery_addresses" title="Adresse de livraison" class="rounded-lg mb-3 d-none"
uncollapsed=true>
@include('Shop.Orders.partials.addresses', [
'addresses' => $customer['delivery_addresses'] ?? false,
])
@include('Shop.Orders.partials.shipping')
</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>

1
resources/views/Shop/Orders/partials/shipping.blade.php Normal file
View File

@@ -0,0 +1 @@

74
resources/views/Shop/Orders/view.blade.php Normal file
View File

@@ -0,0 +1,74 @@
<div class="row">
<div class="col-6">
<h4>{{ $order['delivery']['name'] ?? '' }} </h4>
</div>
<div class="col-6 text-right">
</div>
</div>
<div class="row mb-3">
<div class="col-6">
<h3>
{{ $order['customer']['last_name'] }} {{ $order['customer']['first_name'] }}
</h3>
<div class="row">
<div class="col-6">
<x-card title="Adresse de facturation">
@if ($order['invoice']['address'])
{{ $order['invoice']['address']['address'] }}<br />
@isset($order['invoice']['address']['address2'])
{{ $order['invoice']['address']['address2'] }}<br />
@endisset
{{ $order['invoice']['address']['zipcode'] }}
{{ $order['invoice']['address']['city'] }}<br />
@endif
</x-card>
</div>
<div class="col-6">
<x-card title="Adresse de livraison">
@if ($order['delivery_address'])
{{ $order['delivery_address']['address'] }}<br />
@isset($order['delivery_address']['address2'])
{{ $order['delivery_address']['address2'] }}<br />
@endisset
{{ $order['delivery_address']['zipcode'] }}
{{ $order['delivery_address']['city'] }}<br />
@endif
</x-card>
</div>
</div>
</div>
<div class="col-6">
<div class="row mb-3">
<div class="col-6" style="font-size: 1.2em; font-weight: 500;">
Commande N° {{ $order['ref'] }}<br />
du {{ Carbon\Carbon::parse($order['created_at'])->isoFormat('LLLL') }}
</div>
<div class="col-6">
Statut : {{ $order['status'] }}
</div>
</div>
<div class="row mb-3">
<div class="col-6">
Canal de vente : {{ $order['sale_channel']['name'] }}
</div>
<div class="col-6">
Règlement : {{ $order['payment_type'] }}
</div>
</div>
<div class="row mb-3">
<div class="col-4">
Type de livraison : {{ $order['delivery_type_id'] }}
</div>
<div class="col-4">
Référence Colis : {{ $order['delivery_ref'] }}
</div>
<div class="col-4">
Lien suivi : {{ $order['delivery_link'] }}
</div>
</div>
</div>
</div>
@include('Admin.Shop.Orders.partials.detail', ['detail_type' => 'commande'])