Merge branch 'develop' into filrak-patch-1

Author: patzick

CHANGELOG.md

@@ -5,8 +5,16 @@ 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).
 
 ## [1.8.3] - 2019.02.27
+
+
+# Added
+- New reactive helper to check online state. Usage: `import { onlineHelper } from '@vue-storefront/core/helpers'` and then `onlineHelper.isOnline` - @patzick (#2510)
+
 ### Fixed
 - Problem with placing second order (unbinding payment methods after first order) - @patzick (#2195, #2503)
+- Remaking order on user orders page - @patzick (#2480)
+- Validation in the Myprofile section for postcode field - @pkarw (#1317)
+- Non-integer qty of product added to the cart - @pkarw (#2517)
 
 ### Changed / Improved
 - Fixed an issue where the correct image for a product configuration wasn't set on the product page image carousel. Also added the fix on the productcarousel in the zoom component - @DaanKouters (#2419)
@@ -19,8 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added video support in Product Gallery component. - @rain2o (#2433)
 - Improved product quantity change component in product and cart - @patzick (#2398, #2437)
 - Updated to Vue 2.6.6 - @filrak (#2456)
-- Null sidebar menu data on static page fixed - @filrak (#2449, ##2441)
-- Fix cannot edit previous steps in checkout - @filrak (##2438)
+- Null sidebar menu data on static page fixed - @filrak (#2449, #2441)
+- Fix cannot edit previous steps in checkout - @filrak, @patzick (#2438)
 - Fixed route guard ssr problem - @vue-kacper (#2364)
 - Fix links in footer to static pages bug - @filrak (#2452)
 - Fix links at docs, Basics/Configuration file explained - @daksamit (#2490)
@@ -30,9 +38,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - add cart count config, allows you to display the item count instead of a sum of the item quantities - @pauluse (#2483)
 - improved product gallery load view, shows correct image on reload - @patzick (#2481, #2482, #2488, #2501)
 - Fix an issue where the index.html template within a theme is ignored - @EnthrallRecords (#2489) 
+- Added async sidebar component with async off-screen components error handling and fetch retrying after coming back online - @filrak (#2408, #2451)
 - Inconsistent filters behaviour - clear filters on page load - @patzick (#2435)
 - fix price is never below 0 and user can't add 0 or below 0 products to cart @RakowskiPrzemyslaw (#2437)
 - Check for placing single order in case of error in any payment module - @patzick (#2409)
+- Display prices in products added in offline mode. - @patzick (#2450)
 
 ### Deprecated / Removed
 - `@vue-storefront/store` package deprecated - @filrak

core/helpers/index.ts

@@ -2,6 +2,7 @@ import rootStore from '@vue-storefront/core/store'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
 import { remove as removeAccents } from 'remove-accents'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import Vue from 'vue'
 
 /**
  * Create slugify -> "create-slugify" permalink  of text
@@ -159,3 +160,10 @@ export function once (key, fn) {
 }
 
 export const isServer: boolean = typeof window === 'undefined'
+
+// Online/Offline helper
+export const onlineHelper = Vue.observable({ 
+  isOnline: isServer || navigator.onLine 
+})
+!isServer && window.addEventListener('online',  () => onlineHelper.isOnline = true)
+!isServer && window.addEventListener('offline', () => onlineHelper.isOnline = false)

core/lib/multistore.ts

@@ -33,6 +33,7 @@ export interface StoreView {
 }
 
 export function currentStoreView () : StoreView {
+  // TODO: Change to getter all along our code
   return rootStore.state.storeView
 }
 

core/modules/cart/store/actions.ts

@@ -227,6 +227,7 @@ const actions: ActionTree<CartState, RootState> = {
     let productIndex = 0
     for (let product of productsToAdd) {
       if (typeof product === 'undefined' || product === null) continue
+      if (product.qty && typeof product.qty !== 'number') product.qty = parseInt(product.qty)
       if ((rootStore.state.config.useZeroPriceProduct)? product.priceInclTax < 0 : product.priceInclTax <= 0  ) {
         rootStore.dispatch('notification/spawnNotification', {
           type: 'error',
@@ -399,7 +400,7 @@ const actions: ActionTree<CartState, RootState> = {
           country: country,
           method_code: shipping ? shipping.method_code : null,
           carrier_code: shipping ? shipping.carrier_code : null,
-          payment_method: payment.code
+          payment_method: payment ? payment.code : null
         }
       }
       if (methodsData.country && methodsData.carrier_code) {

core/modules/cart/store/getters.ts

@@ -4,10 +4,11 @@ import i18n from '@vue-storefront/i18n'
 import CartState from '../types/CartState'
 import RootState from '@vue-storefront/core/types/RootState'
 import AppliedCoupon from '../types/AppliedCoupon'
+import { onlineHelper } from '@vue-storefront/core/helpers'
 
 const getters: GetterTree<CartState, RootState> = {
   totals (state) {
-    if (state.platformTotalSegments) {
+    if (state.platformTotalSegments && onlineHelper.isOnline) {
       return state.platformTotalSegments
     } else {
       let shipping = state.shipping instanceof Array ? state.shipping[0] : state.shipping

core/modules/cart/store/mutations.ts

@@ -14,7 +14,7 @@ const mutations: MutationTree<CartState> = {
     if (!record) {
       let item = {
         ...product,
-        qty: product.qty ? product.qty : 1
+        qty: parseInt(product.qty ? product.qty : 1)
       }
       Vue.prototype.$bus.$emit('cart-before-add', { product: item })
       state.cartItems.push(item)
@@ -43,7 +43,7 @@ const mutations: MutationTree<CartState> = {
 
     if (record) {
       Vue.prototype.$bus.$emit('cart-before-update', { product: record })
-      record.qty = qty
+      record.qty = parseInt(qty)
       Vue.prototype.$bus.$emit('cart-after-update', { product: record })
       state.cartSavedAt = Date.now()
     }

core/modules/checkout/components/Payment.ts

@@ -53,7 +53,6 @@ export const Payment = {
     edit () {
       if (this.isFilled) {
         this.$bus.$emit('checkout-before-edit', 'payment')
-        this.isFilled = false
       }
     },
     hasBillingData () {

core/modules/checkout/components/Shipping.ts

@@ -79,7 +79,6 @@ export const Shipping = {
     edit () {
       if (this.isFilled) {
         this.$bus.$emit('checkout-before-edit', 'shipping')
-        this.isFilled = false
       }
     },
     hasShippingDetails () {

core/modules/order/components/UserOrders.ts

@@ -13,7 +13,7 @@ export const UserOrders = {
     }
   },
   methods: {
-    reorder (products) {
+    remakeOrder (products) {
       products.forEach(item => {
         this.$store.dispatch('product/single', { options: { sku: item.sku }, setCurrentProduct: false, selectDefaultVariant: false }).then((product) => {
           product.qty = item.qty_ordered

package.json

@@ -98,7 +98,7 @@
     "commander": "^2.18.0",
     "cross-env": "^3.1.4",
     "css-loader": "^1.0.0",
-    "cypress": "^3.0.2",
+    "cypress": "^3.1.5",
     "d3-dsv": "^1.0.8",
     "detect-installed": "^2.0.4",
     "empty-dir": "^1.0.0",