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

fix devops error

Browse Source
This commit is contained in:
ludo
2024-01-05 01:30:46 +01:00
parent d33dd6e755
commit 25b8fc40c5
128 changed files with 410 additions and 2580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,6 +50,7 @@ class Articles
public static function getSiblingsDescriptions($id)
{
$data = [];
$siblings = self::getSiblings($id);
foreach ($siblings as $sibling) {
if ($sibling->description && ($sibling->article_nature->name ?? false)) {
@@ -76,6 +77,7 @@ class Articles
public static function getOptionsWithNature()
{
$data = [];
$articles = Article::with(['article_nature'])->get();
foreach ($articles as $article) {
$data[$article->id] = ($article->article_nature->name ?? null).' - '.$article->name;
@@ -117,6 +119,7 @@ class Articles
public static function getFullDescriptionByArticle($article)
{
$data = [];
switch ($article->product_type) {
case 'App\Models\Botanic\Variety':
$data['variety'] = $article->product->description;
@@ -141,13 +144,6 @@ class Articles
if ($siblings) {
array_push($data, $siblings);
}
/*
$data['resume'] = ($data['semences'] ?? null) .
($data['plants'] ?? null) .
($data['variety'] ?? null) .
($data['merchandise'] ?? null) .
($data['plus'] ?? null);
*/
$data['description'] = $article->description;
return $data;
@@ -155,6 +151,7 @@ class Articles
public static function getArticlesByHomepage()
{
$data = [];
$shelves = Categories::getByHomepage();
foreach ($shelves as $shelve) {
$data[] = [
@@ -285,7 +282,7 @@ class Articles
$article_nature_ids = $options['article_nature_ids'] ?? false;
$product_type = $options['product_type'] ?? false;
$model = ($options['homepage'] ?? false) ? Article::homepage()->visible() : Article::visible();
$model = $options['homepage'] ?? false ? Article::homepage()->visible() : Article::visible();
$model = $category_id ? $model->byCategoryParent($category_id) : $model;
$model = $tags ? $model->byTags($tags) : $model;
$model = $search ? $model->search($search) : $model;
@@ -307,7 +304,9 @@ class Articles
public static function getFull($id)
{
$data['article'] = self::getArticleEdit($id);
$data = [
'article' => self::getArticleEdit($id),
];
return self::getMeta($data);
}
@@ -333,6 +332,7 @@ class Articles
public static function getInheritedByProduct($product_id, $product_type)
{
$data = [];
switch ($product_type) {
case 'App\Models\Botanic\Variety':
$product = Varieties::get($product_id);
@@ -414,7 +414,6 @@ class Articles
$data['categories_options'] = Categories::getOptions();
$data['natures_options'] = ArticleNatures::getOptions();
// $data['packages'] = ($data['article']['article_family_id'] ?? false) ? Packages::getSelectByFamily($data['article']['article_family_id']) : [];
$data['tags_list'] = TagGroups::getTreeTags();
$data['models_options'] = [
'App\Models\Botanic\Specie' => 'Espèces',
@@ -439,7 +438,7 @@ class Articles
{
$models = self::getProductTypesModelsByCategory($category_id);
return (($models[0] ?? false) == Merchandise::class) ? 'merchandise' : 'botanic';
return ($models[0] ?? false) === Merchandise::class ? 'merchandise' : 'botanic';
}
public static function getProductTypesModelsByCategory($category_id)
@@ -549,6 +548,7 @@ class Articles
$merchandise = $article->product ?? false;
$images = count($merchandise->images ?? []) ? $merchandise->images : $images;
break;
default:
}
return $images;
@@ -575,6 +575,7 @@ class Articles
case 'App\Models\Shop\Merchandise':
$image = $article->product->image ?? false;
break;
default:
}
return $image;
@@ -591,9 +592,6 @@ class Articles
$tags = $data['tags'] ?? false;
unset($data['tags']);
$prices = $data['prices'] ?? false;
unset($data['prices']);
$article = self::store($data);
self::storeImages($article, $images);
self::storeCategories($article, $categories);