fix(storefront): BCTHEME-1473 reverting PR for BCTHEME-1171 (#2354)

bigcommerce · May 22, 2023 · 2ac5b9e · 2ac5b9e
1 parent cce7637
commit 2ac5b9e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 64 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Reverted fix for sold-out badge appearance [#2354](https://github.com/bigcommerce/cornerstone/pull/2354)
 - If the gift is a variant, the button "Change" shows in cart, and other variant are visible [#2349](https://github.com/bigcommerce/cornerstone/pull/2349)
 - Removes the URL encoding from the 'description' in the product rich snippet schema [#2350](https://github.com/bigcommerce/cornerstone/pull/2350)
 - Running Lighthouse npm script fails in terminal [#2345](https://github.com/bigcommerce/cornerstone/pull/2345)

diff --git a/templates/components/products/card.html b/templates/components/products/card.html
@@ -29,39 +29,19 @@
     {{/if}}>
     <figure class="card-figure">
         {{#if stock_level '===' 0}}
-            {{#if show_cart_action}}
-                {{#if theme_settings.pdp_sold_out_label '===' ''}}
-                    {{> components/products/product-badge
-                        badge-type='sold-out'
-                        badge_view=theme_settings.product_sold_out_badges
-                        badge_label=(lang "page_builder.pdp_sold_out_label")
-                    }}
-                {{else}}
-                    {{> components/products/product-badge
-                        badge-type='sold-out'
-                        badge_view=theme_settings.product_sold_out_badges
-                        badge_label=theme_settings.pdp_sold_out_label
-                    }}
-                {{/if}}
+            {{#if theme_settings.pdp_sold_out_label '===' ''}}
+                {{> components/products/product-badge
+                    badge-type='sold-out'
+                    badge_view=theme_settings.product_sold_out_badges
+                    badge_label=(lang "page_builder.pdp_sold_out_label")
+                }}
+            {{else}}
+                {{> components/products/product-badge
+                    badge-type='sold-out'
+                    badge_view=theme_settings.product_sold_out_badges
+                    badge_label=theme_settings.pdp_sold_out_label
+                }}
             {{/if}}
-        {{else if has_options '===' false}}
-            {{#and (if stock_level '===' null) show_cart_action}}
-                {{#and (unless add_to_cart_url) (unless pre_order)}}
-                    {{#if theme_settings.pdp_sold_out_label '===' ''}}
-                        {{> components/products/product-badge
-                            badge-type='sold-out'
-                            badge_view=theme_settings.product_sold_out_badges
-                            badge_label=(lang "page_builder.pdp_sold_out_label")
-                        }}
-                    {{else}}
-                        {{> components/products/product-badge
-                            badge-type='sold-out'
-                            badge_view=theme_settings.product_sold_out_badges
-                            badge_label=theme_settings.pdp_sold_out_label
-                        }}
-                    {{/if}}
-                {{/and}}
-            {{/and}}
         {{else}}
             {{#or price.sale_price_with_tax.value price.sale_price_without_tax.value}}
                 {{#if theme_settings.pdp_sale_badge_label '===' ''}}

diff --git a/templates/components/products/list-item.html b/templates/components/products/list-item.html
@@ -21,39 +21,19 @@
            {{/if}}
         >
         {{#if stock_level '===' 0}}
-            {{#if show_cart_action}}
-                {{#if theme_settings.pdp_sold_out_label '===' ''}}
-                    {{> components/products/product-badge
-                        badge-type='sold-out'
-                        badge_view=theme_settings.product_sold_out_badges
-                        badge_label=(lang "page_builder.pdp_sold_out_label")
-                    }}
-                {{else}}
-                    {{> components/products/product-badge
-                        badge-type='sold-out'
-                        badge_view=theme_settings.product_sold_out_badges
-                        badge_label=theme_settings.pdp_sold_out_label
-                    }}
-                {{/if}}
+            {{#if theme_settings.pdp_sold_out_label '===' ''}}
+                {{> components/products/product-badge
+                    badge-type='sold-out'
+                    badge_view=theme_settings.product_sold_out_badges
+                    badge_label=(lang "page_builder.pdp_sold_out_label")
+                }}
+            {{else}}
+                {{> components/products/product-badge
+                    badge-type='sold-out'
+                    badge_view=theme_settings.product_sold_out_badges
+                    badge_label=theme_settings.pdp_sold_out_label
+                }}
             {{/if}}
-        {{else if has_options '===' false}}
-            {{#and (if stock_level '===' null) show_cart_action}}
-                {{#and (unless add_to_cart_url) (unless pre_order)}}
-                    {{#if theme_settings.pdp_sold_out_label '===' ''}}
-                        {{> components/products/product-badge
-                            badge-type='sold-out'
-                            badge_view=theme_settings.product_sold_out_badges
-                            badge_label=(lang "page_builder.pdp_sold_out_label")
-                        }}
-                    {{else}}
-                        {{> components/products/product-badge
-                            badge-type='sold-out'
-                            badge_view=theme_settings.product_sold_out_badges
-                            badge_label=theme_settings.pdp_sold_out_label
-                        }}
-                    {{/if}}
-                {{/and}}
-            {{/and}}
         {{else}}
             {{#or price.sale_price_with_tax.value price.sale_price_without_tax.value}}
                 {{#if theme_settings.pdp_sale_badge_label '===' ''}}