Merge pull request #1547 from sacr3dc0w/master

Clean up conditional logic in a couple component templates
bigcommerce · Jul 24, 2019 · abcb529 · abcb529
2 parents c7c54d2 + e9796bb
commit abcb529
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@
 - Remove head.rsslinks [#1539](https://github.com/bigcommerce/cornerstone/pull/1539)
 - Prevent heading from displaying when no price ranges are available [#1545](https://github.com/bigcommerce/cornerstone/pull/1545)
 - Utilize srcset for responsive images [#1507](https://github.com/bigcommerce/cornerstone/pull/1507)
+- Clean up conditional logic in a couple component templates [#1547](https://github.com/bigcommerce/cornerstone/pull/1547)
 
 ## 3.5.1 (2019-06-24)
 - Fix conditional logic in share.html [#1522](https://github.com/bigcommerce/cornerstone/pull/1522)

diff --git a/templates/components/amp/products/product-view-details.html b/templates/components/amp/products/product-view-details.html
@@ -89,11 +89,9 @@ <h2 class="modal-header-title">{{lang 'products.bulk_pricing.modal_title'}}</h2>
                                 {{lang 'products.bulk_pricing.range' min=min max=max}}
                                 {{#if type '===' 'percent'}}
                                     {{lang 'products.bulk_pricing.percent' discount=discount.formatted}}
-                                {{/if}}
-                                {{#if type '===' 'fixed'}}
+                                {{else if type '===' 'fixed'}}
                                     {{lang 'products.bulk_pricing.fixed' discount=discount.formatted}}
-                                {{/if}}
-                                {{#if type '===' 'price'}}
+                                {{else if type '===' 'price'}}
                                     {{lang 'products.bulk_pricing.price' discount=discount.formatted}}
                                 {{/if}}
                             </li>

diff --git a/templates/components/products/bulk-discount-rates.html b/templates/components/products/bulk-discount-rates.html
@@ -19,11 +19,9 @@ <h2 class="modal-header-title">{{lang 'products.bulk_pricing.modal_title'}}</h2>
                     {{lang 'products.bulk_pricing.range' min=min max=max}}
                     {{#if type '===' 'percent'}}
                     {{lang 'products.bulk_pricing.percent' discount=discount.formatted}}
-                    {{/if}}
-                    {{#if type '===' 'fixed'}}
+                    {{else if type '===' 'fixed'}}
                     {{lang 'products.bulk_pricing.fixed' discount=discount.formatted}}
-                    {{/if}}
-                    {{#if type '===' 'price'}}
+                    {{else if type '===' 'price'}}
                     {{lang 'products.bulk_pricing.price' discount=discount.formatted}}
                     {{/if}}
                 </li>