diff --git a/app/Http/Controllers/Shop/Admin/PriceGenericController.php b/app/Http/Controllers/Shop/Admin/PriceGenericController.php index b7fca3eb..b91a5825 100644 --- a/app/Http/Controllers/Shop/Admin/PriceGenericController.php +++ b/app/Http/Controllers/Shop/Admin/PriceGenericController.php @@ -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); + } } diff --git a/app/Repositories/Botanic/Varieties.php b/app/Repositories/Botanic/Varieties.php index 1974d99a..7f0d8113 100644 --- a/app/Repositories/Botanic/Varieties.php +++ b/app/Repositories/Botanic/Varieties.php @@ -95,7 +95,7 @@ class Varieties } public static function destroy($id) - { + { return Variety::destroy($id); } diff --git a/resources/views/Shop/Admin/Articles/form.blade.php b/resources/views/Shop/Admin/Articles/form.blade.php index 5d96b0fe..85543e6e 100644 --- a/resources/views/Shop/Admin/Articles/form.blade.php +++ b/resources/views/Shop/Admin/Articles/form.blade.php @@ -1,8 +1,3 @@ -@include('boilerplate::load.fileinput') -@include('boilerplate::load.select2') -@include('load.set_options') -@include('boilerplate::load.tinymce') -
@@ -75,22 +70,28 @@
- @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') - + @endpush \ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/generic_prices.blade.php b/resources/views/Shop/Admin/Articles/partials/generic_prices.blade.php deleted file mode 100644 index 210d73d5..00000000 --- a/resources/views/Shop/Admin/Articles/partials/generic_prices.blade.php +++ /dev/null @@ -1,52 +0,0 @@ -@include('Shop.Admin.Articles.partials.generic_prices.block_generic_price_new') - -
- @include('Shop.Admin.Articles.partials.generic_prices.list-generic_prices') -
- - - - -@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') - -@endpush diff --git a/resources/views/Shop/Admin/Articles/partials/generic_prices/generic_prices.blade.php b/resources/views/Shop/Admin/Articles/partials/generic_prices/generic_prices.blade.php index 412b9328..0605063e 100644 --- a/resources/views/Shop/Admin/Articles/partials/generic_prices/generic_prices.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/generic_prices/generic_prices.blade.php @@ -1,15 +1,13 @@ -@include('Shop.Admin.Articles.partials.generic_prices.block_generic_price_new') -
@include('Shop.Admin.Articles.partials.generic_prices.list-generic_prices')
- @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'])
- +
@@ -17,39 +15,37 @@ @endpush diff --git a/resources/views/Shop/Admin/Articles/partials/generic_prices/list-generic_prices.blade.php b/resources/views/Shop/Admin/Articles/partials/generic_prices/list-generic_prices.blade.php index de96b574..24374dc5 100644 --- a/resources/views/Shop/Admin/Articles/partials/generic_prices/list-generic_prices.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/generic_prices/list-generic_prices.blade.php @@ -7,7 +7,7 @@ @push('js') @endpush diff --git a/resources/views/Shop/Admin/PriceGenerics/partials/table-prices.blade.php b/resources/views/Shop/Admin/PriceGenerics/partials/table-prices.blade.php index a1c31fd9..f82c7cf7 100644 --- a/resources/views/Shop/Admin/PriceGenerics/partials/table-prices.blade.php +++ b/resources/views/Shop/Admin/PriceGenerics/partials/table-prices.blade.php @@ -1,9 +1,9 @@ @if (count($generic['prices'] ?? [])) - +
- diff --git a/resources/views/components/button.blade.php b/resources/views/components/button.blade.php index 7cfd9399..edb61bdf 100644 --- a/resources/views/components/button.blade.php +++ b/resources/views/components/button.blade.php @@ -1,4 +1,4 @@ - \ No newline at end of file diff --git a/routes/Shop/Admin/PriceGenerics.php b/routes/Shop/Admin/PriceGenerics.php index 99db9eb1..50b264a8 100644 --- a/routes/Shop/Admin/PriceGenerics.php +++ b/routes/Shop/Admin/PriceGenerics.php @@ -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'); });