Merge branch 'develop' into bugfix/vuestorefront#2888-SSR-problem-on-…

…product-page-with-logged-in-user
patzick · Jun 12, 2019 · f3ca926 · f3ca926
2 parents 6a1a154 + b50704f
commit f3ca926
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -39,6 +39,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add support for api.url in the Task module - @basvanpoppel (#3011)
 
 ### Fixed
+- Special price got zeroed - @pkarw (#2940)
 - Microcart tax + discount totals fix - @pkarw (#2892)
 - Microcart offline prices now forced down to original prices - @pkarw (#3012)
 - Login/Register errorr message added in case of FetchError (no network connectivity) - @pkarw

diff --git a/core/modules/catalog/helpers/index.ts b/core/modules/catalog/helpers/index.ts
@@ -183,8 +183,6 @@ export function syncProductPrice (product, backProduct) { // TODO: we probably n
   if (product.priceInclTax >= product.originalPriceInclTax) {
     product.specialPriceInclTax = 0
     product.special_price = 0
-  } else {
-    product.special_price = 0 // the same price as original; it's not a promotion
   }
   Vue.prototype.$bus.$emit('product-after-priceupdate', product)
   // Logger.log(product.sku, product, backProduct)()