diff --git a/.htaccess b/.htaccess
index 0aa99318..32d3a811 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,3 +1,89 @@
+#~~PSHOWLAZYIMG-MODULE~start~~-rewrite-webp-files
+# Code automatically added by module pshowlazyimg
+
+RewriteEngine On
+RewriteCond %{HTTP_ACCEPT} image/webp
+RewriteRule . - [E=REWRITEBASE:/]
+RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.webp [L]
+RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.webp [L]
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$8/$1$2$3$4$5$6$7$8$9$10.webp [L]
+RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/c/$1$2$3.webp [L]
+RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/c/$1$2.webp [L]
+
+#~~PSHOWLAZYIMG-MODULE~end~~-rewrite-webp-files
+
+#~~PSHOWLAZYIMG-MODULE~start~~-webp-on-the-fly
+# Code automatically added by module pshowlazyimg
+
+RewriteEngine On
+RewriteCond %{HTTP_ACCEPT} image/webp
+RewriteCond %{REQUEST_FILENAME} -f
+RewriteRule . - [E=REWRITEBASE:/]
+RewriteRule ^(.*)\.(jpe?g|png)$ %{ENV:REWRITEBASE}modules/pshowlazyimg/webp-on-demand.php?source=%{SCRIPT_FILENAME} [NC,L]
+
+
+AddType image/webp .webp
+
+#~~PSHOWLAZYIMG-MODULE~end~~-webp-on-the-fly
+
+#x13webp module start
+#Domain: www.interblue.pl
+RewriteRule . - [E=REWRITEBASE:/]
+RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
+
+# Images
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$1$2$3.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$1$2$3$4.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$1$2$3$4$5.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$1$2$3$4$5$6.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$1$2$3$4$5$6$7.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$1$2$3$4$5$6$7$8.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])([0-9])(\-[_a-zA-Z0-9-]*)?(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/p/$1/$2/$3/$4/$5/$6/$7/$1$2$3$4$5$6$7$8$9.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^c/([0-9]+)(\-[\.*_a-zA-Z0-9-]*)(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/c/$1$2$3.webp [L]
+RewriteCond %{HTTP_HOST} ^www.interblue.pl$
+RewriteRule ^c/([a-zA-Z_-]+)(-[0-9]+)?/.+\.webp$ %{ENV:REWRITEBASE}img/c/$1$2.webp [L]
+# AlphaImageLoader for IE and fancybox
+RewriteRule ^images_ie/?([^/]+)\.(jpe?g|png|gif)$ js/jquery/plugins/fancybox/images/$1.$2 [L]
+#x13webp redirections start
+
+SetEnvIf Request_URI "\.(jpe?g|png)$" REQUEST_image
+
+
+RewriteEngine On
+RewriteCond %{HTTP_ACCEPT} image/webp
+RewriteCond %{REQUEST_FILENAME} (.*)\.(jpe?g|png)$
+RewriteCond %1\.webp -f
+RewriteRule (.+)\.(jpe?g|png)$ $1.webp [T=image/webp,E=accept:1]
+
+
+RewriteEngine On
+RewriteCond %{HTTP_ACCEPT} image/webp
+RewriteCond %{DOCUMENT_ROOT}/$1.webp -f
+RewriteRule (.+)\.(jpe?g|png)$ $1.webp [T=image/webp]
+
+
+Header append Vary Accept env=REDIRECT_accept
+
+
+AddType image/webp .webp
+
+#x13webp redirections end
+
+#x13webp module end
+
# ~~start~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again
# .htaccess automaticaly generated by PrestaShop e-commerce open-source solution
# http://www.prestashop.com - http://www.prestashop.com/forums
@@ -9,6 +95,7 @@ SetEnv HTTP_MOD_REWRITE On
RewriteEngine on
+
#Domain: www.interblue.pl
RewriteRule . - [E=REWRITEBASE:/]
RewriteRule ^api(?:/(.*))?$ %{ENV:REWRITEBASE}webservice/dispatcher.php?url=$1 [QSA,L]
@@ -107,8 +194,7 @@ FileETag none
#If rewrite mod isn't enabled
-# ErrorDocument 404 /index.php?controller=404
-ErrorDocument 404 https://www.interblue.pl/nie-znaleziono-strony
+ErrorDocument 404 /index.php?controller=404
# ~~end~~ Do not remove this comment, Prestashop will keep automatically the code outside this comment when .htaccess will be generated again
diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json
index 2441b444..af212e88 100644
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -98,13 +98,13 @@
},
"google-merchant_id-1.xml": {
"type": "-",
- "size": 18115062,
+ "size": 17943590,
"lmtime": 0,
"modified": true
},
".htaccess": {
"type": "-",
- "size": 83923,
+ "size": 88569,
"lmtime": 0,
"modified": true
},
@@ -150,6 +150,12 @@
"lmtime": 0,
"modified": false
},
+ ".htaccess_backup_20250222_155201": {
+ "type": "-",
+ "size": 86941,
+ "lmtime": 0,
+ "modified": false
+ },
".htaccess.bck": {
"type": "-",
"size": 77278,
diff --git a/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl b/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
index ef6d8d48..53165b9a 100644
--- a/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
+++ b/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
@@ -18,7 +18,7 @@
{$cover_src = $blog->getImgSrc('post', $post.id_post, $settings.cover_type, $post.cover)}
{if !empty($cover_src)}
@@ -35,7 +35,7 @@
{$post.content|strip_tags|truncate:$settings.truncate:'...'|escape:'html':'UTF-8'}
{if !empty($settings.show_readmore)}
-
+
diff --git a/modules/amazzingblog/views/templates/front/post-list-item.tpl b/modules/amazzingblog/views/templates/front/post-list-item.tpl
index 99fa1d2b..50adfd56 100644
--- a/modules/amazzingblog/views/templates/front/post-list-item.tpl
+++ b/modules/amazzingblog/views/templates/front/post-list-item.tpl
@@ -18,7 +18,7 @@
{$cover_src = $blog->getImgSrc('post', $post.id_post, $settings.cover_type, $post.cover)}
{if !empty($cover_src)}
@@ -69,7 +69,7 @@
{/if}
{if !empty($settings.truncate) && !empty($settings.show_readmore)}
-
+
{l s='Read more' mod='amazzingblog'}
diff --git a/modules/amazzingblog/views/templates/front/post-list-presentation.tpl b/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
index ccb15f7c..3bfc8770 100644
--- a/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
+++ b/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
@@ -69,7 +69,7 @@
{/if}
{if !empty($settings.show_readmore)}
-
+
{l s='Read more' mod='amazzingblog'}
diff --git a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
index ef6d8d48..53165b9a 100644
--- a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
+++ b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item-compact.tpl
@@ -18,7 +18,7 @@
{$cover_src = $blog->getImgSrc('post', $post.id_post, $settings.cover_type, $post.cover)}
{if !empty($cover_src)}
@@ -35,7 +35,7 @@
{$post.content|strip_tags|truncate:$settings.truncate:'...'|escape:'html':'UTF-8'}
{if !empty($settings.show_readmore)}
-
+
diff --git a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item.tpl b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item.tpl
index 10f851ab..8416c976 100644
--- a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item.tpl
+++ b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-item.tpl
@@ -20,7 +20,7 @@
{if !empty($cover_src)}
@@ -71,7 +71,7 @@
{/if}
{if !empty($settings.truncate) && !empty($settings.show_readmore)}
-
+
{l s='Read more' mod='amazzingblog'}
diff --git a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-presentation.tpl b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
index ccb15f7c..3bfc8770 100644
--- a/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
+++ b/themes/InterBlue/modules/amazzingblog/views/templates/front/post-list-presentation.tpl
@@ -69,7 +69,7 @@
{/if}
{if !empty($settings.show_readmore)}
-
+
{l s='Read more' mod='amazzingblog'}
diff --git a/themes/InterBlue/templates/_partials/head.tpl b/themes/InterBlue/templates/_partials/head.tpl
index 3fcb4c4b..8ee61b7b 100644
--- a/themes/InterBlue/templates/_partials/head.tpl
+++ b/themes/InterBlue/templates/_partials/head.tpl
@@ -33,11 +33,17 @@
{block name='head_seo_title'}{$page.meta.title}{/block}
- {if $page.meta.robots !== 'index'}
-
+ {assign var="excluded_pages" value=['/dane-osobiste', '/moje-konto', '/adresy', '/adres', '/historia-zamowien', '/potwierdzenie-zwrotu', '/rabaty', '/module/psgdpr/gdpr','/module/przelewy24/accountMyCards']}
+ {assign var="clean_uri" value=explode('?', $smarty.server.REQUEST_URI)|@reset}
+
+ {if in_array($clean_uri, $excluded_pages)}
+
+ {elseif $page.meta.robots !== 'index'}
+
{/if}
{if $page.canonical}
-
+ {assign var="canonical" value=explode('?', $page.canonical)|@reset}
+
{/if}
{block name='head_hreflang'}
{foreach from=$urls.alternative_langs item=pageUrl key=code}
diff --git a/themes/InterBlue/templates/catalog/_partials/miniatures/product-light.tpl b/themes/InterBlue/templates/catalog/_partials/miniatures/product-light.tpl
index 2e0d36b6..f61a652a 100644
--- a/themes/InterBlue/templates/catalog/_partials/miniatures/product-light.tpl
+++ b/themes/InterBlue/templates/catalog/_partials/miniatures/product-light.tpl
@@ -27,7 +27,7 @@