From 46ad2a291724a0ccf01cfd3e383ce308729bf69a Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludo@huma.net>
Date: Fri, 2 Apr 2021 17:00:22 +0200
Subject: [PATCH] Fixes

---
 .../Controllers/Shop/Admin/ArticleController.php    |  5 ++++-
 app/Repositories/Shop/ArticlePrices.php             |  3 +++
 app/Repositories/Shop/Articles.php                  |  2 +-
 .../block_generic_price_new.blade.php               |  4 +---
 .../generic_prices/generic_prices.blade.php         | 13 ++++++++-----
 .../partials/prices/block_price_new.blade.php       |  2 +-
 resources/views/load/set_options.blade.php          |  2 +-
 routes/Botanic/Admin/Families.php                   |  2 +-
 routes/Botanic/Admin/Genres.php                     |  2 +-
 routes/Botanic/Admin/Species.php                    |  2 +-
 routes/Botanic/Admin/Varieties.php                  |  2 +-
 routes/Shop/Admin/ArticleAttributes.php             |  4 ----
 routes/Shop/Admin/ArticleFamilies.php               |  2 +-
 routes/Shop/Admin/Articles.php                      |  2 +-
 routes/Shop/Admin/Categories.php                    |  2 +-
 routes/Shop/Admin/Customers.php                     |  2 +-
 routes/Shop/Admin/PriceGenerics.php                 |  2 +-
 routes/Shop/Admin/TagGroups.php                     |  2 +-
 routes/Shop/Admin/Tags.php                          |  2 +-
 19 files changed, 30 insertions(+), 27 deletions(-)
 delete mode 100644 routes/Shop/Admin/ArticleAttributes.php

diff --git a/app/Http/Controllers/Shop/Admin/ArticleController.php b/app/Http/Controllers/Shop/Admin/ArticleController.php
index 4926dd87..4c9cb55b 100644
--- a/app/Http/Controllers/Shop/Admin/ArticleController.php
+++ b/app/Http/Controllers/Shop/Admin/ArticleController.php
@@ -28,7 +28,10 @@ class ArticleController extends Controller
 
 	public function store(Request $request)
 	{
-		Articles::storeFull($request->all());
+		$data = $request->all();
+		dump($data);
+		exit;
+		Articles::storeFull($data);
 		return redirect()->route('Shop.Admin.Articles.index');
 	}
 
diff --git a/app/Repositories/Shop/ArticlePrices.php b/app/Repositories/Shop/ArticlePrices.php
index 1c3b6d02..aac3f414 100644
--- a/app/Repositories/Shop/ArticlePrices.php
+++ b/app/Repositories/Shop/ArticlePrices.php
@@ -41,6 +41,9 @@ class ArticlePrices
 
 	public static function storePrices($article_id, $prices)
 	{
+		dump($article_id);
+		dump($prices);
+		exit;
 		if ($prices) {
 			foreach ($prices as $key => $price) {
 				$price['article_attribute']['article_attribute_value_id'] = $price['attribute']['attribute_value_id'];
diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php
index 5eeda1c1..6bd97dd5 100644
--- a/app/Repositories/Shop/Articles.php
+++ b/app/Repositories/Shop/Articles.php
@@ -39,7 +39,7 @@ class Articles
 
 	public static function getMeta(&$data = [])
 	{
-		$data['products'] = ($data['product_type'] == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions();
+		$data['products'] = ( ($data['product_type'] ?? false) == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions();
 		$data['categories_options'] = Categories::getOptions();
 		$data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens();
 		$data['families_options'] = ArticleFamilies::getOptions();
diff --git a/resources/views/Shop/Admin/Articles/partials/generic_prices/block_generic_price_new.blade.php b/resources/views/Shop/Admin/Articles/partials/generic_prices/block_generic_price_new.blade.php
index 81906018..b04a8520 100644
--- a/resources/views/Shop/Admin/Articles/partials/generic_prices/block_generic_price_new.blade.php
+++ b/resources/views/Shop/Admin/Articles/partials/generic_prices/block_generic_price_new.blade.php
@@ -1,7 +1,5 @@
 <div class="col-12 row-new-generic row-generic">
-
-	<input type="hidden" name="prices[][id]" value="">
-
+	
 	@include('Shop.Admin.PriceGenerics.partials.table-prices', ['generic' => $generic['generic'] ?? null ])
 
 </div>
\ No newline at end of file
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 210d73d5..412b9328 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
@@ -4,11 +4,14 @@
 	@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'])
-
+<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'])
+	</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>
+	</div>
+</div>
 
 @push('js')
 	<script>
diff --git a/resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php b/resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php
index 63c0bcd1..634f870b 100644
--- a/resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php
+++ b/resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php
@@ -1,6 +1,6 @@
 <div class="col-12 row-new-price row-price">
 
-	<input type="hidden" name="prices[][id]" value="">
+	<input type="hidden" name="prices[0][article_id]" value="{{ $id ?? null }}">
 
 	<div class="card card-light">
 		<div class="card-body pt-2">
diff --git a/resources/views/load/set_options.blade.php b/resources/views/load/set_options.blade.php
index e8f4caf1..961874e5 100644
--- a/resources/views/load/set_options.blade.php
+++ b/resources/views/load/set_options.blade.php
@@ -9,7 +9,7 @@
 					$el.append($("<option></option>").attr("value",'').text('{{ __("all") }}'));
 				}
 				$.each(data, function(key, name) {
-					console.log(name);
+					// console.log(name);
 					if (key != null) {
 						if (key == selected) {
 							$el.append($("<option selected='selected'></option>").attr("value", key).text(name));
diff --git a/routes/Botanic/Admin/Families.php b/routes/Botanic/Admin/Families.php
index d191fb18..413e57ae 100644
--- a/routes/Botanic/Admin/Families.php
+++ b/routes/Botanic/Admin/Families.php
@@ -3,7 +3,7 @@
 Route::prefix('Families')->name('Families.')->group(function () {
 	Route::get('', 'FamilyController@index')->name('index');
 	Route::get('create', 'FamilyController@create')->name('create');
-	Route::delete('destroy', 'FamilyController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'FamilyController@destroy')->name('destroy');
 	Route::post('update', 'FamilyController@update')->name('update');
 	Route::post('store', 'FamilyController@store')->name('store');
 	Route::get('edit/{id}', 'FamilyController@edit')->name('edit');
diff --git a/routes/Botanic/Admin/Genres.php b/routes/Botanic/Admin/Genres.php
index b180b5d4..e8c66b56 100644
--- a/routes/Botanic/Admin/Genres.php
+++ b/routes/Botanic/Admin/Genres.php
@@ -3,7 +3,7 @@
 Route::prefix('Genres')->name('Genres.')->group(function () {
 	Route::get('', 'GenreController@index')->name('index');
 	Route::get('create', 'GenreController@create')->name('create');
-	Route::delete('destroy', 'GenreController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'GenreController@destroy')->name('destroy');
 	Route::post('update', 'GenreController@update')->name('update');
 	Route::post('store', 'GenreController@store')->name('store');
 	Route::get('edit/{id}', 'GenreController@edit')->name('edit');
diff --git a/routes/Botanic/Admin/Species.php b/routes/Botanic/Admin/Species.php
index 4b6ec9f3..22753ad5 100644
--- a/routes/Botanic/Admin/Species.php
+++ b/routes/Botanic/Admin/Species.php
@@ -3,7 +3,7 @@
 Route::prefix('Species')->name('Species.')->group(function () {
 	Route::get('', 'SpecieController@index')->name('index');
 	Route::get('create', 'SpecieController@create')->name('create');
-	Route::delete('destroy', 'SpecieController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'SpecieController@destroy')->name('destroy');
 	Route::post('update', 'SpecieController@update')->name('update');
 	Route::post('store', 'SpecieController@store')->name('store');
 	Route::get('edit/{id}', 'SpecieController@edit')->name('edit');
diff --git a/routes/Botanic/Admin/Varieties.php b/routes/Botanic/Admin/Varieties.php
index b0c576ec..a1dc8cb4 100644
--- a/routes/Botanic/Admin/Varieties.php
+++ b/routes/Botanic/Admin/Varieties.php
@@ -4,7 +4,7 @@ Route::prefix('Varieties')->name('Varieties.')->group(function () {
 	Route::get('', 'VarietyController@index')->name('index');
 	Route::get('getDataTable', 'VarietyController@getDataTable')->name('getDataTable');
 	Route::get('create', 'VarietyController@create')->name('create');
-	Route::delete('destroy', 'VarietyController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'VarietyController@destroy')->name('destroy');
 	Route::post('update', 'VarietyController@update')->name('update');
 	Route::post('store', 'VarietyController@store')->name('store');
 	Route::get('edit/{id}', 'VarietyController@edit')->name('edit');
diff --git a/routes/Shop/Admin/ArticleAttributes.php b/routes/Shop/Admin/ArticleAttributes.php
deleted file mode 100644
index 9a2d78ab..00000000
--- a/routes/Shop/Admin/ArticleAttributes.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-Route::resource('ArticleAttributes', 'ArticleAttributeController');
-
diff --git a/routes/Shop/Admin/ArticleFamilies.php b/routes/Shop/Admin/ArticleFamilies.php
index 904c93d0..6fe85a43 100644
--- a/routes/Shop/Admin/ArticleFamilies.php
+++ b/routes/Shop/Admin/ArticleFamilies.php
@@ -3,7 +3,7 @@
 Route::prefix('ArticleFamilies')->name('ArticleFamilies.')->group(function () {
 	Route::get('', 'ArticleFamilyController@index')->name('index');
 	Route::get('create', 'ArticleFamilyController@create')->name('create');
-	Route::delete('destroy', 'ArticleFamilyController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'ArticleFamilyController@destroy')->name('destroy');
 	Route::post('update', 'ArticleFamilyController@update')->name('update');
 	Route::post('store', 'ArticleFamilyController@store')->name('store');
 	Route::get('edit/{id}', 'ArticleFamilyController@edit')->name('edit');
diff --git a/routes/Shop/Admin/Articles.php b/routes/Shop/Admin/Articles.php
index fd305e6c..273dc521 100644
--- a/routes/Shop/Admin/Articles.php
+++ b/routes/Shop/Admin/Articles.php
@@ -3,7 +3,7 @@
 Route::prefix('Articles')->name('Articles.')->group(function () {
 	Route::get('', 'ArticleController@index')->name('index');
 	Route::get('create', 'ArticleController@create')->name('create');
-	Route::delete('destroy', 'ArticleController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'ArticleController@destroy')->name('destroy');
 	Route::post('update', 'ArticleController@update')->name('update');
 	Route::post('store', 'ArticleController@store')->name('store');
 	Route::get('edit/{id}', 'ArticleController@edit')->name('edit');
diff --git a/routes/Shop/Admin/Categories.php b/routes/Shop/Admin/Categories.php
index f4db1fcd..0d7afc91 100644
--- a/routes/Shop/Admin/Categories.php
+++ b/routes/Shop/Admin/Categories.php
@@ -3,7 +3,7 @@
 Route::prefix('Categories')->name('Categories.')->group(function () {
 	Route::get('', 'CategoryController@index')->name('index');
 	Route::get('create', 'CategoryController@create')->name('create');
-	Route::delete('destroy', 'CategoryController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'CategoryController@destroy')->name('destroy');
 	Route::post('update', 'CategoryController@update')->name('update');
 	Route::post('store', 'CategoryController@store')->name('store');
 	Route::get('edit/{id}', 'CategoryController@edit')->name('edit');
diff --git a/routes/Shop/Admin/Customers.php b/routes/Shop/Admin/Customers.php
index 1dbbda7d..ad9f67e2 100644
--- a/routes/Shop/Admin/Customers.php
+++ b/routes/Shop/Admin/Customers.php
@@ -3,7 +3,7 @@
 Route::prefix('Customers')->name('Customers.')->group(function () {
 	Route::get('', 'CustomerController@index')->name('index');
 	Route::get('create', 'CustomerController@create')->name('create');
-	Route::delete('destroy', 'CustomerController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'CustomerController@destroy')->name('destroy');
 	Route::post('update', 'CustomerController@update')->name('update');
 	Route::post('store', 'CustomerController@store')->name('store');
 	Route::get('edit/{id}', 'CustomerController@edit')->name('edit');
diff --git a/routes/Shop/Admin/PriceGenerics.php b/routes/Shop/Admin/PriceGenerics.php
index d1abe878..99db9eb1 100644
--- a/routes/Shop/Admin/PriceGenerics.php
+++ b/routes/Shop/Admin/PriceGenerics.php
@@ -3,7 +3,7 @@
 Route::prefix('PriceGenerics')->name('PriceGenerics.')->group(function () {
 	Route::get('', 'PriceGenericController@index')->name('index');
 	Route::get('create', 'PriceGenericController@create')->name('create');
-	Route::delete('destroy', 'PriceGenericController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'PriceGenericController@destroy')->name('destroy');
 	Route::post('update', 'PriceGenericController@update')->name('update');
 	Route::post('store', 'PriceGenericController@store')->name('store');
 	Route::get('edit/{id}', 'PriceGenericController@edit')->name('edit');
diff --git a/routes/Shop/Admin/TagGroups.php b/routes/Shop/Admin/TagGroups.php
index 289b291b..85412a06 100644
--- a/routes/Shop/Admin/TagGroups.php
+++ b/routes/Shop/Admin/TagGroups.php
@@ -3,7 +3,7 @@
 Route::prefix('TagGroups')->name('TagGroups.')->group(function () {
 	Route::get('', 'TagGroupController@index')->name('index');
 	Route::get('create', 'TagGroupController@create')->name('create');
-	Route::delete('destroy', 'TagGroupController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'TagGroupController@destroy')->name('destroy');
 	Route::post('update', 'TagGroupController@update')->name('update');
 	Route::post('store', 'TagGroupController@store')->name('store');
 	Route::get('edit/{id}', 'TagGroupController@edit')->name('edit');
diff --git a/routes/Shop/Admin/Tags.php b/routes/Shop/Admin/Tags.php
index d6a15db0..1db02813 100644
--- a/routes/Shop/Admin/Tags.php
+++ b/routes/Shop/Admin/Tags.php
@@ -3,7 +3,7 @@
 Route::prefix('Tags')->name('Tags.')->group(function () {
 	Route::get('', 'TagController@index')->name('index');
 	Route::get('create', 'TagController@create')->name('create');
-	Route::delete('destroy', 'TagController@destroy')->name('destroy');
+	Route::delete('destroy/{id?}', 'TagController@destroy')->name('destroy');
 	Route::post('update', 'TagController@update')->name('update');
 	Route::post('store', 'TagController@store')->name('store');
 	Route::get('edit/{id}', 'TagController@edit')->name('edit');