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

Fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-04-06 22:20:44 +02:00
parent 1a7f8fa3f6
commit 4c4405d067
9 changed files with 50 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Shop/Admin/PriceGenericController.php
View File

@@ -60,4 +60,9 @@ class PriceGenericController extends Controller
{
return PriceGenerics::destroy($id);
}
public function getPrice($id) {
$data['generic'] = PriceGenerics::getFull($id);
return view('Shop.Admin.PriceGenerics.partials.table-prices', $data);
}
}

2
app/Repositories/Botanic/Varieties.php
View File

@@ -95,7 +95,7 @@ class Varieties
}
public static function destroy($id)
{
{
return Variety::destroy($id);
}

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

@@ -1,8 +1,3 @@
@include('boilerplate::load.fileinput')
@include('boilerplate::load.select2')
@include('load.set_options')
@include('boilerplate::load.tinymce')
<div class="row mt-3">
<div class="col-12">
<div class="card card-primary card-outline card-outline-tabs">
@@ -75,22 +70,28 @@
</div>
</div>
@include('components.save')
@include('boilerplate::load.fileinput')
@include('boilerplate::load.select2')
@include('load.set_options')
@include('boilerplate::load.tinymce')
@include('load.appender')
@include('load.toggle')
@push('js')
<script>
$(function() {
<script>
$(function() {
$('.select2').select2({ width: '100%' });
$('.editor').tinymce({});
$('.select2').select2({ width: '100%' });
$('.editor').tinymce({});
$('.active-checkbox').bootstrapToggle();
$('.active-checkbox').off('change').on('change', function(e) {
var id = $('#id').val();
// handleAdmin.toggle(id, $(this).prop('checked'));
});
$('.active-checkbox').bootstrapToggle();
$('.active-checkbox').off('change').on('change', function(e) {
var id = $('#id').val();
// handleAdmin.toggle(id, $(this).prop('checked'));
});
});
</script>
</script>
@endpush

52
resources/views/Shop/Admin/Articles/partials/generic_prices.blade.php
View File

@@ -1,52 +0,0 @@
@include('Shop.Admin.Articles.partials.generic_prices.block_generic_price_new')
<div id="append_generic_price" class="row">
@include('Shop.Admin.Articles.partials.generic_prices.list-generic_prices')
</div>
<button type="button" class="btn btn-sm btn-primary add-new-generic_price">Associer un tarif générique<i class="fa fa-plus"></i></button>
@include('components.select-tree', ['name' => "article_price_generic_id", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm w-100'])
@push('js')
<script>
function append_generic_price() {
// handle_append_attribute();
$('.select2').select2();
// handle_change_attribute();
// load_attribute_values($('.attributes-value'), $('.attributes-family').val());
}
$("#append_generic_price").appender({
rowSection: '.row-new-generic_price',
type: '.row-generic_price',
addBtn: '.add-new-generic_price',
appendEffect: 'slide',
addClass: 'animated bounceInLeft',
rowNumber: '.row-generic_price-number',
deleteBtn: '.delete-new-generic_price-btn',
callback: append_generic_price,
rowNumberStart: 2,
hideSection: true
});
function handle_delete_generic_price() {
$('.delete-generic_price-btn').click(function() {
var $selector = $(this).parents('.row-generic_price');
var id = $selector.find('.generic_price_id').val();
/*
confirm_delete(id, "{## route('Shop.Admin.ArticlePrices.destroy') }}", function() {
$selector.remove();
});
*/
});
}
</script>
@endpush

46
resources/views/Shop/Admin/Articles/partials/generic_prices/generic_prices.blade.php
View File

@@ -1,15 +1,13 @@
@include('Shop.Admin.Articles.partials.generic_prices.block_generic_price_new')
<div id="append_generic_price" class="row">
@include('Shop.Admin.Articles.partials.generic_prices.list-generic_prices')
</div>
<div class="row mt-3">
<div class="col-6">
@include('components.select-tree', ['name' => "article_price_generic_id", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm w-100'])
@include('components.select-tree', ['name' => "article_price_generic_id", 'id_name' => "article_price_generic_id", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm w-100'])
</div>
<div class="col-6">
<button type="button" class="btn btn-sm btn-primary add-new-generic_price">Associer un tarif générique <i class="fa fa-plus"></i></button>
<button type="button" class="btn btn-sm btn-primary" id="add-new-generic_price">Associer un tarif générique <i class="fa fa-plus"></i></button>
</div>
</div>
@@ -17,39 +15,37 @@
<script>
function append_generic_price() {
// handle_append_attribute();
$('.select2').select2();
// handle_change_attribute();
// load_attribute_values($('.attributes-value'), $('.attributes-family').val());
handleAddGeneric();
}
$("#append_generic_price").appender({
rowSection: '.row-new-generic_price',
type: '.row-generic_price',
addBtn: '.add-new-generic_price',
appendEffect: 'slide',
addClass: 'animated bounceInLeft',
rowNumber: '.row-generic_price-number',
deleteBtn: '.delete-new-generic_price-btn',
callback: append_generic_price,
rowNumberStart: 2,
hideSection: true
});
function handleAddGeneric() {
$('#add-new-generic_price').click(function() {
var id = $('#article_price_generic_id').val();
var content = $.get("{{ route('Shop.Admin.PriceGenerics.getPrice') }}/" + id, function(data) {
$('#append_generic_price').html(data);
handleDeleteGenericPrice();
});
});
}
function handle_delete_generic_price() {
$('.delete-generic_price-btn').click(function() {
var $selector = $(this).parents('.row-generic_price');
var id = $selector.find('.generic_price_id').val();
function handleDeleteGenericPrice() {
$('.delete-generic_price-btn').off().click(function(e) {
console.log('ici');
e.preventDefault();
// $('#append_generic_price').html('');
/*
confirm_delete(id, "{## route('Shop.Admin.ArticlePrices.destroy') }}", function() {
confirm_delete(id, "{## route('Shop.Admin.GenericPrices.destroy') }}", function() {
$selector.remove();
});
*/
});
}
$(function() {
append_generic_price();
});
</script>
@endpush

2
resources/views/Shop/Admin/Articles/partials/generic_prices/list-generic_prices.blade.php
View File

@@ -7,7 +7,7 @@
@push('js')
<script>
$(function () {
handle_delete_generic_price();
handleDeleteGenericPrice();
});
</script>
@endpush

4
resources/views/Shop/Admin/PriceGenerics/partials/table-prices.blade.php
View File

@@ -1,9 +1,9 @@
@if (count($generic['prices'] ?? []))
<table class="table table-bordered table-hover table-striped w-100 mb-0 dataTable">
<input type="hidden" name="price_generics[0]" value="{{ $generic['id'] }}">
<thead>
<th>
<button type="button" class="btn btn-xs btn-danger delete-price-btn mt-2" data-card-widget="collapse" data-toggle="tooltip" title="supprimer" data-id="{{ $generic['id'] }}">
<button type="button" class="btn btn-xs btn-danger delete-generic-price-btn mt-2" data-card-widget="collapse" data-toggle="tooltip" title="supprimer" data-id="{{ $generic['id'] }}">
<i class="fas fa-trash"></i>
</button>

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

@@ -1,4 +1,4 @@
<button type="{{ $type ?? 'button' }}" class="btn {{ $class ?? ''}}" @if (isset($id)) id="{{ $id }}"@endif>
<button type="{{ $type ?? 'button' }}" class="btn {{ $class ?? ''}}" @if (isset($id_button)) id="{{ $id_button }}"@endif>
<i class="fa fa-fw {{ $icon ?? '' }}"></i>
{{ $txt ?? '' }}
</button>

1
routes/Shop/Admin/PriceGenerics.php
View File

@@ -8,5 +8,6 @@ Route::prefix('PriceGenerics')->name('PriceGenerics.')->group(function () {
Route::post('store', 'PriceGenericController@store')->name('store');
Route::get('edit/{id}', 'PriceGenericController@edit')->name('edit');
Route::get('getPrice/{id?}', 'PriceGenericController@getPrice')->name('getPrice');
});