diff --git a/www/css/base.css b/www/css/base.css index 01c0a3e..688abcd 100644 --- a/www/css/base.css +++ b/www/css/base.css @@ -22,7 +22,7 @@ --accent-gold-hover: #A87A2B; --accent-gold-light: rgba(200, 150, 62, 0.12); --brand-dark: #2B1E16; - --border-color: #E2D5C3; + --border-color: 137,159,135; /* #E2D5C3 */ --hero-gradient: linear-gradient(135deg, rgba(200, 150, 62, 0.18) 0%, rgba(247, 243, 236, 0.96) 42%, rgba(255, 255, 255, 0.92) 100%); --font-sans: 'Plus Jakarta Sans', sans-serif; --font-serif: 'Cinzel', serif; diff --git a/www/system-brs-core/app/index/inc/indexController.php b/www/system-brs-core/app/index/inc/indexController.php index 49e06f1..b4a54dc 100644 --- a/www/system-brs-core/app/index/inc/indexController.php +++ b/www/system-brs-core/app/index/inc/indexController.php @@ -394,7 +394,7 @@ class indexController extends cCore // Set image path or default image. $imgPath = self::IMG_ASSETS_DEFAULT_TESTIMONIAL; if (!empty($v['i'])) { - $imgPath = self::normalizeImagePath($v['i']); + $imgPath = self::normalizeImagePath($v['i'], 'service_card'); } $result[$k] = [ diff --git a/www/system-brs-core/app/index/tmpl/include/index/home-about-text.twig b/www/system-brs-core/app/index/tmpl/include/index/home-about-text.twig index fddc699..a0c9d7b 100644 --- a/www/system-brs-core/app/index/tmpl/include/index/home-about-text.twig +++ b/www/system-brs-core/app/index/tmpl/include/index/home-about-text.twig @@ -15,7 +15,7 @@ {{ section.description }}
- + {{ section.button_text }}
diff --git a/www/system-brs-core/app/index/tmpl/include/index/testimonial.twig b/www/system-brs-core/app/index/tmpl/include/index/testimonial.twig index 1471b49..2bec214 100644 --- a/www/system-brs-core/app/index/tmpl/include/index/testimonial.twig +++ b/www/system-brs-core/app/index/tmpl/include/index/testimonial.twig @@ -20,9 +20,7 @@
{{ testi.name }}
{{ testi.role }}
- -{# {{ stars.render(testi.rating) }}#} - +
diff --git a/www/system-brs-core/app/index/tmpl/index.twig b/www/system-brs-core/app/index/tmpl/index.twig index 7b78cc2..6d7d01b 100644 --- a/www/system-brs-core/app/index/tmpl/index.twig +++ b/www/system-brs-core/app/index/tmpl/index.twig @@ -1,7 +1,7 @@ {{ include("include/index/home-slider.twig") }} {{ include("include/index/category-slider.twig") }} {{ include("include/index/featured-product.twig") }} -{{ include("include/index/service-area.twig") }} +{#{{ include("include/index/service-area.twig") }}#} {#{{ include("include/index/home-about-product.twig") }}#} {{ include("include/index/home-about-text.twig") }} {#{{ include("include/index/deal-of-area.twig") }}#} diff --git a/www/system-brs-core/app/pubBuy/tmpl/checkout.twig b/www/system-brs-core/app/pubBuy/tmpl/checkout.twig index 08f287d..3aacc36 100644 --- a/www/system-brs-core/app/pubBuy/tmpl/checkout.twig +++ b/www/system-brs-core/app/pubBuy/tmpl/checkout.twig @@ -56,7 +56,7 @@
- + {{ dt.gM("Return to cart") }}
diff --git a/www/system-brs-core/app/pubBuy/tmpl/include/checkout/address.twig b/www/system-brs-core/app/pubBuy/tmpl/include/checkout/address.twig index 66a90ad..1ba1744 100644 --- a/www/system-brs-core/app/pubBuy/tmpl/include/checkout/address.twig +++ b/www/system-brs-core/app/pubBuy/tmpl/include/checkout/address.twig @@ -104,10 +104,10 @@
- +
- +
diff --git a/www/system-brs-core/app/pubCategories/inc/pubCategoriesController.php b/www/system-brs-core/app/pubCategories/inc/pubCategoriesController.php index 96f9bc2..7831be3 100644 --- a/www/system-brs-core/app/pubCategories/inc/pubCategoriesController.php +++ b/www/system-brs-core/app/pubCategories/inc/pubCategoriesController.php @@ -519,20 +519,22 @@ class pubCategoriesController extends cCore{ private function getCachedCategoryTreeData(int $selectedAliasId): array { - $cacheType = ($selectedAliasId > 0 ? self::APC_CATEGORY_TREE_MAIN_KEY . $selectedAliasId : self::APC_CATEGORY_TREE_ROOT_KEY); - $cached = $this->cache->get($cacheType, $this->langId); + $isCat = $selectedAliasId > 0; + $cacheType = ($isCat ? self::APC_CATEGORY_TREE_MAIN_KEY . $selectedAliasId : self::APC_CATEGORY_TREE_ROOT_KEY); + $cached = $this->cache->get($cacheType, $this->langId); if ($cached !== false && is_array($cached)) { return $cached; } $treeData = indexController::loadCategoryButtonMenu($this, $this->langId); - if ($selectedAliasId > 0) { + if ($isCat) { $selectedTitle = $this->module->getCategoryTitleByAliasId($selectedAliasId, $this->langId); $selectedTitle = $this->normalizeCategoryTitle($selectedTitle); if (empty($selectedTitle)) { // Fallback for selected main category - $item_id = $this->uri_data['item_id'] ?? ''; + $item_id = $this->uri_data['item_id'] ?? ''; $selectedTitle = (new cmsTextManagerModule())->getDataById($item_id, ['a_title']); + $selectedTitle = $this->normalizeCategoryTitle($selectedTitle); } if (!empty($treeData[$selectedTitle])) { @@ -549,8 +551,7 @@ class pubCategoriesController extends cCore{ private function normalizeCategoryTitle(string $title): string { $title = trim(html_entity_decode($title, ENT_QUOTES | ENT_HTML5, 'UTF-8')); - $title = preg_replace('/\s+/u', ' ', $title); - return function_exists('mb_strtolower') ? mb_strtolower($title, 'UTF-8') : strtolower($title); + return preg_replace('/\s+/u', ' ', $title); } private function flattenCategoryTree(array $treeData): array @@ -563,7 +564,7 @@ class pubCategoriesController extends cCore{ } if (!empty($subCategories['t']) && !empty($subCategories['l'])) { - $linkSet = isset($subCategories['l']) && $subCategories['l'] !== '' && $subCategories['l'] !== '/'; + $linkSet = $subCategories['l'] !== '' && $subCategories['l'] !== '/'; $image = '/img/assets/collection/collection-1.jpg'; if (!empty($subCategories['i'])) { diff --git a/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerConst.php b/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerConst.php index b389ac0..045cb26 100644 --- a/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerConst.php +++ b/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerConst.php @@ -64,6 +64,4 @@ class cmsTextManagerConst const MAP_SUB_URL_TYPE = 316; // Map url classificator type ID for site map urls table const CATEGORY_ALIAS_ID = 899; // Category url alias ID const CATEGORY_TYPES = [self::BASE_SUB_CATEGORIES, self::BASE_CATEGORIES]; - - // TODO: Not implemented types. } diff --git a/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerController.php b/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerController.php index ec50844..daa9228 100644 --- a/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerController.php +++ b/www/system-brs-core/cms/cmsTextManager/inc/cmsTextManagerController.php @@ -467,7 +467,7 @@ class cmsTextManagerController extends cCore // Url to lower $link = stripSpecialChars(strtolower($val["a_link-{$langId}"]), ["-"], false); - if (strlen($link) && in_array($update['a_type'], cmsTextManagerConst::CATEGORY_TYPES, true)) { + if (strlen($link) && in_array($update['a_type'], cmsTextManagerConst::CATEGORY_TYPES)) { // If url segment is in use send an error if ($this->module->chkUrlSegment($link, $recordId, $langId)) cJSON::sendError(['msg' => "Url segment already in use, please chose a different one"]); @@ -962,6 +962,7 @@ class cmsTextManagerController extends cCore cmsTextManagerConst::GLOBAL_BREADCRUMBS => ['category_bg'], cmsTextManagerConst::SHOP_SIDE_BANNER => ['shop_side_banner'], cmsTextManagerConst::COLLECTION_BANNER => ['collection_banner'], + cmsTextManagerConst::INDEX_PAGE_TESTIMONIAL => ['service_card'], ]; return [ diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/breadcrumb.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/breadcrumb.twig index e551b5a..fac8b36 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/breadcrumb.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/breadcrumb.twig @@ -2,9 +2,9 @@ {% set breadcrumbs_t = HEADER.breadcrumbs_t|default(HEADER.t) %}
- - {{ dt.gM("Home") }} / {{ breadcrumbs_t }} + + {{ dt.gM("Home") }} / {{ breadcrumbs_t }} -

{{ HEADER.s }}

+

{{ HEADER.s }}

diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/cart-items-table.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/cart-items-table.twig index 0cf0306..036ce0a 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/cart-items-table.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/cart-items-table.twig @@ -1,30 +1,21 @@ -{% set cartData = cart|default({}) %} +{% set cartData = cart|default({}) %} {% set cartItems = cartData.cat|default({}) %}
-
-
- Shipping progress - 65% -
-
- -
-
{% for prodId, variants in cartItems %} {% for variantKey, item in variants %} -
+
-
+
{{ item.t }}
- {{ item.t }} - + {{ item.t }} + {{ item.c1 }}{% if item.c1 and item.c2 %} / {% endif %}{{ item.c2 }}
-
{{ CURR|default('€ ')|raw }}{{ item.p|number_format(2, '.', ' ') }}
+
{{ CURR|default('€ ')|raw }}{{ item.p|number_format(2, '.', ' ') }}
@@ -40,5 +31,4 @@
{% endfor %} {% endfor %} -
diff --git a/www/system-brs-core/library/cView/tpl/helpers/pub/drawers.twig b/www/system-brs-core/library/cView/tpl/helpers/pub/drawers.twig index 08cf790..56411ec 100644 --- a/www/system-brs-core/library/cView/tpl/helpers/pub/drawers.twig +++ b/www/system-brs-core/library/cView/tpl/helpers/pub/drawers.twig @@ -1,4 +1,4 @@ -{% set cartData = cart|default({}) %} +{% set cartData = cart|default({}) %} {% set cartItems = cartData.cat|default({}) %} {% set hasCartItems = cartItems is not empty %}