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

fixes on addresses

Browse Source
This commit is contained in:
ludo
2024-04-29 22:01:45 +02:00
parent c63bb762ed
commit ee60bac538
14 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/Admin/Shop/Articles/form.blade.php
View File

@@ -25,18 +25,15 @@
<script>
$(function() {
$('.active-checkbox').bootstrapToggle();
$('.active-checkbox').off('change').on('change', function(e) {
$('.active-checkbox').off().change(function(e) {
var id = $('#id').val();
// handleAdmin.toggle(id, $(this).prop('checked'));
});
initChevron();
initEditor();
initSaveForm('#article-form');
initSelect2();
});
</script>
@endpush

25
resources/views/Shop/Articles/article.blade.php
View File

@@ -1,25 +0,0 @@
<a href="{{ route('Shop.Offers.show', ['id' => $offer['id']]) }}">
<div class="card">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($offer['article']['image'] ?? false) }}" class="card-img-top" alt="...">
<div class="card-body">
<span class="card-title">{{ $offer['article']['name'] }}</span>
<span class="pull-right">
<i class="fa fa-heart"></i>
</span>
<p class="card-text">
<div class="row">
<div class="col-6">
3.50 €<br>
Semence
</div>
<div class="col-6">
1.65 €<br>
Plant
</div>
</div>
</p>
</div>
</div>
</a>

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

@@ -23,6 +23,7 @@
@include('Shop.Customers.partials.addresses', [
'prefix' => 'deliveries',
'addresses' => $customer['delivery_addresses'],
'with_name' => true,
])
</x-card>
@@ -30,6 +31,7 @@
@include('Shop.Customers.partials.addresses', [
'prefix' => 'invoices',
'addresses' => $customer['invoice_addresses'],
'with_name' => true,
])
</x-card>
@@ -38,8 +40,8 @@
</x-card>
</div>
</div>
<x-save />
</form>
<x-save />
@endsection
@include('load.form.save')

12
resources/views/Shop/Customers/partials/address.blade.php
View File

@@ -1,3 +1,15 @@
@if ($with_name ?? false)
<div class="row">
<div class="col-12">
@include('components.form.input', [
'name' => $prefix ?? false ? $prefix . "['name']" : 'name',
'value' => $customer['name'] ?? '',
'label' => 'Nom',
])
</div>
</div>
@endif
<div class="row">
<div class="col-12">
@include('components.form.input', [

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

@@ -5,6 +5,9 @@
val="{{ $address['id'] }}" id="address_{{ $address['id'] }}" />
</div>
<div class="col-11">
@if ($with_name ?? false)
{{ $address['name'] }}<br />>
@endif
{{ $address['address'] }}<br />
@if ($address['address2'])
{{ $address['address2'] }}<br />
@@ -15,7 +18,7 @@
@endforeach
<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">
<x-card classBody="bg-green-dark yellow" title="Nouvelle adresse" classTitle="h4">
@include('Shop.Customers.partials.address', [
'prefix' => $prefix,
'with_country' => false,
@@ -29,7 +32,7 @@
<div class="row">
<div class="col-12 text-right">
<x-form.button id="add_address_{{ $prefix }}" icon="fa-plus" txt="Ajouter une adresse"
class="btn-warning btn-sm" />
class="btn-warning btn-sm mt-2" />
</div>
</div>

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

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

20
resources/views/load/form/save.blade.php
View File

@@ -2,14 +2,24 @@
@push('scripts')
<script>
function initSaveForm(form, sel) {
initValidator();
console.log('ici');
if (typeof initValidator === 'function') {
initValidator();
}
var form = (typeof(form) == 'undefined') ? '#form' : form;
var selector = (typeof(sel) == 'undefined') ? '.save' : sel;
$(selector).off().click(function(e) {
e.preventDefault();
if ($(form).valid()) {
$(this).prop("disabled", true);
$(this).html($(this).data('loading-text'));
if (typeof initValidator === 'function') {
console.log('click');
e.preventDefault();
if ($(form).valid()) {
$(this).prop("disabled", true);
$(this).html($(this).data('loading-text'));
$(form).submit();
} else {
console.log('erreur');
}
} else {
$(form).submit();
}
});