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

cosmetic fixes, enhance profile, fix mails, ...

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-03-14 23:33:14 +01:00
parent 695d23a139
commit 23e6ca35ca
27 changed files with 266 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
resources/views/Shop/Customers/edit.blade.php
View File

@@ -11,15 +11,15 @@
</div>
<div class="col-6">
<x-card title="Mes adresses de livraison" class="gradient-green1 mb-3">
@include('Shop.Customers.partials.addresses')
@include('Shop.Customers.partials.addresses', ['addresses' => $customer['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 />
@endsection
@include('load.layout.modal')

15
resources/views/Shop/Customers/partials/addresses.blade.php
View File

@@ -1,5 +1,5 @@
@foreach ($addresses ?? [] as $address)
<div class="row">
<div class="row mt-3">
<div class="col-1">
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
</div>
@@ -13,9 +13,22 @@
</div>
@endforeach
<div id="add_address_container" class="green-dark d-none mb-3 mt-3">
<x-card classBody="bg-green-dark yellow" title="Nouvelle adresse">
@include('components.address', ['prefix' => 'deliveries', 'with_country' => false, 'with_tab' => true])
</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" />
</div>
</div>
@push('js')
<script>
$('#add_address').click(function() {
$('#add_address_container').toggleClass('d-none');
})
</script>
@endpush

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

@@ -1,6 +1,6 @@
@foreach ($deliveries as $delivery)
<div class="row mt-3 mb-3">
<div class="col-1 text-right">
<div class="row">
<div class="col-1 text-right pt-1">
@include('components.form.radios.icheck', [
'name' => 'delivery_id',
'id_name' => 'delivery_id_' . $delivery['id'],
@@ -8,7 +8,7 @@
'checked' => $customer['sale_delivery_id'] ?? false,
])
</div>
<div class="col-11 pt-1">
<div class="col-11 pt-3">
<strong>{{ $delivery['name'] }} - {{ $delivery['sale_channel']['name'] }}</strong><br/>
<p>{{ $delivery['description'] }}</p>
</div>

2
resources/views/Shop/auth/passwords/password_confirmation.blade.php
View File

@@ -1,4 +1,4 @@
<div class="row mb-3">
<div class="row mb-3 mt-3">
<label for="new-password" class="col-md-6 control-label text-right">Mot de passe actuel</label>
<div class="col-md-6">
<input id="current-password" type="password" class="form-control" name="current-password" required>

2
resources/views/Shop/layout/partials/megamenu.blade.php
View File

@@ -3,7 +3,7 @@
@endphp
<div class="container p-0">
<div class="row m-0 shadow bg-white p-2 w-100 @if ( in_array($menu['id'], [$category['id'], $category['parent_id']])) active @endif">
<div class="row m-0 shadow bg-white p-2 w-100 @if ( in_array($menu['id'], [$category['id'] ?? false, $category['parent_id'] ?? false])) active @endif">
<div class="col mb-4">
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
<div class="w-100"><strong>Tous les articles</strong></div>

2
resources/views/Shop/layout/partials/megamenu_leafs.blade.php
View File

@@ -1,5 +1,5 @@
<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
<div class="w-100 @if (in_array($menu_children['id'], [$category['id'], $category['parent_id']])) active @endif">
<div class="w-100 @if (in_array($menu_children['id'], [$category['id'] ?? false, $category['parent_id'] ?? false])) active @endif">
<strong>{{ $menu_children['name'] }}</strong>
</div>
</a>

2
resources/views/Shop/layout/partials/sections.blade.php
View File

@@ -5,7 +5,7 @@
<ul class="navbar-nav w-100">
@foreach ($categories as $menu)
<li class="nav-item dropdown megamenu p-2 col
@if (in_array($menu['id'], [$category['id'], $category['parent_id'], $category['parent']['parent_id'] ?? false])) active @endif">
@if (in_array($menu['id'], [$category['id'] ?? false, $category['parent_id'] ?? false, $category['parent']['parent_id'] ?? false])) active @endif">
@if ($menu['children'] ?? false)
<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase">
{{ $menu['name'] }}

65
resources/views/components/address.blade.php
View File

@@ -1,5 +1,5 @@
@if (($mode ?? false) == 'view')
<label class="light" for="{{ $prefix ?? null }}address">{{ __('address') }}</label><br/>
<label class="{{ $classLabel ?? 'light' }}" for="{{ $prefix ?? null }}address">{{ __('address') }}</label><br/>
@if ($item[($prefix ?? null) . 'address'])
{{ $item[($prefix ?? null) . 'address'] ?? null }}<br/>
@endif
@@ -23,34 +23,61 @@
<input type="hidden" name="{{ ($prefix ?? null) . (($with_tab ?? false) ? '[id]' : 'address_id') }}" value="{{ $with_id }}">
@endif
<div class="row mb-3">
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}address">{{ __('street') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address]' : 'address'), 'value' => ($with_tab ?? false) ? $item['address'] : ($item[($prefix ?? null) . 'address'] ?? null), 'disabled' => $disabled ?? false ])
<div class="col-12">
@include('components.form.input', [
'label' => __('street'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address]' : 'address'),
'value' => ($with_tab ?? false) ? $item['address'] ?? null : ($item[($prefix ?? null) . 'address'] ?? null),
'disabled' => $disabled ?? false
])
</div>
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}address2">{{ __('street_complement') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address2]' : 'address2'), 'value' => ($with_tab ?? false) ? $item['address2'] : ($item[($prefix ?? null) . 'address2'] ?? null), 'disabled' => $disabled ?? false ])
<div class="col-12">
@include('components.form.input', [
'label' => __('street_complement'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address2]' : 'address2'),
'value' => ($with_tab ?? false) ? $item['address2'] ?? null : ($item[($prefix ?? null) . 'address2'] ?? null),
'disabled' => $disabled ?? false,
])
</div>
</div>
<div class="row mb-3">
<div class="col-6 form-group">
<label class="light" for="{{ $prefix ?? null }}zipcode">{{ __('zipcode') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[zipcode]' : 'zipcode'), 'value' => ($with_tab ?? false) ? $item['zipcode'] : ($item[($prefix ?? null) . 'zipcode'] ?? null), 'disabled' => $disabled ?? false ])
<div class="col-4">
@include('components.form.input', [
'label' => __('zipcode'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[zipcode]' : 'zipcode'),
'value' => ($with_tab ?? false) ? $item['zipcode'] ?? null : ($item[($prefix ?? null) . 'zipcode'] ?? null),
'disabled' => $disabled ?? false,
])
</div>
<div class="col-6 form-group">
<label class="light" for="{{ $prefix ?? null }}city">{{ __('city') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[city]' : 'city'), 'value' => ($with_tab ?? false) ? $item['city'] : ($item[($prefix ?? null) . 'city'] ?? null), 'disabled' => $disabled ?? false ])
<div class="col-8">
@include('components.form.input', [
'label' => __('city'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[city]' : 'city'),
'value' => ($with_tab ?? false) ? $item['city'] ?? null : ($item[($prefix ?? null) . 'city'] ?? null),
'disabled' => $disabled ?? false,
])
</div>
</div>
@if ($with_country ?? true)
<div class="row mb-3">
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}country">{{ __('country') }}</label><br/>
@include('components.form.select', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[country_id]' : 'country_id'), 'list' => $countries ?? null, 'value' => ($with_tab ?? false) ? $item['country_id'] : ($item[($prefix ?? null) . 'country_id'] ?? null), 'with_empty' => '', 'required' => true, 'disabled' => $disabled ?? false ])
<div class="col-12 col-lg-6">
@include('components.form.select', [
'label' => __('country'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[country_id]' : 'country_id'),
'list' => $countries ?? null,
'value' => ($with_tab ?? false) ? $item['country_id'] ?? null : ($item[($prefix ?? null) . 'country_id'] ?? null),
'with_empty' => '',
'required' => true,
'disabled' => $disabled ?? false,
])
</div>
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}state">{{ __('state') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[state]' : 'state'), 'value' => ($with_tab ?? false) ? $item['state'] : ($item[($prefix ?? null) . 'state'] ?? null), 'disabled' => $disabled ?? false ])
<div class="col-12 col-lg-6">
@include('components.form.input', [
'label' => çç('state'),
'name' => ($prefix ?? null) . (($with_tab ?? false) ? '[state]' : 'state'),
'value' => ($with_tab ?? false) ? $item['state'] ?? null : ($item[($prefix ?? null) . 'state'] ?? null),
'disabled' => $disabled ?? false,
])
</div>
</div>
@endif

2
resources/views/components/card.blade.php
View File

@@ -9,7 +9,7 @@
{!! $tools !!}
</div>
@endisset
<h3 class="card-title {{ $classTitle ?? '' }}">{{ $title ?? false }}</h3>
<h3 class="card-title {{ $classTitle ?? 'mb-0' }}">{{ $title ?? false }}</h3>
@endisset
</div>
@endif