Skip to content

fix: issue with incorrect conditions #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
slavafyi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: issue with incorrect conditions #31

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 9 additions & 4 deletions layout/theme.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,12 @@
- The template is defined (will be undefined for app proxies like /apps|a|community|tools/*)
- The current template is not the login page, unless multipass login is enabled
{% endcomment %}
{%- assign should_redirect = template != blank and template.name != 'login' or settings.multipass_login -%}
{%- liquid
assign should_redirect = false
if settings.multipass_login or template != blank and template.name != 'login'
assign should_redirect = true
endif
-%}

{%- if settings.storefront_hostname != blank and should_redirect -%}
<script>
Expand Down Expand Up @@ -181,12 +186,12 @@
var customRedirectsStr = "{{ settings.custom_redirects | newline_to_br | strip_newlines | replace: ' ', '' }}";
if (customRedirectsStr) {
var customRedirects = customRedirectsStr.split('<br/>');

for (var cri = 0; cri < customRedirects.length; cri += 1) {
var redirect = customRedirects[cri].split('>');
var fromPath = redirect[0];
var toPath = redirect[1];

if (fromPath && toPath && redirectUrl.startsWith('https://' + storefrontHostname + fromPath)) {
redirectUrl = redirectUrl.replace(storefrontHostname + fromPath, storefrontHostname + toPath);
break;
Expand All @@ -196,7 +201,7 @@

redirectUrl = new URL(redirectUrl);

{% comment %}
{% comment %}
Handle discount code logic (e.g. xxx.myshopify.com/discount/freeshipping?redirect=/products)
- Add discount code to as param to the edirect URL if the `discount_code` cookie exists
- Cookie is deleted after to prevent it from being automatically added to other routes
Expand Down