Works for friday & saturday

This commit is contained in:
Ludovic CANDELLIER
2022-05-29 00:46:04 +02:00
parent 352b109e87
commit 5b74c93b2e
44 changed files with 2023 additions and 79 deletions

View File

@@ -99,7 +99,7 @@ class Articles
case 'App\Models\Botanic\Variety':
$variety = $article->product;
$specie = $variety->specie;
$description = $specie->description . $variety->description;
$description = $specie->description . $variety->description;
break;
case 'App\Models\Botanic\Specie':
$specie = $article->product;
@@ -160,6 +160,9 @@ class Articles
$data[$article->name][$article_nature_name] = self::getDataPriceForSale($article, $prices);
}
}
if ($data ?? false) {
ksort($data);
}
return $data ?? false;
}
@@ -189,13 +192,9 @@ class Articles
public static function getArticlesWithOffers($options = false)
{
$category_id = $options['category_id'] ?? false;
$sale_channel_id = $options['sale_channel_id'] ?? SaleChannels::getDefaultID();
$tags = $options['tags'] ?? false;
$model = ($options['homepage'] ?? false) ? Article::homepage()->visible() : Article::visible();
// exit;
$data = $model->byCategoryParent($category_id)->byTags($tags)->withAvailableOffers($sale_channel_id)->with([
$model = self::getModelByOptions($options);
$data = $model->withAvailableOffers($sale_channel_id)->with([
'image',
'product',
'article_nature',
@@ -214,6 +213,21 @@ class Articles
return $data;
}
public static function getModelByOptions($options = false)
{
$category_id = $options['category_id'] ?? false;
$search = $options['search'] ?? false;
$tags = $options['tags'] ?? false;
$article_nature_id = $options['article_nature_id'] ?? false;
$model = ($options['homepage'] ?? false) ? Article::homepage()->visible() : Article::visible();
$model = $category_id ? $model->byCategoryParent($category_id) : $model;
$model = $tags ? $model->byTagsSelected($tags) : $model;
$model = $search ? $model->search($search) : $model;
$model = $article_nature_id ? $model->byArticleNature($article_nature_id) : $model;
return $model;
}
public static function getFull($id)
{
$data['article'] = self::getArticleEdit($id);