Merge pull request #671 from azkyakhan/#v1.0.6

Removed overlay z-index property, helper for calculating product price in cart and removed body scroll (#v1.0.6)

App.vue

@@ -28,7 +28,6 @@ export default {
 <style lang="scss">
 @import "~@storefront-ui/shared/styles/helpers/breakpoints";
 body {
-  --overlay-z-index: 2;
   --sidebar-aside-z-index: 2;
   --sidebar-z-index: 2;
   --bottom-navigation-height: 3.75rem;

components/organisms/o-microcart-panel.vue

@@ -20,8 +20,8 @@
               :key="product.id"
               :image="getThumbnailForProductExtend(product)"
               :title="product.name"
-              :regular-price="formatPrice(getProductPrice(product).regular)"
-              :special-price="formatPrice(getProductPrice(product).special)"
+              :regular-price="getProductPrice(product).regular"
+              :special-price="getProductPrice(product).special"
               :stock="10"
               :qty="product.qty"
               class="collected-product"
@@ -117,8 +117,8 @@
 import { mapState, mapGetters } from 'vuex';
 import { localizedRoute } from '@vue-storefront/core/lib/multistore';
 import { onlineHelper } from '@vue-storefront/core/helpers';
-import { getThumbnailForProduct, getProductPrice } from '@vue-storefront/core/modules/cart/helpers';
-import { price } from '@vue-storefront/core/filters';
+import { getThumbnailForProduct } from '@vue-storefront/core/modules/cart/helpers';
+import { getProductPrice, getProductPriceFromTotals } from 'theme/helpers';
 import VueOfflineMixin from 'vue-offline/mixin';
 import onEscapePress from '@vue-storefront/core/mixins/onEscapePress';
 
@@ -184,10 +184,9 @@ export default {
       return getThumbnailForProduct(product);
     },
     getProductPrice (product) {
-      return getProductPrice(product)
-    },
-    formatPrice (value) {
-      return value ? price(value) : ''
+      return onlineHelper.isOnline && product.totals && product.totals.options
+        ? getProductPriceFromTotals(product)
+        : getProductPrice(product);
     },
     getProductOptions (product) {
       return onlineHelper.isOnline && product.totals && product.totals.options

components/organisms/o-microcart.vue

@@ -11,7 +11,6 @@
 import { mapState } from 'vuex';
 import ALoadingSpinner from 'theme/components/atoms/a-loading-spinner';
 import ALoadingError from 'theme/components/atoms/a-loading-error';
-import { disableBodyScroll, enableBodyScroll } from 'body-scroll-lock'
 
 const OMicrocartPanel = () =>
   import(/* webpackChunkName: "vsf-microcart" */ 'theme/components/organisms/o-microcart-panel');
@@ -36,17 +35,6 @@ export default {
       isMicrocartOpen: state => state.ui.microcart
     })
   },
-  watch: {
-    isMicrocartOpen (state) {
-      if (state) {
-        this.$nextTick(() => {
-          disableBodyScroll(this.$el)
-        })
-      } else {
-        enableBodyScroll(this.$el)
-      }
-    }
-  },
   methods: {
     reloadComponent () {
       this.theMicrocartAsyncComponent = () => ({