diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdb4468c79..2717284205 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
## Draft
- Fix for sort disappearing on range update with product filtering [#1232](https://github.com/bigcommerce/cornerstone/pull/1232)
- No longer escaping HTML content in blog summaries. [#1238](https://github.com/bigcommerce/cornerstone/pull/1238)
+- Fix product pricing schema.org microdata. [#1233](https://github.com/bigcommerce/cornerstone/pull/1233)
## 1.18.0 (2018-05-09)
- Add the +/- icons for the category filtering [#1211](https://github.com/bigcommerce/cornerstone/pull/1211)
diff --git a/templates/components/products/price-range.html b/templates/components/products/price-range.html
index 22ad46c89a..5d55c9791a 100644
--- a/templates/components/products/price-range.html
+++ b/templates/components/products/price-range.html
@@ -2,8 +2,10 @@
{{price_range.min.with_tax.formatted}} - {{price_range.max.with_tax.formatted}}
{{#and price_range.min.without_tax price_range.max.without_tax}}
-
{{lang 'products.price_with_tax' tax_label=price_range.min.tax_label}}
- {{else if schema_org}}
+
{{lang 'products.price_with_tax' tax_label=price_range.min.tax_label}}
+
+ {{/and}}
+ {{#if schema_org}}
@@ -13,7 +15,7 @@
- {{/and}}
+ {{/if}}
{{/and}}
{{#and price_range.min.without_tax price_range.max.without_tax}}
diff --git a/templates/components/products/price.html b/templates/components/products/price.html
index c3d6cff4ec..c5927b77c0 100644
--- a/templates/components/products/price.html
+++ b/templates/components/products/price.html
@@ -2,19 +2,19 @@
{{> components/products/price-range price_range=price.price_range schema_org=schema_org}}
{{else}}
{{#if price.with_tax}}
-
+
{{#if price.rrp_with_tax}}
{{lang 'products.retail_price'}}
{{price.rrp_with_tax.formatted}}
{{/if}}
-
+
{{#if price.non_sale_price_with_tax}}
{{lang 'products.price_was'}}
{{price.non_sale_price_with_tax.formatted}}
{{/if}}
-
+
{{#if price.non_sale_price_with_tax}}
{{lang 'products.price_now'}}
@@ -36,19 +36,19 @@
{{/if}}
{{#if price.without_tax}}
-
+
{{#if price.rrp_without_tax}}
{{lang 'products.retail_price'}}
{{price.rrp_without_tax.formatted}}
{{/if}}
-
+
{{#if price.non_sale_price_without_tax}}
{{lang 'products.price_was'}}
{{price.non_sale_price_without_tax.formatted}}
{{/if}}
-
+
{{#if price.non_sale_price_without_tax}}
{{lang 'products.price_now'}}
diff --git a/templates/components/products/product-view.html b/templates/components/products/product-view.html
index 87d771a47d..ef3679264e 100644
--- a/templates/components/products/product-view.html
+++ b/templates/components/products/product-view.html
@@ -11,10 +11,11 @@
{{product.title}}
-
-
+
+
+
{{#if product.call_for_price}}
{{product.call_for_price}}
@@ -28,6 +29,7 @@
{{{region name="product_below_price"}}}
+ {{#if product.rating}}
{{#if settings.show_product_rating}}
{{#if product.num_reviews '>' 0}}
@@ -58,6 +60,7 @@
components/products/modals/writeReview}}
{{/if}}
+ {{/if}}
{{product.detail_messages}}
{{#if product.sku}}