Merge branch 'develop' of https://github.com/DivanteLtd/vue-storefront …

…into develop

# Conflicts:
#	src/themes/default/pages/Home.vue

src/themes/default/pages/Home.vue

@@ -72,19 +72,23 @@ export default {
     // Load personal and shipping details for Checkout page from IndexedDB
     this.$store.dispatch('checkout/load')
   },
-  async beforeMount () {
+  beforeMount () {
     if (this.$store.state.__DEMO_MODE__) {
-      const onboardingClaim = await this.$store.dispatch('claims/check', { claimCode: 'onboardingAccepted' })
-      if (!onboardingClaim) { // show onboarding info
-        this.$bus.$emit('modal-toggle', 'modal-onboard')
-        this.$store.dispatch('claims/set', { claimCode: 'onboardingAccepted', value: true })
-      }
+      this.$store.dispatch('claims/check', { claimCode: 'onboardingAccepted' }).then((onboardingClaim) => {
+        if (!onboardingClaim) { // show onboarding info
+          this.$bus.$emit('modal-toggle', 'modal-onboard')
+          this.$store.dispatch('claims/set', { claimCode: 'onboardingAccepted', value: true })
+        }
+      })
     }
   },
-  async asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
+  asyncData ({ store, route }) { // this is for SSR purposes to prefetch data
     const config = store.state.config
+    return new Promise((resolve, reject) => {
+      Logger.info('Calling asyncData in Home (theme)')()
 
-    Logger.info('Calling asyncData in Home (theme)')()
+      let newProductsQuery = prepareQuery({ queryConfig: 'newProducts' })
+      let coolBagsQuery = prepareQuery({ queryConfig: 'coolBags' })
 
       store.dispatch('category/list', { level: store.state.config.entities.category.categoriesDynamicPrefetch && store.state.config.entities.category.categoriesDynamicPrefetchLevel ? store.state.config.entities.category.categoriesDynamicPrefetchLevel : null, includeFields: config.entities.optimize ? config.entities.category.includeFields : null, excludeFields: config.entities.optimize ? config.entities.category.excludeFields : null }).then((categories) => {
         store.dispatch('product/list', {
@@ -99,27 +103,26 @@ export default {
             store.state.homepage.new_collection = res.items
           }
 
-    await store.dispatch('category/list', { includeFields: config.entities.optimize ? config.entities.category.includeFields : null })
-
-    const newProductsResult = await store.dispatch('product/list', {
-      query: newProductsQuery,
-      size: 8,
-      sort: 'created_at:desc',
-      includeFields: config.entities.optimize ? (config.products.setFirstVarianAsDefaultInURL ? config.entities.productListWithChildren.includeFields : config.entities.productList.includeFields) : []
-    })
-    if (newProductsResult) {
-      store.state.homepage.new_collection = newProductsResult.items
-    }
-
-    const coolBagsResult = await store.dispatch('product/list', {
-      query: coolBagsQuery,
-      size: 4,
-      sort: 'created_at:desc',
-      includeFields: config.entities.optimize ? (config.products.setFirstVarianAsDefaultInURL ? config.entities.productListWithChildren.includeFields : config.entities.productList.includeFields) : []
+          store.dispatch('product/list', {
+            query: coolBagsQuery,
+            size: 4,
+            sort: 'created_at:desc',
+            includeFields: config.entities.optimize ? (config.products.setFirstVarianAsDefaultInURL ? config.entities.productListWithChildren.includeFields : config.entities.productList.includeFields) : []
+          }).then((res) => {
+            if (res) {
+              store.state.homepage.coolbags_collection = res.items
+            }
+            return resolve()
+          }).catch(err => {
+            reject(err)
+          })
+        }).catch(err => {
+          reject(err)
+        })
+      }).catch(err => {
+        reject(err)
+      })
     })
-    if (coolBagsResult) {
-      store.state.homepage.coolbags_collection = coolBagsResult.items
-    }
   }
 }
 </script>