Fix on addresses
This commit is contained in:
ludo
@@ -1,25 +1,54 @@
|
||||
@extends('Shop.layout.layout', [
|
||||
'title' => __('Editer son profil'),
|
||||
'title' => __('Editer son profil'),
|
||||
])
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-6">
|
||||
<x-card title="Mes coordonnées" class="gradient-green1">
|
||||
@include('Shop.Customers.partials.registration')
|
||||
</x-card>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<x-card title="Mes adresses de livraison" class="gradient-green1 mb-3">
|
||||
@include('Shop.Customers.partials.addresses', ['addresses' => $customer['addresses']])
|
||||
</x-card>
|
||||
{{ Form::open([
|
||||
'route' => 'Shop.Customers.store',
|
||||
'id' => 'customer-form',
|
||||
'autocomplete' => 'off',
|
||||
'files' => true,
|
||||
]) }}
|
||||
|
||||
<x-card title="Mon mot de passe" class="gradient-green1">
|
||||
@include('Shop.auth.passwords.password_confirmation')
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
<x-save />
|
||||
<input type="hidden" name="id" id="id" value="{{ $customer['id'] ?? null }}">
|
||||
|
||||
<div class="row mb-3">
|
||||
<div class="col-6">
|
||||
<x-card title="Mes coordonnées" class="gradient-green1">
|
||||
@include('Shop.Customers.partials.registration')
|
||||
</x-card>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<x-card title="Mes adresses de livraison" class="gradient-green1 mb-3">
|
||||
@include('Shop.Customers.partials.addresses', [
|
||||
'prefix' => 'deliveries',
|
||||
'addresses' => $customer['delivery_addresses'],
|
||||
])
|
||||
</x-card>
|
||||
|
||||
<x-card title="Mes adresses de facturation" class="gradient-green1 mb-3">
|
||||
@include('Shop.Customers.partials.addresses', [
|
||||
'prefix' => 'invoices',
|
||||
'addresses' => $customer['invoice_addresses'],
|
||||
])
|
||||
</x-card>
|
||||
|
||||
<x-card title="Mon mot de passe" class="gradient-green1">
|
||||
@include('Shop.auth.passwords.password_confirmation')
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
<x-save />
|
||||
</form>
|
||||
@endsection
|
||||
|
||||
@include('load.form.save')
|
||||
@include('load.layout.modal')
|
||||
|
||||
@push('js')
|
||||
<script>
|
||||
$(function() {
|
||||
initSaveForm('#customer-form');
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@include('components.form.input', [
|
||||
'name' => ($prefix ?? '') . 'address',
|
||||
'name' => $prefix ?? false ? $prefix . "['address']" : 'address',
|
||||
'value' => $customer['address'] ?? '',
|
||||
'label' => $label ?? '',
|
||||
])
|
||||
@@ -11,7 +11,7 @@
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@include('components.form.input', [
|
||||
'name' => ($prefix ?? '') . 'address2',
|
||||
'name' => $prefix ?? false ? $prefix . "['address2']" : 'address2',
|
||||
'value' => $customer['address2'] ?? '',
|
||||
'label' => 'Complément d\'adresse',
|
||||
])
|
||||
@@ -21,16 +21,16 @@
|
||||
<div class="row">
|
||||
<div class="col-4">
|
||||
@include('components.form.input', [
|
||||
'name' => ($prefix ?? '') . 'zipcode',
|
||||
'name' => $prefix ?? false ? $prefix . "['zipcode']" : 'zipcode',
|
||||
'value' => $customer['zipcode'] ?? '',
|
||||
'label' => 'Code postal',
|
||||
])
|
||||
</div>
|
||||
<div class="col-8">
|
||||
@include('components.form.input', [
|
||||
'name' => ($prefix ?? '') . 'city',
|
||||
'name' => $prefix ?? false ? $prefix . "['city']" : 'city',
|
||||
'value' => $customer['city'] ?? '',
|
||||
'label' => 'Ville',
|
||||
])
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,39 +1,42 @@
|
||||
@foreach ($addresses ?? [] as $address)
|
||||
<div class="row mt-3">
|
||||
<div class="col-1">
|
||||
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
|
||||
<x-form.radios.icheck name="@if ($prefix ?? false) {{ $prefix }} . '[]' @endif address_id"
|
||||
val="{{ $address['id'] }}" id="address_{{ $address['id'] }}" />
|
||||
</div>
|
||||
<div class="col-11">
|
||||
{{ $address['address'] }}<br/>
|
||||
{{ $address['address'] }}<br />
|
||||
@if ($address['address2'])
|
||||
{{ $address['address2'] }}<br/>
|
||||
{{ $address['address2'] }}<br />
|
||||
@endif
|
||||
{{ $address['zipcode'] }} {{ $address['city'] }}
|
||||
</div>
|
||||
</div>
|
||||
@endforeach
|
||||
|
||||
<div id="add_address_container" class="green-dark d-none mb-3 mt-3">
|
||||
<div id="add_address_container_{{ $prefix }}" class="green-dark d-none mb-3 mt-3">
|
||||
<x-card classBody="bg-green-dark yellow" title="Nouvelle adresse">
|
||||
@include('Shop.Customers.partials.address', [
|
||||
'prefix' => 'deliveries',
|
||||
'prefix' => $prefix,
|
||||
'with_country' => false,
|
||||
'with_tab' => true,
|
||||
'label' => 'Adresse',
|
||||
'customer' => [],
|
||||
])
|
||||
</x-card>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12 text-right">
|
||||
<x-form.button id="add_address" icon="fa-plus" txt="Ajouter une adresse" class="btn-warning btn-sm" />
|
||||
<x-form.button id="add_address_{{ $prefix }}" icon="fa-plus" txt="Ajouter une adresse"
|
||||
class="btn-warning btn-sm" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@push('js')
|
||||
<script>
|
||||
$('#add_address').click(function() {
|
||||
$('#add_address_container').toggleClass('d-none');
|
||||
$('#add_address_{{ $prefix }}').click(function() {
|
||||
$('#add_address_container_{{ $prefix }}').toggleClass('d-none');
|
||||
})
|
||||
</script>
|
||||
@endpush
|
||||
@endpush
|
||||
|
||||
@@ -48,4 +48,4 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@include('Shop.Customers.partials.address', ['label' => 'Adresse de facturation'])
|
||||
@include('Shop.Customers.partials.address', ['label' => 'Adresse'])
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<nav>
|
||||
<div class="nav nav-tabs pl-2">
|
||||
<a href="#deliveries" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="deliveries" aria-selected="true">
|
||||
<a href="#deliveries" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="deliveries"
|
||||
aria-selected="true">
|
||||
MON MODE D'ACHAT
|
||||
</a>
|
||||
<a href="#invoices" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="invoices" aria-selected="false">
|
||||
<a href="#invoices" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="invoices"
|
||||
aria-selected="false">
|
||||
FACTURES ET SUIVI DE COMMANDES
|
||||
</a>
|
||||
</div>
|
||||
@@ -11,9 +13,13 @@
|
||||
|
||||
<div class="tab-content">
|
||||
<div class="tab-pane fade show active pt-0 pb-0" id="deliveries">
|
||||
@include('Shop.Customers.partials.deliveries')
|
||||
<x-card classBody="bg-light">
|
||||
@include('Shop.Customers.partials.deliveries')
|
||||
</x-card>
|
||||
</div>
|
||||
<div class="tab-pane fade show pt-0 pb-0" id="invoices">
|
||||
@include('Shop.Customers.partials.invoices')
|
||||
<x-card classBody="bg-light">
|
||||
@include('Shop.Customers.partials.invoices')
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
<x-card title="Mes coordonnées" class="mb-3 gradient-green1" outline=false classBody="pt-3" tools="<button id='profile_edit' class='btn btn-outline-warning'><i class='fa fa-fw fa-edit'></i></button>">
|
||||
<x-card title="Mes coordonnées" class="mb-3 gradient-green1" outline=false classBody="pt-3"
|
||||
tools="<button id='profile_edit' class='btn btn-outline-warning'><i class='fa fa-fw fa-edit'></i></button>">
|
||||
|
||||
@if ($customer['company'])
|
||||
<i class="fa fa-building pr-2"></i>
|
||||
@@ -28,13 +29,6 @@
|
||||
<script>
|
||||
$('#profile_edit').click(function() {
|
||||
window.location.assign("{{ route('Shop.Customers.edit') }}");
|
||||
/*
|
||||
openModal('Modification de vos coordonnées',
|
||||
'profile-form',
|
||||
"{{ route('Shop.Customers.modalProfile') }}/",
|
||||
"{{ route('Shop.Customers.storeProfile') }}",
|
||||
);
|
||||
*/
|
||||
});
|
||||
</script>
|
||||
@endpush
|
||||
@endpush
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
@extends('Shop.layout.layout', [
|
||||
'title' => __('Profil'),
|
||||
'title' => __('Profil'),
|
||||
])
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-lg-3 col-md-12">
|
||||
@include('Shop.Customers.partials.user')
|
||||
</div>
|
||||
<div class="col-lg-9 col-md-12">
|
||||
@include('Shop.Customers.partials.sale')
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-lg-3 col-md-12">
|
||||
@include('Shop.Customers.partials.user')
|
||||
</div>
|
||||
<div class="col-lg-9 col-md-12">
|
||||
@include('Shop.Customers.partials.sale')
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@include('load.layout.modal')
|
||||
|
||||
Reference in New Issue
Block a user