From d9fd26d3541e02d4656d32af547a3e338bbbc4ff Mon Sep 17 00:00:00 2001
From: Nikita Kiselev <kiselev2008@gmail.com>
Date: Thu, 7 Aug 2025 18:07:18 +0300
Subject: [PATCH] feat: add new mainpage products options, hide attributes

---
 .../upload/admin/controller/extension/module/tgshop.php         | 1 +
 .../upload/oc_telegram_shop/src/Handlers/ProductsHandler.php    | 2 +-
 spa/src/views/Product.vue                                       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
index fe73d7e..3e6ce1b 100755
--- a/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
+++ b/module/oc_telegram_shop/upload/admin/controller/extension/module/tgshop.php
@@ -381,6 +381,7 @@ HTML,
                     'type' => 'select',
                     'options' => [
                         'most_viewed' => 'Популярные товары',
+                        'latest' => 'Последние сверху',
                         'featured' => 'Избранные товары (задать в поле ниже)',
                     ],
                     'help' => 'Выберите, какие товары показывать на главной странице магазина в Telegram. Это влияет на первую видимую секцию каталога для пользователя.',
diff --git a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
index 19849de..97dbd14 100755
--- a/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
+++ b/module/oc_telegram_shop/upload/oc_telegram_shop/src/Handlers/ProductsHandler.php
@@ -108,7 +108,7 @@ class ProductsHandler
 
         $products = $productsQuery
             ->forPage($page, $perPage)
-            ->orderBy('viewed', 'DESC')
+            ->orderBy($mainpageProducts === 'latest' ? 'date_modified' : 'viewed', 'DESC')
             ->get();
 
         $productIds = Arr::pluck($products, 'product_id');
diff --git a/spa/src/views/Product.vue b/spa/src/views/Product.vue
index 399a96e..119860d 100644
--- a/spa/src/views/Product.vue
+++ b/spa/src/views/Product.vue
@@ -33,7 +33,7 @@
             </div>
           </div>
 
-          <div class="mt-3">
+          <div v-if="product.attributes && product.attributes.length > 0" class="mt-3">
             <h3 class="font-bold mb-2">Характеристики</h3>
 
             <div class="space-y-6">