Merge branch 'main' of http://91.189.216.43:3000/jacek.pyziak/wyczarujprezent.pl

override/controllers/front/listing/CategoryController.php

@@ -46,4 +46,39 @@ class CategoryController extends CategoryControllerCore
     public function getTemplateVarSubCategoriesPublic() {
         return $this->getTemplateVarSubCategories();
     }
+    
+    /*
+    * Override na tytuł kategorii z podstronami
+    * date: 21.07.2025
+    * author: Tomasz Załucki <info@innhouse.pl>
+    */
+     public function getTemplateVarPage()
+    {
+        $page = parent::getTemplateVarPage();
+        if (Validate::isLoadedObject($this->category) && $this->category->active) {
+            
+            // Pobierz oryginalny tytuł kategorii i ustaw go jako meta title
+            // Domyślnie tytuł pobierany jest z presentera i pokazuje w nawiasie numer podstrony
+            $categoryTitle = $this->category->name;
+            $shopName = Configuration::get('PS_SHOP_NAME');
+            $currentPage = (int) Tools::getValue('page', 1);
+            $newMetaTitle = $categoryTitle . ' - ' . trim($shopName);
+
+
+            if ($currentPage > 1) {
+                $newMetaTitle .= ' - Strona ' . $currentPage;
+            }
+
+            $page['meta']['title'] = $newMetaTitle;
+
+            $metaTitle = trim($this->category->meta_title);
+            if ($metaTitle !== '') {
+                $page['meta']['seo_title'] = $metaTitle;
+            } else {
+                $page['meta']['seo_title'] = null;
+            }
+        }
+
+        return $page;
+    }
 }

themes/charme/assets/css/custom.scss

@@ -426,4 +426,8 @@ body#product {
       display: none !important;
     }
   }
+}
+
+.form-control.alert {
+  border: 1px solid #cc0000 !important;
 }

themes/charme/assets/js/custom.js

@@ -727,4 +727,4 @@ $(window).on('resize', function(){
     }, 100);
 
 
-});
+});

themes/charme/assets/js/custom_js.js

@@ -0,0 +1,57 @@
+document.addEventListener('DOMContentLoaded', function () {
+  const phoneInput = document.querySelector('input[name="phone"]');
+  const confirmBtn = document.getElementById('confirm_order');
+  if (!phoneInput || !confirmBtn) return;
+
+  const STATE = { internalChange: false, activated: false };
+
+  function normalizePhone(val) {
+    let v = (val || '').replace(/\D+/g, '');
+    if (v.length > 9) v = v.slice(0, 9);
+    return v;
+  }
+
+  function isValidPhone() {
+    return normalizePhone(phoneInput.value).length === 9;
+  }
+
+  function setBtnDisabled(disabled) {
+    if (confirmBtn.disabled !== disabled) {
+      STATE.internalChange = true;       // znacznik: to nasza zmiana
+      confirmBtn.disabled = disabled;
+      STATE.internalChange = false;
+    }
+  }
+
+  function applyPhoneValidation() {
+    const normalized = normalizePhone(phoneInput.value);
+    if (phoneInput.value !== normalized) phoneInput.value = normalized;
+
+    if (isValidPhone()) {
+      phoneInput.classList.remove('alert');
+      setBtnDisabled(false);
+    } else {
+      phoneInput.classList.add('alert');
+      setBtnDisabled(true);
+    }
+  }
+
+  // Aktywacja dopiero przy pierwszym focusie
+  phoneInput.addEventListener('focus', function onFirstFocus() {
+    if (STATE.activated) return;
+    STATE.activated = true;
+
+    phoneInput.addEventListener('input', applyPhoneValidation, { passive: true });
+    // pierwsze sprawdzenie – bez emitowania zdarzeń, by nie triggerować cudzych handlerów
+    applyPhoneValidation();
+
+    // Pilnowanie przycisku, gdy inny skrypt zmieni jego stan
+    const observer = new MutationObserver(function (mutations) {
+      if (STATE.internalChange) return; // ignoruj nasze własne zmiany
+      // Tylko jeśli numer niepoprawny – wymuś blokadę
+      if (!isValidPhone()) setBtnDisabled(true);
+    });
+
+    observer.observe(confirmBtn, { attributes: true, attributeFilter: ['disabled'] });
+  }, { once: true });
+});

themes/charme/templates/_partials/footer.tpl

@@ -60,9 +60,10 @@
       {else}
       <div class="col-md-12">
       {/if}
-	  
+
 	    {hook h='displayCopyrightContainer'}
 	  </div>
     </div>
   </div>
-</div>
+</div>
+<script type="text/javascript" src="https://wyczarujprezent.pl/themes/charme/assets/js/custom_js.js?ver=1.003"></script>

themes/charme/templates/_partials/head.tpl

@@ -29,7 +29,11 @@
   <meta http-equiv="x-ua-compatible" content="ie=edge">
 {/block}
 {block name='head_seo'}
-  <title>{block name='head_seo_title'}{$page.meta.title}{/block}</title>
+  <title>
+    {block name='head_seo_title'}
+      {if isset($page.meta.seo_title) && $page.meta.seo_title|trim != ''}{$page.meta.seo_title}{else}{$page.meta.title}{/if}
+    {/block}
+  </title>
   {hook h="displayAfterTitleTag"}
   <meta name="description" content="{block name='head_seo_description'}{$page.meta.description}{/block}">
   <meta name="keywords" content="{block name='head_seo_keywords'}{$page.meta.keywords}{/block}">
@@ -53,8 +57,7 @@
 {block name='stylesheets'}
   {include file="_partials/stylesheets.tpl" stylesheets=$stylesheets}
 {/block}
-
-<link rel="stylesheet" href="/themes/charme/assets/css/custom.css?ver=1.10028">
+<link rel="stylesheet" href="/themes/charme/assets/css/custom.css?ver=1.10030">
 
 {block name='javascript_head'}
   {include file="_partials/javascript.tpl" javascript=$javascript.head vars=$js_custom_vars}
@@ -66,22 +69,21 @@
 
 {block name='hook_extra'}{/block}
 {literal}
-<script type="text/javascript">
-console.log('test');
-  (function waitForElement() {
-  const targetSelector = '.remaining-amount-to-free-shipping-container';
-  const destinationSelector = '#tc-container';
+  <script type="text/javascript">
+    (function waitForElement() {
+      const targetSelector = '.remaining-amount-to-free-shipping-container';
+      const destinationSelector = '#tc-container';
 
-  const targetElement = document.querySelector(targetSelector);
-  const destinationElement = document.querySelector(destinationSelector);
+      const targetElement = document.querySelector(targetSelector);
+      const destinationElement = document.querySelector(destinationSelector);
 
-  if (targetElement && destinationElement) {
-    destinationElement.insertBefore(targetElement, destinationElement.firstChild);
-  } else {
-    // Czekaj i sprawdź ponownie za 200 ms
-    setTimeout(waitForElement, 200);
-  }
-})();
-</script>
+      if (targetElement && destinationElement) {
+        destinationElement.insertBefore(targetElement, destinationElement.firstChild);
+      } else {
+        // Czekaj i sprawdź ponownie za 200 ms
+        setTimeout(waitForElement, 200);
+      }
+    })();
+  </script>
 <script id="Cookiebot" src="https://consent.cookiebot.com/uc.js" data-cbid="c8f25b0f-e05a-4f87-8ab6-1ea1ad1853b0" data-blockingmode="auto" type="text/javascript"></script>
 {/literal}