fix editing orders

This commit is contained in:
Ludovic CANDELLIER
2022-11-19 23:43:12 +01:00
parent 782809829b
commit d33b5eea52
19 changed files with 314 additions and 174 deletions

View File

@@ -458,17 +458,17 @@ class Articles
$images = count($article->images) ? $article->images : collect([]);
switch ($article->product_type) {
case 'App\Models\Botanic\Variety':
$variety = $article->product;
$specie = $variety->specie;
$variety = $article->product ?? false;
$specie = $variety->specie ?? false;
$images = $variety ? (count($variety->images) ? $images->merge($variety->images) : $images) : $images;
$images = $specie ? (count($specie->images) ? $images->merge($specie->images) : $images) : $images;
break;
case 'App\Models\Botanic\Specie':
$specie = $article->product;
$images = count($specie->images) ? $specie->images : $images;
$specie = $article->product ?? false;
$images = count($specie->images ?? []) ? $specie->images : $images;
break;
case 'App\Models\Shop\Merchandise':
$merchandise = $article->product;
$merchandise = $article->product ?? false;
$images = count($merchandise->images) ? $merchandise->images : $images;
break;
}
@@ -488,20 +488,13 @@ class Articles
}
switch ($article->product_type) {
case 'App\Models\Botanic\Variety':
$variety = $article->product;
$image = $variety->image ?? false;
if (!$image) {
$specie = $variety->specie;
$image = $specie->image ?? false;
}
$image = $article->product->image ?? ($article->product->specie->image ?? false);
break;
case 'App\Models\Botanic\Specie':
$specie = $article->product;
$image = $specie->image ?? false;
$image = $article->product->image ?? false;
break;
case 'App\Models\Shop\Merchandise':
$merchandise = $article->product;
$image = $merchandise->image ?? false;
$image = $article->product->image ?? false;
break;
}
return $image;
@@ -509,16 +502,16 @@ class Articles
public static function storeFull($data)
{
$images = isset($data['images']) ? $data['images'] : false;
$images = $data['images'] ?? false;
unset($data['images']);
$categories = isset($data['categories']) ? $data['categories'] : false;
$categories = $data['categories'] ?? false;
unset($data['categories']);
$tags = isset($data['tags']) ? $data['tags'] : false;
$tags = $data['tags'] ?? false;
unset($data['tags']);
$prices = isset($data['prices']) ? $data['prices'] : false;
$prices = $data['prices'] ?? false;
unset($data['prices']);
$article = self::store($data);