Merge pull request #1063 from junedkazi/STENCIL-3383-list-view

STENCIL-3383 STENCIL-3353 Do not show add to cart on disabled products, add pre-order button & update pre-order url to add product to cart, fix login for pricing on product cards.
bigcommerce · Aug 14, 2017 · 4cb9784 · 4cb9784
2 parents b819868 + f55b397
commit 4cb9784
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Change the 403 page message to be more friendly [#1057](https://github.com/bigcommerce/cornerstone/pull/1057) & [#1059](https://github.com/bigcommerce/cornerstone/pull/1059)
 - Add bulk discount rates to product cards [#1058](https://github.com/bigcommerce/cornerstone/pull/1058)
 - Add higher z-index to display text over burst image [#1066](https://github.com/bigcommerce/cornerstone/pull/1066)
+- Do not show add to cart on disabled products, add pre-order button, update pre-order url to add product to cart & fix login for pricing on product cards. [#1063](https://github.com/bigcommerce/cornerstone/pull/1063)
 
 ## 1.9.1 (2017-07-25)
 - Move some hard-coded validation messages to language file [#1040](https://github.com/bigcommerce/cornerstone/pull/1040)

diff --git a/assets/scss/layouts/products/_productList.scss b/assets/scss/layouts/products/_productList.scss
@@ -8,6 +8,7 @@
 
 .productList {
     @include u-listBullets("none");
+    margin: spacing("half");
 
     .product {
         // scss-lint:disable NestingDepth

diff --git a/templates/components/products/card.html b/templates/components/products/card.html
@@ -43,7 +43,7 @@
                             <a href="{{url}}" class="button button--small card-figcaption-button" data-product-id="{{id}}">{{lang 'products.choose_options'}}</a>
                         {{/if}}
                         {{#if pre_order}}
-                            <a href="{{url}}" class="button button--small card-figcaption-button">{{lang 'products.pre_order'}}</a>
+                            <a href="{{pre_order_add_to_cart_url}}" class="button button--small card-figcaption-button">{{lang 'products.pre_order'}}</a>
                         {{/if}}
                         {{#if add_to_cart_url }}
                             <a href="{{add_to_cart_url}}" class="button button--small card-figcaption-button">{{lang 'products.add_to_cart'}}</a>

diff --git a/templates/components/products/list-item.html b/templates/components/products/list-item.html
@@ -26,20 +26,27 @@ <h4 class="listItem-title">
                 {{/if}}
             </div>
             <div class="listItem-actions">
-                {{#if price}}
-                    <div class="listItem-price">{{> components/products/price price=price}}</div>
-                {{/if}}
-                {{#unless hide_add_to_cart}}
-                    {{#if has_options}}
-                        <a href="{{url}}" class="button button--primary" data-product-id="{{id}}">{{lang "products.choose_options"}}</a>
-                    {{else}}
+                {{#or customer (if theme_settings.restrict_to_login '!==' true)}}
+                    {{#if price}}
+                        <div class="listItem-price">{{> components/products/price price=price}}</div>
+                    {{/if}}
+                    {{#if show_cart_action}}
+                        {{#if has_options}}
+                            <a href="{{url}}" class="button button--small" data-product-id="{{id}}">{{lang 'products.choose_options'}}</a>
+                        {{/if}}
+                        {{#if pre_order}}
+                            <a href="{{pre_order_add_to_cart_url}}" class="button button--primary">{{lang 'products.pre_order'}}</a>
+                        {{/if}}
+                        {{#if add_to_cart_url }}
+                            <a href="{{add_to_cart_url}}" class="button button--primary">{{lang 'products.add_to_cart'}}</a>
+                        {{/if}}
                         {{#if out_of_stock_message }}
-                        <span href="{{url}}" class="button button--primary">{{out_of_stock_message}}</span>
-                        {{else}}
-                        <a href="{{add_to_cart_url}}" class="button button--primary">{{lang "products.add_to_cart"}}</a>
+                            <a href="{{url}}" class="button button--small" data-product-id="{{id}}">{{out_of_stock_message}}</a>
                         {{/if}}
                     {{/if}}
-                {{/unless}}
+                {{else}}
+                    {{> components/common/login-for-pricing}}
+                {{/or}}
                 {{#if show_compare}}
                     <label class="button button--small" for="compare-{{id}}">
                         {{lang "products.compare"}} <input type="checkbox" name="products[]" value="{{id}}" id="compare-{{id}}" data-compare-id="{{id}}">

diff --git a/templates/components/products/list.html b/templates/components/products/list.html
@@ -1,7 +1,7 @@
 <ul class="productList">
     {{#each products}}
     <li class="product">
-        {{>components/products/list-item show_compare=../show_compare show_rating=../settings.show_product_rating theme_settings=../theme_settings}}
+        {{>components/products/list-item show_compare=../show_compare show_rating=../settings.show_product_rating theme_settings=../theme_settings customer=../customer}}
     </li>
     {{/each}}
 </ul>