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

Fix on merchandises

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-04-25 23:31:24 +02:00
parent 61a52ef330
commit 84063d2f72
7 changed files with 79 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,6 +65,11 @@ class MerchandiseController extends Controller
return Merchandises::deleteImage($id, $index);
}
public function getOptions()
{
return response()->json(['0' => ''] + Merchandises::getOptions());
}
public function exportExcel()
{
return Merchandises::exportExcel();

1
app/Repositories/Core/Categories.php
View File

@@ -35,7 +35,6 @@ class Categories
public static function getCategoryTreeVisibles($sale_channel_id = false)
{
// return self::getModel()->defaultOrder()->visible()->hasAvailableOffers($sale_channel_id)->get()->toTree();
return self::getModel()->defaultOrder()->hasAvailableOffersByCategoryParent($sale_channel_id)->visible()->get()->toTree();
}

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

@@ -325,7 +325,7 @@ class Articles
case 'App\Models\Botanic\Variety':
$data['products'] = Varieties::getOptionsWithSpecie();
break;
case 'App\Models\Botanic\Variety':
case 'App\Models\Botanic\Specie':
$data['products'] = Species::getOptions();
break;
case 'App\Models\Shop\Merchandise':
@@ -343,7 +343,6 @@ class Articles
'App\Models\Botanic\Specie' => 'Espèces',
'App\Models\Botanic\Variety' => 'Variétés',
'App\Models\Shop\Merchandise' => 'Marchandise',
'App\Models\Shop\Merchandise' => 'Autres',
];
return $data;
}

12
app/Repositories/Shop/Merchandises.php
View File

@@ -53,6 +53,18 @@ class Merchandises
return $item->id;
}
public static function storeFull($data)
{
$images = $data['images'] ?? false;
$tags = $data['tags'] ?? false;
unset($data['images']);
unset($data['tags']);
$merchandise = self::store($data);
self::storeImages($merchandise, $images);
self::storeTags($merchandise, $tags);
return $merchandise;
}
public static function create($data)
{
return Merchandise::create($data);