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

add watermark on zoom, update display of article nature on shelve (change icon to text

Browse Source
This commit is contained in:
ludo
2024-02-04 22:09:53 +01:00
parent 4c6f9b3b61
commit 308b6cb349
9 changed files with 93 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,7 +81,7 @@ class Articles
$images = ArticleImages::getFullImagesByArticle($article);
$data['image'] = self::getPreviewSrc($images[0] ?? false);
$data['images'] = count($images) ? $images : false;
$data['image_big'] = self::getImageSrc($images[0] ?? false);
$data['image_big'] = self::getZoomSrc($images[0] ?? false);
$data['inherited'] = ArticleInherited::getInherited($id);
$data['categories'] = ArticleCategories::getCategoriesNameByArticle($article);
$data['tags'] = ArticleTags::getFullTagsSlugByArticle($article);
@@ -143,7 +143,7 @@ class Articles
public static function getArticlesToSell($options)
{
$articles = self::getArticlesWithOffers($options);
$searchOrder = array_flip($options['ids']->toArray() ?? []);
$searchOrder = $options['ids'] ?? false ? array_flip($options['ids']->toArray()) : false;
foreach ($articles as $article) {
$price_lists = $article->offers[0]->tariff->price_lists->toArray();
if (! count($price_lists)) {
@@ -151,7 +151,9 @@ class Articles
}
if (! is_array($data[$article->name] ?? false)) {
$data[$article->name] = self::getDataForSale($article);
$data[$article->name]['searchOrder'] = $searchOrder[$article->id];
if ($searchOrder) {
$data[$article->name]['searchOrder'] = $searchOrder[$article->id];
}
}
$prices = $price_lists[0]['price_list_values'][0];
$article_nature_name = strtolower($article->article_nature->name);

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

@@ -7,7 +7,7 @@ class Shelves
public static function getOffersByCategoryAndNature($categoryId, $articleNatureId = false, $tags = [], $articleNature = false, $displayByRows = false)
{
$articleNatures = Articles::getArticleNaturesWithOffers(['category_id' => $categoryId]);
$productType = self::getProductType($articleNature, $articleNatures);
$productType = self::getProductType($articleNatureId, $articleNature, $articleNatures);
$articleNatureId = $articleNatureId ?
$articleNatureId :
self::getArticleNatureId($articleNature, $articleNatures);