diff --git a/language/en-GB/mod_wtjshoppingswipercarousel.sys.ini b/language/en-GB/mod_wtjshoppingswipercarousel.sys.ini index 49901a0..a414d45 100644 --- a/language/en-GB/mod_wtjshoppingswipercarousel.sys.ini +++ b/language/en-GB/mod_wtjshoppingswipercarousel.sys.ini @@ -4,5 +4,5 @@ MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_INSTALL = "Thank you for intalling extension MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_DISCOVER_INSTALL = "Thank you for intalling extension" MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_UPDATE = "Thank you for updating extension" MOD_WTJSHOPPINGSWIPERCAROUSEL_MAYBE_INTERESTING="

It may be interesting

" -MOD_WTJSHOPPINGSWIPERCAROUSEL_WHATS_NEW="

v.1.1.0 What's new?

JoomShopping product link button added

If Joomshopping is running in catalog mode, the buy button is unavailable. Therefore, a link to the product has been added.

" +MOD_WTJSHOPPINGSWIPERCAROUSEL_WHATS_NEW="

v.1.1.1 What's new?

Bug fix

Fixed the error \"class JSFactory not found\".

" MOD_WTJSHOPPINGSWIPERCAROUSEL_JOOMLARU_TELEGRAM_CHAT="Joomla community in Telegram" \ No newline at end of file diff --git a/language/ru-RU/mod_wtjshoppingswipercarousel.sys.ini b/language/ru-RU/mod_wtjshoppingswipercarousel.sys.ini index ac3a963..f4bdb27 100644 --- a/language/ru-RU/mod_wtjshoppingswipercarousel.sys.ini +++ b/language/ru-RU/mod_wtjshoppingswipercarousel.sys.ini @@ -4,5 +4,5 @@ MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_INSTALL = "Спасибо за устано MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_DISCOVER_INSTALL = "Спасибо за установку расширения" MOD_WTJSHOPPINGSWIPERCAROUSEL_AFTER_UPDATE = "Спасибо за обновление расширения" MOD_WTJSHOPPINGSWIPERCAROUSEL_MAYBE_INTERESTING="

Может быть интересно

" -MOD_WTJSHOPPINGSWIPERCAROUSEL_WHATS_NEW="

v.1.1.0 Что нового?

Добавлена ссылка \"Подробнее\" для товара

Если Joomshopping работает в режиме каталога - кнопка купить недоступна. Поэтому добавлена ссылка на товар.

" +MOD_WTJSHOPPINGSWIPERCAROUSEL_WHATS_NEW="

v.1.1.1 Что нового?

Исправление ошибок

Исправлена ошибка \"class JSFactory not found\".

" MOD_WTJSHOPPINGSWIPERCAROUSEL_JOOMLARU_TELEGRAM_CHAT="Joomla сообщество в Телеграм" \ No newline at end of file diff --git a/mod_wtjshoppingswipercarousel.xml b/mod_wtjshoppingswipercarousel.xml index 193678b..980917f 100644 --- a/mod_wtjshoppingswipercarousel.xml +++ b/mod_wtjshoppingswipercarousel.xml @@ -2,12 +2,12 @@ MOD_WTJSHOPPINGSWIPERCAROUSEL Sergey Tolkachyov - January 2024 + February 2024 Copyright (C) 2021 Sergey Tolkachyov. All rights reserved. GNU General Public License version 2 or later; see LICENSE.txt info@web-tolk.ru https://web-tolk.ru - 1.1.0 + 1.1.1 MOD_WTJSHOPPINGSWIPERCAROUSEL_DESC Joomla\Module\Wtjshoppingswipercarousel script.php diff --git a/script.php b/script.php index 87ce6e0..924f5ca 100644 --- a/script.php +++ b/script.php @@ -2,7 +2,7 @@ /** * @package Com_blank - * @version 1.1.0 + * @version 1.1.1 * @Author Sergey Tolkachyov, https://web-tolk.ru * @copyright Copyright (C) 2023 Sergey Tolkachyov * @license GNU/GPL http://www.gnu.org/licenses/gpl-3.0.html diff --git a/services/provider.php b/services/provider.php index b82cff4..6c3a471 100644 --- a/services/provider.php +++ b/services/provider.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ defined('_JEXEC') or die; diff --git a/src/Dispatcher/Dispatcher.php b/src/Dispatcher/Dispatcher.php index ed2429f..7c5fa8f 100644 --- a/src/Dispatcher/Dispatcher.php +++ b/src/Dispatcher/Dispatcher.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ diff --git a/src/Fields/JshoppingcategoriesField.php b/src/Fields/JshoppingcategoriesField.php index 5b208c3..88c499c 100644 --- a/src/Fields/JshoppingcategoriesField.php +++ b/src/Fields/JshoppingcategoriesField.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ diff --git a/src/Fields/JshoppinglabelsField.php b/src/Fields/JshoppinglabelsField.php index 578ebbf..dd36eb3 100644 --- a/src/Fields/JshoppinglabelsField.php +++ b/src/Fields/JshoppinglabelsField.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ diff --git a/src/Fields/ModuleinfoField.php b/src/Fields/ModuleinfoField.php index aa7bd3f..94f44e3 100644 --- a/src/Fields/ModuleinfoField.php +++ b/src/Fields/ModuleinfoField.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ namespace Joomla\Module\Wtjshoppingswipercarousel\Site\Fields; diff --git a/src/Helper/WtjshoppingswipercarouselHelper.php b/src/Helper/WtjshoppingswipercarouselHelper.php index 8d9cb76..027a1d6 100644 --- a/src/Helper/WtjshoppingswipercarouselHelper.php +++ b/src/Helper/WtjshoppingswipercarouselHelper.php @@ -3,8 +3,8 @@ * @package WT JShopping Swiper carousel * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru - * @link https://web-tolk.ru - * @version 1.1.0 + * @link https://web-tolk.ru + * @version 1.1.1 * @license GNU General Public License version 3 or later */ @@ -57,6 +57,11 @@ public function getList($params, $app): array */ public function getJshopConfig(): object { + if (!class_exists('JSFactory') && file_exists(JPATH_SITE . '/components/com_jshopping/bootstrap.php')) + { + require_once(JPATH_SITE . '/components/com_jshopping/bootstrap.php'); + } + $jshopConfig = \JSFactory::getConfig(); return $jshopConfig; @@ -130,7 +135,7 @@ public function getSwiperParams($data, $app): void $breakpoints[$breakpoint->breakpoint] = [ 'slidesPerView' => $breakpoint->slidesPerView, 'spaceBetween' => $breakpoint->spaceBetween, - 'direction' => (!empty($breakpoint->direction) ? $breakpoint->direction : 'horizontal'), + 'direction' => (!empty($breakpoint->direction) ? $breakpoint->direction : 'horizontal'), ]; } @@ -232,6 +237,7 @@ private function getImagesFromModuleParams($params): array /** * Return JoomShopping product list + * * @param $params * @param $app * @@ -246,12 +252,13 @@ private function getJshoppingProducts($params, $app): array $noimage = $jshopConfig->image_product_live_path . "/noimage.gif"; $filters = []; $count = $params->get('joomshopping_products_count_products', 4); - $list = []; + $list = []; if ($params->get('joomshopping_products_type') == 'last_products') { $productlist = \JSFactory::getModel('last', 'Site\\Productlist'); - $categories = $params->get('catids', []); - if(is_array($categories) && count($categories) > 0){ + $categories = $params->get('catids', []); + if (is_array($categories) && count($categories) > 0) + { $categories = array_map('intval', $categories); } $filters['categorys'] = $categories; @@ -277,10 +284,12 @@ private function getJshoppingProducts($params, $app): array if (strpos($product_ids, ',') !== false) { $product_ids = explode(',', $product_ids); - $product_ids = array_map('trim',$product_ids); + $product_ids = array_map('trim', $product_ids); - } else { - $product_ids = (array)trim($product_ids); + } + else + { + $product_ids = (array) trim($product_ids); } if (is_array($product_ids) && count($product_ids) > 0) @@ -304,9 +313,10 @@ private function getJshoppingProducts($params, $app): array if ($params->get('joomshopping_products_type') == 'toprating_products') { - $product = \JSFactory::getModel('toprating', 'Site\\Productlist'); + $product = \JSFactory::getModel('toprating', 'Site\\Productlist'); $categories = $params->get('catids', []); - if(is_array($categories) && count($categories) > 0){ + if (is_array($categories) && count($categories) > 0) + { $categories = array_map('intval', $categories); } $filters['categorys'] = $categories; @@ -321,9 +331,10 @@ private function getJshoppingProducts($params, $app): array } if ($params->get('joomshopping_products_type') == 'tophits_products') { - $product = \JSFactory::getModel('tophits', 'Site\\Productlist'); + $product = \JSFactory::getModel('tophits', 'Site\\Productlist'); $categories = $params->get('catids', []); - if(is_array($categories) && count($categories) > 0){ + if (is_array($categories) && count($categories) > 0) + { $categories = array_map('intval', $categories); } $filters['categorys'] = $categories; @@ -340,7 +351,8 @@ private function getJshoppingProducts($params, $app): array if ($params->get('joomshopping_products_type') == 'bestseller_products') { $categories = $params->get('catids', []); - if(is_array($categories) && count($categories) > 0){ + if (is_array($categories) && count($categories) > 0) + { $categories = array_map('intval', $categories); } @@ -357,7 +369,7 @@ private function getJshoppingProducts($params, $app): array if ($params->get('joomshopping_products_type') == 'label_products') { - $product = \JSFactory::getModel('label', 'Site\\Productlist'); + $product = \JSFactory::getModel('label', 'Site\\Productlist'); $label_ids = (array) $params->get('label_id'); if ($label_ids) @@ -366,7 +378,8 @@ private function getJshoppingProducts($params, $app): array } $categories = $params->get('catids', []); - if(is_array($categories) && count($categories) > 0){ + if (is_array($categories) && count($categories) > 0) + { $categories = array_map('intval', $categories); } diff --git a/tmpl/bs-5-card-joomshopping-products.php b/tmpl/bs-5-card-joomshopping-products.php index 12f8b33..fd06005 100644 --- a/tmpl/bs-5-card-joomshopping-products.php +++ b/tmpl/bs-5-card-joomshopping-products.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ use Joomla\CMS\Factory; diff --git a/tmpl/default.php b/tmpl/default.php index 0a23a26..10d873f 100644 --- a/tmpl/default.php +++ b/tmpl/default.php @@ -4,7 +4,7 @@ * @copyright Copyright (C) 2022-2023 Sergey Tolkachyov. All rights reserved. * @author Sergey Tolkachyov - https://web-tolk.ru * @link https://web-tolk.ru - * @version 1.1.0 + * @version 1.1.1 * @license GNU General Public License version 3 or later */ use Joomla\CMS\HTML\HTMLHelper;