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-02 17:00:22 +02:00
parent 4999031563
commit 46ad2a2917
19 changed files with 30 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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');
}

3
app/Repositories/Shop/ArticlePrices.php
View File

@@ -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'];

2
app/Repositories/Shop/Articles.php
View File

@@ -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();

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

@@ -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>

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

@@ -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>
<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>

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

@@ -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">

2
resources/views/load/set_options.blade.php
View File

@@ -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));

2
routes/Botanic/Admin/Families.php
View File

@@ -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');

2
routes/Botanic/Admin/Genres.php
View File

@@ -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');

2
routes/Botanic/Admin/Species.php
View File

@@ -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');

2
routes/Botanic/Admin/Varieties.php
View File

@@ -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');

4
routes/Shop/Admin/ArticleAttributes.php
View File

@@ -1,4 +0,0 @@
<?php
Route::resource('ArticleAttributes', 'ArticleAttributeController');

2
routes/Shop/Admin/ArticleFamilies.php
View File

@@ -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');

2
routes/Shop/Admin/Articles.php
View File

@@ -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');

2
routes/Shop/Admin/Categories.php
View File

@@ -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');

2
routes/Shop/Admin/Customers.php
View File

@@ -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');

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

@@ -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');

2
routes/Shop/Admin/TagGroups.php
View File

@@ -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');

2
routes/Shop/Admin/Tags.php
View File

@@ -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');