Prevent heading from displaying when no price ranges are available (#…

…1545)

* Prevent heading from displaying when no price ranges are available

It is possible for a category to have an insufficient number of items to generate price ranges. If the theme is customized to display the "Shop by Price" sidebar and the category does not generate a price range, only the heading is displayed.

* Add changelog for #1545

* Combine conditional for determining if price block displays

* Resolve conflict in changelog

CHANGELOG.md

@@ -11,6 +11,7 @@
 - Fix incorrect DOM selectors causing the payment method form on the account page from working properly in Safari [#1541](https://github.com/bigcommerce/cornerstone/pull/1541)
 - Add Amazon Pay and Google Pay to payment icons in footer [#1542](https://github.com/bigcommerce/cornerstone/pull/1542)
 - 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)
 
 ## 3.5.1 (2019-06-24)
 - Fix conditional logic in share.html [#1522](https://github.com/bigcommerce/cornerstone/pull/1522)

templates/components/category/shop-by-price.html

@@ -1,4 +1,4 @@
-{{#if theme_settings.shop_by_price_visibility}}
+{{#and theme_settings.shop_by_price_visibility shop_by_price}}
     <div class="sidebarBlock">
         <h5 class="sidebarBlock-heading">{{lang 'category.shop_by_price'}}</h5>
         <ul class="navList">
@@ -17,4 +17,4 @@ <h5 class="sidebarBlock-heading">{{lang 'category.shop_by_price'}}</h5>
             {{/any}}
         </ul>
     </div>
-{{/if}}
+{{/and}}