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

Fixes after reading excel files and discuss with eric

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-03-26 15:40:53 +01:00
parent 37ffaa938b
commit 22fa3d3246
22 changed files with 456 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php
View File

@@ -11,7 +11,28 @@
@include('components.number', ['name' => "prices[$key][quantity]", 'value' => $price['quantity'] ?? 1, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-lg-5">
<div class="col-lg-3">
{{ Form::label('package_id', 'Type Package') }}<br/>
@include('components.select', [
'name' => "prices[$key][package_id]",
'value' => $price['package_id'] ?? null,
'list' => $packages ?? null,
'required' => true,
'class' => 'select2 form-control-sm packages w-100',
])
</div>
<div class="col-lg-1">
{{ Form::label('package_qty', 'Pack Qté') }}<br/>
@include('components.number', [
'name' => "prices[$key][package_quantity]",
'value' => $price['package_quantity'] ?? null,
'required' => true,
'class' => 'form-control-sm',
])
</div>
<div class="col-lg-3">
{{ Form::label('unity_id', 'Unité') }}<br/>
@include('components.select', [
'name' => "prices[$key][unity_id]",
@@ -19,10 +40,11 @@
'list' => $unities ?? null,
'required' => true,
'class' => 'select2 form-control-sm unities w-100',
'with_empty' => ''
])
</div>
<div class="col-lg-5">
<div class="col-lg-3">
<div class="row">
<div class="col-4">
{{ Form::label('tax_id', 'TVA') }}<br/>

26
resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php
View File

@@ -12,7 +12,28 @@
@include('components.number', ['name' => 'prices[0][quantity]', 'value' => $quantity ?? 1, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-lg-5">
<div class="col-lg-3">
{{ Form::label('package_id', 'Type Package') }}<br/>
@include('components.select', [
'name' => "prices[0][package_id]",
'value' => $price['package_id'] ?? null,
'list' => $packages ?? null,
'required' => true,
'class' => 'select2 form-control-sm packages w-100',
])
</div>
<div class="col-lg-1">
{{ Form::label('package_qty', 'Pack Qté') }}<br/>
@include('components.number', [
'name' => "prices[0][package_quantity]",
'value' => $price['package_quantity'] ?? null,
'required' => true,
'class' => 'form-control-sm',
])
</div>
<div class="col-lg-3">
{{ Form::label('unity_id', 'Unité') }}<br/>
@include('components.select', [
'name' => "prices[0][unity_id]",
@@ -20,10 +41,11 @@
'list' => $unities ?? null,
'required' => true,
'class' => 'select2 form-control-sm unities w-100',
'with_empty' => ''
])
</div>
<div class="col-lg-5">
<div class="col-lg-3">
<div class="row">
<div class="col-4">

2
resources/views/Shop/Admin/PriceGenerics/form.blade.php
View File

@@ -12,7 +12,7 @@
</div>
</div>
@include('Shop.Admin.PriceGenerics.partials.prices', ['prices' => $generic['values'] ?? null ])
@include('Shop.Admin.PriceGenerics.partials.prices', ['prices' => $generic['prices'] ?? null ])
<div class="row">
<div class="col-md-8">

63
resources/views/Shop/Admin/PriceGenerics/partials/block_price.blade.php
View File

@@ -7,30 +7,63 @@
<div class="row">
<div class="col-2">
<div class="col-1">
{{ Form::label('quantity', 'Qté.') }}<br/>
@include('components.number', ['name' => "prices[$key][quantity]", 'value' => $price['quantity'] ?? 1, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-3">
<div class="col-lg-3">
{{ Form::label('package_id', 'Type Package') }}<br/>
@include('components.select', [
'name' => "prices[$key][package_id]",
'value' => $price['package_id'] ?? null,
'list' => $packages ?? null,
'required' => true,
'class' => 'select2 form-control-sm packages w-100',
])
</div>
<div class="col-lg-1">
{{ Form::label('package_qty', 'Pack Qté') }}<br/>
@include('components.number', [
'name' => "prices[$key][package_quantity]",
'value' => $price['package_quantity'] ?? null,
'required' => true,
'class' => 'form-control-sm',
])
</div>
<div class="col-lg-3">
{{ Form::label('unity_id', 'Unité') }}<br/>
@include('components.select', ['name' => 'prices[0][unity_id]', 'value' => $unity_id ?? null, 'list' => $unities ?? null, 'required' => true, 'class' => 'form-control-sm'])
@include('components.select', [
'name' => "prices[$key][unity_id]",
'value' => $price['unity_id'] ?? null,
'list' => $unities ?? null,
'required' => true,
'class' => 'select2 form-control-sm unities w-100',
'with_empty' => ''
])
</div>
<div class="col-2">
{{ Form::label('tax_id', 'TVA') }}<br/>
@include('components.select', ['name' => "prices[$key][tax_id]", 'value' => $price['tax_id'] ?? null, 'list' => $taxes ?? null, 'required' => true, 'class' => 'form-control-sm'])
<div class="col-lg-3">
<div class="row">
<div class="col-4">
{{ Form::label('tax_id', 'TVA') }}<br/>
@include('components.select', ['name' => "prices[$key][tax_id]", 'value' => $price['tax_id'] ?? null, 'list' => $taxes_options ?? null, 'required' => true, 'class' => 'form-control form-control-sm'])
</div>
<div class="col-4">
{{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => "prices[$key][price]", 'value' => $price['price'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])
</div>
<div class="col-4">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => "prices[$key][price_taxed]", 'value' => $price['price_taxed'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
</div>
</div>
</div>
<div class="col-2">
{{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => "prices[$key][price]", 'value' => $price['price'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])
</div>
<div class="col-2">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => "prices[$key][price_taxed]", 'value' => $price['price_taxed'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
</div>
<div class="col-1 text-right">
<br/>

3
resources/views/Shop/layout/partials/footer.blade.php
View File

@@ -1,6 +1,3 @@
<footer id="footer">
@include("Shop._partials.footer-after")
</footer>

2
resources/views/layouts/site.blade.php
View File

@@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- CSRF Token -->
<meta name="csrf-token" content="{{ csrf_token() }}">
<title>{{ config('app.name', 'Laravel') }}</title>
<title>{{ config('app.name') }}</title>
<link rel="stylesheet" href="/css/site.min.css">
@stack('css')
</head>

18
resources/views/load/functions.blade.php Normal file
View File

@@ -0,0 +1,18 @@
@if(!defined('LOAD_FUNCTIONS'))
@push('scripts')
<script>
function delay(callback, ms) {
var timer = 0;
return function() {
var context = this, args = arguments;
clearTimeout(timer);
timer = setTimeout(function () {
callback.apply(context, args);
}, ms || 0);
};
}
</script>
@endpush
@php(define('LOAD_FUNCTIONS', true))
@endif