minor fixes

This commit is contained in:
ludo
2023-12-09 21:02:28 +01:00
parent b5da5fc881
commit 2a429e4163
49 changed files with 448 additions and 266 deletions

View File

@@ -173,17 +173,17 @@ return [
'confirmdelete' => 'Confirmez-vous la suppression de l\'offre ?',
],
'packages' => [
'title' => 'Déclinaisons',
'name' => 'Déclinaison',
'description' => 'Gérer les déclinaisons',
'add' => 'Ajouter une déclinaison',
'edit' => 'Editer une déclinaison',
'del' => 'Effacer une déclinaison',
'list' => 'Liste des déclinaisons',
'successadd' => 'La déclinaison été correctement ajoutée',
'successmod' => 'La déclinaison a été correctement modifiée',
'successdel' => 'La déclinaison a été correctement effacée',
'confirmdelete' => 'Confirmez-vous la suppression de la déclinaison ?',
'title' => 'Packages',
'name' => 'Package',
'description' => 'Gérer les packages',
'add' => 'Ajouter un package',
'edit' => 'Editer un package',
'del' => 'Effacer un package',
'list' => 'Liste des packages',
'successadd' => 'Le package été correctement ajouté',
'successmod' => 'Le package a été correctement modifié',
'successdel' => 'Le package a été correctement effacé',
'confirmdelete' => 'Confirmez-vous la suppression du package ?',
],
'producers' => [
'title' => 'Producteurs',

View File

@@ -1,35 +1,35 @@
@extends('layout.index', [
'title' => __('shop.articles.title'),
'subtitle' => __('shop.articles.list'),
'breadcrumb' => [__('shop.articles.title')]
'title' => __('shop.articles.title'),
'subtitle' => __('shop.articles.list'),
'breadcrumb' => [__('shop.articles.title')],
])
@section('content')
@component('components.card')
@include('components.datatable', [
'route' => route('Admin.Shop.Articles.index'),
'model' => 'articles',
'with_filters' => true,
'callback' => 'handleArticle()',
])
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-articles-filters'])
@include('Admin.Shop.Articles.partials.filters', ['model' => 'articles'])
@endcomponent
@endcomponent
<x-card>
@include('components.datatable', [
'route' => route('Admin.Shop.Articles.index'),
'model' => 'articles',
'with_filters' => true,
'callback' => 'handleArticle()',
])
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-articles-filters'])
@include('Admin.Shop.Articles.partials.filters', ['model' => 'articles'])
@endcomponent
</x-card>
@endsection
@include('load.form.select2')
@include('load.form.toggle')
@push('js')
<script>
function handleArticle() {
initToggle("{{ route('Admin.Shop.Articles.toggleVisible') }}", '.visible');
initToggle("{{ route('Admin.Shop.Articles.toggleHomepage') }}", '.homepage');
}
<script>
function handleArticle() {
initToggle("{{ route('Admin.Shop.Articles.toggleVisible') }}", '.visible');
initToggle("{{ route('Admin.Shop.Articles.toggleHomepage') }}", '.homepage');
}
$(document).ready(function () {
initSelect2();
});
</script>
$(document).ready(function() {
initSelect2();
});
</script>
@endpush

View File

@@ -1,121 +1,123 @@
<div class="row">
<div class="col-md-6">
<div class="row mb-3">
<div class="col-6">
{{ Form::label('first_name', 'Prénom') }}
@include('components.form.input', [
'name' => 'first_name',
'value' => $customer['first_name'] ?? null,
'required' => true,
])
<div class="col-6">
<x-card>
<div class="row mb-3">
<div class="col-6">
@include('components.form.input', [
'name' => 'first_name',
'value' => $customer['first_name'] ?? null,
'required' => true,
'label' => 'Prénom',
])
</div>
<div class="col-6">
@include('components.form.input', [
'name' => 'last_name',
'value' => $customer['last_name'] ?? null,
'required' => true,
'label' => 'Nom',
])
</div>
</div>
<div class="col-6">
{{ Form::label('last_name', 'Nom') }}
@include('components.form.input', [
'name' => 'last_name',
'value' => $customer['last_name'] ?? null,
'required' => true,
])
<div class="row mb-3">
<div class="col-12">
@include('components.form.input', [
'name' => 'company',
'value' => $customer['company'] ?? null,
'label' => 'Société',
])
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('company', 'Société') }}
@include('components.form.input', [
'name' => 'company',
'value' => $customer['company'] ?? null,
])
<div class="row mb-3">
<div class="col-12">
@include('components.form.input', [
'name' => 'tva',
'value' => $customer['tva'] ?? null,
'label' => 'TVA',
])
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('tva', 'TVA') }}
@include('components.form.input', [
'name' => 'tva',
'value' => $customer['tva'] ?? null,
])
<div class="row mb-3">
<div class="col-6">
@include('components.form.input', [
'name' => 'email',
'value' => $customer['email'] ?? null,
'required' => true,
'label' => 'Email',
])
</div>
<div class="col-6">
@include('components.form.input', [
'name' => 'phone',
'value' => $customer['phone'] ?? null,
'label' => 'Téléphone',
])
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-6">
{{ Form::label('email', 'Email') }}
@include('components.form.input', [
'name' => 'email',
'value' => $customer['email'] ?? null,
'required' => true,
])
</div>
<div class="col-6">
{{ Form::label('phone', 'Téléphone') }}
@include('components.form.input', [
'name' => 'phone',
'value' => $customer['phone'] ?? null,
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('address', 'Adresse') }}
@include('components.form.input', [
'name' => 'address',
'value' => $customer['address'] ?? null,
'required' => true,
])
<div class="row mb-3">
<div class="col-12">
@include('components.form.input', [
'name' => 'address',
'value' => $customer['address'] ?? null,
'required' => true,
'label' => 'Adresse',
])
</div>
</div>
</div>
<div class="row">
<div class="col-12">
{{ Form::label('address2', 'Adresse complémentaire') }}
@include('components.form.input', [
'name' => 'address2',
'value' => $customer['address2'] ?? null,
])
<div class="row mb-3">
<div class="col-12">
@include('components.form.input', [
'name' => 'address2',
'value' => $customer['address2'] ?? null,
'label' => 'Adresse complémentaire',
])
</div>
</div>
</div>
<div class="row mb-3">
<div class="col-4">
{{ Form::label('zipcode', 'Code postal') }}
@include('components.form.input', [
'name' => 'zipcode',
'value' => $customer['zipcode'] ?? null,
'required' => true,
])
<div class="row mb-3">
<div class="col-4">
@include('components.form.input', [
'name' => 'zipcode',
'value' => $customer['zipcode'] ?? null,
'required' => true,
'label' => 'Code postal',
])
</div>
<div class="col-8">
@include('components.form.input', [
'name' => 'city',
'value' => $customer['city'] ?? null,
'required' => true,
'label' => 'Ville',
])
</div>
</div>
<div class="col-8">
{{ Form::label('city', 'Ville') }}
@include('components.form.input', [
'name' => 'city',
'value' => $customer['city'] ?? null,
'required' => true,
])
</div>
</div>
<div class="row mb-3">
<div class="col-6">
{{ Form::label('sale_delivery_id', __('shop.deliveries.name')) }}
@include('components.form.select', [
'name' => 'deliveries[]',
'list' => $deliveries ?? [],
'values' => $customer['deliveries'] ?? null,
'with_empty' => '',
'class' => 'select2',
'multiple' => true,
])
<div class="row mb-3">
<div class="col-12">
@include('components.form.select', [
'name' => 'sale_channels[]',
'list' => $sale_channels ?? [],
'values' => $customer['sale_channels'] ?? null,
'with_empty' => '',
'class' => 'select2',
'multiple' => true,
'label' => __('shop.sale_channels.name'),
])
</div>
</div>
</div>
</x-card>
</div>
<div class="col-md-6">
@component('components.layout.box-collapse', ['title' => __('Adresses'), 'id' => 'form-customer-address'])
<div class="col-6">
<x-layout.box-collapse title='Adresses' id='form-customer-address'>
@include('Admin.Shop.CustomerAddresses.list', ['dataTable' => $customer_addresses])
@endcomponent
</x-layout.box-collapse>
</div>
</div>
@include('components.save')
<x-save />
@include('load.form.save')
@include('load.form.select2')

View File

@@ -1,11 +1,18 @@
@extends('layout.index', [
'title' => __('shop.customers.title'),
'subtitle' => __('shop.customers.list'),
'breadcrumb' => [__('shop.customers.title')]
'title' => __('shop.customers.title'),
'subtitle' => __('shop.customers.list'),
'breadcrumb' => [__('shop.customers.title')],
])
@section('content')
@component('components.card')
@include('components.datatable', ['route' => route('Admin.Shop.Customers.index'), 'model' => 'customers'])
@endcomponent
<x-card>
@include('components.datatable', [
'route' => route('Admin.Shop.Customers.index'),
'model' => 'customers',
'with_filters' => true,
])
<x-layout.modal title="Filtres" id="modal-customers-filters">
@include('Admin.Shop.Customers.partials.filters', ['model' => 'customers'])
</x-layout.modal>
</x-card>
@endsection

View File

@@ -0,0 +1,14 @@
<form id="{{ $model }}-filters">
<div class="row mb-3">
<label class="col-4">{{ __('shop.sale_channels.name') }}</label>
<div class="col-8">
@include('components.form.select', [
'name' => 'sale_channel_id',
'list' => $sale_channels ?? [],
'value' => $filters['sale_channel_id'] ?? null,
'with_empty' => '',
'class' => 'select2',
])
</div>
</div>
</form>

View File

@@ -1,26 +1,34 @@
@extends('layout.index', [
'title' => __('shop.deliveries.title'),
'subtitle' => __('shop.deliveries.list'),
'breadcrumb' => [__('shop.deliveries.title')]
'title' => __('shop.deliveries.title'),
'subtitle' => __('shop.deliveries.list'),
'breadcrumb' => [__('shop.deliveries.title')],
])
@section('content')
@component('components.card')
@include('components.datatable', ['route' => route('Admin.Shop.Deliveries.index'), 'model' => 'deliveries', 'callback' => 'handleDelivery();'])
@endcomponent
<x-card>
@include('components.datatable', [
'route' => route('Admin.Shop.Deliveries.index'),
'model' => 'deliveries',
'with_filters' => true,
'callback' => 'handleDelivery();',
])
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-deliveries-filters'])
@include('Admin.Shop.Deliveries.partials.filters', ['model' => 'deliveries'])
@endcomponent
</x-card>
@endsection
@include('load.form.select2')
@include('load.form.toggle')
@push('js')
<script>
function handleDelivery() {
initToggle("{{ route('Admin.Shop.Deliveries.toggleActive') }}");
}
<script>
function handleDelivery() {
initToggle("{{ route('Admin.Shop.Deliveries.toggleActive') }}");
}
$(document).ready(function () {
initSelect2();
});
</script>
@endpush
$(document).ready(function() {
initSelect2();
});
</script>
@endpush

View File

@@ -1,5 +1,14 @@
<form id="{{ $model }}-filters">
<div class="row mb-3">
</div>
<div class="row mb-3">
<label class="col-4">{{ __('shop.sale_channels.name') }}</label>
<div class="col-8">
@include('components.form.select', [
'name' => 'sale_channel_id',
'list' => $sale_channels ?? [],
'value' => $filters['sale_channel_id'] ?? null,
'with_empty' => '',
'class' => 'select2',
])
</div>
</div>
</form>

View File

@@ -1,6 +1,13 @@
<div class="row">
<div class="row mb-3">
<div class="col-6">
@include('components.form.select', [
@include('components.form.datepicker', [
'label' => 'Date',
'name' => 'date',
'value' => $invoice_payment['date'] ?? null,
])
</div>
<div class="col-6">
@include('components.form.select', [
'label' => 'Règlement',
'name' => 'payment_type',
'list' => $payment_types ?? [],
@@ -8,8 +15,10 @@
'class' => 'select2',
])
</div>
</div>
<div class="row mb-3">
<div class="col-6">
@include('components.form.input', [
@include('components.form.inputs.money', [
'label' => 'Montant',
'name' => 'amount',
'value' => $invoice_payment['amount'] ?? null,

View File

@@ -1,14 +1,21 @@
@extends('layout.index', [
'title' => __('shop.packages.title'),
'subtitle' => __('shop.packages.list'),
'breadcrumb' => [__('shop.packages.title')]
'title' => __('shop.packages.title'),
'subtitle' => __('shop.packages.list'),
'breadcrumb' => [__('shop.packages.title')],
])
@section('content')
@component('components.card')
@include('components.datatable', ['route' => route('Admin.Shop.Packages.index'), 'model' => 'packages', 'with_filters' => true])
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-packages-filters'])
@include('Admin.Shop.Packages.partials.filters')
@endcomponent
@endcomponent
<x-card>
@include('components.datatable', [
'route' => route('Admin.Shop.Packages.index'),
'model' => 'packages',
'with_filters' => true,
])
@component('components.layout.modal', [
'title' => 'Filtres',
'id' => 'modal-packages-filters',
])
@include('Admin.Shop.Packages.partials.filters')
@endcomponent
</x-card>
@endsection