From be6936d95371291d637eedca8902d24c4a836537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cbc-yevhenii-buliuk=E2=80=9D?=
 <“yevhenii.buliuk@bigcommerce.com”>
Date: Tue, 1 Jun 2021 17:03:28 +0300
Subject: [PATCH] fix(storefront): BCTHEME-906 Hide prices for aria-label and
 data-product-price attributes if set to Hidden for guests

---
 CHANGELOG.md                                  |  1 +
 lang/en.json                                  |  1 +
 .../components/common/login-for-pricing.html  |  2 +-
 templates/components/common/navigation.html   |  4 ++-
 templates/components/products/card.html       | 27 ++++++++++++++-----
 templates/components/products/list-item.html  | 25 ++++++++++++++---
 .../components/products/product-view.html     | 13 ++++++++-
 7 files changed, 61 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bac41c1743..d798755d29 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Changelog
 
 ## Draft
+- Hide prices for aria-label and data-product-price attributes if set to "Hidden for guests". Hide currency selection for non-logged in users. [#2131](https://github.com/bigcommerce/cornerstone/pull/2131)
 - Added settings for payment banners. [#2021](https://github.com/bigcommerce/cornerstone/pull/2021)
 - Use https:// for schema markup. [#2039](https://github.com/bigcommerce/cornerstone/pull/2039)
 - Update focus tooltip styles contrast to achieve accessibility AA Complaince. [#2047](https://github.com/bigcommerce/cornerstone/pull/2047)
diff --git a/lang/en.json b/lang/en.json
index 70143f39fa..2141b10177 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -159,6 +159,7 @@
         "change": "Change",
         "sign_up": "Register",
         "login": "Sign in",
+        "login_for_pricing": "Log in for pricing",
         "logout": "Sign out",
         "account": "Account",
         "cart": "Cart",
diff --git a/templates/components/common/login-for-pricing.html b/templates/components/common/login-for-pricing.html
index fc49b1162a..ae128c776b 100644
--- a/templates/components/common/login-for-pricing.html
+++ b/templates/components/common/login-for-pricing.html
@@ -1 +1 @@
-<p translate>Log in for pricing</p>
\ No newline at end of file
+<p translate>{{lang 'common.login_for_pricing'}}</p>
diff --git a/templates/components/common/navigation.html b/templates/components/common/navigation.html
index dde9d24005..99b20718d7 100644
--- a/templates/components/common/navigation.html
+++ b/templates/components/common/navigation.html
@@ -1,5 +1,7 @@
 <nav class="navUser">
-    {{> components/common/currency-selector}}
+    {{#if customer.id}}
+        {{> components/common/currency-selector}}
+    {{/if}}
 
     <ul class="navUser-section navUser-section--alt">
         {{#if customer.store_credit.value '>' 0}}
diff --git a/templates/components/products/card.html b/templates/components/products/card.html
index 8f1478578b..f32061206a 100644
--- a/templates/components/products/card.html
+++ b/templates/components/products/card.html
@@ -17,11 +17,15 @@
         {{/each}}"
         data-product-brand="{{brand.name}}"
         data-product-price="
-        {{#if price.with_tax}}
-            {{price.with_tax.value}}
+        {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+            {{#if price.with_tax}}
+                {{price.with_tax.value}}
+            {{else}}
+                {{price.without_tax.value}}
+            {{/if}}
         {{else}}
-            {{price.without_tax.value}}
-        {{/if}}"
+            {{lang 'common.login_for_pricing'}}
+        {{/or}}"
     {{/if}}>
     <figure class="card-figure">
         {{#if stock_level '===' 0}}
@@ -39,9 +43,15 @@
                 }}
             {{/or}}
         {{/if}}
+        
         <a href="{{url}}"
            class="card-figure__link"
-           aria-label="{{name}},{{> components/products/product-aria-label}}"
+           aria-label="
+           {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+               {{name}},{{> components/products/product-aria-label}}
+           {{else}}
+               {{name}}
+           {{/or}}"
            {{#if settings.data_tag_enabled}} data-event-type="product-click" {{/if}}
         >
             <div class="card-img-container">
@@ -103,7 +113,12 @@
             <p class="card-text" data-test-info-type="brandName">{{brand.name}}</p>
         {{/if}}
         <h3 class="card-title">
-            <a aria-label="{{name}},{{> components/products/product-aria-label}}"
+            <a aria-label="
+               {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+                   {{name}},{{> components/products/product-aria-label}}
+               {{else}}
+                   {{name}}
+               {{/or}}"
                href="{{url}}"
                {{#if settings.data_tag_enabled}} data-event-type="product-click" {{/if}}>{{name}}</a>
         </h3>
diff --git a/templates/components/products/list-item.html b/templates/components/products/list-item.html
index cff94e61ec..ac0842999e 100644
--- a/templates/components/products/list-item.html
+++ b/templates/components/products/list-item.html
@@ -1,12 +1,26 @@
 {{#if settings.data_tag_enabled}}
-    <article class="listItem" data-event-type="{{event}}" data-entity-id="{{id}}" data-position="{{position}}" data-name="{{name}}" data-product-category="{{#each category}}{{#if @last}}{{this}}{{else}}{{this}}, {{/if}}{{/each}}" data-product-brand="{{brand.name}}" data-product-price="{{#if price.with_tax}}{{price.with_tax.value}}{{else}}{{price.without_tax.value}}{{/if}}">
+    <article class="listItem" data-event-type="{{event}}" data-entity-id="{{id}}" data-position="{{position}}" data-name="{{name}}" data-product-category="{{#each category}}{{#if @last}}{{this}}{{else}}{{this}}, {{/if}}{{/each}}" data-product-brand="{{brand.name}}" data-product-price="
+    {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+        {{#if price.with_tax}}
+            {{price.with_tax.value}}
+        {{else}}
+            {{price.without_tax.value}}
+        {{/if}}
+    {{else}}
+        {{lang 'common.login_for_pricing'}}
+    {{/or}}">
 {{else}}
     <article class="listItem">
 {{/if}}
     <figure class="listItem-figure">
         <a href="{{url}}"
            class="listItem-figure__link"
-           aria-label="{{name}},{{> components/products/product-aria-label}}"
+           aria-label="
+           {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+               {{name}},{{> components/products/product-aria-label}}
+           {{else}}
+               {{name}}
+           {{/or}}"
            {{#if settings.data_tag_enabled}}
            data-event-type="product-click"
            {{/if}}
@@ -53,7 +67,12 @@
                 {{/if}}
                 <h4 class="listItem-title">
                     <a href="{{url}}"
-                    aria-label="{{name}},{{> components/products/product-aria-label}}"
+                    aria-label="
+                    {{#or customer (if theme_settings.restrict_to_login '===' false)}}
+                        {{name}},{{> components/products/product-aria-label}}
+                    {{else}}
+                        {{name}}
+                    {{/or}}"
                     {{#if settings.data_tag_enabled}}
                     data-event-type="product-click"
                     {{/if}}
diff --git a/templates/components/products/product-view.html b/templates/components/products/product-view.html
index 9ce3fe3255..167e94aff1 100644
--- a/templates/components/products/product-view.html
+++ b/templates/components/products/product-view.html
@@ -1,4 +1,15 @@
-<div class="productView" {{#if settings.data_tag_enabled}} data-event-type="product" data-entity-id="{{product.id}}" data-name="{{product.title}}" data-product-category="{{#each product.category}}{{#if @last}}{{this}}{{else}}{{this}}, {{/if}}{{/each}}" data-product-brand="{{product.brand.name}}" data-product-price="{{#if product.price.with_tax}}{{product.price.with_tax.value}}{{else}}{{product.price.without_tax.value}}{{/if}}" data-product-variant="single-product-option"{{/if}}>
+<div class="productView" {{#if settings.data_tag_enabled}} data-event-type="product" data-entity-id="{{product.id}}" data-name="{{product.title}}" data-product-category="{{#each product.category}}{{#if @last}}{{this}}{{else}}{{this}}, {{/if}}{{/each}}" data-product-brand="{{product.brand.name}}"
+data-product-price="
+{{#or customer (if theme_settings.restrict_to_login '===' false)}}
+    {{#if product.price.with_tax}}
+        {{product.price.with_tax.value}}
+    {{else}}
+        {{product.price.without_tax.value}}
+    {{/if}}
+{{else}}
+    {{lang 'common.login_for_pricing'}}
+{{/or}}"
+data-product-variant="single-product-option"{{/if}}>
 {{#each product.reviews.messages}}
         {{#if error}}
             {{> components/common/alert/alert-error error}}