From bb6d9d9bbafb9bf3da8f06b7ebabecd9ab23c135 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Fri, 17 May 2019 10:36:55 +0530
Subject: [PATCH 01/47] Added badges to the icon to display item count

---
 .../components/blocks/Header/CompareIcon.js   |  3 +++
 .../components/blocks/Header/WishlistIcon.js  |  3 +++
 .../compare/components/CompareButton.ts       |  3 +++
 core/modules/compare/store/getters.ts         |  3 ++-
 .../wishlist/components/WishlistButton.ts     |  5 +++++
 core/modules/wishlist/store/index.ts          |  3 ++-
 .../core/blocks/Header/CompareIcon.vue        | 17 +++++++++++++++++
 .../core/blocks/Header/WishlistIcon.vue       | 19 ++++++++++++++++++-
 8 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/core/compatibility/components/blocks/Header/CompareIcon.js b/core/compatibility/components/blocks/Header/CompareIcon.js
index 5b12a1638c..26922ae0a1 100644
--- a/core/compatibility/components/blocks/Header/CompareIcon.js
+++ b/core/compatibility/components/blocks/Header/CompareIcon.js
@@ -7,6 +7,9 @@ export default {
     isActive () {
       // Computed Property renamed to 'isEmpty'
       return !this.isEmpty
+    },
+    getTotalProducts () {
+      return this.totalProducts
     }
   }
 }
diff --git a/core/compatibility/components/blocks/Header/WishlistIcon.js b/core/compatibility/components/blocks/Header/WishlistIcon.js
index 8cc9d63afe..76d9679613 100644
--- a/core/compatibility/components/blocks/Header/WishlistIcon.js
+++ b/core/compatibility/components/blocks/Header/WishlistIcon.js
@@ -13,6 +13,9 @@ export default {
     // deprecated in this component
     isWishlistOpen () {
       return this.$store.state.ui.wishlist
+    },
+    getwishlistItemsCount () {
+      return this.$store.getters['wishlist/wishlistItemCount']
     }
   },
   methods: {
diff --git a/core/modules/compare/components/CompareButton.ts b/core/modules/compare/components/CompareButton.ts
index 704aef9fd8..bbe89168ac 100644
--- a/core/modules/compare/components/CompareButton.ts
+++ b/core/modules/compare/components/CompareButton.ts
@@ -6,6 +6,9 @@ export const CompareButton = {
   computed: {
     isEmpty () : boolean {
       return this.$store.getters['compare/isEmpty']
+    },
+    totalProducts () {
+      return this.$store.getters['compare/totalProducts']
     }
   }
 }
diff --git a/core/modules/compare/store/getters.ts b/core/modules/compare/store/getters.ts
index c5aeb19d8b..e693c3c069 100644
--- a/core/modules/compare/store/getters.ts
+++ b/core/modules/compare/store/getters.ts
@@ -5,7 +5,8 @@ import CompareState from '../types/CompareState'
 const getters: GetterTree<CompareState, RootState> = {
   isEmpty: (state) => state.items.length === 0,
   isOnCompare: (state) => (product) => state.items.find(p => p.sku === product.sku),
-  isCompareLoaded: state => state.loaded
+  isCompareLoaded: state => state.loaded,
+  totalProducts: (state) => state.items.length
 }
 
 export default getters
diff --git a/core/modules/wishlist/components/WishlistButton.ts b/core/modules/wishlist/components/WishlistButton.ts
index d3555c3aae..f50db465cd 100644
--- a/core/modules/wishlist/components/WishlistButton.ts
+++ b/core/modules/wishlist/components/WishlistButton.ts
@@ -3,5 +3,10 @@ export const WishlistButton = {
     toggleWishlist () {
       this.$store.dispatch('ui/toggleWishlist')
     }
+  },
+  computed: {
+    wishlistItemsCount () {
+      return this.$store.getters['wishlist/wishlistItemCount']
+    }
   }
 }
\ No newline at end of file
diff --git a/core/modules/wishlist/store/index.ts b/core/modules/wishlist/store/index.ts
index c770df0e70..62f9bd6dbc 100644
--- a/core/modules/wishlist/store/index.ts
+++ b/core/modules/wishlist/store/index.ts
@@ -13,7 +13,8 @@ export const module:Module<WishlistState, RootState> = {
   actions,
   mutations,
   getters: {
-    isWishlistLoaded: state => state.loaded
+    isWishlistLoaded: state => state.loaded,
+    wishlistItemCount: (state) => state.items.length
   }
 }
 
diff --git a/src/themes/default/components/core/blocks/Header/CompareIcon.vue b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
index 067b762e6c..21c66db9c7 100644
--- a/src/themes/default/components/core/blocks/Header/CompareIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
@@ -1,6 +1,13 @@
 <template>
   <router-link :to="localizedRoute('/compare')" class="compare-icon no-underline inline-flex" v-if="isActive">
     <i class="material-icons">compare</i>
+    <span
+      class="compare-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
+      v-cloak
+      v-show="getTotalProducts"
+    >
+      {{ getTotalProducts }}
+    </span>
   </router-link>
 </template>
 
@@ -11,3 +18,13 @@ export default {
   mixins: [CompareIcon]
 }
 </script>
+
+<style scoped>
+  .compare-count {
+    top: 7px;
+    left: 50%;
+    min-width: 16px;
+    min-height: 16px;
+    border-radius: 10px;
+  }
+</style>
diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
index df5c2bc4c5..8d7dd450c5 100644
--- a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
@@ -1,11 +1,18 @@
 <template>
   <button
     type="button"
-    class="inline-flex bg-cl-transparent brdr-none"
+    class="inline-flex bg-cl-transparent brdr-none relative"
     @click="toggleWishlistPanel"
     :aria-label="$t('Open wishlist')"
   >
     <i class="material-icons">favorite_border</i>
+    <span
+      class="whishlist-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
+      v-cloak
+      v-show="getwishlistItemsCount"
+    >
+      {{ getwishlistItemsCount }}
+    </span>
   </button>
 </template>
 
@@ -16,3 +23,13 @@ export default {
   mixins: [WishlistIcon]
 }
 </script>
+
+<style scoped>
+  .whishlist-count {
+    top: 7px;
+    left: 50%;
+    min-width: 16px;
+    min-height: 16px;
+    border-radius: 10px;
+  }
+</style>

From d562a39fcd88f4274447ee0dfedab474e15a2a70 Mon Sep 17 00:00:00 2001
From: miluka <mlukasik@divante.co>
Date: Mon, 10 Jun 2019 09:40:38 +0200
Subject: [PATCH 02/47] Links product in the wishlist with a proper variant.

---
 .../core/blocks/Wishlist/Product.vue          | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 3fc70abc33..61008fb43b 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -1,52 +1,57 @@
 <template>
   <li class="row pr55 py20">
     <div @click="closeWishlist">
-      <router-link :to="localizedRoute({
-        name: product.type_id + '-product',
-        fullPath: product.url_path,
+      <router-link
+        :to="localizedRoute({
+        name: 'configurable-product',
         params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
-      })">
-        <img v-lazy="thumbnail" >
+      })"
+      >
+        <img v-lazy="thumbnail">
       </router-link>
     </div>
     <div class="col-xs between-xs flex pl40 py15">
       <div @click="closeWishlist">
-        <router-link :to="localizedRoute({
-          name: product.type_id + '-product',
-          fullPath: product.url_path,
+        <router-link
+          :to="localizedRoute({
+          name: 'configurable-product',
           params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
-        })">
-          {{ product.name | htmlDecode }}
-        </router-link>
+        })"
+        >{{ product.name | htmlDecode }}</router-link>
         <div class="h6 cl-bg-tertiary pt5 sku">{{ product.sku }}</div>
       </div>
     </div>
     <div class="col-xs flex py15 align-right">
       <div>
         <span class="price-special" v-if="product.special_price">{{ product.priceInclTax | price }}</span>&nbsp;
-        <span class="price-original" v-if="product.special_price" >{{ product.originalPriceInclTax | price }}</span>
+        <span
+          class="price-original"
+          v-if="product.special_price"
+        >{{ product.originalPriceInclTax | price }}</span>
 
-        <span v-if="!product.special_price">
-          {{ product.priceInclTax | price }}
-        </span>
+        <span v-if="!product.special_price">{{ product.priceInclTax | price }}</span>
       </div>
       <div>
-        <div class="mt5"><span @click="removeFromWishlist(product)"><remove-button class="cl-accent" /></span></div>
+        <div class="mt5">
+          <span @click="removeFromWishlist(product)">
+            <remove-button class="cl-accent"/>
+          </span>
+        </div>
       </div>
     </div>
   </li>
 </template>
 
 <script>
-import Product from '@vue-storefront/core/compatibility/components/blocks/Wishlist/Product'
-import RemoveButton from './RemoveButton'
+import Product from "@vue-storefront/core/compatibility/components/blocks/Wishlist/Product";
+import RemoveButton from "./RemoveButton";
 
 export default {
   components: {
     RemoveButton
   },
   mixins: [Product]
-}
+};
 </script>
 
 <style scoped>

From 2ee0a5e220c8d38d4dcbcc78d90c2a3aa33c58d1 Mon Sep 17 00:00:00 2001
From: miluka <mlukasik@divante.co>
Date: Mon, 10 Jun 2019 09:56:17 +0200
Subject: [PATCH 03/47] Fixes formatting

---
 .../core/blocks/Wishlist/Product.vue          | 37 ++++++++-----------
 1 file changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 61008fb43b..8a8803509c 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -1,57 +1,50 @@
 <template>
   <li class="row pr55 py20">
     <div @click="closeWishlist">
-      <router-link
-        :to="localizedRoute({
+      <router-link :to="localizedRoute({
         name: 'configurable-product',
         params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
-      })"
-      >
-        <img v-lazy="thumbnail">
+      })">
+        <img v-lazy="thumbnail" >
       </router-link>
     </div>
     <div class="col-xs between-xs flex pl40 py15">
       <div @click="closeWishlist">
-        <router-link
-          :to="localizedRoute({
+        <router-link :to="localizedRoute({
           name: 'configurable-product',
           params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
-        })"
-        >{{ product.name | htmlDecode }}</router-link>
+        })">
+          {{ product.name | htmlDecode }}
+        </router-link>
         <div class="h6 cl-bg-tertiary pt5 sku">{{ product.sku }}</div>
       </div>
     </div>
     <div class="col-xs flex py15 align-right">
       <div>
         <span class="price-special" v-if="product.special_price">{{ product.priceInclTax | price }}</span>&nbsp;
-        <span
-          class="price-original"
-          v-if="product.special_price"
-        >{{ product.originalPriceInclTax | price }}</span>
+        <span class="price-original" v-if="product.special_price" >{{ product.originalPriceInclTax | price }}</span>
 
-        <span v-if="!product.special_price">{{ product.priceInclTax | price }}</span>
+        <span v-if="!product.special_price">
+          {{ product.priceInclTax | price }}
+        </span>
       </div>
       <div>
-        <div class="mt5">
-          <span @click="removeFromWishlist(product)">
-            <remove-button class="cl-accent"/>
-          </span>
-        </div>
+        <div class="mt5"><span @click="removeFromWishlist(product)"><remove-button class="cl-accent" /></span></div>
       </div>
     </div>
   </li>
 </template>
 
 <script>
-import Product from "@vue-storefront/core/compatibility/components/blocks/Wishlist/Product";
-import RemoveButton from "./RemoveButton";
+import Product from '@vue-storefront/core/compatibility/components/blocks/Wishlist/Product'
+import RemoveButton from './RemoveButton'
 
 export default {
   components: {
     RemoveButton
   },
   mixins: [Product]
-};
+}
 </script>
 
 <style scoped>

From 54bc4cb323c44fd31dbacc15a9453b2fdad843ed Mon Sep 17 00:00:00 2001
From: miluka <mlukasik@divante.co>
Date: Mon, 10 Jun 2019 10:13:35 +0200
Subject: [PATCH 04/47] Updates changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba1aeff10a..4bf1b6e972 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,7 +22,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added "Clear wishlist" button - @aniamusial (#2806)
 - Make all links with the primary color - @hackbard (#2932)
 - Remembering last search query - @webdiver, @patzick (#2787)
-- Added new Module order-history this provides the pagination via lazy laod - @hackbard (#2810) 
+- Added new Module order-history this provides the pagination via lazy laod - @hackbard (#2810)
 - OrderNumber on ThankYouPage - @Flyingmana (#2743)
 - Extracted ProductImage component to support faster images loading - @przemyslawspaczek (#2925)
 
@@ -47,6 +47,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed ios input zoom on category page - @victorkadup (#2815)
 - Fixed Load more in Search Results not working when typed to fast - @Flyingmana (#2659, #2946)
 - Subscribe button responsive - @exlo89, @webdiver, @przemyslawspaczek (#2886)
+- Fixed product link in wishlist - @michasik (#2987)
 
 ### Changed / Improved
 - Changed the way to access the configuration. Currently the `rootStore.state.config` is deprecated. Please do use the `import config from 'config'` > `config` instead - @pkarw (#2649)

From c19a5a6ab71261eda2fda83f44564f88ccd5ce21 Mon Sep 17 00:00:00 2001
From: miluka <mlukasik@divante.co>
Date: Mon, 10 Jun 2019 11:01:03 +0200
Subject: [PATCH 05/47] Changes name param in router-link

---
 .../default/components/core/blocks/Wishlist/Product.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 8a8803509c..2f2656fb03 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -2,7 +2,7 @@
   <li class="row pr55 py20">
     <div @click="closeWishlist">
       <router-link :to="localizedRoute({
-        name: 'configurable-product',
+        name: product.type_id + '-product',
         params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
       })">
         <img v-lazy="thumbnail" >
@@ -11,7 +11,7 @@
     <div class="col-xs between-xs flex pl40 py15">
       <div @click="closeWishlist">
         <router-link :to="localizedRoute({
-          name: 'configurable-product',
+          name: product.type_id + '-product',
           params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
         })">
           {{ product.name | htmlDecode }}

From 79ff96bc056523e4931ec554bdc1e63bc83def49 Mon Sep 17 00:00:00 2001
From: michasik <mlukasik@divante.co>
Date: Tue, 11 Jun 2019 09:06:55 +0200
Subject: [PATCH 06/47] Preserve params passed to localizedDispatcherRoute
 method in multistore. Minimizes params passed to localizedRoute method in
 router-link in both Wishlist and Microcart.

---
 core/lib/multistore.ts                                     | 4 ++--
 .../default/components/core/blocks/Microcart/Product.vue   | 7 ++-----
 .../default/components/core/blocks/Wishlist/Product.vue    | 6 ++++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index 050b20f2d8..26ec7c318a 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -11,7 +11,7 @@ export interface LocalizedRoute {
   path?: string,
   name?: string,
   hash?: string,
-  params?: object,
+  params?: { [key: string]: unknown; },
   fullPath?: string
 }
 
@@ -113,7 +113,7 @@ export function adjustMultistoreApiUrl (url: string): string {
 }
 
 export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig | RawLocation, storeCode: string): any {
-  if (routeObj && (routeObj as LocalizedRoute).fullPath && config.seo.useUrlDispatcher) return localizedDispatcherRoute(Object.assign({}, routeObj, { params: null }) as LocalizedRoute, storeCode)
+  if (routeObj && (routeObj as LocalizedRoute).fullPath && config.seo.useUrlDispatcher) return localizedDispatcherRoute(Object.assign({}, routeObj) as LocalizedRoute, storeCode)
   if (storeCode && routeObj && config.defaultStoreCode !== storeCode) {
     if (typeof routeObj === 'object') {
       if (routeObj.name) {
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index 5ca6f675b7..44db97f1ba 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -11,11 +11,8 @@
           class="serif h4 name"
           :to="localizedRoute({
             name: product.type_id + '-product',
-            params: {
-              parentSku: product.parentSku ? product.parentSku : product.sku,
-              slug: product.slug,
-              childSku: product.sku
-            }
+            fullPath: product.url_path,
+            params: { childSku: product.sku }
           })"
           data-testid="productLink"
           @click.native="$store.commit('ui/setMicrocart', false)"
diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 2f2656fb03..ad3573725e 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -3,7 +3,8 @@
     <div @click="closeWishlist">
       <router-link :to="localizedRoute({
         name: product.type_id + '-product',
-        params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
+        fullPath: product.url_path,
+        params: { childSku: product.sku }
       })">
         <img v-lazy="thumbnail" >
       </router-link>
@@ -12,7 +13,8 @@
       <div @click="closeWishlist">
         <router-link :to="localizedRoute({
           name: product.type_id + '-product',
-          params: { parentSku: product.parentSku ? product.parentSku : product.sku, slug: product.slug, childSku: product.sku }
+          fullPath: product.url_path,
+          params: { childSku: product.sku }
         })">
           {{ product.name | htmlDecode }}
         </router-link>

From 7e3004203bb67c160766501cb00753961d9d9e00 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Wed, 12 Jun 2019 10:32:23 +0530
Subject: [PATCH 07/47] Displayed whishlist items count on page load

---
 .../components/core/blocks/Header/WishlistIcon.vue    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
index 8d7dd450c5..aee689e5b4 100644
--- a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
@@ -11,16 +11,23 @@
       v-cloak
       v-show="getwishlistItemsCount"
     >
-      {{ getwishlistItemsCount }}
+      {{ getWishListQty }}
     </span>
   </button>
 </template>
 
 <script>
 import WishlistIcon from '@vue-storefront/core/compatibility/components/blocks/Header/WishlistIcon'
+import wishlistMountedMixin from '@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin'
+import { WishlistButton } from '@vue-storefront/core/modules/wishlist/components/WishlistButton'
 
 export default {
-  mixins: [WishlistIcon]
+  mixins: [WishlistIcon, wishlistMountedMixin, WishlistButton],
+  computed: {
+    getWishListQty () {
+      return this.$store.state['wishlist'].items.length
+    }
+  }
 }
 </script>
 

From 7445783195cfe0640dcee695bbd7f77650a8c296 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Wed, 12 Jun 2019 10:38:21 +0530
Subject: [PATCH 08/47] Added a changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fc3036250..58307dbc76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added linting for typescript files @ResuBaka (#2843)
 - Added back to top functionality - @vishal-7037 (#2866)
 - Thumbnail sizes are now configurable within the `config.products.thumbnails` and `config.cart.thumbnails` - @pkarw (#2897)
+- Added items count badges for Compare products and wishlist icons at header - @vishal-7037 (#3047)
 
 ### Removed
 - The getter `cart/totals` has ben replaced with `cart/getTotals` - @pkarw (#2522)

From 87f167c784a67e3d74b61933d8c84c71c3ac6130 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Thu, 13 Jun 2019 12:36:15 +0200
Subject: [PATCH 09/47] update versions

---
 core/i18n/package.json              | 2 +-
 core/package.json                   | 2 +-
 docs/package.json                   | 2 +-
 lerna.json                          | 2 +-
 package.json                        | 2 +-
 src/themes/default-amp/package.json | 2 +-
 src/themes/default/package.json     | 2 +-
 test/unit/package.json              | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/i18n/package.json b/core/i18n/package.json
index ff3ce3257f..64cba958ec 100644
--- a/core/i18n/package.json
+++ b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",
diff --git a/core/package.json b/core/package.json
index 871309ae20..bc0330d6d8 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/core",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "description": "Vue Storefront Core",
   "license": "MIT",
   "main": "app.js",
diff --git a/docs/package.json b/docs/package.json
index efe54ca3eb..5123db6445 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vue-storefront/docs",
   "private": true,
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "scripts": {
     "docs:dev": "vuepress dev",
     "docs:build": "vuepress build"
diff --git a/lerna.json b/lerna.json
index 8a8588951e..76f848c825 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,6 +1,6 @@
 {
   "lerna": "3.14.1",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "npmClient": "yarn",
   "useWorkspaces": true,
   "registry": "https://registry.npmjs.org/"
diff --git a/package.json b/package.json
index 5f761e8934..45a3a89fa2 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "description": "A Vue.js, PWA eCommerce frontend",
   "private": true,
   "engines": {
diff --git a/src/themes/default-amp/package.json b/src/themes/default-amp/package.json
index 3a80e0c116..f96a658fa8 100755
--- a/src/themes/default-amp/package.json
+++ b/src/themes/default-amp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-default-amp",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "description": "Default AMP theme for Vue Storefront",
   "main": "index.js",
   "scripts": {
diff --git a/src/themes/default/package.json b/src/themes/default/package.json
index dfece12843..612803d26e 100644
--- a/src/themes/default/package.json
+++ b/src/themes/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-default",
-  "version": "1.10.0-rc.1",
+  "version": "1.11.0-rc.1",
   "description": "Default theme for Vue Storefront",
   "main": "index.js",
   "scripts": {
diff --git a/test/unit/package.json b/test/unit/package.json
index 0c8f540b46..cf5fa8c359 100644
--- a/test/unit/package.json
+++ b/test/unit/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@vue-storefront/unit-tests",
   "private": true,
-  "version": "1.10.0-rc.1"
+  "version": "1.11.0-rc.1"
 }

From 800036a6d8cec10338ad11054957c2f72c16d2f4 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Thu, 13 Jun 2019 15:10:37 +0200
Subject: [PATCH 10/47] add new changelog

---
 CHANGELOG.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c40beda6..43a8770966 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,18 @@ All notable changes to this project will be documented in this file.
 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.11.0-rc.1] - UNRELEASED
+
+### Added
+- 
+
+### Fixed
+- 
+
+### Changed / Improved
+- 
+
 ## [1.10.0-rc.1] - UNRELEASED
 
 ### Added

From 5ded7103766d3af5871e5c4c19513872c793517d Mon Sep 17 00:00:00 2001
From: michasik <mlukasik@divante.co>
Date: Thu, 13 Jun 2019 16:08:46 +0200
Subject: [PATCH 11/47] Uses formatProductLink method from url helpers methods
 in Wishlist and Microcart

---
 core/modules/url/helpers/index.ts             |  4 ++--
 .../core/blocks/Microcart/Product.vue         | 13 ++++++-----
 .../core/blocks/Wishlist/Product.vue          | 22 +++++++++----------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/core/modules/url/helpers/index.ts b/core/modules/url/helpers/index.ts
index df6c1f17d0..fd963c895f 100644
--- a/core/modules/url/helpers/index.ts
+++ b/core/modules/url/helpers/index.ts
@@ -63,13 +63,13 @@ export function formatProductLink (
     url_path?: string,
     type_id: string,
     slug: string,
-    configurable_children: []
+    options: [],
   },
   storeCode
 ): string | LocalizedRoute {
   if (config.seo.useUrlDispatcher && product.url_path) {
     let routeData: LocalizedRoute;
-    if (product.configurable_children && product.configurable_children.length > 0) {
+    if (product.options && product.options.length > 0) {
       routeData = {
         fullPath: product.url_path,
         params: { childSku: product.sku }
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index e9ced5cde0..39d08fafb5 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -9,11 +9,7 @@
       <div>
         <router-link
           class="serif h4 name"
-          :to="localizedRoute({
-            name: product.type_id + '-product',
-            fullPath: product.url_path,
-            params: { childSku: product.sku }
-          })"
+          :to="productLink"
           data-testid="productLink"
           @click.native="$store.commit('ui/setMicrocart', false)"
         >
@@ -90,6 +86,8 @@
 <script>
 import config from 'config'
 import Product from '@vue-storefront/core/compatibility/components/blocks/Microcart/Product'
+import { currentStoreView } from '@vue-storefront/core/lib/multistore'
+import { formatProductLink } from '@vue-storefront/core/modules/url/helpers'
 
 import RemoveButton from './RemoveButton'
 import BaseInputNumber from 'theme/components/core/blocks/Form/BaseInputNumber'
@@ -104,6 +102,11 @@ export default {
     return {
       displayItemDiscounts: config.cart.displayItemDiscounts
     }
+  },
+  computed: {
+    productLink () {
+      return formatProductLink(this.product, currentStoreView().storeCode)
+    },
   }
 }
 </script>
diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index fb032e2b28..38be74021c 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -1,21 +1,13 @@
 <template>
   <li class="row pr55 py20">
     <div @click="closeWishlist">
-      <router-link :to="localizedRoute({
-        name: product.type_id + '-product',
-        fullPath: product.url_path,
-        params: { childSku: product.sku }
-      })">
+      <router-link :to="productLink">
         <img v-lazy="thumbnail" >
       </router-link>
     </div>
     <div class="col-xs between-xs flex pl40 py15">
       <div @click="closeWishlist">
-        <router-link :to="localizedRoute({
-          name: product.type_id + '-product',
-          fullPath: product.url_path,
-          params: { childSku: product.sku }
-        })">
+        <router-link :to="productLink">
           {{ product.name | htmlDecode }}
         </router-link>
         <div class="h6 cl-bg-tertiary pt5 sku">
@@ -43,13 +35,21 @@
 
 <script>
 import Product from '@vue-storefront/core/compatibility/components/blocks/Wishlist/Product'
+import { currentStoreView } from '@vue-storefront/core/lib/multistore'
+import { formatProductLink } from '@vue-storefront/core/modules/url/helpers'
+
 import RemoveButton from './RemoveButton'
 
 export default {
   components: {
     RemoveButton
   },
-  mixins: [Product]
+  mixins: [Product],
+  computed: {
+    productLink () {
+      return formatProductLink(this.product, currentStoreView().storeCode)
+    },
+  }
 }
 </script>
 

From 19ffb2611dcc2457b3ea297a53de79f1c2e55c36 Mon Sep 17 00:00:00 2001
From: michasik <mlukasik@divante.co>
Date: Thu, 13 Jun 2019 17:48:25 +0200
Subject: [PATCH 12/47] Resolves conflicts #2

---
 core/lib/multistore.ts                                       | 5 -----
 .../default/components/core/blocks/Wishlist/Product.vue      | 3 ---
 2 files changed, 8 deletions(-)

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index 7b0d9dad8f..cabff15e41 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -153,13 +153,8 @@ export function localizedDispatcherRoute (routeObj: LocalizedRoute | string, sto
   return routeObj
 }
 export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig | RawLocation, storeCode: string): any {
-<<<<<<< HEAD
   if (routeObj && (routeObj as LocalizedRoute).fullPath && config.seo.useUrlDispatcher) return localizedDispatcherRoute(Object.assign({}, routeObj) as LocalizedRoute, storeCode)
-  if (storeCode && routeObj && config.defaultStoreCode !== storeCode) {
-=======
-  if (routeObj && (routeObj as LocalizedRoute).fullPath && config.seo.useUrlDispatcher) return localizedDispatcherRoute(Object.assign({}, routeObj, { params: null }) as LocalizedRoute, storeCode)
   if (storeCode && routeObj && config.defaultStoreCode !== storeCode && config.storeViews[storeCode].appendStoreCode) {
->>>>>>> develop
     if (typeof routeObj === 'object') {
       if (routeObj.name) {
         routeObj.name = storeCode + '-' + routeObj.name
diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 321ab02660..3f64ec931e 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -48,18 +48,15 @@ export default {
   },
   mixins: [Product],
   computed: {
-<<<<<<< HEAD
     productLink () {
       return formatProductLink(this.product, currentStoreView().storeCode)
     },
-=======
     image () {
       return {
         loading: this.thumbnail,
         src: this.thumbnail
       }
     }
->>>>>>> develop
   }
 }
 </script>

From f5366b57fb6bb6c7b4979d80ca8ca874cd4a0178 Mon Sep 17 00:00:00 2001
From: michasik <mlukasik@divante.co>
Date: Fri, 14 Jun 2019 09:34:33 +0200
Subject: [PATCH 13/47] Fixes build errors

---
 core/lib/multistore.ts                                    | 2 +-
 core/modules/url/helpers/index.ts                         | 2 +-
 .../default/components/core/blocks/Microcart/Product.vue  | 8 +++-----
 .../default/components/core/blocks/Wishlist/Product.vue   | 6 ++----
 4 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index cabff15e41..b9af7c7e26 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -11,7 +11,7 @@ export interface LocalizedRoute {
   path?: string,
   name?: string,
   hash?: string,
-  params?: { [key: string]: unknown; },
+  params?: { [key: string]: unknown },
   fullPath?: string,
   host?: string
 }
diff --git a/core/modules/url/helpers/index.ts b/core/modules/url/helpers/index.ts
index c826d67e2d..324b595501 100644
--- a/core/modules/url/helpers/index.ts
+++ b/core/modules/url/helpers/index.ts
@@ -63,7 +63,7 @@ export function formatProductLink (
     url_path?: string,
     type_id: string,
     slug: string,
-    options: [],
+    options: []
   },
   storeCode
 ): string | LocalizedRoute {
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index a8f6457ac8..696fc0f429 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -110,17 +110,15 @@ export default {
         loading: this.thumbnail,
         src: this.thumbnail
       }
+    },
+    productLink () {
+      return formatProductLink(this.product, currentStoreView().storeCode)
     }
   },
   data () {
     return {
       displayItemDiscounts: config.cart.displayItemDiscounts
     }
-  },
-  computed: {
-    productLink () {
-      return formatProductLink(this.product, currentStoreView().storeCode)
-    },
   }
 }
 </script>
diff --git a/src/themes/default/components/core/blocks/Wishlist/Product.vue b/src/themes/default/components/core/blocks/Wishlist/Product.vue
index 3f64ec931e..e9815a59c1 100644
--- a/src/themes/default/components/core/blocks/Wishlist/Product.vue
+++ b/src/themes/default/components/core/blocks/Wishlist/Product.vue
@@ -2,7 +2,7 @@
   <li class="row pr55 py20">
     <div class="image" @click="closeWishlist">
       <router-link :to="productLink">
-        <img v-lazy="thumbnail" >
+        <img v-lazy="thumbnail">
       </router-link>
     </div>
     <div class="col-xs between-xs flex pl40 py15">
@@ -39,12 +39,10 @@ import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { formatProductLink } from '@vue-storefront/core/modules/url/helpers'
 
 import RemoveButton from './RemoveButton'
-import ProductImage from 'theme/components/core/ProductImage'
 
 export default {
   components: {
-    RemoveButton,
-    ProductImage
+    RemoveButton
   },
   mixins: [Product],
   computed: {

From 95d02514429479b1824672901ef71c9c285873ae Mon Sep 17 00:00:00 2001
From: Iwona Piotrowska <ipiotrowska@divante.pl>
Date: Fri, 14 Jun 2019 11:16:56 +0200
Subject: [PATCH 14/47] Save shipping address when creating account during
 checkout

---
 CHANGELOG.md                                  |  1 +
 .../checkout/components/OrderReview.ts        | 19 +++++++++++++++++--
 core/modules/user/store/actions.ts            |  4 ++--
 docs/guide/modules/user.md                    |  2 +-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a57c076a2a..8bf7f3eac9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -126,6 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added some structured data to product page - @cewald (#2910)
 - Improved the Size Guide feature so it opens in a modal popup instead of a new page - @RGijsberts - (#2913)
 - Refactored Travis config @Tjitse-E (#3035)
+- Shipping address is saved as default when not logged in user chooses to create account during checkout (#2636)
 
 ## [1.9.2] - 2019.06.10
 
diff --git a/core/modules/checkout/components/OrderReview.ts b/core/modules/checkout/components/OrderReview.ts
index dfd71b2025..855623379d 100644
--- a/core/modules/checkout/components/OrderReview.ts
+++ b/core/modules/checkout/components/OrderReview.ts
@@ -1,4 +1,5 @@
-import { mapGetters } from 'vuex'
+import { mapState, mapGetters } from 'vuex'
+import RootState from '@vue-storefront/core/types/RootState'
 import i18n from '@vue-storefront/i18n'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
@@ -19,6 +20,9 @@ export const OrderReview = {
     }
   },
   computed: {
+    ...mapState({
+      shippingDetails: (state: RootState) => state.checkout.shippingDetails
+    }),
     ...mapGetters({
       isVirtualCart: 'cart/isVirtualCart'
     })
@@ -37,7 +41,18 @@ export const OrderReview = {
         email: this.$store.state.checkout.personalDetails.emailAddress,
         password: this.$store.state.checkout.personalDetails.password,
         firstname: this.$store.state.checkout.personalDetails.firstName,
-        lastname: this.$store.state.checkout.personalDetails.lastName
+        lastname: this.$store.state.checkout.personalDetails.lastName,
+        addresses: [{
+          firstname: this.shippingDetails.firstName,
+          lastname: this.shippingDetails.lastName,
+          street: [this.shippingDetails.streetAddress, this.shippingDetails.apartmentNumber],
+          city: this.shippingDetails.city,
+          ...(this.shippingDetails.state ? { region: { region: this.shippingDetails.state } } : {}),
+          country_id: this.shippingDetails.country,
+          postcode: this.shippingDetails.zipCode,
+          ...(this.shippingDetails.phoneNumber ? { telephone: this.shippingDetails.phoneNumber } : {}),
+          default_shipping: true
+        }]
       }).then(async (result) => {
         this.$bus.$emit('notification-progress-stop')
         if (result.code !== 200) {
diff --git a/core/modules/user/store/actions.ts b/core/modules/user/store/actions.ts
index 8efac5b270..84e3365270 100644
--- a/core/modules/user/store/actions.ts
+++ b/core/modules/user/store/actions.ts
@@ -98,7 +98,7 @@ const actions: ActionTree<UserState, RootState> = {
   /**
    * Login user and return user profile and current token
    */
-  async register (context, { email, firstname, lastname, password }) {
+  async register (context, { email, firstname, lastname, password, addresses }) {
     let url = config.users.create_endpoint
     if (config.storeViews.multistore) {
       url = adjustMultistoreApiUrl(url)
@@ -109,7 +109,7 @@ const actions: ActionTree<UserState, RootState> = {
         'Accept': 'application/json, text/plain, */*',
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify({ customer: { email: email, firstname: firstname, lastname: lastname }, password: password })
+      body: JSON.stringify({ customer: { email: email, firstname: firstname, lastname: lastname, addresses: addresses }, password: password })
     }).then(resp => { return resp.json() })
   },
 
diff --git a/docs/guide/modules/user.md b/docs/guide/modules/user.md
index 43df39bb0e..b149651122 100644
--- a/docs/guide/modules/user.md
+++ b/docs/guide/modules/user.md
@@ -164,7 +164,7 @@ Calls the `vue-storefront-api` endpoint to send the password reset link to speci
 
 Called to login the user and receive the current token that can be used to authorize subsequent API calls. After user is successfully authorized the `user/me` action is dispatched to load the user profile data.
 
-#### `register (context, { email, firstname, lastname, password })`
+#### `register (context, { email, firstname, lastname, password, addresses })`
 
 Registers the user account in the eCommerce platform / Magento.
 

From 06041ff65ec85f7d09394ca159578d0e94693c97 Mon Sep 17 00:00:00 2001
From: Iwona Piotrowska <ipiotrowska@divante.pl>
Date: Fri, 14 Jun 2019 11:40:57 +0200
Subject: [PATCH 15/47] Fill in the CHANGELOG

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bf7f3eac9..85ddffd1ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -126,7 +126,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added some structured data to product page - @cewald (#2910)
 - Improved the Size Guide feature so it opens in a modal popup instead of a new page - @RGijsberts - (#2913)
 - Refactored Travis config @Tjitse-E (#3035)
-- Shipping address is saved as default when not logged in user chooses to create account during checkout (#2636)
+- Shipping address is saved as default when not logged in user chooses to create account during checkout - @iwonapiotrowska (#2636)
 
 ## [1.9.2] - 2019.06.10
 

From e50db9cfb7e96a49cbe1462cc7e70c04545ef1f9 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Mon, 17 Jun 2019 09:06:57 +0200
Subject: [PATCH 16/47] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eeb15f3be5..cae7d663ea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -
 
 ### Fixed
--
+- Fixed product link in wishlist and microcart - @michasik (#2987)
 
 ### Changed / Improved
 -
@@ -84,7 +84,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed placeholders in gallery in offline mode - @przspa (#2863)
 - Incorrect `user_id` set on the order object - @pkarw (#2966)
 - Problem with SSR render on product page with logged in user - @patzick (#2888)
-- Fixed product link in wishlist and microcart - @michasik (#2987)
 
 ### Changed / Improved
 - The action `cart/userAfterLoggedin` got renamed to `cart/authorize` - @pkarw (#2522)

From 1e785f0d0989f51c991420a4d93a83472e571b9e Mon Sep 17 00:00:00 2001
From: Iwona Piotrowska <ipiotrowska@divante.pl>
Date: Mon, 17 Jun 2019 11:23:03 +0200
Subject: [PATCH 17/47] Refactor code after review

---
 CHANGELOG.md                                  |  3 +-
 .../checkout/components/OrderReview.ts        | 53 ++++++++++---------
 core/modules/user/store/actions.ts            |  2 +-
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85ddffd1ba..8f93a14747 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 
 
 ### Changed / Improved
-- 
+- Shipping address is saved as default when not logged in user chooses to create account during checkout - @iwonapiotrowska (#2636)
 
 ## [1.10.0-rc.1] - UNRELEASED
 
@@ -126,7 +126,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added some structured data to product page - @cewald (#2910)
 - Improved the Size Guide feature so it opens in a modal popup instead of a new page - @RGijsberts - (#2913)
 - Refactored Travis config @Tjitse-E (#3035)
-- Shipping address is saved as default when not logged in user chooses to create account during checkout - @iwonapiotrowska (#2636)
 
 ## [1.9.2] - 2019.06.10
 
diff --git a/core/modules/checkout/components/OrderReview.ts b/core/modules/checkout/components/OrderReview.ts
index 855623379d..c1835245e8 100644
--- a/core/modules/checkout/components/OrderReview.ts
+++ b/core/modules/checkout/components/OrderReview.ts
@@ -1,5 +1,4 @@
-import { mapState, mapGetters } from 'vuex'
-import RootState from '@vue-storefront/core/types/RootState'
+import { mapGetters } from 'vuex'
 import i18n from '@vue-storefront/i18n'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
@@ -20,16 +19,15 @@ export const OrderReview = {
     }
   },
   computed: {
-    ...mapState({
-      shippingDetails: (state: RootState) => state.checkout.shippingDetails
-    }),
     ...mapGetters({
-      isVirtualCart: 'cart/isVirtualCart'
+      isVirtualCart: 'cart/isVirtualCart',
+      getShippingDetails: 'checkout/getShippingDetails',
+      getPersonalDetails: 'checkout/getPersonalDetails'
     })
   },
   methods: {
     placeOrder () {
-      if (this.$store.state.checkout.personalDetails.createAccount) {
+      if (this.getPersonalDetails.createAccount) {
         this.register()
       } else {
         this.$bus.$emit('checkout-before-placeOrder')
@@ -37,23 +35,26 @@ export const OrderReview = {
     },
     async register () {
       this.$bus.$emit('notification-progress-start', i18n.t('Registering the account ...'))
-      this.$store.dispatch('user/register', {
-        email: this.$store.state.checkout.personalDetails.emailAddress,
-        password: this.$store.state.checkout.personalDetails.password,
-        firstname: this.$store.state.checkout.personalDetails.firstName,
-        lastname: this.$store.state.checkout.personalDetails.lastName,
-        addresses: [{
-          firstname: this.shippingDetails.firstName,
-          lastname: this.shippingDetails.lastName,
-          street: [this.shippingDetails.streetAddress, this.shippingDetails.apartmentNumber],
-          city: this.shippingDetails.city,
-          ...(this.shippingDetails.state ? { region: { region: this.shippingDetails.state } } : {}),
-          country_id: this.shippingDetails.country,
-          postcode: this.shippingDetails.zipCode,
-          ...(this.shippingDetails.phoneNumber ? { telephone: this.shippingDetails.phoneNumber } : {}),
-          default_shipping: true
-        }]
-      }).then(async (result) => {
+
+      try {
+        const result = await this.$store.dispatch('user/register', {
+          email: this.getPersonalDetails.emailAddress,
+          password: this.getPersonalDetails.password,
+          firstname: this.getPersonalDetails.firstName,
+          lastname: this.getPersonalDetails.lastName,
+          addresses: [{
+            firstname: this.getShippingDetails.firstName,
+            lastname: this.getShippingDetails.lastName,
+            street: [this.getShippingDetails.streetAddress, this.getShippingDetails.apartmentNumber],
+            city: this.getShippingDetails.city,
+            ...(this.getShippingDetails.state ? { region: { region: this.getShippingDetails.state } } : {}),
+            country_id: this.getShippingDetails.country,
+            postcode: this.getShippingDetails.zipCode,
+            ...(this.getShippingDetails.phoneNumber ? { telephone: this.getShippingDetails.phoneNumber } : {}),
+            default_shipping: true
+          }]
+        })
+
         this.$bus.$emit('notification-progress-stop')
         if (result.code !== 200) {
           this.onFailure(result)
@@ -71,10 +72,10 @@ export const OrderReview = {
           this.$bus.$emit('checkout-before-placeOrder', result.result.id)
           this.onSuccess()
         }
-      }).catch(err => {
+      } catch (err) {
         this.$bus.$emit('notification-progress-stop')
         Logger.error(err, 'checkout')()
-      })
+      }
     }
   }
 }
diff --git a/core/modules/user/store/actions.ts b/core/modules/user/store/actions.ts
index 84e3365270..eb9fe9d694 100644
--- a/core/modules/user/store/actions.ts
+++ b/core/modules/user/store/actions.ts
@@ -109,7 +109,7 @@ const actions: ActionTree<UserState, RootState> = {
         'Accept': 'application/json, text/plain, */*',
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify({ customer: { email: email, firstname: firstname, lastname: lastname, addresses: addresses }, password: password })
+      body: JSON.stringify({ customer: { email, firstname, lastname, addresses }, password })
     }).then(resp => { return resp.json() })
   },
 

From fe1d0705e7f983bb146d8f8cbbd4fd465d70f6f6 Mon Sep 17 00:00:00 2001
From: Max Malm <benjick@dumfan.net>
Date: Mon, 17 Jun 2019 12:16:11 +0200
Subject: [PATCH 18/47] Update url.md

Add link to vsf-mapping-fallback
---
 docs/guide/basics/url.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/guide/basics/url.md b/docs/guide/basics/url.md
index edfb48e570..df25a2c30a 100644
--- a/docs/guide/basics/url.md
+++ b/docs/guide/basics/url.md
@@ -24,4 +24,8 @@ With all `product/list` Vuex action calls the `url/registerMapping` action is be
 
 ## Custom URLs for CMS pages and other content types
 
-You can use the Url Dispatcher feature with all content types. The only thing You need to change is to customize the `url/mappingFallback` Vuex action to properly query other content sources.
\ No newline at end of file
+You can use the Url Dispatcher feature with all content types. The only thing You need to change is to customize the `url/mappingFallback` Vuex action to properly query other content sources.
+
+## Modules
+
+* [vsf-mapping-fallback](https://github.com/kodbruket/vsf-mapping-fallback) simplifies the process of adding URL mappings

From 5f23a1d11d1bb4a43d56b2071e602c1199a84ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Anio=C5=82?=
 <33483514+tom-aniol@users.noreply.github.com>
Date: Mon, 17 Jun 2019 15:22:54 +0200
Subject: [PATCH 19/47] Add Novusweb, ITT Web, Trellis

---
 README.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/README.md b/README.md
index 7e3a05aded..b8b56b996f 100644
--- a/README.md
+++ b/README.md
@@ -706,6 +706,53 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
         </a>
 </td>
     <td align="center" valign="middle"> 
+<a href="https://www.novusweb.com/">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/blue_novusweb.png"
+            alt="Novusweb"
+            height="30"
+          >
+        </a>
+</td>
+   <td align="center" valign="middle"> 
+<a href="www.trellis.co">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/trellis.png"
+            alt="Trellis"
+            height="30"
+          >
+        </a>
+</td>
+    </tr>
+      <tr>
+      <td align="center" valign="middle"> 
+<a href="https://ittweb.net/it?utm_source=referral&utm_medium=vsf&utm_campaign=partners">
+          <img
+            src="https://divante.co/partners/Vue-Storefront/ITTweb.png"
+            alt="ITT Web"
+            height="40"
+          >
+        </a>
+</td>
+  <td align="center" valign="middle"> 
+<a href="">
+          <img
+            src=""
+            alt=""
+            height="40"
+          >
+        </a>
+</td>
+     <td align="center" valign="middle"> 
+<a href="">
+          <img
+            src=""
+            alt=""
+            height="40"
+          >
+        </a>
+</td>
+    <td align="center" valign="middle"> 
 <a href="">
           <img
             src=""

From 094821823c42d64d8fdd8f30c9e8d8314a7363c2 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Mon, 17 Jun 2019 19:26:44 +0530
Subject: [PATCH 20/47] Updated suggested changes

---
 .../components/blocks/Header/CompareIcon.js       |  3 ---
 .../components/blocks/Header/WishlistIcon.js      |  3 ---
 core/modules/compare/components/CompareButton.ts  |  3 ---
 core/modules/compare/store/getters.ts             |  2 +-
 .../modules/wishlist/components/WishlistButton.ts | 15 ++++++++++-----
 core/modules/wishlist/store/index.ts              |  2 +-
 .../components/core/blocks/Header/CompareIcon.vue | 13 ++++++++++---
 .../core/blocks/Header/WishlistIcon.vue           | 13 +++----------
 8 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/core/compatibility/components/blocks/Header/CompareIcon.js b/core/compatibility/components/blocks/Header/CompareIcon.js
index 26922ae0a1..5b12a1638c 100644
--- a/core/compatibility/components/blocks/Header/CompareIcon.js
+++ b/core/compatibility/components/blocks/Header/CompareIcon.js
@@ -7,9 +7,6 @@ export default {
     isActive () {
       // Computed Property renamed to 'isEmpty'
       return !this.isEmpty
-    },
-    getTotalProducts () {
-      return this.totalProducts
     }
   }
 }
diff --git a/core/compatibility/components/blocks/Header/WishlistIcon.js b/core/compatibility/components/blocks/Header/WishlistIcon.js
index 76d9679613..8cc9d63afe 100644
--- a/core/compatibility/components/blocks/Header/WishlistIcon.js
+++ b/core/compatibility/components/blocks/Header/WishlistIcon.js
@@ -13,9 +13,6 @@ export default {
     // deprecated in this component
     isWishlistOpen () {
       return this.$store.state.ui.wishlist
-    },
-    getwishlistItemsCount () {
-      return this.$store.getters['wishlist/wishlistItemCount']
     }
   },
   methods: {
diff --git a/core/modules/compare/components/CompareButton.ts b/core/modules/compare/components/CompareButton.ts
index 78d61774b2..54ab5dd04c 100644
--- a/core/modules/compare/components/CompareButton.ts
+++ b/core/modules/compare/components/CompareButton.ts
@@ -6,9 +6,6 @@ export const CompareButton = {
   computed: {
     isEmpty (): boolean {
       return this.$store.getters['compare/isEmpty']
-    },
-    totalProducts () {
-      return this.$store.getters['compare/totalProducts']
     }
   }
 }
diff --git a/core/modules/compare/store/getters.ts b/core/modules/compare/store/getters.ts
index e693c3c069..aab30a8ed7 100644
--- a/core/modules/compare/store/getters.ts
+++ b/core/modules/compare/store/getters.ts
@@ -6,7 +6,7 @@ const getters: GetterTree<CompareState, RootState> = {
   isEmpty: (state) => state.items.length === 0,
   isOnCompare: (state) => (product) => state.items.find(p => p.sku === product.sku),
   isCompareLoaded: state => state.loaded,
-  totalProducts: (state) => state.items.length
+  getCompareProductsCount: (state) => state.items.length
 }
 
 export default getters
diff --git a/core/modules/wishlist/components/WishlistButton.ts b/core/modules/wishlist/components/WishlistButton.ts
index 9f3f6542da..4a6fe1f2c9 100644
--- a/core/modules/wishlist/components/WishlistButton.ts
+++ b/core/modules/wishlist/components/WishlistButton.ts
@@ -1,12 +1,17 @@
+import wishlistMountedMixin from '@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin'
+import { mapGetters } from 'vuex'
+
 export const WishlistButton = {
+  mixins: [wishlistMountedMixin],
+  computed: {
+    ...mapGetters('wishlist', ['getWishlistItemsCount']),
+    getwishlistProductCount () {
+      return this.getWishlistItemsCount
+    }
+  },
   methods: {
     toggleWishlist () {
       this.$store.dispatch('ui/toggleWishlist')
     }
-  },
-  computed: {
-    wishlistItemsCount () {
-      return this.$store.getters['wishlist/wishlistItemCount']
-    }
   }
 }
diff --git a/core/modules/wishlist/store/index.ts b/core/modules/wishlist/store/index.ts
index dc9cee015b..b5238713fe 100644
--- a/core/modules/wishlist/store/index.ts
+++ b/core/modules/wishlist/store/index.ts
@@ -14,6 +14,6 @@ export const module: Module<WishlistState, RootState> = {
   mutations,
   getters: {
     isWishlistLoaded: state => state.loaded,
-    wishlistItemCount: (state) => state.items.length
+    getWishlistItemsCount: (state) => state.items.length
   }
 }
diff --git a/src/themes/default/components/core/blocks/Header/CompareIcon.vue b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
index 21c66db9c7..e837a411dc 100644
--- a/src/themes/default/components/core/blocks/Header/CompareIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
@@ -4,18 +4,25 @@
     <span
       class="compare-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
       v-cloak
-      v-show="getTotalProducts"
+      v-show="getcompareProductCount"
     >
-      {{ getTotalProducts }}
+      {{ getcompareProductCount }}
     </span>
   </router-link>
 </template>
 
 <script>
 import CompareIcon from '@vue-storefront/core/compatibility/components/blocks/Header/CompareIcon'
+import { mapGetters } from 'vuex'
 
 export default {
-  mixins: [CompareIcon]
+  mixins: [CompareIcon],
+  computed: {
+    ...mapGetters('compare', ['getCompareProductsCount']),
+    getcompareProductCount () {
+      return this.getCompareProductsCount
+    }
+  }
 }
 </script>
 
diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
index aee689e5b4..478c97d2d5 100644
--- a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
@@ -9,25 +9,18 @@
     <span
       class="whishlist-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
       v-cloak
-      v-show="getwishlistItemsCount"
+      v-show="getwishlistProductCount"
     >
-      {{ getWishListQty }}
+      {{ getwishlistProductCount }}
     </span>
   </button>
 </template>
 
 <script>
 import WishlistIcon from '@vue-storefront/core/compatibility/components/blocks/Header/WishlistIcon'
-import wishlistMountedMixin from '@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin'
-import { WishlistButton } from '@vue-storefront/core/modules/wishlist/components/WishlistButton'
 
 export default {
-  mixins: [WishlistIcon, wishlistMountedMixin, WishlistButton],
-  computed: {
-    getWishListQty () {
-      return this.$store.state['wishlist'].items.length
-    }
-  }
+  mixins: [WishlistIcon]
 }
 </script>
 

From f69a6cb68b3aa6466017fbcad8241ee3decbb379 Mon Sep 17 00:00:00 2001
From: Vishal Sutariya <vishalsutariya7037@gmail.com>
Date: Mon, 17 Jun 2019 19:35:09 +0530
Subject: [PATCH 21/47] Remove unwanted code

---
 core/modules/wishlist/components/WishlistButton.ts       | 5 +----
 .../components/core/blocks/Header/CompareIcon.vue        | 9 +++------
 .../components/core/blocks/Header/WishlistIcon.vue       | 4 ++--
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/core/modules/wishlist/components/WishlistButton.ts b/core/modules/wishlist/components/WishlistButton.ts
index 4a6fe1f2c9..3475856afd 100644
--- a/core/modules/wishlist/components/WishlistButton.ts
+++ b/core/modules/wishlist/components/WishlistButton.ts
@@ -4,10 +4,7 @@ import { mapGetters } from 'vuex'
 export const WishlistButton = {
   mixins: [wishlistMountedMixin],
   computed: {
-    ...mapGetters('wishlist', ['getWishlistItemsCount']),
-    getwishlistProductCount () {
-      return this.getWishlistItemsCount
-    }
+    ...mapGetters('wishlist', ['getWishlistItemsCount'])
   },
   methods: {
     toggleWishlist () {
diff --git a/src/themes/default/components/core/blocks/Header/CompareIcon.vue b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
index e837a411dc..500d005497 100644
--- a/src/themes/default/components/core/blocks/Header/CompareIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/CompareIcon.vue
@@ -4,9 +4,9 @@
     <span
       class="compare-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
       v-cloak
-      v-show="getcompareProductCount"
+      v-show="getCompareProductsCount"
     >
-      {{ getcompareProductCount }}
+      {{ getCompareProductsCount }}
     </span>
   </router-link>
 </template>
@@ -18,10 +18,7 @@ import { mapGetters } from 'vuex'
 export default {
   mixins: [CompareIcon],
   computed: {
-    ...mapGetters('compare', ['getCompareProductsCount']),
-    getcompareProductCount () {
-      return this.getCompareProductsCount
-    }
+    ...mapGetters('compare', ['getCompareProductsCount'])
   }
 }
 </script>
diff --git a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
index 478c97d2d5..d299a9b712 100644
--- a/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
+++ b/src/themes/default/components/core/blocks/Header/WishlistIcon.vue
@@ -9,9 +9,9 @@
     <span
       class="whishlist-count absolute flex center-xs middle-xs border-box py0 px2 h6 lh16 weight-700 cl-white bg-cl-silver"
       v-cloak
-      v-show="getwishlistProductCount"
+      v-show="getWishlistItemsCount"
     >
-      {{ getwishlistProductCount }}
+      {{ getWishlistItemsCount }}
     </span>
   </button>
 </template>

From e14a2a0abde6f71a48e21c8e694b5502e50d3aa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Anio=C5=82?=
 <33483514+tom-aniol@users.noreply.github.com>
Date: Mon, 17 Jun 2019 18:04:00 +0200
Subject: [PATCH 22/47] Add Yireo

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b8b56b996f..8f38a9bc9b 100644
--- a/README.md
+++ b/README.md
@@ -735,10 +735,10 @@ Vue Storefront is a Community effort brought to You by our great Core Team and s
         </a>
 </td>
   <td align="center" valign="middle"> 
-<a href="">
+<a href="https://www.yireo.com/">
           <img
-            src=""
-            alt=""
+            src="https://divante.co/partners/Vue-Storefront/yireo-logo-trans-520x520.png"
+            alt="Yireo"
             height="40"
           >
         </a>

From 6cf85569a25fbcb4526c9e7d3912d03a62309e17 Mon Sep 17 00:00:00 2001
From: pmaureatelabs <pm@aureatelabs.com>
Date: Tue, 18 Jun 2019 13:23:17 +0530
Subject: [PATCH 23/47] Update ui-store.md

Update file location path
---
 docs/guide/core-themes/ui-store.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/core-themes/ui-store.md b/docs/guide/core-themes/ui-store.md
index 6583112ac6..f1727c6095 100644
--- a/docs/guide/core-themes/ui-store.md
+++ b/docs/guide/core-themes/ui-store.md
@@ -1,6 +1,6 @@
 # Working with UI Store (Interface state)
 
-We are using Vuex to store the application interface state. The [ui-store file](https://github.com/DivanteLtd/vue-storefront/blob/master/core/store/modules/ui-store/index.ts) contains the information about the state of different pieces of UI, such as overlay visibility, wishlist visibility, etc. Of course, you are not forced to make use of it in your theme, but keep in mind that many core components are using the UI store.
+We are using Vuex to store the application interface state. The [store file](https://github.com/DivanteLtd/vue-storefront/blob/master/core/store/index.ts) contains the information about the state of different pieces of UI, such as overlay visibility, wishlist visibility, etc. Of course, you are not forced to make use of it in your theme, but keep in mind that many core components are using the UI store.
 
 ## State object
 

From a28c06a828c76cc032af87d9b670547fa35b9d43 Mon Sep 17 00:00:00 2001
From: pmaureatelabs <pm@aureatelabs.com>
Date: Tue, 18 Jun 2019 14:46:51 +0530
Subject: [PATCH 24/47] Update translations.md

Update path of a theme directory
---
 docs/guide/core-themes/translations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/core-themes/translations.md b/docs/guide/core-themes/translations.md
index 0ff36f0a6f..335e885814 100644
--- a/docs/guide/core-themes/translations.md
+++ b/docs/guide/core-themes/translations.md
@@ -29,7 +29,7 @@ For all helper methods and directives, along with available parameters, please d
 
 ## Working with translations
 
-Translations are provided in `i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `theme/resource/i18n/en-US.csv` accordingly.
+Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/[your-theme]/resource/i18n/en-US.csv` accordingly.
 
 Here's an example of `en-US.csv` for `en-US` locale:
 
@@ -45,7 +45,7 @@ Here's an example of `en-US.csv` for `en-US` locale:
 "Vue Storefront Logo", "Vue Storefront Logo"
 ```
 
-when you create the `en-US.csv` file within your `theme/resource/i18n/` folder and override some messages like:
+when you create the `en-US.csv` file within your `src/themes/[your-theme]/resource/i18n/` folder and override some messages like:
 
 ```csv
 "customMessage","You can define or override translation messages here."

From 2d77be73ca2fb84a37380f39f14808a92fbd441a Mon Sep 17 00:00:00 2001
From: pmaureatelabs <pm@aureatelabs.com>
Date: Tue, 18 Jun 2019 15:07:53 +0530
Subject: [PATCH 25/47] Edit translations.md

Update theme name directive
---
 docs/guide/core-themes/translations.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/guide/core-themes/translations.md b/docs/guide/core-themes/translations.md
index 335e885814..e213e17245 100644
--- a/docs/guide/core-themes/translations.md
+++ b/docs/guide/core-themes/translations.md
@@ -29,7 +29,7 @@ For all helper methods and directives, along with available parameters, please d
 
 ## Working with translations
 
-Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/[your-theme]/resource/i18n/en-US.csv` accordingly.
+Translations are provided in `core/i18n/resource/i18n/en-US.csv` file and can be extended / overridden in `src/themes/{themename}/resource/i18n/en-US.csv` accordingly.
 
 Here's an example of `en-US.csv` for `en-US` locale:
 
@@ -45,7 +45,7 @@ Here's an example of `en-US.csv` for `en-US` locale:
 "Vue Storefront Logo", "Vue Storefront Logo"
 ```
 
-when you create the `en-US.csv` file within your `src/themes/[your-theme]/resource/i18n/` folder and override some messages like:
+when you create the `en-US.csv` file within your `src/themes/{themename}/resource/i18n/` folder and override some messages like:
 
 ```csv
 "customMessage","You can define or override translation messages here."

From f2465196bb1d7a6265d85901b309c6d5e326e729 Mon Sep 17 00:00:00 2001
From: Chirag Viradiya <viradiyachirag91@gmail.com>
Date: Thu, 20 Jun 2019 11:34:30 +0530
Subject: [PATCH 26/47] Add missing i18n for payment-cash-on-delivery module

---
 core/i18n/resource/i18n/en-US.csv                        | 1 +
 src/modules/payment-cash-on-delivery/components/Info.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/i18n/resource/i18n/en-US.csv b/core/i18n/resource/i18n/en-US.csv
index 1fc8064bdf..2bdd77c5dc 100644
--- a/core/i18n/resource/i18n/en-US.csv
+++ b/core/i18n/resource/i18n/en-US.csv
@@ -74,3 +74,4 @@
 "Quantity must be above 0","Quantity must be above 0"
 "Error: Error while adding products","Error: Error while adding products"
 "Unexpected authorization error. Check your Network conection.","Unexpected authorization error. Check your Network conection."
+"You are going to pay for this order upon delivery.","You are going to pay for this order upon delivery."
diff --git a/src/modules/payment-cash-on-delivery/components/Info.vue b/src/modules/payment-cash-on-delivery/components/Info.vue
index 32d3328025..d04dec6dad 100644
--- a/src/modules/payment-cash-on-delivery/components/Info.vue
+++ b/src/modules/payment-cash-on-delivery/components/Info.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="mb15 mt20 payment-cash-on-delivery-info-container">
     <h4 class="mt0">
-      Payment Information
+      $t('Payment Information')
     </h4>
     <div class="bg-cl-secondary px20 py20">
       <p>
-        You are going to pay for this order upon delivery.
+        $t('You are going to pay for this order upon delivery.')
       </p>
     </div>
   </div>

From 81664754d57d4e0b613777026bca0c8642323e3a Mon Sep 17 00:00:00 2001
From: Nils Preuss <nils.preuss@gmx.net>
Date: Fri, 21 Jun 2019 15:05:27 +0200
Subject: [PATCH 27/47] Fix german translation as they were strange

They felt like some autotranslate.
---
 src/themes/default/resource/i18n/de-DE.csv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/resource/i18n/de-DE.csv b/src/themes/default/resource/i18n/de-DE.csv
index 4aeef4f43a..2662b31280 100644
--- a/src/themes/default/resource/i18n/de-DE.csv
+++ b/src/themes/default/resource/i18n/de-DE.csv
@@ -206,8 +206,8 @@
 "Type","Typ"
 "Status","Status"
 "Purchase","Kaufen"
-"View order","Anzeigereihenfolge"
-"Remake order","Reihenfolge der Nachfertigung"
+"View order","Bestllung ansehen"
+"Remake order","Nachbestellen"
 "No orders yet","Noch keine Bestellungen"
 "Order #","Bestellung #"
 "Items ordered","Bestellte Artikel"

From 08c269f0904cd88069d9e6239425e09f47adb8e0 Mon Sep 17 00:00:00 2001
From: Daan Kouters <daan@getnoticed.nl>
Date: Sat, 22 Jun 2019 21:56:34 +0200
Subject: [PATCH 28/47] Convert cart_id to string

---
 core/pages/Checkout.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index c9c6009a50..f82f26df5d 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -261,7 +261,7 @@ export default {
     prepareOrder () {
       this.order = {
         user_id: this.$store.state.user.current ? this.$store.state.user.current.id.toString() : '',
-        cart_id: this.$store.state.cart.cartServerToken ? this.$store.state.cart.cartServerToken : '',
+        cart_id: this.$store.state.cart.cartServerToken ? this.$store.state.cart.cartServerToken.toString() : '',
         products: this.$store.state.cart.cartItems,
         addressInformation: {
           billingAddress: {

From 10b4c28c3811bd65dfeed64bd174c81437ed6d75 Mon Sep 17 00:00:00 2001
From: Daan Kouters <daan@getnoticed.nl>
Date: Mon, 24 Jun 2019 11:22:57 +0200
Subject: [PATCH 29/47] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e20ca55e59..a4307d93d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,6 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.10.0-rc.1] - 2019.06.19
 
 ### Added
+- Cast cart_id as string - Order schema expects string, Magento does not generate a string as cart id in any case
 - Make installer work for windows - @Flyingmana (#2616)
 - "Clear cart" button in the cart - @jablpiotrek (#2587)
 - Global config api path under `api.url` - @BartoszLiburski (#2622)

From 2a1fe4dd36448528e40b352500a87579d0416499 Mon Sep 17 00:00:00 2001
From: michasik <mlukasik@divante.co>
Date: Mon, 24 Jun 2019 11:23:09 +0200
Subject: [PATCH 30/47] Refactors refactorProductLink method to handle filtered
 products links from category

---
 core/modules/url/helpers/index.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/modules/url/helpers/index.ts b/core/modules/url/helpers/index.ts
index 324b595501..3f2094c2b5 100644
--- a/core/modules/url/helpers/index.ts
+++ b/core/modules/url/helpers/index.ts
@@ -63,13 +63,14 @@ export function formatProductLink (
     url_path?: string,
     type_id: string,
     slug: string,
-    options: []
+    options?: [],
+    configurable_children?: []
   },
   storeCode
 ): string | LocalizedRoute {
   if (config.seo.useUrlDispatcher && product.url_path) {
     let routeData: LocalizedRoute;
-    if (product.options && product.options.length > 0) {
+    if ((product.options && product.options.length > 0) || (product.configurable_children && product.configurable_children.length > 0)) {
       routeData = {
         fullPath: product.url_path,
         params: { childSku: product.sku }

From 2985d0088393ca6ccb083022352416609bfb5e50 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 25 Jun 2019 13:39:45 +0200
Subject: [PATCH 31/47] Added function for getting the real host when request
 is proxied

Apache2 changes the host header and writes the original into the
x-forwarded-host header so we need to check bothe headers.
---
 core/server-entry.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/server-entry.ts b/core/server-entry.ts
index 83c63656be..ddfb185c67 100755
--- a/core/server-entry.ts
+++ b/core/server-entry.ts
@@ -58,6 +58,10 @@ function _ssrHydrateSubcomponents (components, store, router, resolve, reject, a
   })
 }
 
+function getHostFromHeader (headers: string[]): string {
+  return headers['x-forwarded-host'] !== undefined ? headers['x-forwarded-host'] : headers['host']
+}
+
 export default async context => {
   const { app, router, store } = await createApp(context, context.vs && context.vs.config ? context.vs.config : buildTimeConfig)
   return new Promise((resolve, reject) => {
@@ -69,7 +73,8 @@ export default async context => {
       if (config.storeViews.multistore === true) {
         let storeCode = context.vs.storeCode // this is from http header or env variable
         if (storeCode === undefined && router.currentRoute) { // this is from url
-          const currentRoute = Object.assign({}, router.currentRoute, {host: context.server.request.headers.host})
+          const host = getHostFromHeader(context.server.request.headers)
+          const currentRoute = Object.assign({}, router.currentRoute, { host })
           storeCode = storeCodeFromRoute(currentRoute)
         }
         if (storeCode !== '' && storeCode !== null) {

From 8db61f03fe8ed2b9b6069049fa8454c94bfb89f0 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 25 Jun 2019 13:52:35 +0200
Subject: [PATCH 32/47] Added change log entry

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d192a47ce1..5bda2dfba5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.11.0-rc.1] - UNRELEASED
 
 ### Added
--
+- Apache2 proxy header support for store based on host @resubka (#3143)
 
 ### Fixed
 - Fixed product link in wishlist and microcart - @michasik (#2987)

From dc27a2650271dd7bda72495e5bf0d3ff62661479 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 25 Jun 2019 13:53:35 +0200
Subject: [PATCH 33/47] Fixed typo in changelog.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5bda2dfba5..e76ad25379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.11.0-rc.1] - UNRELEASED
 
 ### Added
-- Apache2 proxy header support for store based on host @resubka (#3143)
+- Apache2 proxy header support for store based on host @resubaka (#3143)
 
 ### Fixed
 - Fixed product link in wishlist and microcart - @michasik (#2987)

From cd13ebee445711dbbadd73ab04f8097bf0661aa6 Mon Sep 17 00:00:00 2001
From: Tomasz Kikowski <tomaszkikowski@gmail.com>
Date: Wed, 26 Jun 2019 07:33:24 +0200
Subject: [PATCH 34/47] Changes in getting CMS blocks from cache

---
 core/modules/cms/store/block/actions.ts | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/core/modules/cms/store/block/actions.ts b/core/modules/cms/store/block/actions.ts
index ac900572ef..6091a17aff 100644
--- a/core/modules/cms/store/block/actions.ts
+++ b/core/modules/cms/store/block/actions.ts
@@ -54,7 +54,11 @@ const actions: ActionTree<CmsBlockState, RootState> = {
    */
   single (context, { key = 'identifier', value, excludeFields = null, includeFields = null, skipCache = false }) {
     const state = context.state
-    if (skipCache || (!state.items || state.items.length === 0)) {
+    let cmsBlock = []
+    if (state.items && state.items.length > 0) {
+      cmsBlock = state.items.filter(item => item[key] === value)
+    }
+    if (skipCache || cmsBlock.length === 0) {
       let query = new SearchQuery()
       if (value) {
         query = query.applyFilter({key: key, value: {'like': value}})
@@ -69,16 +73,7 @@ const actions: ActionTree<CmsBlockState, RootState> = {
         })
     } else {
       return new Promise((resolve, reject) => {
-        if (state.items.length > 0) {
-          let cmsBlock = state.items.find((itm) => { return itm[key] === value })
-          if (cmsBlock) {
-            resolve(cmsBlock)
-          } else {
-            reject(new Error('CMS block query returned empty result ' + key + ' = ' + value))
-          }
-        } else {
-          resolve()
-        }
+        resolve(cmsBlock[0])
       })
     }
   },

From 3ebd967a8142cd9244da0b35320d3309b808e09c Mon Sep 17 00:00:00 2001
From: Tomasz Kikowski <tomaszkikowski@gmail.com>
Date: Wed, 26 Jun 2019 07:41:00 +0200
Subject: [PATCH 35/47] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1054bff245..4cae2f6470 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -64,6 +64,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Multiple instances for searchAdapter invocations - @bratok (#2960)
 - Fixed issue with login popup state not resetting on mobile devices - @aniamusial (#2699)
 - Fix sortBy for the category page - @Jensderond (#2868)
+- Resolve problem with getting CMS block from cache - @qiqqq (#2499)
 
 ### Changed / Improved
 - The action `cart/userAfterLoggedin` got renamed to `cart/authorize` - @pkarw (#2522)

From c2a3bba1ef03580034cac86234ef396cbd796f9d Mon Sep 17 00:00:00 2001
From: David Grimason <d.grimason@wonect.com>
Date: Wed, 26 Jun 2019 15:07:09 +0900
Subject: [PATCH 36/47] Enable choice of transition for Modal content. Also
 scope Modal scss

---
 src/themes/default/components/core/Modal.vue | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/Modal.vue b/src/themes/default/components/core/Modal.vue
index df3b7e2724..2e020ffb72 100644
--- a/src/themes/default/components/core/Modal.vue
+++ b/src/themes/default/components/core/Modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <transition name="fade-in-down">
+  <transition :name="transitionName">
     <div
       class="modal"
       v-if="isVisible"
@@ -93,6 +93,10 @@ export default {
     width: {
       type: Number,
       default: 0
+    },
+    transitionName: {
+      type: String,
+      default: 'fade-in-down'
     }
   },
   computed: {
@@ -103,7 +107,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 @import '~theme/css/base/global_vars';
 $z-index-modal: map-get($z-index, modal);
 

From 57156ab868b26285a5e77cb1520f8399273252f0 Mon Sep 17 00:00:00 2001
From: David Grimason <d.grimason@wonect.com>
Date: Wed, 26 Jun 2019 15:32:37 +0900
Subject: [PATCH 37/47] Changelog for this PR

---
 CHANGELOG.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d192a47ce1..4f305ffaea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,7 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed product link in wishlist and microcart - @michasik (#2987)
 
 ### Changed / Improved
--
+- Can set transition style for Modal content - @grimasod (#3146)
 
 ## [1.10.0-rc.1] - 2019.06.19
 
@@ -110,8 +110,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Product video - retrieve video id from 'video_id' field (if set) instead of 'id' - @afirlejczyk
 - Webpack config improvement - @yogeshsuhagiya (#2689)
 - BaseSelect input event - @ResuBaka (#2683)
-- Fixed static file handler to immediately return 404 status for missing files - @grimason (#2685)
-- Fixed maxAge Response Header for static files and Content-Type for Service Worker - @grimason (#2686)
+- Fixed static file handler to immediately return 404 status for missing files - @grimasod (#2685)
+- Fixed maxAge Response Header for static files and Content-Type for Service Worker - @grimasod (#2686)
 - Default log verbosity is changed to show only errors - @lromanowicz (#2717)
 - Remembering last search query - @webdiver, @patzick (#2787)
 - Extracted ProductImage component to support faster images loading - @przemyslawspaczek (#2925)

From 8b70c8135b6e727bbfa501a95c94c0e7ee012039 Mon Sep 17 00:00:00 2001
From: Daan Kouters <daan@getnoticed.nl>
Date: Wed, 26 Jun 2019 11:32:34 +0200
Subject: [PATCH 38/47] Update CHANGELOG.md

Co-Authored-By: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2fba1ba2d5..26b82f024e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.10.0-rc.1] - 2019.06.19
 
 ### Added
-- Cast cart_id as string - Order schema expects string, Magento does not generate a string as cart id in any case
+- Cast cart_id as string - Order schema expects string, Magento does not generate a string as cart id in any case - @DaanKouters (#3097)
 - Make installer work for windows - @Flyingmana (#2616)
 - "Clear cart" button in the cart - @jablpiotrek (#2587)
 - Global config api path under `api.url` - @BartoszLiburski (#2622)

From 6b86d5268154bbb209fb335d978264695a8a8fef Mon Sep 17 00:00:00 2001
From: Daan Kouters <daan@getnoticed.nl>
Date: Wed, 26 Jun 2019 11:33:55 +0200
Subject: [PATCH 39/47] Update changelog

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26b82f024e..f49ec8e1e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -19,7 +19,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.10.0-rc.1] - 2019.06.19
 
 ### Added
-- Cast cart_id as string - Order schema expects string, Magento does not generate a string as cart id in any case - @DaanKouters (#3097)
+- Cast cart_id as string - Order schema expects string, Magento does not generate a string as cart id in every case - @DaanKouters (#3097)
 - Make installer work for windows - @Flyingmana (#2616)
 - "Clear cart" button in the cart - @jablpiotrek (#2587)
 - Global config api path under `api.url` - @BartoszLiburski (#2622)

From e08e9b8023c8efa7c504bbba96e25d934ac7bd82 Mon Sep 17 00:00:00 2001
From: przspa <pspaczek@divante.co>
Date: Wed, 26 Jun 2019 12:01:29 +0200
Subject: [PATCH 40/47] Fixed attribute name

---
 core/pages/Category.js     | 2 +-
 core/pages/Checkout.js     | 2 +-
 core/pages/CmsPage.js      | 2 +-
 core/pages/Error.js        | 2 +-
 core/pages/Home.js         | 2 +-
 core/pages/MyAccount.js    | 2 +-
 core/pages/PageNotFound.js | 2 +-
 core/pages/Product.js      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/pages/Category.js b/core/pages/Category.js
index cbb70e8bd4..c88dbc7e5e 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -287,7 +287,7 @@ export default {
         }
       ],
       title: htmlDecode(this.category.meta_title || this.categoryName),
-      meta: this.category.meta_description ? [{ vmid: 'description', description: htmlDecode(this.category.meta_description) }] : []
+      meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [{ vmid: 'description', description: htmlDecode(this.categoryName) }]
     }
   }
 }
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index c9c6009a50..7818051750 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -337,7 +337,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Checkout'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
diff --git a/core/pages/CmsPage.js b/core/pages/CmsPage.js
index 1b6027dd50..d77bc3a245 100644
--- a/core/pages/CmsPage.js
+++ b/core/pages/CmsPage.js
@@ -39,7 +39,7 @@ export default {
   metaInfo () {
     return {
       title: htmlDecode(this.pageTitle || this.$route.meta.title),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: htmlDecode(this.$route.meta.description) }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: htmlDecode(this.$route.meta.description) }] : []
     }
   }
 }
diff --git a/core/pages/Error.js b/core/pages/Error.js
index a71248b9dd..2d067da4f2 100644
--- a/core/pages/Error.js
+++ b/core/pages/Error.js
@@ -15,7 +15,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Internal Server Error 500'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/Home.js b/core/pages/Home.js
index fba85241e3..127e707167 100644
--- a/core/pages/Home.js
+++ b/core/pages/Home.js
@@ -31,7 +31,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Home Page'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js
index f4fc098a54..14a3e2dcc2 100644
--- a/core/pages/MyAccount.js
+++ b/core/pages/MyAccount.js
@@ -44,7 +44,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('My Account'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js
index 915f525b94..a45250ba98 100644
--- a/core/pages/PageNotFound.js
+++ b/core/pages/PageNotFound.js
@@ -23,7 +23,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('404 Page Not Found'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', description: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/Product.js b/core/pages/Product.js
index 76861acdff..5f1e6a0150 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -241,7 +241,7 @@ export default {
         }
       ],
       title: htmlDecode(this.product.meta_title || this.productName),
-      meta: this.product.meta_description ? [{ vmid: 'description', description: htmlDecode(this.product.meta_description) }] : []
+      meta: this.product.meta_description ? [{ vmid: 'description', content: htmlDecode(this.product.meta_description) }] : []
     }
   }
 }

From 9647ee5d4de68385a85957eeafcfe8ad94cca7bd Mon Sep 17 00:00:00 2001
From: przspa <pspaczek@divante.co>
Date: Wed, 26 Jun 2019 12:02:42 +0200
Subject: [PATCH 41/47] Removed test case

---
 core/pages/Category.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/pages/Category.js b/core/pages/Category.js
index c88dbc7e5e..dedb5b3a3e 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -287,7 +287,7 @@ export default {
         }
       ],
       title: htmlDecode(this.category.meta_title || this.categoryName),
-      meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : [{ vmid: 'description', description: htmlDecode(this.categoryName) }]
+      meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : []
     }
   }
 }

From 3073b4cdfb6f9b9e3c02f519c2e35a673e009e12 Mon Sep 17 00:00:00 2001
From: przspa <pspaczek@divante.co>
Date: Wed, 26 Jun 2019 12:16:34 +0200
Subject: [PATCH 42/47] Updated changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c8be2f903..c7319a4257 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -74,6 +74,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Logo on the Error page has been fixed - @przspa (#3077)
 - No placeholders / no photos for Get Inspire section in offline - @przspa (#3072)
 - Back icon on product page causing inconsistent behavior - @patzick (#3056)
+- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) 
 
 ### Changed / Improved
 - The `cart/sync`, `cart/addItems`, `cart/removeItem` and `cart/updateQuantity` now returns the `diffLog` object with all the notifications, server statuses and items changed during the shopping cart sync

From bc2722673fa4df62a233c547531aeb9fbe857d0c Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Wed, 26 Jun 2019 15:57:58 +0200
Subject: [PATCH 43/47] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e76ad25379..29216c315e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.11.0-rc.1] - UNRELEASED
 
 ### Added
-- Apache2 proxy header support for store based on host @resubaka (#3143)
+- Apache2 proxy header support for store based on host - @resubaka (#3143)
 
 ### Fixed
 - Fixed product link in wishlist and microcart - @michasik (#2987)

From 6cd0938406500c345a9fa482be00f1ae57bd03c8 Mon Sep 17 00:00:00 2001
From: przspa <pspaczek@divante.co>
Date: Thu, 27 Jun 2019 10:21:55 +0200
Subject: [PATCH 44/47] Fixed myAccountLinks SubCategory position from fixed to
 absolute

---
 .../default/components/core/blocks/SidebarMenu/SubCategory.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
index 3b68a3b9f0..e06d01d2fb 100644
--- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
+++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
@@ -48,7 +48,7 @@
     </ul>
     <ul
       v-if="myAccountLinks"
-      class="sidebar-submenu fixed w-100 p0 bg-cl-primary"
+      class="sidebar-submenu absolute w-100 p0 bg-cl-primary"
       :style="styles"
     >
       <li

From 996890013a892c35578bc92b82434faad830c50d Mon Sep 17 00:00:00 2001
From: przspa <pspaczek@divante.co>
Date: Thu, 27 Jun 2019 12:55:44 +0200
Subject: [PATCH 45/47] Added name attribute to meta description override
 function

---
 core/pages/Category.js     | 2 +-
 core/pages/Checkout.js     | 2 +-
 core/pages/CmsPage.js      | 2 +-
 core/pages/Error.js        | 2 +-
 core/pages/Home.js         | 2 +-
 core/pages/MyAccount.js    | 2 +-
 core/pages/PageNotFound.js | 2 +-
 core/pages/Product.js      | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/pages/Category.js b/core/pages/Category.js
index dedb5b3a3e..7d01c57e46 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -287,7 +287,7 @@ export default {
         }
       ],
       title: htmlDecode(this.category.meta_title || this.categoryName),
-      meta: this.category.meta_description ? [{ vmid: 'description', content: htmlDecode(this.category.meta_description) }] : []
+      meta: this.category.meta_description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.category.meta_description) }] : []
     }
   }
 }
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index 7818051750..9fc1b0e885 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -337,7 +337,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Checkout'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
diff --git a/core/pages/CmsPage.js b/core/pages/CmsPage.js
index d77bc3a245..e505cefcfe 100644
--- a/core/pages/CmsPage.js
+++ b/core/pages/CmsPage.js
@@ -39,7 +39,7 @@ export default {
   metaInfo () {
     return {
       title: htmlDecode(this.pageTitle || this.$route.meta.title),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: htmlDecode(this.$route.meta.description) }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.$route.meta.description) }] : []
     }
   }
 }
diff --git a/core/pages/Error.js b/core/pages/Error.js
index 2d067da4f2..5f5bfc3832 100644
--- a/core/pages/Error.js
+++ b/core/pages/Error.js
@@ -15,7 +15,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Internal Server Error 500'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/Home.js b/core/pages/Home.js
index 127e707167..2f82029f99 100644
--- a/core/pages/Home.js
+++ b/core/pages/Home.js
@@ -31,7 +31,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('Home Page'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/MyAccount.js b/core/pages/MyAccount.js
index 14a3e2dcc2..73808509cd 100644
--- a/core/pages/MyAccount.js
+++ b/core/pages/MyAccount.js
@@ -44,7 +44,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('My Account'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
     }
   },
   asyncData ({ store, route, context }) { // this is for SSR purposes to prefetch data
diff --git a/core/pages/PageNotFound.js b/core/pages/PageNotFound.js
index a45250ba98..f84e0e7651 100644
--- a/core/pages/PageNotFound.js
+++ b/core/pages/PageNotFound.js
@@ -23,7 +23,7 @@ export default {
   metaInfo () {
     return {
       title: this.$route.meta.title || i18n.t('404 Page Not Found'),
-      meta: this.$route.meta.description ? [{ vmid: 'description', content: this.$route.meta.description }] : []
+      meta: this.$route.meta.description ? [{ vmid: 'description', name: 'description', content: this.$route.meta.description }] : []
     }
   }
 }
diff --git a/core/pages/Product.js b/core/pages/Product.js
index 5f1e6a0150..a5b85e9160 100644
--- a/core/pages/Product.js
+++ b/core/pages/Product.js
@@ -241,7 +241,7 @@ export default {
         }
       ],
       title: htmlDecode(this.product.meta_title || this.productName),
-      meta: this.product.meta_description ? [{ vmid: 'description', content: htmlDecode(this.product.meta_description) }] : []
+      meta: this.product.meta_description ? [{ vmid: 'description', name: 'description', content: htmlDecode(this.product.meta_description) }] : []
     }
   }
 }

From 4963b4f9ffdff1421da80763f757f4f71f70873c Mon Sep 17 00:00:00 2001
From: David Grimason <d.grimason@wonect.com>
Date: Fri, 28 Jun 2019 12:02:00 +0900
Subject: [PATCH 46/47] Doc update for transition prop

---
 docs/guide/components/modal.md | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/guide/components/modal.md b/docs/guide/components/modal.md
index 56dd3852a0..632c5a5b42 100644
--- a/docs/guide/components/modal.md
+++ b/docs/guide/components/modal.md
@@ -22,10 +22,12 @@ Simple modal component. Visibility of modal container is based on internal state
 
 ### Available props
 
-| Prop  | Type   | Required | Default | Description           |
-| ----- | ------ | -------- | ------- | --------------------- |
-| name  | String | true     |         | Unique name of modal  |
-| delay | Number | false    | 300     | Timeout to show modal |
+| Prop           | Type   | Required | Default        | Description                                |
+| -------------- | ------ | -------- | -------------- | ------------------------------------------ |
+| name           | String | true     |                | Unique name of modal                       |
+| delay          | Number | false    | 300            | Timeout to show modal                      |
+| width          | Number | false    | 0              | Optional fixed width of content, in pixels |
+| transitionName | String | false    | 'fade-in-down' | Content transition style                   |
 
 ### Available Methods
 
@@ -37,3 +39,15 @@ Simple modal component. Visibility of modal container is based on internal state
 ### Styles
 
 Core component doesn't have CSS styles. If you want to see an example of our implementation please look [here](https://github.com/DivanteLtd/vue-storefront/blob/master/src/themes/default/components/core/Modal.vue)
+
+### Transitions
+
+The default theme defines one transition, `fade-in-down`, which can be seen [here](https://github.com/DivanteLtd/vue-storefront/blob/master/src/themes/default/css/animations/_transitions.scss). This is the default value for the `transitionName` prop. Further transitions can be defined in a custom theme by following this example. Vue transitions are explained [here](https://vuejs.org/v2/guide/transitions.html).
+
+To have modal content display immediately, without any transition, just supply an empty string for the `transitionName` prop. For example:
+
+```html
+<modal name="modal-example" transition-name="" :delay="0" :width="600">
+  <!-- modal content goes here -->
+</modal>
+```

From aeb363402e9c55f15634808ea06eb688b30fa7a0 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Fri, 28 Jun 2019 09:23:23 +0200
Subject: [PATCH 47/47] Update CHANGELOG.md

---
 CHANGELOG.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c7319a4257..e4205e25e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 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.10.0-rc.2] - UNRELEASED
+
+### Fixed
+- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) 
+
 ## [1.10.0-rc.1] - 2019.06.19
 
 ### Added
@@ -74,7 +79,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Logo on the Error page has been fixed - @przspa (#3077)
 - No placeholders / no photos for Get Inspire section in offline - @przspa (#3072)
 - Back icon on product page causing inconsistent behavior - @patzick (#3056)
-- Fixed wrong meta description attribute by page overwrite - @przspa (#3091) 
 
 ### Changed / Improved
 - The `cart/sync`, `cart/addItems`, `cart/removeItem` and `cart/updateQuantity` now returns the `diffLog` object with all the notifications, server statuses and items changed during the shopping cart sync