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

fix route

Browse Source
This commit is contained in:
ludo
2024-03-11 18:38:23 +01:00
parent 7b7295aed1
commit 2227242704
9 changed files with 232 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Gruntfile.js
View File

@@ -41,40 +41,21 @@ var jsAdminLTE = [
] ]
var jsCoreInclude = [ var jsCoreInclude = [
// 'build/js/include/core/appender.js',
// 'build/js/include/core/cache.js',
// 'build/js/include/core/handlebars.js',
// 'build/js/include/core/lang.js',
'build/js/include/core/objectLength.js', 'build/js/include/core/objectLength.js',
// 'build/js/include/core/session.js',
'build/js/include/core/url.js', 'build/js/include/core/url.js',
'build/js/include/core/user.js', 'build/js/include/core/user.js',
// 'build/js/include/form/check_fields.js',
// 'build/js/include/form/checkbox.js',
// 'build/js/include/form/datetime.js',
// 'build/js/include/form/multi-select.js',
'build/js/include/form/radio.js', 'build/js/include/form/radio.js',
// 'build/js/include/form/select.js',
'build/js/include/form/upload.js', 'build/js/include/form/upload.js',
'build/js/include/form/validator.js', 'build/js/include/form/validator.js',
'build/js/include/layout/animate.js', 'build/js/include/layout/animate.js',
// 'build/js/include/layout/message.js',
// 'build/js/include/layout/modal.js',
'build/js/include/layout/scroll.js', 'build/js/include/layout/scroll.js',
'build/js/include/layout/tooltip.js', 'build/js/include/layout/tooltip.js',
// 'build/js/include/datatable.js',
// 'build/js/include/file.js',
// 'build/js/include/uploader.js',
] ]
var jsBundle = [ var jsBundle = [
'node_modules/jquery-ui-sortable/jquery-ui.min.js', 'node_modules/jquery-ui-sortable/jquery-ui.min.js',
'node_modules/jquery-serializejson/jquery.serializejson.min.js', 'node_modules/jquery-serializejson/jquery.serializejson.min.js',
// 'node_modules/moment/min/moment.min.js',
'node_modules/jquery-placeholder/jquery.placeholder.js', 'node_modules/jquery-placeholder/jquery.placeholder.js',
// 'node_modules/daterangepicker/daterangepicker.js',
// 'node_modules/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js',
// 'node_modules/bootstrap4-toggle/js/bootstrap4-toggle.min.js',
'node_modules/@claviska/jquery-minicolors/jquery.minicolors.js', 'node_modules/@claviska/jquery-minicolors/jquery.minicolors.js',
'node_modules/bootstrap-validate/dist/bootstrap-validate.js', 'node_modules/bootstrap-validate/dist/bootstrap-validate.js',
'node_modules/bootstrap-validator/dist/validator.min.js', 'node_modules/bootstrap-validator/dist/validator.min.js',
@@ -87,15 +68,11 @@ var jsBundle = [
'node_modules/jquery.quicksearch/dist/jquery.quicksearch.min.js', 'node_modules/jquery.quicksearch/dist/jquery.quicksearch.min.js',
'node_modules/jquery.nicescroll/dist/jquery.nicescroll.js', 'node_modules/jquery.nicescroll/dist/jquery.nicescroll.js',
'node_modules/jquery-slimscroll/jquery.slimscroll.min.js', 'node_modules/jquery-slimscroll/jquery.slimscroll.min.js',
// 'node_modules/superclick/dist/js/superclick.min.js',
// 'node_modules/dropzone/dist/min/dropzone.min.js',
'node_modules/handlebars/dist/handlebars.min.js', 'node_modules/handlebars/dist/handlebars.min.js',
'node_modules/swag/lib/swag.min.js', 'node_modules/swag/lib/swag.min.js',
'node_modules/multiselect/js/jquery.multi-select.js', 'node_modules/multiselect/js/jquery.multi-select.js',
'node_modules/screenfull/dist/screenfull.js', 'node_modules/screenfull/dist/screenfull.js',
'node_modules/underscore/underscore-min.js', 'node_modules/underscore/underscore-min.js',
// 'Admin/js/themes/admin/layout.js',
// 'node_modules/wew.js/dist/wew.min.js'
] ]
var jsMain = [ var jsMain = [
@@ -136,7 +113,6 @@ var cssMain = [
] ]
var jsDataTables = [ var jsDataTables = [
// 'build/Suite/js/datatables.js',
'node_modules/jszip/dist/jszip.min.js', 'node_modules/jszip/dist/jszip.min.js',
'node_modules/pdfmake/build/pdfmake.min.js', 'node_modules/pdfmake/build/pdfmake.min.js',
'node_modules/pdfmake/build/vfs_fonts.js', 'node_modules/pdfmake/build/vfs_fonts.js',

6
app/Http/Controllers/Admin/Shop/CustomerAddressController.php
View File

@@ -15,7 +15,11 @@ class CustomerAddressController extends Controller
public function create() public function create()
{ {
return view('Admin.Shop.CustomerAddresses.create'); $data = [
'with_country' => false,
];
return view('Admin.Shop.CustomerAddresses.create', $data);
} }
public function store(Request $request) public function store(Request $request)

2
app/Http/Controllers/Shop/Auth/RegisterController.php
View File

@@ -45,7 +45,7 @@ class RegisterController extends Controller
return $request->wantsJson() return $request->wantsJson()
? new JsonResponse([], 201) ? new JsonResponse([], 201)
: redirect('home'); : redirect()->route('home');
} }
public function emailVerify() public function emailVerify()

4
app/Http/Controllers/Shop/Controller.php
View File

@@ -6,8 +6,4 @@ use App\Http\Controllers\Controller as ParentController;
class Controller extends ParentController class Controller extends ParentController
{ {
public function __construct()
{
$this->middleware('auth.check');
}
} }

3
app/Http/Controllers/Shop/OrderController.php
View File

@@ -18,6 +18,9 @@ class OrderController extends Controller
{ {
public function index(CustomerOrdersDataTable $dataTable) public function index(CustomerOrdersDataTable $dataTable)
{ {
if (Customers::isNotConnected()) {
abort(403);
}
return $dataTable->render('Shop.Orders.partials.list'); return $dataTable->render('Shop.Orders.partials.list');
} }

2
build/js/include/form/validator.js
View File

@@ -1,6 +1,6 @@
function initValidator() { function initValidator() {
$( document ).ready(function() { $( document ).ready(function() {
// console.log('initValidator'); console.log('initValidator');
// $(window).on('load', function() { // $(window).on('load', function() {
// window.addEventListener('load', function() { // window.addEventListener('load', function() {

16
resources/views/Admin/Shop/CustomerAddresses/create.blade.php
View File

@@ -1,11 +1,15 @@
@extends('layout.index', [ @extends('layout.index', [
'title' => __('shop.customers.title'), 'title' => __('shop.customer_addresses.title'),
'subtitle' => __('shop.customers.add'), 'subtitle' => __('shop.customer_addresses.add'),
'breadcrumb' => [__('shop.customers.title')] 'breadcrumb' => [__('shop.customers.title')],
]) ])
@section('content') @section('content')
{{ Form::open(['route' => 'Admin.Shop.Customers.store', 'id' => 'customer-form', 'autocomplete' => 'off']) }} {{ Form::open([
@include('Admin.Shop.Customers.form') 'route' => 'Admin.Shop.CustomerAddresses.store',
</form> 'id' => 'customer_address-form',
'autocomplete' => 'off',
]) }}
@include('components.address')
</form>
@endsection @endsection

244
resources/views/Admin/Shop/CustomerAddresses/form.blade.php
View File

@@ -1,123 +1,123 @@
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
<div class="row mb-3"> <div class="row mb-3">
<div class="col-6"> <div class="col-6">
{{ Form::label('first_name', 'Prénom') }} {{ Form::label('first_name', 'Prénom') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'first_name', 'name' => 'first_name',
'value' => $customer['first_name'] ?? null, 'value' => $customer['first_name'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
<div class="col-6"> <div class="col-6">
{{ Form::label('last_name', 'Nom') }} {{ Form::label('last_name', 'Nom') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'last_name', 'name' => 'last_name',
'value' => $customer['last_name'] ?? null, 'value' => $customer['last_name'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12"> <div class="col-12">
{{ Form::label('company', 'Société') }} {{ Form::label('company', 'Société') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'company', 'name' => 'company',
'value' => $customer['company'] ?? null, 'value' => $customer['company'] ?? null,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12"> <div class="col-12">
{{ Form::label('tva', 'TVA') }} {{ Form::label('tva', 'TVA') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'tva', 'name' => 'tva',
'value' => $customer['tva'] ?? null, 'value' => $customer['tva'] ?? null,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-6"> <div class="col-6">
{{ Form::label('email', 'Email') }} {{ Form::label('email', 'Email') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'email', 'name' => 'email',
'value' => $customer['email'] ?? null, 'value' => $customer['email'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
<div class="col-6"> <div class="col-6">
{{ Form::label('phone', 'Téléphone') }} {{ Form::label('phone', 'Téléphone') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'phone', 'name' => 'phone',
'value' => $customer['phone'] ?? null, 'value' => $customer['phone'] ?? null,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12"> <div class="col-12">
{{ Form::label('address', 'Adresse') }} {{ Form::label('address', 'Adresse') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'address', 'name' => 'address',
'value' => $customer['address'] ?? null, 'value' => $customer['address'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
{{ Form::label('address2', 'Adresse complémentaire') }} {{ Form::label('address2', 'Adresse complémentaire') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'address2', 'name' => 'address2',
'value' => $customer['address2'] ?? null, 'value' => $customer['address2'] ?? null,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-4"> <div class="col-4">
{{ Form::label('zipcode', 'Code postal') }} {{ Form::label('zipcode', 'Code postal') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'zipcode', 'name' => 'zipcode',
'value' => $customer['zipcode'] ?? null, 'value' => $customer['zipcode'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
<div class="col-8"> <div class="col-8">
{{ Form::label('city', 'Ville') }} {{ Form::label('city', 'Ville') }}
@include('components.form.input', [ @include('components.form.input', [
'name' => 'city', 'name' => 'city',
'value' => $customer['city'] ?? null, 'value' => $customer['city'] ?? null,
'required' => true, 'required' => true,
]) ])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-6"> <div class="col-6">
{{ Form::label('sale_delivery_id', __('shop.deliveries.name')) }} {{ Form::label('sale_delivery_id', __('shop.deliveries.name')) }}
@include('components.form.select', [ @include('components.form.select', [
'name' => 'deliveries[]', 'name' => 'deliveries[]',
'list' => $deliveries ?? [], 'list' => $deliveries ?? [],
'values' => $customer['deliveries'] ?? null, 'values' => $customer['deliveries'] ?? null,
'with_empty' => '', 'with_empty' => '',
'class' => 'select2', 'class' => 'select2',
'multiple' => true, 'multiple' => true,
]) ])
</div> </div>
</div> </div>
</div> </div>
<div class="col-md-4"> <div class="col-md-4">
@if ($customer['addresses']) @if ($customer['addresses'])
@include('components.address', [ @include('components.address', [
'with_country' => false, 'with_country' => false,
'prefix' => 'addresses[0]', 'prefix' => 'addresses[0]',
'with_tab' => true, 'with_tab' => true,
'item' => $customer['addresses'][0], 'item' => $customer['addresses'][0],
]) ])
@endif @endif
</div> </div>
</div> </div>
@include('components.save') @include('components.save')
@@ -126,10 +126,10 @@
@include('load.form.select2') @include('load.form.select2')
@push('js') @push('js')
<script> <script>
$(function() { $(function() {
initSelect2(); initSelect2();
initSaveForm('#customer-form'); initSaveForm('#customer-form');
}); });
</script> </script>
@endpush @endpush

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

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