From 98d7cf540819ee05193ad49d6bd3b8ca41aca2f0 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Fri, 27 Sep 2019 18:29:44 +0200
Subject: [PATCH 01/99] save the payment methods returned on updateTotals to
 state.

---
 core/modules/cart/helpers/createOrderData.ts        |  9 +++++++++
 core/modules/cart/helpers/createShippingInfoData.ts |  3 +++
 core/modules/cart/store/actions/totalsActions.ts    | 10 ++++++++--
 core/modules/cart/types/BillingAddress.ts           |  8 ++++++++
 core/modules/cart/types/CheckoutData.ts             |  2 ++
 core/modules/cart/types/OrderShippingDetails.ts     |  4 +++-
 6 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 core/modules/cart/types/BillingAddress.ts

diff --git a/core/modules/cart/helpers/createOrderData.ts b/core/modules/cart/helpers/createOrderData.ts
index d79e382425..37c12e34ac 100644
--- a/core/modules/cart/helpers/createOrderData.ts
+++ b/core/modules/cart/helpers/createOrderData.ts
@@ -21,6 +21,7 @@ const createOrderData = ({
   shippingDetails,
   shippingMethods,
   paymentMethods,
+  paymentDetails,
   taxCountry = currentStoreView().tax.defaultCountry
 }: CheckoutData): OrderShippingDetails => {
   const country = shippingDetails.country ? shippingDetails.country : taxCountry
@@ -36,6 +37,14 @@ const createOrderData = ({
       postcode: shippingDetails.zipCode,
       street: [shippingDetails.streetAddress]
     },
+    billingAddress: {
+      firstname: paymentDetails.firstName,
+      lastname: paymentDetails.lastName,
+      city: paymentDetails.city,
+      postcode: paymentDetails.zipCode,
+      street: [paymentDetails.streetAddress],
+      countryId: paymentDetails.country
+    },
     method_code: shipping && shipping.method_code ? shipping.method_code : null,
     carrier_code: shipping && shipping.carrier_code ? shipping.carrier_code : null,
     payment_method: payment && payment.code ? payment.code : null
diff --git a/core/modules/cart/helpers/createShippingInfoData.ts b/core/modules/cart/helpers/createShippingInfoData.ts
index 394cfc86ed..e42b0f19ff 100644
--- a/core/modules/cart/helpers/createShippingInfoData.ts
+++ b/core/modules/cart/helpers/createShippingInfoData.ts
@@ -3,6 +3,9 @@ const createShippingInfoData = (methodsData) => ({
     countryId: methodsData.country,
     ...(methodsData.shippingAddress ? methodsData.shippingAddress : {})
   },
+  billingAddress: {
+    ...(methodsData.billingAddress ? methodsData.billingAddress : {})
+  },
   shippingCarrierCode: methodsData.carrier_code,
   shippingMethodCode: methodsData.method_code
 });
diff --git a/core/modules/cart/store/actions/totalsActions.ts b/core/modules/cart/store/actions/totalsActions.ts
index a31379d674..ade4bd8344 100644
--- a/core/modules/cart/store/actions/totalsActions.ts
+++ b/core/modules/cart/store/actions/totalsActions.ts
@@ -15,7 +15,7 @@ const totalsActions = {
 
     return CartService.getTotals()
   },
-  async overrideServerTotals ({ commit, dispatch }, { addressInformation, hasShippingInformation }) {
+  async overrideServerTotals ({ commit, getters, dispatch }, { addressInformation, hasShippingInformation }) {
     const { resultCode, result } = await dispatch('getTotals', { addressInformation, hasShippingInformation })
 
     if (resultCode === 200) {
@@ -32,6 +32,11 @@ const totalsActions = {
       commit(types.CART_UPD_TOTALS, { itemsAfterTotal, totals, platformTotalSegments: totals.total_segments })
       commit(types.CART_SET_TOTALS_SYNC)
 
+      // we received payment methods as a result of this call, updating state
+      if (getters.canUpdateMethods) {
+        dispatch('checkout/replacePaymentMethods', result.payment_methods, { root: true })
+      }
+
       return
     }
 
@@ -45,7 +50,8 @@ const totalsActions = {
       const shippingMethodsData = methodsData || createOrderData({
         shippingDetails: rootGetters['checkout/getShippingDetails'],
         shippingMethods: rootGetters['checkout/getShippingMethods'],
-        paymentMethods: rootGetters['checkout/getPaymentMethods']
+        paymentMethods: rootGetters['checkout/getPaymentMethods'],
+        paymentDetails: rootGetters['checkout/getPaymentDetails']
       })
 
       if (shippingMethodsData.country) {
diff --git a/core/modules/cart/types/BillingAddress.ts b/core/modules/cart/types/BillingAddress.ts
new file mode 100644
index 0000000000..18d17cc487
--- /dev/null
+++ b/core/modules/cart/types/BillingAddress.ts
@@ -0,0 +1,8 @@
+export default interface ShippingAddress {
+  firstname: string,
+  lastname: string,
+  city: string,
+  postcode: string,
+  street: string[],
+  countryId: string
+}
diff --git a/core/modules/cart/types/CheckoutData.ts b/core/modules/cart/types/CheckoutData.ts
index feac99cb00..4e2c5c676e 100644
--- a/core/modules/cart/types/CheckoutData.ts
+++ b/core/modules/cart/types/CheckoutData.ts
@@ -1,10 +1,12 @@
 import ShippingDetails from '@vue-storefront/core/modules/checkout/types/ShippingDetails'
 import ShippingMethod from './ShippingMethod'
 import PaymentMethod from './PaymentMethod'
+import PaymentDetails from '@vue-storefront/core/modules/checkout/types/PaymentDetails'
 
 export default interface CheckoutData {
   shippingDetails: ShippingDetails,
   shippingMethods: ShippingMethod[],
   paymentMethods: PaymentMethod[],
+  paymentDetails: PaymentDetails,
   taxCountry?: string
 }
diff --git a/core/modules/cart/types/OrderShippingDetails.ts b/core/modules/cart/types/OrderShippingDetails.ts
index a455dda4d2..ebfc2005c5 100644
--- a/core/modules/cart/types/OrderShippingDetails.ts
+++ b/core/modules/cart/types/OrderShippingDetails.ts
@@ -1,9 +1,11 @@
 import ShippingAddress from './ShippingAddress'
+import BillingAddress from './BillingAddress'
 
 export default interface OrderShippingDetails {
   country?: string,
   method_code?: string,
   carrier_code?: string,
   payment_method?: string,
-  shippingAddress?: ShippingAddress
+  shippingAddress?: ShippingAddress,
+  billingAddress?: BillingAddress
 }

From 103d231b7f1b2c7af58a2f9138bede0bea5c261a Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Sat, 28 Sep 2019 12:05:35 +0200
Subject: [PATCH 02/99] feat: moved trace logic to a server.onLoad hook

---
 core/scripts/server.ts                                   | 9 +++++----
 .../googleCloud => modules/google-cloud-trace}/index.js  | 0
 .../google-cloud-trace}/package.json                     | 0
 src/modules/server.ts                                    | 8 ++++++++
 src/trace/index.js                                       | 6 ------
 5 files changed, 13 insertions(+), 10 deletions(-)
 rename src/{trace/googleCloud => modules/google-cloud-trace}/index.js (100%)
 rename src/{trace/googleCloud => modules/google-cloud-trace}/package.json (100%)
 delete mode 100644 src/trace/index.js

diff --git a/core/scripts/server.ts b/core/scripts/server.ts
index fde457d835..7892c232f9 100755
--- a/core/scripts/server.ts
+++ b/core/scripts/server.ts
@@ -1,16 +1,17 @@
-require('../../src/trace').default()
+import { serverHooksExecutors } from '@vue-storefront/core/server/hooks'
 const path = require('path')
-const express = require('express')
-const ms = require('ms')
 const rootPath = require('app-root-path').path
 const resolve = file => path.resolve(rootPath, file)
+const serverExtensions = require(resolve('src/modules/server'))
+serverHooksExecutors.onLoad()
+const express = require('express')
+const ms = require('ms')
 const request = require('request');
 
 const cache = require('./utils/cache-instance')
 const apiStatus = require('./utils/api-status')
 const HTMLContent = require('../pages/Compilation')
 const ssr = require('./utils/ssr-renderer')
-const serverExtensions = require(resolve('src/modules/server'))
 let config = require('config')
 
 const compileOptions = {
diff --git a/src/trace/googleCloud/index.js b/src/modules/google-cloud-trace/index.js
similarity index 100%
rename from src/trace/googleCloud/index.js
rename to src/modules/google-cloud-trace/index.js
diff --git a/src/trace/googleCloud/package.json b/src/modules/google-cloud-trace/package.json
similarity index 100%
rename from src/trace/googleCloud/package.json
rename to src/modules/google-cloud-trace/package.json
diff --git a/src/modules/server.ts b/src/modules/server.ts
index b2f626e4c3..da750abca1 100644
--- a/src/modules/server.ts
+++ b/src/modules/server.ts
@@ -1,5 +1,13 @@
+import { serverHooks } from '@vue-storefront/core/server/hooks'
 const isProd = process.env.NODE_ENV === 'production'
 
+serverHooks.onLoad(() => {
+  /**
+   * example usage
+   * require('./google-cloud-trace')
+   */
+})
+
 export const serverModules = [
   'src/modules/robots'
   // ['src/modules/compress', { enabled: isProd }]
diff --git a/src/trace/index.js b/src/trace/index.js
deleted file mode 100644
index 9335b3646e..0000000000
--- a/src/trace/index.js
+++ /dev/null
@@ -1,6 +0,0 @@
-module.exports.default = () => {
-  /**
-   * example usage
-   * require('./googleCloud')
-   */
-}

From cf1c8da11b5cb914d5eb9d977dee45cca94de446 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Sat, 28 Sep 2019 12:13:04 +0200
Subject: [PATCH 03/99] Added missing hooks file for the server

---
 core/server/hooks.ts | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 core/server/hooks.ts

diff --git a/core/server/hooks.ts b/core/server/hooks.ts
new file mode 100644
index 0000000000..a31e24b026
--- /dev/null
+++ b/core/server/hooks.ts
@@ -0,0 +1,25 @@
+import { createListenerHook, createMutatorHook } from '@vue-storefront/core/lib/hooks'
+
+// beforeStartApp
+
+const {
+  hook: onLoadHook,
+  executor: onLoadExecutor
+} = createListenerHook<any>()
+
+/** Only for internal usage in this module */
+const serverHooksExecutors = {
+  onLoad: onLoadExecutor
+}
+
+const serverHooks = {
+  /** Hook is fired right at the start of the app.
+   * @param void
+   */
+  onLoad: onLoadHook
+}
+
+export {
+  serverHooks,
+  serverHooksExecutors
+}

From f715faeb82b8d7c2bbfdbbdfb96510bb42effe0f Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Sun, 29 Sep 2019 13:08:33 +0200
Subject: [PATCH 04/99] Changed server extend logic to an server hook

With this you only need to add an server.js or server.ts file to your
module and in there you need to add it to the server trace/extend hook.
---
 core/scripts/server.ts                   |  20 +--
 core/server/hooks.ts                     |  27 +++-
 package.json                             |   6 +-
 src/modules/compress/server.ts           |   9 +-
 src/modules/google-cloud-trace/index.js  |   5 -
 src/modules/google-cloud-trace/server.ts |   8 +
 src/modules/robots/server.ts             |   5 +-
 src/modules/server.ts                    |  14 --
 yarn.lock                                | 188 ++---------------------
 9 files changed, 63 insertions(+), 219 deletions(-)
 delete mode 100644 src/modules/google-cloud-trace/index.js
 create mode 100644 src/modules/google-cloud-trace/server.ts
 delete mode 100644 src/modules/server.ts

diff --git a/core/scripts/server.ts b/core/scripts/server.ts
index 7892c232f9..f846e7ccd0 100755
--- a/core/scripts/server.ts
+++ b/core/scripts/server.ts
@@ -1,9 +1,16 @@
 import { serverHooksExecutors } from '@vue-storefront/core/server/hooks'
+let config = require('config')
 const path = require('path')
+const glob = require('glob')
 const rootPath = require('app-root-path').path
 const resolve = file => path.resolve(rootPath, file)
-const serverExtensions = require(resolve('src/modules/server'))
-serverHooksExecutors.onLoad()
+const serverExtensions = glob.sync('src/modules/*/server.{ts,js}')
+
+serverExtensions.forEach(serverModule => {
+  require(resolve(serverModule))
+})
+
+serverHooksExecutors.tracing(config.server)
 const express = require('express')
 const ms = require('ms')
 const request = require('request');
@@ -12,7 +19,6 @@ const cache = require('./utils/cache-instance')
 const apiStatus = require('./utils/api-status')
 const HTMLContent = require('../pages/Compilation')
 const ssr = require('./utils/ssr-renderer')
-let config = require('config')
 
 const compileOptions = {
   escape: /{{([^{][\s\S]+?[^}])}}/g,
@@ -25,13 +31,7 @@ process['noDeprecation'] = true
 
 const app = express()
 
-serverExtensions.serverModules.forEach(serverModule => {
-  if (Array.isArray(serverModule)) {
-    require(resolve(serverModule[0] + '/server.ts'))(app, serverModule[1])
-  } else {
-    require(resolve(serverModule + '/server.ts'))(app)
-  }
-})
+serverHooksExecutors.extend({ app, config: config.server, isProd })
 
 const templatesCache = ssr.initTemplatesCache(config, compileOptions)
 
diff --git a/core/server/hooks.ts b/core/server/hooks.ts
index a31e24b026..5026bcfb85 100644
--- a/core/server/hooks.ts
+++ b/core/server/hooks.ts
@@ -1,22 +1,39 @@
 import { createListenerHook, createMutatorHook } from '@vue-storefront/core/lib/hooks'
+import {Express} from 'express';
 
-// beforeStartApp
+// To add tracing without adding it directly to the core
 
 const {
-  hook: onLoadHook,
-  executor: onLoadExecutor
+  hook: tracingHook,
+  executor: tracingExecutor
 } = createListenerHook<any>()
 
+// beforeStartApp
+interface Extend {
+  app: Express,
+  config: any,
+  isProd: boolean
+}
+const {
+  hook: extendHook,
+  executor: extendExecutor
+} = createListenerHook<Extend>()
+
 /** Only for internal usage in this module */
 const serverHooksExecutors = {
-  onLoad: onLoadExecutor
+  tracing: tracingExecutor,
+  extend: extendExecutor
 }
 
 const serverHooks = {
   /** Hook is fired right at the start of the app.
    * @param void
    */
-  onLoad: onLoadHook
+  tracing: tracingHook,
+  /**
+   *
+   */
+  extend: extendHook
 }
 
 export {
diff --git a/package.json b/package.json
index a681cade98..82e6401517 100755
--- a/package.json
+++ b/package.json
@@ -50,7 +50,10 @@
   },
   "lint-staged": {
     "*.{js,vue,ts}": "eslint",
-    "**/i18n/*.csv": ["node ./core/scripts/utils/sort-translations.js", "git add"]
+    "**/i18n/*.csv": [
+      "node ./core/scripts/utils/sort-translations.js",
+      "git add"
+    ]
   },
   "husky": {
     "hooks": {
@@ -72,6 +75,7 @@
     "es6-promise": "^4.2.4",
     "express": "^4.14.0",
     "fs-extra": "^8.1.0",
+    "glob": "^7.1.4",
     "graphql": "^0.13.2",
     "graphql-tag": "^2.9.2",
     "isomorphic-fetch": "^2.2.1",
diff --git a/src/modules/compress/server.ts b/src/modules/compress/server.ts
index add229106f..df6b31e9cd 100644
--- a/src/modules/compress/server.ts
+++ b/src/modules/compress/server.ts
@@ -1,8 +1,9 @@
+import { serverHooks } from '@vue-storefront/core/server/hooks'
 
 const compression = require('compression')
-module.exports = (app, moduleConfig) => {
-  if (moduleConfig.enabled) {
+serverHooks.extend(({ app, isProd }) => {
+  if (isProd) {
     console.log('Output Compression is enabled')
-    app.use(compression(moduleConfig))
+    app.use(compression({ enabled: isProd }))
   }
-}
+})
diff --git a/src/modules/google-cloud-trace/index.js b/src/modules/google-cloud-trace/index.js
deleted file mode 100644
index 1ea33c72a8..0000000000
--- a/src/modules/google-cloud-trace/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-const config = require('config')
-let trace = require('@google-cloud/trace-agent')
-if (config.server.trace.enabled) {
-  trace.start(config.server.trace.config)
-}
diff --git a/src/modules/google-cloud-trace/server.ts b/src/modules/google-cloud-trace/server.ts
new file mode 100644
index 0000000000..222c4f55d1
--- /dev/null
+++ b/src/modules/google-cloud-trace/server.ts
@@ -0,0 +1,8 @@
+import { serverHooks } from '@vue-storefront/core/server/hooks'
+
+serverHooks.tracing((config) => {
+  let trace = require('@google-cloud/trace-agent')
+  if (config.has('trace') && config.get('trace.enabled')) {
+    trace.start(config.get('trace.config'))
+  }
+})
diff --git a/src/modules/robots/server.ts b/src/modules/robots/server.ts
index c79de50968..819a5f711f 100644
--- a/src/modules/robots/server.ts
+++ b/src/modules/robots/server.ts
@@ -1,6 +1,7 @@
+import { serverHooks } from '@vue-storefront/core/server/hooks'
 
-module.exports = (app) => {
+serverHooks.extend(({ app }) => {
   app.get('/robots.txt', (req, res) => {
     res.end('User-agent: *\nDisallow: ')
   })
-}
+})
diff --git a/src/modules/server.ts b/src/modules/server.ts
deleted file mode 100644
index da750abca1..0000000000
--- a/src/modules/server.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { serverHooks } from '@vue-storefront/core/server/hooks'
-const isProd = process.env.NODE_ENV === 'production'
-
-serverHooks.onLoad(() => {
-  /**
-   * example usage
-   * require('./google-cloud-trace')
-   */
-})
-
-export const serverModules = [
-  'src/modules/robots'
-  // ['src/modules/compress', { enabled: isProd }]
-]
diff --git a/yarn.lock b/yarn.lock
index 3de0ff47e4..95ade87347 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2656,23 +2656,10 @@ ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-
 ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
 
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
@@ -3074,7 +3061,7 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -4136,22 +4123,12 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
   dependencies:
     caller-callsite "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -4324,10 +4301,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
@@ -4602,7 +4575,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@1.6.2, concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -5472,12 +5445,6 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  dependencies:
-    esutils "^2.0.2"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -5817,22 +5784,6 @@ eslint-module-utils@^2.4.0:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
-eslint-plugin-import@^2.12.0:
-  version "2.18.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.0.tgz#7a5ba8d32622fb35eb9c8db195c2090bd18a3678"
-  dependencies:
-    array-includes "^3.0.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
-    has "^1.0.3"
-    lodash "^4.17.11"
-    minimatch "^3.0.4"
-    read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
-
 eslint-plugin-import@^2.13.0:
   version "2.17.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb"
@@ -5872,12 +5823,6 @@ eslint-plugin-vue-storefront@^0.0.1:
   dependencies:
     requireindex "~1.2.0"
 
-eslint-plugin-vue@^4.5.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
-  dependencies:
-    vue-eslint-parser "^2.0.3"
-
 eslint-plugin-vue@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
@@ -5917,49 +5862,6 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@^4.16.0:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
 eslint@^5.0.0:
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
@@ -6001,7 +5903,7 @@ eslint@^5.0.0:
     table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^3.5.2, espree@^3.5.4:
+espree@^3.5.2:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
@@ -6313,10 +6215,6 @@ eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -6388,13 +6286,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -6513,15 +6404,6 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -6914,7 +6796,7 @@ glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glo
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3:
+glob@^7.1.3, glob@^7.1.4:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
   dependencies:
@@ -6956,7 +6838,7 @@ global@^4.3.2:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
 
@@ -7425,7 +7307,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
+ignore@^3.3.5, ignore@^3.3.6:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
@@ -7547,7 +7429,7 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
-inquirer@^3.0.6, inquirer@^3.3.0:
+inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -7874,10 +7756,6 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -8456,7 +8334,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
@@ -8528,10 +8406,6 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -10714,10 +10588,6 @@ please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-
 pm2-axon-rpc@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.5.1.tgz#ad3c43c43811c71f13e5eee2821194d03ceb03fe"
@@ -11660,10 +11530,6 @@ regexp-tree@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.6.tgz#84900fa12fdf428a2ac25f04300382a7c0148479"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -11857,13 +11723,6 @@ require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requireindex@^1.2.0, requireindex@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
@@ -11885,10 +11744,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -11918,12 +11773,6 @@ resolve@1.x, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, re
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.11.0:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.11.1.tgz#ea10d8110376982fef578df8fc30b9ac30a07a3e"
-  dependencies:
-    path-parse "^1.0.6"
-
 resolve@^1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
@@ -11961,7 +11810,7 @@ retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   dependencies:
@@ -12835,17 +12684,6 @@ synchronous-promise@^2.0.6:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
 table@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
@@ -12956,7 +12794,7 @@ text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -14249,12 +14087,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"

From 09046188e7b97194a0c67c4a88c2152c09dec1cb Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Mon, 30 Sep 2019 06:58:06 +0200
Subject: [PATCH 05/99] Added more server hooks cache/output and renamed
 current hooks

The new hooks are there to extend or change the current behavior of
the core logic. Or to to do something before or after that.
---
 core/scripts/server.ts                   | 28 +++++++++++++--
 core/server/hooks.ts                     | 46 +++++++++++++++++++-----
 src/modules/compress/server.ts           |  2 +-
 src/modules/google-cloud-trace/server.ts |  2 +-
 src/modules/robots/server.ts             |  2 +-
 5 files changed, 66 insertions(+), 14 deletions(-)

diff --git a/core/scripts/server.ts b/core/scripts/server.ts
index f846e7ccd0..5a9d3a7489 100755
--- a/core/scripts/server.ts
+++ b/core/scripts/server.ts
@@ -10,7 +10,7 @@ serverExtensions.forEach(serverModule => {
   require(resolve(serverModule))
 })
 
-serverHooksExecutors.tracing(config.server)
+serverHooksExecutors.afterProcessStarted(config.server)
 const express = require('express')
 const ms = require('ms')
 const request = require('request');
@@ -31,7 +31,7 @@ process['noDeprecation'] = true
 
 const app = express()
 
-serverHooksExecutors.extend({ app, config: config.server, isProd })
+serverHooksExecutors.afterApplicationInitialized({ app, config: config.server, isProd })
 
 const templatesCache = ssr.initTemplatesCache(config, compileOptions)
 
@@ -72,6 +72,9 @@ function invalidateCache (req, res) {
         tags = req.query.tag.split(',')
       }
       const subPromises = []
+
+      serverHooksExecutors.beforeCacheInvalidated()
+
       tags.forEach(tag => {
         if (config.server.availableCacheTags.indexOf(tag) >= 0 || config.server.availableCacheTags.find(t => {
           return tag.indexOf(t) === 0
@@ -83,6 +86,9 @@ function invalidateCache (req, res) {
           console.error(`Invalid tag name ${tag}`)
         }
       })
+
+      serverHooksExecutors.afterCacheInvalidated()
+
       Promise.all(subPromises).then(r => {
         apiStatus(res, `Tags invalidated successfully [${req.query.tag}]`, 200)
       }).catch(error => {
@@ -179,6 +185,15 @@ app.get('*', (req, res, next) => {
         res.setHeader('X-VS-Cache-Tags', cacheTags)
         console.log(`cache tags for the request: ${cacheTags}`)
       }
+
+      const hookResponse = serverHooksExecutors.beforeOutputRendered({
+        req,
+        res,
+        context,
+        output,
+        isProd
+      })
+
       output = ssr.applyAdvancedOutputProcessing(context, output, templatesCache, isProd);
       if (config.server.useOutputCache && cache) {
         cache.set(
@@ -187,6 +202,15 @@ app.get('*', (req, res, next) => {
           tagsArray
         ).catch(errorHandler)
       }
+
+      const hookResponse2 = serverHooksExecutors.afterOutputRendered({
+        req,
+        res,
+        context,
+        output,
+        isProd
+      })
+
       res.end(output)
       console.log(`whole request [${req.url}]: ${Date.now() - s}ms`)
       next()
diff --git a/core/server/hooks.ts b/core/server/hooks.ts
index 5026bcfb85..93ff377bea 100644
--- a/core/server/hooks.ts
+++ b/core/server/hooks.ts
@@ -1,11 +1,21 @@
 import { createListenerHook, createMutatorHook } from '@vue-storefront/core/lib/hooks'
 import {Express} from 'express';
 
-// To add tracing without adding it directly to the core
+// To add like tracing which needs to be done as early as possible
 
 const {
-  hook: tracingHook,
-  executor: tracingExecutor
+  hook: afterProcessStartedHook,
+  executor: afterProcessStartedExecutor
+} = createListenerHook<any>()
+
+const {
+  hook: beforeCacheInvalidatedHook,
+  executor: beforeCacheInvalidatedExecutor
+} = createListenerHook<any>()
+
+const {
+  hook: afterCacheInvalidatedHook,
+  executor: afterCacheInvalidatedExecutor
 } = createListenerHook<any>()
 
 // beforeStartApp
@@ -15,25 +25,43 @@ interface Extend {
   isProd: boolean
 }
 const {
-  hook: extendHook,
-  executor: extendExecutor
+  hook: afterApplicationInitializedHook,
+  executor: afterApplicationInitializedExecutor
 } = createListenerHook<Extend>()
 
+const {
+  hook: beforeOutputRenderedHook,
+  executor: beforeOutputRenderedExecutor
+} = createMutatorHook<any, any>()
+
+const {
+  hook: afterOutputRenderedHook,
+  executor: afterOutputRenderedExecutor
+} = createMutatorHook<any, any>()
+
 /** Only for internal usage in this module */
 const serverHooksExecutors = {
-  tracing: tracingExecutor,
-  extend: extendExecutor
+  afterProcessStarted: afterProcessStartedExecutor,
+  afterApplicationInitialized: afterApplicationInitializedExecutor,
+  beforeOutputRendered: beforeOutputRenderedExecutor,
+  afterOutputRendered: afterOutputRenderedExecutor,
+  beforeCacheInvalidated: beforeCacheInvalidatedExecutor,
+  afterCacheInvalidated: afterCacheInvalidatedExecutor
 }
 
 const serverHooks = {
   /** Hook is fired right at the start of the app.
    * @param void
    */
-  tracing: tracingHook,
+  afterProcessStarted: afterProcessStartedHook,
   /**
    *
    */
-  extend: extendHook
+  afterApplicationInitialized: afterApplicationInitializedHook,
+  beforeOutputRendered: beforeOutputRenderedHook,
+  afterOutputRendered: afterOutputRenderedHook,
+  beforeCacheInvalidated: beforeCacheInvalidatedHook,
+  afterCacheInvalidated: afterCacheInvalidatedHook
 }
 
 export {
diff --git a/src/modules/compress/server.ts b/src/modules/compress/server.ts
index df6b31e9cd..3ca3054bc7 100644
--- a/src/modules/compress/server.ts
+++ b/src/modules/compress/server.ts
@@ -1,7 +1,7 @@
 import { serverHooks } from '@vue-storefront/core/server/hooks'
 
 const compression = require('compression')
-serverHooks.extend(({ app, isProd }) => {
+serverHooks.afterApplicationInitialized(({ app, isProd }) => {
   if (isProd) {
     console.log('Output Compression is enabled')
     app.use(compression({ enabled: isProd }))
diff --git a/src/modules/google-cloud-trace/server.ts b/src/modules/google-cloud-trace/server.ts
index 222c4f55d1..5e7db50b0b 100644
--- a/src/modules/google-cloud-trace/server.ts
+++ b/src/modules/google-cloud-trace/server.ts
@@ -1,6 +1,6 @@
 import { serverHooks } from '@vue-storefront/core/server/hooks'
 
-serverHooks.tracing((config) => {
+serverHooks.afterProcessStarted((config) => {
   let trace = require('@google-cloud/trace-agent')
   if (config.has('trace') && config.get('trace.enabled')) {
     trace.start(config.get('trace.config'))
diff --git a/src/modules/robots/server.ts b/src/modules/robots/server.ts
index 819a5f711f..f245ca1240 100644
--- a/src/modules/robots/server.ts
+++ b/src/modules/robots/server.ts
@@ -1,6 +1,6 @@
 import { serverHooks } from '@vue-storefront/core/server/hooks'
 
-serverHooks.extend(({ app }) => {
+serverHooks.afterApplicationInitialized(({ app }) => {
   app.get('/robots.txt', (req, res) => {
     res.end('User-agent: *\nDisallow: ')
   })

From 8e97a8a4f88815c1dfc9dd97ea1e9dd8dc680a35 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Fri, 27 Sep 2019 18:29:44 +0200
Subject: [PATCH 06/99] save the payment methods returned on updateTotals to
 state.

---
 core/modules/cart/helpers/createOrderData.ts        |  9 +++++++++
 core/modules/cart/helpers/createShippingInfoData.ts |  3 +++
 core/modules/cart/store/actions/totalsActions.ts    | 10 ++++++++--
 core/modules/cart/types/BillingAddress.ts           |  8 ++++++++
 core/modules/cart/types/CheckoutData.ts             |  2 ++
 core/modules/cart/types/OrderShippingDetails.ts     |  4 +++-
 6 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 core/modules/cart/types/BillingAddress.ts

diff --git a/core/modules/cart/helpers/createOrderData.ts b/core/modules/cart/helpers/createOrderData.ts
index d79e382425..37c12e34ac 100644
--- a/core/modules/cart/helpers/createOrderData.ts
+++ b/core/modules/cart/helpers/createOrderData.ts
@@ -21,6 +21,7 @@ const createOrderData = ({
   shippingDetails,
   shippingMethods,
   paymentMethods,
+  paymentDetails,
   taxCountry = currentStoreView().tax.defaultCountry
 }: CheckoutData): OrderShippingDetails => {
   const country = shippingDetails.country ? shippingDetails.country : taxCountry
@@ -36,6 +37,14 @@ const createOrderData = ({
       postcode: shippingDetails.zipCode,
       street: [shippingDetails.streetAddress]
     },
+    billingAddress: {
+      firstname: paymentDetails.firstName,
+      lastname: paymentDetails.lastName,
+      city: paymentDetails.city,
+      postcode: paymentDetails.zipCode,
+      street: [paymentDetails.streetAddress],
+      countryId: paymentDetails.country
+    },
     method_code: shipping && shipping.method_code ? shipping.method_code : null,
     carrier_code: shipping && shipping.carrier_code ? shipping.carrier_code : null,
     payment_method: payment && payment.code ? payment.code : null
diff --git a/core/modules/cart/helpers/createShippingInfoData.ts b/core/modules/cart/helpers/createShippingInfoData.ts
index 394cfc86ed..e42b0f19ff 100644
--- a/core/modules/cart/helpers/createShippingInfoData.ts
+++ b/core/modules/cart/helpers/createShippingInfoData.ts
@@ -3,6 +3,9 @@ const createShippingInfoData = (methodsData) => ({
     countryId: methodsData.country,
     ...(methodsData.shippingAddress ? methodsData.shippingAddress : {})
   },
+  billingAddress: {
+    ...(methodsData.billingAddress ? methodsData.billingAddress : {})
+  },
   shippingCarrierCode: methodsData.carrier_code,
   shippingMethodCode: methodsData.method_code
 });
diff --git a/core/modules/cart/store/actions/totalsActions.ts b/core/modules/cart/store/actions/totalsActions.ts
index a31379d674..16ae4f396c 100644
--- a/core/modules/cart/store/actions/totalsActions.ts
+++ b/core/modules/cart/store/actions/totalsActions.ts
@@ -15,7 +15,7 @@ const totalsActions = {
 
     return CartService.getTotals()
   },
-  async overrideServerTotals ({ commit, dispatch }, { addressInformation, hasShippingInformation }) {
+  async overrideServerTotals ({ commit, getters, dispatch }, { addressInformation, hasShippingInformation }) {
     const { resultCode, result } = await dispatch('getTotals', { addressInformation, hasShippingInformation })
 
     if (resultCode === 200) {
@@ -32,6 +32,11 @@ const totalsActions = {
       commit(types.CART_UPD_TOTALS, { itemsAfterTotal, totals, platformTotalSegments: totals.total_segments })
       commit(types.CART_SET_TOTALS_SYNC)
 
+      // we received payment methods as a result of this call, updating state
+      if (result.payment_methods && getters.canUpdateMethods) {
+        dispatch('checkout/replacePaymentMethods', result.payment_methods, { root: true })
+      }
+
       return
     }
 
@@ -45,7 +50,8 @@ const totalsActions = {
       const shippingMethodsData = methodsData || createOrderData({
         shippingDetails: rootGetters['checkout/getShippingDetails'],
         shippingMethods: rootGetters['checkout/getShippingMethods'],
-        paymentMethods: rootGetters['checkout/getPaymentMethods']
+        paymentMethods: rootGetters['checkout/getPaymentMethods'],
+        paymentDetails: rootGetters['checkout/getPaymentDetails']
       })
 
       if (shippingMethodsData.country) {
diff --git a/core/modules/cart/types/BillingAddress.ts b/core/modules/cart/types/BillingAddress.ts
new file mode 100644
index 0000000000..18d17cc487
--- /dev/null
+++ b/core/modules/cart/types/BillingAddress.ts
@@ -0,0 +1,8 @@
+export default interface ShippingAddress {
+  firstname: string,
+  lastname: string,
+  city: string,
+  postcode: string,
+  street: string[],
+  countryId: string
+}
diff --git a/core/modules/cart/types/CheckoutData.ts b/core/modules/cart/types/CheckoutData.ts
index feac99cb00..4e2c5c676e 100644
--- a/core/modules/cart/types/CheckoutData.ts
+++ b/core/modules/cart/types/CheckoutData.ts
@@ -1,10 +1,12 @@
 import ShippingDetails from '@vue-storefront/core/modules/checkout/types/ShippingDetails'
 import ShippingMethod from './ShippingMethod'
 import PaymentMethod from './PaymentMethod'
+import PaymentDetails from '@vue-storefront/core/modules/checkout/types/PaymentDetails'
 
 export default interface CheckoutData {
   shippingDetails: ShippingDetails,
   shippingMethods: ShippingMethod[],
   paymentMethods: PaymentMethod[],
+  paymentDetails: PaymentDetails,
   taxCountry?: string
 }
diff --git a/core/modules/cart/types/OrderShippingDetails.ts b/core/modules/cart/types/OrderShippingDetails.ts
index a455dda4d2..ebfc2005c5 100644
--- a/core/modules/cart/types/OrderShippingDetails.ts
+++ b/core/modules/cart/types/OrderShippingDetails.ts
@@ -1,9 +1,11 @@
 import ShippingAddress from './ShippingAddress'
+import BillingAddress from './BillingAddress'
 
 export default interface OrderShippingDetails {
   country?: string,
   method_code?: string,
   carrier_code?: string,
   payment_method?: string,
-  shippingAddress?: ShippingAddress
+  shippingAddress?: ShippingAddress,
+  billingAddress?: BillingAddress
 }

From 4ac4c71b8ab65e3540f2b2a2f802512bcfe7ae27 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Mon, 30 Sep 2019 11:31:27 +0200
Subject: [PATCH 07/99] Update payment methods on billing country change

---
 .../cart/store/actions/methodsActions.ts      | 28 +++++++++++++++++--
 core/modules/checkout/components/Payment.ts   |  3 ++
 core/pages/Checkout.js                        |  6 ++++
 .../core/blocks/Checkout/Payment.vue          |  2 +-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/core/modules/cart/store/actions/methodsActions.ts b/core/modules/cart/store/actions/methodsActions.ts
index 662e3ef472..8936c3fada 100644
--- a/core/modules/cart/store/actions/methodsActions.ts
+++ b/core/modules/cart/store/actions/methodsActions.ts
@@ -3,7 +3,8 @@ import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { Logger } from '@vue-storefront/core/lib/logger'
 import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
 import { CartService } from '@vue-storefront/core/data-resolver'
-import { preparePaymentMethodsToSync } from '@vue-storefront/core/modules/cart/helpers'
+import { preparePaymentMethodsToSync, createOrderData, createShippingInfoData } from '@vue-storefront/core/modules/cart/helpers'
+import PaymentMethod from '../../types/PaymentMethod'
 
 const methodsActions = {
   async pullMethods ({ getters, dispatch }, { forceServerSync }) {
@@ -26,9 +27,30 @@ const methodsActions = {
   async syncPaymentMethods ({ getters, rootGetters, dispatch }, { forceServerSync = false }) {
     if (getters.canUpdateMethods && (getters.isTotalsSyncRequired || forceServerSync)) {
       Logger.debug('Refreshing payment methods', 'cart')()
-      const { result } = await CartService.getPaymentMethods()
+      let backendPaymentMethods: PaymentMethod[]
+
+      const paymentDetails = rootGetters['checkout/getPaymentDetails']
+      if (paymentDetails.country) {
+        // use shipping info endpoint to get payment methods using billing address
+        const shippingMethodsData = createOrderData({
+          shippingDetails: rootGetters['checkout/getShippingDetails'],
+          shippingMethods: rootGetters['checkout/getShippingMethods'],
+          paymentMethods: rootGetters['checkout/getPaymentMethods'],
+          paymentDetails: rootGetters['checkout/getPaymentDetails']
+        })
+
+        if (shippingMethodsData.country) {
+          const { result } = await CartService.setShippingInfo(createShippingInfoData(shippingMethodsData))
+          backendPaymentMethods = result.payment_methods || []
+        }
+      }
+      if (!backendPaymentMethods || backendPaymentMethods.length === 0) {
+        const { result } = await CartService.getPaymentMethods()
+        backendPaymentMethods = result
+      }
+
       const { uniqueBackendMethods, paymentMethods } = preparePaymentMethodsToSync(
-        result,
+        backendPaymentMethods,
         rootGetters['checkout/getNotServerPaymentMethods']
       )
       await dispatch('checkout/replacePaymentMethods', paymentMethods, { root: true })
diff --git a/core/modules/checkout/components/Payment.ts b/core/modules/checkout/components/Payment.ts
index d37a4f209d..11d86e1056 100644
--- a/core/modules/checkout/components/Payment.ts
+++ b/core/modules/checkout/components/Payment.ts
@@ -232,6 +232,9 @@ export const Payment = {
 
       // Let anyone listening know that we've changed payment method, usually a payment extension.
       this.$bus.$emit('checkout-payment-method-changed', this.payment.paymentMethod)
+    },
+    changeCountry () {
+      this.$bus.$emit('checkout-before-paymentMethods')
     }
   }
 }
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index b4fb31ed88..53e50bef19 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -59,6 +59,7 @@ export default {
     this.$bus.$on('checkout-before-edit', this.onBeforeEdit)
     this.$bus.$on('order-after-placed', this.onAfterPlaceOrder)
     this.$bus.$on('checkout-before-shippingMethods', this.onBeforeShippingMethods)
+    this.$bus.$on('checkout-before-paymentMethods', this.onBeforePaymentMethods)
     this.$bus.$on('checkout-after-shippingMethodChanged', this.onAfterShippingMethodChanged)
     this.$bus.$on('checkout-after-validationError', this.focusField)
     if (!this.isThankYouPage) {
@@ -118,6 +119,7 @@ export default {
     this.$bus.$off('checkout-before-edit', this.onBeforeEdit)
     this.$bus.$off('order-after-placed', this.onAfterPlaceOrder)
     this.$bus.$off('checkout-before-shippingMethods', this.onBeforeShippingMethods)
+    this.$bus.$off('checkout-before-paymentMethods', this.onBeforePaymentMethods)
     this.$bus.$off('checkout-after-shippingMethodChanged', this.onAfterShippingMethodChanged)
     this.$bus.$off('checkout-after-validationError', this.focusField)
   },
@@ -140,6 +142,10 @@ export default {
       this.$store.dispatch('cart/syncTotals', { forceServerSync: true })
       this.$forceUpdate()
     },
+    onBeforePaymentMethods () {
+      this.$store.dispatch('cart/syncPaymentMethods', { forceServerSync: true })
+      this.$forceUpdate()
+    },
     async onAfterPlaceOrder (payload) {
       this.confirmation = payload.confirmation
       if (this.$store.state.checkout.personalDetails.createAccount) {
diff --git a/src/themes/default/components/core/blocks/Checkout/Payment.vue b/src/themes/default/components/core/blocks/Checkout/Payment.vue
index 6084ad3e4c..ba81a82364 100644
--- a/src/themes/default/components/core/blocks/Checkout/Payment.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Payment.vue
@@ -171,7 +171,7 @@
             v-model="payment.country"
             autocomplete="country-name"
             @blur="$v.payment.country.$touch()"
-            @change="$v.payment.country.$touch()"
+            @change="$v.payment.country.$touch(); changeCountry();"
           />
 
           <base-input

From 4e19586e61f8a459acbb7890e1e0a929ac50a2b2 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Mon, 30 Sep 2019 11:33:47 +0200
Subject: [PATCH 08/99] Updated changelog with payment method for billing
 address change.

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a399d6048..71d3eaddd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -56,6 +56,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
 - Added tests for cart module actions - @andrzejewsky (#3023)
 - Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
+- Get payment methods with billing address data - @rain2o (#2878)
 
 ### Fixed
 

From 1b2e01c86819125eebb1e0419f84fe2f76e99432 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Wed, 2 Oct 2019 13:25:41 +0200
Subject: [PATCH 09/99] Renamed hooks and added use of return of MutatorHooks

---
 core/scripts/server.ts | 21 +++++++++++++++++----
 core/server/hooks.ts   | 25 +++++++++++++++----------
 2 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/core/scripts/server.ts b/core/scripts/server.ts
index 5a9d3a7489..c6652e60b8 100755
--- a/core/scripts/server.ts
+++ b/core/scripts/server.ts
@@ -73,7 +73,7 @@ function invalidateCache (req, res) {
       }
       const subPromises = []
 
-      serverHooksExecutors.beforeCacheInvalidated()
+      serverHooksExecutors.beforeCacheInvalidated({ tags, req })
 
       tags.forEach(tag => {
         if (config.server.availableCacheTags.indexOf(tag) >= 0 || config.server.availableCacheTags.find(t => {
@@ -186,7 +186,7 @@ app.get('*', (req, res, next) => {
         console.log(`cache tags for the request: ${cacheTags}`)
       }
 
-      const hookResponse = serverHooksExecutors.beforeOutputRendered({
+      const beforeOutputRenderedResponse = serverHooksExecutors.beforeOutputRenderedResponse({
         req,
         res,
         context,
@@ -194,6 +194,12 @@ app.get('*', (req, res, next) => {
         isProd
       })
 
+      if (typeof beforeOutputRenderedResponse.output === 'string') {
+        output = beforeOutputRenderedResponse.output
+      } else if (typeof beforeOutputRenderedResponse === 'string') {
+        output = beforeOutputRenderedResponse
+      }
+
       output = ssr.applyAdvancedOutputProcessing(context, output, templatesCache, isProd);
       if (config.server.useOutputCache && cache) {
         cache.set(
@@ -203,7 +209,7 @@ app.get('*', (req, res, next) => {
         ).catch(errorHandler)
       }
 
-      const hookResponse2 = serverHooksExecutors.afterOutputRendered({
+      const afterOutputRenderedResponse = serverHooksExecutors.afterOutputRenderedResponse({
         req,
         res,
         context,
@@ -211,7 +217,14 @@ app.get('*', (req, res, next) => {
         isProd
       })
 
-      res.end(output)
+      if (typeof afterOutputRenderedResponse.output === 'string') {
+        res.end(afterOutputRenderedResponse.output)
+      } else if (typeof afterOutputRenderedResponse === 'string') {
+        res.end(afterOutputRenderedResponse)
+      } else {
+        res.end(output)
+      }
+
       console.log(`whole request [${req.url}]: ${Date.now() - s}ms`)
       next()
     }).catch(errorHandler)
diff --git a/core/server/hooks.ts b/core/server/hooks.ts
index 93ff377bea..f7941c7955 100644
--- a/core/server/hooks.ts
+++ b/core/server/hooks.ts
@@ -1,5 +1,5 @@
 import { createListenerHook, createMutatorHook } from '@vue-storefront/core/lib/hooks'
-import {Express} from 'express';
+import { Express, Request } from 'express';
 
 // To add like tracing which needs to be done as early as possible
 
@@ -8,10 +8,15 @@ const {
   executor: afterProcessStartedExecutor
 } = createListenerHook<any>()
 
+interface beforeCacheInvalidatedParamter {
+  tags: string[],
+  req: Request
+}
+
 const {
   hook: beforeCacheInvalidatedHook,
   executor: beforeCacheInvalidatedExecutor
-} = createListenerHook<any>()
+} = createListenerHook<beforeCacheInvalidatedParamter>()
 
 const {
   hook: afterCacheInvalidatedHook,
@@ -30,21 +35,21 @@ const {
 } = createListenerHook<Extend>()
 
 const {
-  hook: beforeOutputRenderedHook,
-  executor: beforeOutputRenderedExecutor
+  hook: beforeOutputRenderedResponseHook,
+  executor: beforeOutputRenderedResponseExecutor
 } = createMutatorHook<any, any>()
 
 const {
-  hook: afterOutputRenderedHook,
-  executor: afterOutputRenderedExecutor
+  hook: afterOutputRenderedResponseHook,
+  executor: afterOutputRenderedResponseExecutor
 } = createMutatorHook<any, any>()
 
 /** Only for internal usage in this module */
 const serverHooksExecutors = {
   afterProcessStarted: afterProcessStartedExecutor,
   afterApplicationInitialized: afterApplicationInitializedExecutor,
-  beforeOutputRendered: beforeOutputRenderedExecutor,
-  afterOutputRendered: afterOutputRenderedExecutor,
+  beforeOutputRenderedResponse: beforeOutputRenderedResponseExecutor,
+  afterOutputRenderedResponse: afterOutputRenderedResponseExecutor,
   beforeCacheInvalidated: beforeCacheInvalidatedExecutor,
   afterCacheInvalidated: afterCacheInvalidatedExecutor
 }
@@ -58,8 +63,8 @@ const serverHooks = {
    *
    */
   afterApplicationInitialized: afterApplicationInitializedHook,
-  beforeOutputRendered: beforeOutputRenderedHook,
-  afterOutputRendered: afterOutputRenderedHook,
+  beforeOutputRenderedResponse: beforeOutputRenderedResponseHook,
+  afterOutputRenderedResponse: afterOutputRenderedResponseHook,
   beforeCacheInvalidated: beforeCacheInvalidatedHook,
   afterCacheInvalidated: afterCacheInvalidatedHook
 }

From 9792535cfc5c9830b3bbee96024d0541297f7cba Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Thu, 3 Oct 2019 10:11:43 +0200
Subject: [PATCH 10/99] Fixed name of BillingAddress interface

---
 core/modules/cart/types/BillingAddress.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/cart/types/BillingAddress.ts b/core/modules/cart/types/BillingAddress.ts
index 18d17cc487..be0bae3f4b 100644
--- a/core/modules/cart/types/BillingAddress.ts
+++ b/core/modules/cart/types/BillingAddress.ts
@@ -1,4 +1,4 @@
-export default interface ShippingAddress {
+export default interface BillingAddress {
   firstname: string,
   lastname: string,
   city: string,

From ac9ad425832ca96ff258e4ba9059ba1b5ec68462 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Thu, 3 Oct 2019 10:12:18 +0200
Subject: [PATCH 11/99] Removed use of bus emit and dispatch
 cart/syncPaymentMethods directly.

---
 core/modules/checkout/components/Payment.ts | 2 +-
 core/pages/Checkout.js                      | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/core/modules/checkout/components/Payment.ts b/core/modules/checkout/components/Payment.ts
index 81f79b33c1..a9895efdaa 100644
--- a/core/modules/checkout/components/Payment.ts
+++ b/core/modules/checkout/components/Payment.ts
@@ -235,7 +235,7 @@ export const Payment = {
       this.$bus.$emit('checkout-payment-method-changed', this.payment.paymentMethod)
     },
     changeCountry () {
-      this.$bus.$emit('checkout-before-paymentMethods')
+      this.$store.dispatch('cart/syncPaymentMethods', { forceServerSync: true })
     }
   }
 }
diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index 53e50bef19..b4fb31ed88 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -59,7 +59,6 @@ export default {
     this.$bus.$on('checkout-before-edit', this.onBeforeEdit)
     this.$bus.$on('order-after-placed', this.onAfterPlaceOrder)
     this.$bus.$on('checkout-before-shippingMethods', this.onBeforeShippingMethods)
-    this.$bus.$on('checkout-before-paymentMethods', this.onBeforePaymentMethods)
     this.$bus.$on('checkout-after-shippingMethodChanged', this.onAfterShippingMethodChanged)
     this.$bus.$on('checkout-after-validationError', this.focusField)
     if (!this.isThankYouPage) {
@@ -119,7 +118,6 @@ export default {
     this.$bus.$off('checkout-before-edit', this.onBeforeEdit)
     this.$bus.$off('order-after-placed', this.onAfterPlaceOrder)
     this.$bus.$off('checkout-before-shippingMethods', this.onBeforeShippingMethods)
-    this.$bus.$off('checkout-before-paymentMethods', this.onBeforePaymentMethods)
     this.$bus.$off('checkout-after-shippingMethodChanged', this.onAfterShippingMethodChanged)
     this.$bus.$off('checkout-after-validationError', this.focusField)
   },
@@ -142,10 +140,6 @@ export default {
       this.$store.dispatch('cart/syncTotals', { forceServerSync: true })
       this.$forceUpdate()
     },
-    onBeforePaymentMethods () {
-      this.$store.dispatch('cart/syncPaymentMethods', { forceServerSync: true })
-      this.$forceUpdate()
-    },
     async onAfterPlaceOrder (payload) {
       this.confirmation = payload.confirmation
       if (this.$store.state.checkout.personalDetails.createAccount) {

From 16094a5727cd3648edac74eeb9f56227df59279f Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Thu, 3 Oct 2019 11:54:44 +0200
Subject: [PATCH 12/99] Removed redundant use of getter

---
 core/modules/cart/store/actions/methodsActions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/cart/store/actions/methodsActions.ts b/core/modules/cart/store/actions/methodsActions.ts
index 5e5bfd9779..5eb415925d 100644
--- a/core/modules/cart/store/actions/methodsActions.ts
+++ b/core/modules/cart/store/actions/methodsActions.ts
@@ -36,7 +36,7 @@ const methodsActions = {
           shippingDetails: rootGetters['checkout/getShippingDetails'],
           shippingMethods: rootGetters['checkout/getShippingMethods'],
           paymentMethods: rootGetters['checkout/getPaymentMethods'],
-          paymentDetails: rootGetters['checkout/getPaymentDetails']
+          paymentDetails: paymentDetails
         })
 
         if (shippingMethodsData.country) {

From 2ce6f5b3d1879c33900922175e5dcda597c04bd3 Mon Sep 17 00:00:00 2001
From: Rain2o <joel.rain2o@gmail.com>
Date: Thu, 3 Oct 2019 11:55:34 +0200
Subject: [PATCH 13/99] unit test for payment methods for billing address
 updates.

---
 .../test/unit/helpers/createOrderData.spec.ts | 47 +++++++++++++++++--
 .../helpers/createShippingInfoData.spec.ts    | 32 +++++++++++++
 .../test/unit/store/methodsActions.spec.ts    |  9 ++--
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/core/modules/cart/test/unit/helpers/createOrderData.spec.ts b/core/modules/cart/test/unit/helpers/createOrderData.spec.ts
index c81c876c74..411162be95 100644
--- a/core/modules/cart/test/unit/helpers/createOrderData.spec.ts
+++ b/core/modules/cart/test/unit/helpers/createOrderData.spec.ts
@@ -19,6 +19,23 @@ const shippingDetails = {
   shippingMethod: 'method'
 };
 
+const paymentDetails = {
+  country: 'UK',
+  firstName: 'John',
+  lastName: 'Doe',
+  city: 'London',
+  zipCode: 'EC123',
+  streetAddress: 'JohnDoe street',
+  region_id: 1,
+  apartmentNumber: '12',
+  state: 'xxxx',
+  phoneNumber: '123123123',
+  company: '',
+  taxId: '',
+  paymentMethod: '',
+  paymentMethodAdditional: []
+};
+
 describe('Cart createOrderData', () => {
   it('returns data with default shipping and default payment', async () => {
     const shippingMethods = [
@@ -47,7 +64,7 @@ describe('Cart createOrderData', () => {
       }
     ];
 
-    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, taxCountry: 'DE' })
+    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, paymentDetails, taxCountry: 'DE' })
 
     expect(methodsData).toEqual({
       carrier_code: 'CODE4',
@@ -60,6 +77,14 @@ describe('Cart createOrderData', () => {
         lastname: 'Doe',
         postcode: 'EC123',
         street: ['JohnDoe street']
+      },
+      billingAddress: {
+        city: 'London',
+        countryId: 'UK',
+        firstname: 'John',
+        lastname: 'Doe',
+        postcode: 'EC123',
+        street: ['JohnDoe street']
       }
     });
   });
@@ -91,7 +116,7 @@ describe('Cart createOrderData', () => {
       }
     ];
 
-    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, taxCountry: 'DE' })
+    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, paymentDetails, taxCountry: 'DE' })
 
     expect(methodsData).toEqual({
       carrier_code: 'CODE2-first',
@@ -104,6 +129,14 @@ describe('Cart createOrderData', () => {
         lastname: 'Doe',
         postcode: 'EC123',
         street: ['JohnDoe street']
+      },
+      billingAddress: {
+        city: 'London',
+        countryId: 'UK',
+        firstname: 'John',
+        lastname: 'Doe',
+        postcode: 'EC123',
+        street: ['JohnDoe street']
       }
     });
   });
@@ -111,7 +144,7 @@ describe('Cart createOrderData', () => {
   it('returns data without payment, carrier and method', async () => {
     const shippingMethods = [];
     const paymentMethods = [];
-    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, taxCountry: 'DE' });
+    const methodsData = createOrderData({ shippingDetails, shippingMethods, paymentMethods, paymentDetails, taxCountry: 'DE' });
 
     expect(methodsData).toEqual({
       carrier_code: null,
@@ -124,6 +157,14 @@ describe('Cart createOrderData', () => {
         lastname: 'Doe',
         postcode: 'EC123',
         street: ['JohnDoe street']
+      },
+      billingAddress: {
+        city: 'London',
+        countryId: 'UK',
+        firstname: 'John',
+        lastname: 'Doe',
+        postcode: 'EC123',
+        street: ['JohnDoe street']
       }
     });
   });
diff --git a/core/modules/cart/test/unit/helpers/createShippingInfoData.spec.ts b/core/modules/cart/test/unit/helpers/createShippingInfoData.spec.ts
index 277ae13103..ed2bfbfc80 100644
--- a/core/modules/cart/test/unit/helpers/createShippingInfoData.spec.ts
+++ b/core/modules/cart/test/unit/helpers/createShippingInfoData.spec.ts
@@ -9,6 +9,7 @@ describe('Cart createShippingInfoData', () => {
     };
     const shippingInfoData = createShippingInfoData(methodsData);
     expect(shippingInfoData).toEqual({
+      billingAddress: {},
       shippingAddress: {
         countryId: 'UK'
       },
@@ -32,6 +33,7 @@ describe('Cart createShippingInfoData', () => {
     };
     const shippingInfoData = createShippingInfoData(methodsData);
     expect(shippingInfoData).toEqual({
+      billingAddress: {},
       shippingAddress: {
         city: 'London',
         countryId: 'UK',
@@ -44,4 +46,34 @@ describe('Cart createShippingInfoData', () => {
       shippingMethodCode: 'YY'
     });
   });
+
+  it('returns methods data with billing address', async () => {
+    const methodsData = {
+      country: 'UK',
+      carrier_code: 'XX',
+      method_code: 'YY',
+      billingAddress: {
+        city: 'London',
+        countryId: 'UK',
+        firstname: 'John',
+        lastname: 'Doe',
+        postcode: 'EC123',
+        street: ['JohnDoe street']
+      }
+    };
+    const shippingInfoData = createShippingInfoData(methodsData);
+    expect(shippingInfoData).toEqual({
+      shippingAddress: { countryId: 'UK' },
+      billingAddress: {
+        city: 'London',
+        countryId: 'UK',
+        firstname: 'John',
+        lastname: 'Doe',
+        postcode: 'EC123',
+        street: ['JohnDoe street']
+      },
+      shippingCarrierCode: 'XX',
+      shippingMethodCode: 'YY'
+    });
+  });
 });
diff --git a/core/modules/cart/test/unit/store/methodsActions.spec.ts b/core/modules/cart/test/unit/store/methodsActions.spec.ts
index 3980de6237..907410a941 100644
--- a/core/modules/cart/test/unit/store/methodsActions.spec.ts
+++ b/core/modules/cart/test/unit/store/methodsActions.spec.ts
@@ -1,6 +1,6 @@
 import * as types from '@vue-storefront/core/modules/cart/store/mutation-types';
 import { CartService } from '@vue-storefront/core/data-resolver';
-import { preparePaymentMethodsToSync } from '@vue-storefront/core/modules/cart/helpers';
+import { preparePaymentMethodsToSync, createOrderData } from '@vue-storefront/core/modules/cart/helpers';
 import cartActions from '@vue-storefront/core/modules/cart/store/actions';
 import { createContextMock } from '@vue-storefront/unit-tests/utils';
 
@@ -59,7 +59,8 @@ jest.mock('@vue-storefront/core/modules/cart/helpers', () => ({
     merge: jest.fn(),
     isEmpty: jest.fn()
   })),
-  preparePaymentMethodsToSync: jest.fn()
+  preparePaymentMethodsToSync: jest.fn(),
+  createOrderData: jest.fn()
 }));
 jest.mock('@vue-storefront/core/helpers', () => ({
   get isServer () {
@@ -119,7 +120,8 @@ describe('Cart methodsActions', () => {
   it('synchronizes payment methods', async () => {
     const contextMock = createContextMock({
       rootGetters: {
-        'checkout/getNotServerPaymentMethods': []
+        'checkout/getNotServerPaymentMethods': [],
+        'checkout/getPaymentDetails': { country: 'US' }
       },
       getters: {
         canUpdateMethods: true,
@@ -128,6 +130,7 @@ describe('Cart methodsActions', () => {
     });
 
     (CartService.getPaymentMethods as jest.Mock).mockImplementation(() => Promise.resolve({ result: {} }));
+    (createOrderData as jest.Mock).mockImplementation(() => ({ shippingMethodsData: {} }));
     (preparePaymentMethodsToSync as jest.Mock).mockImplementation(() => ({ uniqueBackendMethods: [], paymentMethods: [] }));
 
     await (cartActions as any).syncPaymentMethods(contextMock, {});

From 525758924bc165fb3eaf5e3e22cabf1d5fdb4a1b Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Fri, 4 Oct 2019 07:26:12 +0200
Subject: [PATCH 14/99] Fixed cmsBlock getter cmsBlockIdentifier which called
 it self

This leads to an error.
---
 core/modules/cms/store/block/getters.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/cms/store/block/getters.ts b/core/modules/cms/store/block/getters.ts
index a6dea8c0d3..c70f5333f7 100644
--- a/core/modules/cms/store/block/getters.ts
+++ b/core/modules/cms/store/block/getters.ts
@@ -6,7 +6,7 @@ const getters: GetterTree<CmsBlockState, RootState> = {
   // @deprecated
   cmsBlocks: (state, getters) => getters.getCmsBlocks,
   // @deprecated
-  cmsBlockIdentifier: (state, getters) => (identifier) => getters.cmsBlockIdentifier(identifier),
+  cmsBlockIdentifier: (state, getters) => (identifier) => getters.getCmsBlockByIdentifier(identifier),
   // @deprecated
   cmsBlockId: (state, getters) => (id) => getters.getCmsBlockById(id),
   getCmsBlockByIdentifier: (state) => (identifier) =>

From e4678a78ca84a1dbac0d58383593d4275742c8ec Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Fri, 4 Oct 2019 07:36:12 +0200
Subject: [PATCH 15/99] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c64949d845..99c08e0863 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.2] - unreleased
+
+### Fixed
+
+ - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
+
 ## [1.11.0-rc.1] - 2019.10.03
 
 ### Added

From ce8dcaac9cf066e51a1f2faaef517b4bed4ae612 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Fri, 4 Oct 2019 15:43:40 +0200
Subject: [PATCH 16/99] Fix: Dynamic urls name should only be prefixed when
 appendStoreCode is true

This is a fix for when you have the baseStore set to an storeView store
for example de and have appendStoreCode false and url as /. Then it
currently does not work when multistore is active.

With this is does work as the base url is now the de store with no prefix
in the dynamic url name.
---
 core/lib/multistore.ts                              | 8 ++++++--
 core/modules/catalog-next/store/category/actions.ts | 4 ++--
 core/modules/catalog/store/category/actions.ts      | 4 ++--
 core/modules/catalog/store/product/actions.ts       | 4 ++--
 core/modules/url/store/actions.ts                   | 6 +++---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index e0b1244245..22ef790291 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -141,8 +141,11 @@ export function localizedDispatcherRoute (routeObj: LocalizedRoute | string, sto
   return routeObj
 }
 
-export function localizedDispatcherRouteName (routeName: string, storeCode: string): string {
-  return storeCode ? `${storeCode}-${routeName}` : routeName
+export function localizedDispatcherRouteName (routeName: string, storeCode: string, appendStoreCode: boolean = false): string {
+  if (appendStoreCode) {
+    return `${storeCode}-${routeName}`
+  }
+  return routeName
 }
 
 export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig | RawLocation, storeCode: string): any {
@@ -170,6 +173,7 @@ export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig
 }
 
 export function setupMultistoreRoutes (config, router: VueRouter, routes: RouteConfig[], priority: number = 0): void {
+  debugger
   const allRoutes: RouteConfig[] = []
   const { storeCode, appendStoreCode } = currentStoreView()
   if (storeCode && appendStoreCode) {
diff --git a/core/modules/catalog-next/store/category/actions.ts b/core/modules/catalog-next/store/category/actions.ts
index b9de48da1d..5a1a9a5f8e 100644
--- a/core/modules/catalog-next/store/category/actions.ts
+++ b/core/modules/catalog-next/store/category/actions.ts
@@ -109,14 +109,14 @@ const actions: ActionTree<CategoryState, RootState> = {
     })
   },
   async registerCategoryProductsMapping ({ dispatch }, products = []) {
-    const storeCode = currentStoreView().storeCode
+    const { storeCode, appendStoreCode } = currentStoreView()
     await Promise.all(products.map(product => {
       const { url_path, sku, slug, type_id } = product
       return dispatch('url/registerMapping', {
         url: localizedDispatcherRoute(url_path, storeCode),
         routeData: {
           params: { parentSku: product.sku, slug },
-          'name': localizedDispatcherRouteName(type_id + '-product', storeCode)
+          'name': localizedDispatcherRouteName(type_id + '-product', storeCode, appendStoreCode)
         }
       }, { root: true })
     }))
diff --git a/core/modules/catalog/store/category/actions.ts b/core/modules/catalog/store/category/actions.ts
index a98f491cd6..9ac14abc9f 100644
--- a/core/modules/catalog/store/category/actions.ts
+++ b/core/modules/catalog/store/category/actions.ts
@@ -63,7 +63,7 @@ const actions: ActionTree<CategoryState, RootState> = {
     return list
   },
   async registerCategoryMapping ({ dispatch }, { categories }) {
-    const storeCode = currentStoreView().storeCode
+    const { storeCode, appendStoreCode } = currentStoreView()
     for (let category of categories) {
       if (category.url_path) {
         await dispatch('url/registerMapping', {
@@ -72,7 +72,7 @@ const actions: ActionTree<CategoryState, RootState> = {
             params: {
               'slug': category.slug
             },
-            'name': localizedDispatcherRouteName('category', storeCode)
+            'name': localizedDispatcherRouteName('category', storeCode, appendStoreCode)
           }
         }, { root: true })
       }
diff --git a/core/modules/catalog/store/product/actions.ts b/core/modules/catalog/store/product/actions.ts
index 46e9b99590..49fd45011d 100644
--- a/core/modules/catalog/store/product/actions.ts
+++ b/core/modules/catalog/store/product/actions.ts
@@ -296,7 +296,7 @@ const actions: ActionTree<ProductState, RootState> = {
     return searchResult
   },
   preConfigureAssociated (context, { searchResult, prefetchGroupProducts }) {
-    const storeCode = currentStoreView().storeCode
+    const { storeCode, appendStoreCode } = currentStoreView()
     for (let product of searchResult.items) {
       if (product.url_path) {
         const { parentSku, slug } = product
@@ -305,7 +305,7 @@ const actions: ActionTree<ProductState, RootState> = {
           url: localizedDispatcherRoute(product.url_path, storeCode),
           routeData: {
             params: { parentSku, slug },
-            'name': localizedDispatcherRouteName(product.type_id + '-product', storeCode)
+            'name': localizedDispatcherRouteName(product.type_id + '-product', storeCode, appendStoreCode)
           }
         }, { root: true })
       }
diff --git a/core/modules/url/store/actions.ts b/core/modules/url/store/actions.ts
index 66568ccd9f..cb59ae9ca5 100644
--- a/core/modules/url/store/actions.ts
+++ b/core/modules/url/store/actions.ts
@@ -66,7 +66,7 @@ export const actions: ActionTree<UrlState, any> = {
    * This method could be overriden in custom module to provide custom URL mapping logic
    */
   async mappingFallback ({ dispatch }, { url, params }: { url: string, params: any}) {
-    const storeCode = currentStoreView().storeCode
+    const { storeCode, appendStoreCode } = currentStoreView()
     const productQuery = new SearchQuery()
     url = (removeStoreCodeFromRoute(url.startsWith('/') ? url.slice(1) : url) as string)
     productQuery.applyFilter({key: 'url_path', value: {'eq': url}}) // Tees category
@@ -74,7 +74,7 @@ export const actions: ActionTree<UrlState, any> = {
     if (products && products.items && products.items.length) {
       const product = products.items[0]
       return {
-        name: localizedDispatcherRouteName(product.type_id + '-product', storeCode),
+        name: localizedDispatcherRouteName(product.type_id + '-product', storeCode, appendStoreCode),
         params: {
           slug: product.slug,
           parentSku: product.sku,
@@ -85,7 +85,7 @@ export const actions: ActionTree<UrlState, any> = {
       const category = await dispatch('category/single', { key: 'url_path', value: url }, { root: true })
       if (category !== null) {
         return {
-          name: localizedDispatcherRouteName('category', storeCode),
+          name: localizedDispatcherRouteName('category', storeCode, appendStoreCode),
           params: {
             slug: category.slug
           }

From a57d00bc6f8d1c45072c72d0f914fa72e5179b5b Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Fri, 4 Oct 2019 15:50:29 +0200
Subject: [PATCH 17/99] Updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c64949d845..d4da8db453 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.2] - unreleased
+
+### Fixed
+
+ - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+
 ## [1.11.0-rc.1] - 2019.10.03
 
 ### Added

From 6f9d6cb98468cbfbbf1487a4f9d245ce02301588 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Fri, 4 Oct 2019 15:53:39 +0200
Subject: [PATCH 18/99] removed debugger

---
 core/lib/multistore.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/lib/multistore.ts b/core/lib/multistore.ts
index 22ef790291..249b45ee51 100644
--- a/core/lib/multistore.ts
+++ b/core/lib/multistore.ts
@@ -173,7 +173,6 @@ export function localizedRoute (routeObj: LocalizedRoute | string | RouteConfig
 }
 
 export function setupMultistoreRoutes (config, router: VueRouter, routes: RouteConfig[], priority: number = 0): void {
-  debugger
   const allRoutes: RouteConfig[] = []
   const { storeCode, appendStoreCode } = currentStoreView()
   if (storeCode && appendStoreCode) {

From b8ff716f6167b5799ec6734345770d8e2b377e75 Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 3 Oct 2019 11:01:52 +0200
Subject: [PATCH 19/99] update versioning

---
 core/i18n/package.json                        | 2 +-
 core/package.json                             | 2 +-
 docs/package.json                             | 2 +-
 package.json                                  | 2 +-
 packages/cli/boilerplates/module/package.json | 4 ++--
 src/themes/default-amp/package.json           | 2 +-
 src/themes/default/package.json               | 2 +-
 test/unit/package.json                        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/i18n/package.json b/core/i18n/package.json
index 64cba958ec..7b3313dc8e 100644
--- a/core/i18n/package.json
+++ b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",
diff --git a/core/package.json b/core/package.json
index dc7cea68f3..53d75e2c2a 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/core",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Vue Storefront Core",
   "license": "MIT",
   "main": "app.js",
diff --git a/docs/package.json b/docs/package.json
index 7046b21434..0612ce0bfb 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vue-storefront/docs",
   "private": true,
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "scripts": {
     "docs:dev": "vuepress dev",
     "docs:build": "vuepress build",
diff --git a/package.json b/package.json
index a681cade98..7421865ff4 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "A Vue.js, PWA eCommerce frontend",
   "private": true,
   "engines": {
diff --git a/packages/cli/boilerplates/module/package.json b/packages/cli/boilerplates/module/package.json
index 0506626c4f..77b385d0c2 100644
--- a/packages/cli/boilerplates/module/package.json
+++ b/packages/cli/boilerplates/module/package.json
@@ -12,13 +12,13 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.1",
+    "@vue-storefront/core": "^1.11.0-rc.2",
     "ts-loader": "^6.0.4",
     "typescript": "^3.5.2",
     "webpack": "^4.35.2",
     "webpack-cli": "^3.3.5"
   },
   "peerDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.1"
+    "@vue-storefront/core": "^1.11.0-rc.2"
   }
 }
diff --git a/src/themes/default-amp/package.json b/src/themes/default-amp/package.json
index f96a658fa8..53248b805c 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.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "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 612803d26e..73ef55c8ca 100644
--- a/src/themes/default/package.json
+++ b/src/themes/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-default",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Default theme for Vue Storefront",
   "main": "index.js",
   "scripts": {
diff --git a/test/unit/package.json b/test/unit/package.json
index cf5fa8c359..3df062b2ab 100644
--- a/test/unit/package.json
+++ b/test/unit/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@vue-storefront/unit-tests",
   "private": true,
-  "version": "1.11.0-rc.1"
+  "version": "1.11.0-rc.2"
 }

From 6bc5007d494697d76fe36d355c41a711dfa88339 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Sun, 6 Oct 2019 13:23:40 +0200
Subject: [PATCH 20/99] es7 support

---
 CHANGELOG.md                                        | 6 +++++-
 core/i18n/package.json                              | 2 +-
 core/modules/catalog-next/store/category/actions.ts | 3 ++-
 core/modules/catalog-next/store/category/getters.ts | 7 ++++++-
 core/package.json                                   | 2 +-
 docs/package.json                                   | 2 +-
 package.json                                        | 2 +-
 packages/cli/boilerplates/module/package.json       | 4 ++--
 src/themes/default-amp/package.json                 | 2 +-
 src/themes/default/package.json                     | 2 +-
 test/unit/package.json                              | 2 +-
 11 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4da8db453..b8e6a15e23 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
- - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+- Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+
+### Added
+
+- Added support for ES7
 
 ## [1.11.0-rc.1] - 2019.10.03
 
diff --git a/core/i18n/package.json b/core/i18n/package.json
index 7b3313dc8e..64cba958ec 100644
--- a/core/i18n/package.json
+++ b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.11.0-rc.2",
+  "version": "1.11.0-rc.1",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",
diff --git a/core/modules/catalog-next/store/category/actions.ts b/core/modules/catalog-next/store/category/actions.ts
index 5a1a9a5f8e..ec53f86148 100644
--- a/core/modules/catalog-next/store/category/actions.ts
+++ b/core/modules/catalog-next/store/category/actions.ts
@@ -47,7 +47,8 @@ const actions: ActionTree<CategoryState, RootState> = {
   },
   async loadMoreCategoryProducts ({ commit, getters, rootState, dispatch }) {
     const { perPage, start, total } = getters.getCategorySearchProductsStats
-    if (start >= total || total < perPage) return
+    const totalValue = typeof total === 'object' ? total.value : total
+    if (start >= totalValue || totalValue < perPage) return
 
     const searchQuery = getters.getCurrentSearchQuery
     let filterQr = buildFilterProductsQuery(getters.getCurrentCategory, searchQuery.filters)
diff --git a/core/modules/catalog-next/store/category/getters.ts b/core/modules/catalog-next/store/category/getters.ts
index 6f20defe19..dd54b83f2b 100644
--- a/core/modules/catalog-next/store/category/getters.ts
+++ b/core/modules/catalog-next/store/category/getters.ts
@@ -118,7 +118,12 @@ const getters: GetterTree<CategoryState, RootState> = {
     return parseCategoryPath(resultCategoryList)
   },
   getCategorySearchProductsStats: state => state.searchProductsStats || {},
-  getCategoryProductsTotal: (state, getters) => getters.getCategorySearchProductsStats.total || 0
+  getCategoryProductsTotal: (state, getters) => {
+    const { total } = getters.getCategorySearchProductsStats
+    const totalValue = typeof total === 'object' ? total.value : total
+
+    return totalValue || 0
+  }
 }
 
 export default getters
diff --git a/core/package.json b/core/package.json
index 53d75e2c2a..dc7cea68f3 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/core",
-  "version": "1.11.0-rc.2",
+  "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 0612ce0bfb..7046b21434 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vue-storefront/docs",
   "private": true,
-  "version": "1.11.0-rc.2",
+  "version": "1.11.0-rc.1",
   "scripts": {
     "docs:dev": "vuepress dev",
     "docs:build": "vuepress build",
diff --git a/package.json b/package.json
index 7421865ff4..a681cade98 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront",
-  "version": "1.11.0-rc.2",
+  "version": "1.11.0-rc.1",
   "description": "A Vue.js, PWA eCommerce frontend",
   "private": true,
   "engines": {
diff --git a/packages/cli/boilerplates/module/package.json b/packages/cli/boilerplates/module/package.json
index 77b385d0c2..0506626c4f 100644
--- a/packages/cli/boilerplates/module/package.json
+++ b/packages/cli/boilerplates/module/package.json
@@ -12,13 +12,13 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.2",
+    "@vue-storefront/core": "^1.11.0-rc.1",
     "ts-loader": "^6.0.4",
     "typescript": "^3.5.2",
     "webpack": "^4.35.2",
     "webpack-cli": "^3.3.5"
   },
   "peerDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.2"
+    "@vue-storefront/core": "^1.11.0-rc.1"
   }
 }
diff --git a/src/themes/default-amp/package.json b/src/themes/default-amp/package.json
index 53248b805c..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.11.0-rc.2",
+  "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 73ef55c8ca..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.11.0-rc.2",
+  "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 3df062b2ab..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.11.0-rc.2"
+  "version": "1.11.0-rc.1"
 }

From 4b4a40b14f8ede77a030d199d452a6b1b33460d8 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 8 Oct 2019 14:34:08 +0200
Subject: [PATCH 21/99] Fix: bundle product with only one option

---
 .../catalog/components/ProductBundleOption.ts        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index bd770652bc..2abea7733f 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -29,7 +29,10 @@ export const ProductBundleOption = {
       return `bundleOptionQty_${this.option.option_id}`
     },
     value () {
-      return this.option.product_links.find(product => product.id === this.productOptionId)
+      if (Array.isArray(this.option.product_links)) {
+        return this.option.product_links.find(product => product.id === this.productOptionId)
+      }
+      return this.option.product_links
     },
     errorMessage () {
       return this.errorMessages ? this.errorMessages[this.quantityName] : ''
@@ -57,7 +60,12 @@ export const ProductBundleOption = {
   methods: {
     setDefaultValues () {
       if (this.option.product_links) {
-        const defaultOption = this.option.product_links.find(pl => { return pl.is_default })
+        let defaultOption
+        if (Array.isArray(this.option.product_links)) {
+          defaultOption = this.option.product_links.find(pl => { return pl.is_default })
+        } else {
+          defaultOption = this.option.product_links
+        }
         this.productOptionId = defaultOption ? defaultOption.id : this.option.product_links[0].id
         this.quantity = defaultOption ? defaultOption.qty : 1
       }

From 9a61e6f8502276280bc81ce2de679de7812a6d22 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 8 Oct 2019 14:35:11 +0200
Subject: [PATCH 22/99] Fix: possible problem with event that is not working
 because of casing for bundle products

---
 core/modules/catalog/components/ProductBundleOption.ts      | 2 +-
 src/themes/default/components/core/ProductBundleOptions.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index 2abea7733f..9f9aba4c86 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -71,7 +71,7 @@ export const ProductBundleOption = {
       }
     },
     bundleOptionChanged () {
-      this.$emit('optionChanged', {
+      this.$emit('option-changed', {
         option: this.option,
         fieldName: this.productBundleOption,
         qty: this.quantity,
diff --git a/src/themes/default/components/core/ProductBundleOptions.vue b/src/themes/default/components/core/ProductBundleOptions.vue
index 3d12c8a8ea..d36f910e3f 100644
--- a/src/themes/default/components/core/ProductBundleOptions.vue
+++ b/src/themes/default/components/core/ProductBundleOptions.vue
@@ -1,7 +1,7 @@
 <template>
   <form class="custom-options">
     <div v-for="option in product.bundle_options" :key="('bundleOption_' + option.option_id)">
-      <product-bundle-option :option="option" @optionChanged="optionChanged" :error-messages="errorMessages" />
+      <product-bundle-option :option="option" @option-changed="optionChanged" :error-messages="errorMessages" />
     </div>
   </form>
 </template>

From 4992a7ee247bb5f73456ccab6da56e0283eb801f Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 8 Oct 2019 14:37:46 +0200
Subject: [PATCH 23/99] Fix: possible problem when two products have no
 server_item_id and item_id

This is a problem because then they are equal but should not so now we
check if one is undefined and then return false in that case.
---
 core/modules/cart/helpers/productsEquals.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/modules/cart/helpers/productsEquals.ts b/core/modules/cart/helpers/productsEquals.ts
index e354ee4765..0a1698138f 100644
--- a/core/modules/cart/helpers/productsEquals.ts
+++ b/core/modules/cart/helpers/productsEquals.ts
@@ -15,8 +15,12 @@ const getProductType = (product: CartItem): string =>
 const getServerItemId = (product: CartItem): string | number =>
   product.server_item_id || product.item_id
 
-const isServerIdsEquals = (product1: CartItem, product2: CartItem): boolean =>
-  getServerItemId(product1) === getServerItemId(product2)
+const isServerIdsEquals = (product1: CartItem, product2: CartItem): boolean => {
+  if (getServerItemId(product1) === undefined || getServerItemId(product2) === undefined) {
+    return false
+  }
+  return getServerItemId(product1) === getServerItemId(product2)
+}
 
 const isChecksumEquals = (product1: CartItem, product2: CartItem): boolean =>
   getChecksum(product1) === getChecksum(product2)

From f659bdfd004e04d44c62a953cf3546e43f0e7366 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 8 Oct 2019 14:50:33 +0200
Subject: [PATCH 24/99] Updated CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4da8db453..02dbc8a50d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
  - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+ - Fixed three problems you can run into when you have bundle products - @resubaka (#3692)
 
 ## [1.11.0-rc.1] - 2019.10.03
 

From 1f997e6c65db1c60a0eb44d29971c1a87c0337f8 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Wed, 9 Oct 2019 06:10:16 +0200
Subject: [PATCH 25/99] Cosmetic changes in ProductBundleOption.ts and
 productsEquals.ts

---
 core/modules/cart/helpers/productsEquals.ts   |  9 ++++----
 .../catalog/components/ProductBundleOption.ts | 21 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/core/modules/cart/helpers/productsEquals.ts b/core/modules/cart/helpers/productsEquals.ts
index 0a1698138f..92e8870fc9 100644
--- a/core/modules/cart/helpers/productsEquals.ts
+++ b/core/modules/cart/helpers/productsEquals.ts
@@ -16,10 +16,11 @@ const getServerItemId = (product: CartItem): string | number =>
   product.server_item_id || product.item_id
 
 const isServerIdsEquals = (product1: CartItem, product2: CartItem): boolean => {
-  if (getServerItemId(product1) === undefined || getServerItemId(product2) === undefined) {
-    return false
-  }
-  return getServerItemId(product1) === getServerItemId(product2)
+  const product1ItemId = getServerItemId(product1)
+  const product2ItemId = getServerItemId(product2)
+  const areItemIdsDefined = product1ItemId !== undefined && product2ItemId !== undefined
+
+  return areItemIdsDefined && product1ItemId === product2ItemId
 }
 
 const isChecksumEquals = (product1: CartItem, product2: CartItem): boolean =>
diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index 9f9aba4c86..8732ffea61 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -29,10 +29,11 @@ export const ProductBundleOption = {
       return `bundleOptionQty_${this.option.option_id}`
     },
     value () {
-      if (Array.isArray(this.option.product_links)) {
-        return this.option.product_links.find(product => product.id === this.productOptionId)
+      const { product_links } = this.option
+      if (Array.isArray(product_links)) {
+        return product_links.find(product => product.id === this.productOptionId)
       }
-      return this.option.product_links
+      return product_links
     },
     errorMessage () {
       return this.errorMessages ? this.errorMessages[this.quantityName] : ''
@@ -59,14 +60,12 @@ export const ProductBundleOption = {
   },
   methods: {
     setDefaultValues () {
-      if (this.option.product_links) {
-        let defaultOption
-        if (Array.isArray(this.option.product_links)) {
-          defaultOption = this.option.product_links.find(pl => { return pl.is_default })
-        } else {
-          defaultOption = this.option.product_links
-        }
-        this.productOptionId = defaultOption ? defaultOption.id : this.option.product_links[0].id
+      const { product_links } = this.option
+
+      if (product_links) {
+        const defaultOption = Array.isArray(product_links) ? product_links.find(pl => { return pl.is_default }) : product_links
+
+        this.productOptionId = defaultOption ? defaultOption.id : product_links[0].id
         this.quantity = defaultOption ? defaultOption.qty : 1
       }
     },

From da8616bea8f02d5b897f9abeb15932f8f6e1155e Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Wed, 9 Oct 2019 10:29:39 +0200
Subject: [PATCH 26/99] Fixed line length of short if so it is not over 120
 chars

---
 core/modules/catalog/components/ProductBundleOption.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index 8732ffea61..a030effb5f 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -63,7 +63,9 @@ export const ProductBundleOption = {
       const { product_links } = this.option
 
       if (product_links) {
-        const defaultOption = Array.isArray(product_links) ? product_links.find(pl => { return pl.is_default }) : product_links
+        const defaultOption = Array.isArray(product_links)
+          ? product_links.find(pl => { return pl.is_default })
+          : product_links
 
         this.productOptionId = defaultOption ? defaultOption.id : product_links[0].id
         this.quantity = defaultOption ? defaultOption.qty : 1

From 25a13c4beb34bc2e01264763a07302fd467e458b Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Wed, 9 Oct 2019 09:49:48 +0200
Subject: [PATCH 27/99] add checkbox custom opton type

---
 .../components/ProductCustomOptions.ts        | 74 ++++++++++++++-----
 .../components/core/ProductCustomOptions.vue  |  4 +-
 2 files changed, 59 insertions(+), 19 deletions(-)

diff --git a/core/modules/catalog/components/ProductCustomOptions.ts b/core/modules/catalog/components/ProductCustomOptions.ts
index 34f80a5da6..09010443b7 100644
--- a/core/modules/catalog/components/ProductCustomOptions.ts
+++ b/core/modules/catalog/components/ProductCustomOptions.ts
@@ -6,9 +6,15 @@ import { Logger } from '@vue-storefront/core/lib/logger'
 
 function _defaultOptionValue (co) {
   switch (co.type) {
-    case 'radio': return co.values && co.values.length ? co.values[0].option_type_id : 0
-    case 'checkbox': return false
-    default: return ''
+    case 'radio': {
+      return co.values && co.values.length ? co.values[0].option_type_id : 0
+    }
+    case 'checkbox': {
+      return []
+    }
+    default: {
+      return ''
+    }
   }
 }
 
@@ -16,6 +22,29 @@ function _fieldName (co) {
   return 'customOption_' + co.option_id
 }
 
+function _getSelectedOptionValue (optionType, optionValues = [], inputValue) {
+  switch (optionType) {
+    case 'field': {
+      return inputValue
+    }
+    case 'radio':
+    case 'select':
+    case 'drop_down': {
+      const selectedValue = optionValues.find((value) => value.option_type_id === inputValue) || {}
+
+      return selectedValue.option_type_id || ''
+    }
+    case 'checkbox': {
+      return optionValues.filter((value) => (inputValue || []).includes(value.option_type_id))
+        .map((value) => value.option_type_id)
+        .join(',')
+    }
+    default: {
+      return ''
+    }
+  }
+}
+
 export const ProductCustomOptions = {
   name: 'ProductCustomOptions',
   props: {
@@ -26,21 +55,34 @@ export const ProductCustomOptions = {
   },
   data () {
     return {
-      inputValues: {
-      },
-      selectedOptions: {
-      },
+      inputValues: {},
       validation: {
         rules: {},
         results: {}
       }
     }
   },
+  computed: {
+    selectedOptions () {
+      const customOptions = this.product.custom_options
+      if (!customOptions) {
+        return {}
+      }
+
+      return customOptions.reduce((selectedOptions, option) => {
+        const fieldName = _fieldName(option)
+        selectedOptions[fieldName] = _getSelectedOptionValue(option.type, option.values, this.inputValues[fieldName])
+        return selectedOptions
+      }, {})
+    }
+  },
   created () {
     rootStore.dispatch('product/addCustomOptionValidator', {
       validationRule: 'required', // You may add your own custom fields validators elsewhere in the theme
       validatorFunction: (value) => {
-        return { error: (value === null || value === '') || (value === false) || (value === 0), message: i18n.t('Field is required.') }
+        const error = Array.isArray(value) ? !value.length : !value
+        const message = i18n.t('Field is required.')
+        return { error, message }
       }
     })
     this.setupInputFields()
@@ -50,22 +92,20 @@ export const ProductCustomOptions = {
       setCustomOptionValue: types.PRODUCT_SET_CUSTOM_OPTION // map `this.add()` to `this.$store.commit('increment')`
     }),
     setupInputFields () {
-      for (let co of this.product.custom_options) {
-        const fieldName = _fieldName(co)
-        this['inputValues'][fieldName] = _defaultOptionValue(co)
-        if (co.is_require) { // validation rules are very basic
+      for (const customOption of this.product.custom_options) {
+        const fieldName = _fieldName(customOption)
+        this['inputValues'][fieldName] = _defaultOptionValue(customOption)
+        if (customOption.is_require) { // validation rules are very basic
           this.validation.rules[fieldName] = 'required' // TODO: add custom validators for the custom options
         }
-        this.optionChanged(co, co.values && co.values.length > 0 ? co.values[0] : null)
+        this.optionChanged(customOption)
       }
     },
-    optionChanged (option, opval = null) {
+    optionChanged (option) {
       const fieldName = _fieldName(option)
-      const value = opval === null ? this.inputValues[fieldName] : opval.option_type_id
       this.validateField(option)
-      this.setCustomOptionValue({ optionId: option.option_id, optionValue: value })
+      this.setCustomOptionValue({ optionId: option.option_id, optionValue: this.selectedOptions[fieldName] })
       this.$store.dispatch('product/setCustomOptions', { product: this.product, customOptions: this.$store.state.product.current_custom_options }) // TODO: move it to "AddToCart"
-      this.selectedOptions[fieldName] = (opval === null ? value : opval)
       this.$bus.$emit('product-after-customoptions', { product: this.product, option: option, optionValues: this.selectedOptions })
     },
     validateField (option) {
diff --git a/src/themes/default/components/core/ProductCustomOptions.vue b/src/themes/default/components/core/ProductCustomOptions.vue
index 5bf74143f7..7a59caeb31 100644
--- a/src/themes/default/components/core/ProductCustomOptions.vue
+++ b/src/themes/default/components/core/ProductCustomOptions.vue
@@ -18,7 +18,7 @@
         >
         <div class="m5 relative" v-for="opval in option.values" :key="opval.option_type_id" v-if="option.type === 'radio' || option.type === 'select' || option.type === 'drop_down'">
           <input
-            @change="optionChanged(option, opval)"
+            @change="optionChanged(option)"
             type="radio"
             class="m0 no-outline"
             :name="('customOption_' + option.option_id)"
@@ -30,7 +30,7 @@
         </div>
         <div class="m5 relative" v-for="opval in option.values" :key="opval.option_type_id" v-if="option.type === 'checkbox'">
           <input
-            @change="optionChanged(option, opval)"
+            @change="optionChanged(option)"
             type="checkbox"
             class="m0 no-outline"
             :name="('customOption_' + option.option_id)"

From 19c8bc715b75167c8d8843b4b0fc97f8a88a3e96 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Wed, 9 Oct 2019 09:53:21 +0200
Subject: [PATCH 28/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fdf42c160..c31132bc86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,8 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
- - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
- - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+- Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
+- Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+- Fixed handling checkbox custom option (#2781)
 
 ## [1.11.0-rc.1] - 2019.10.03
 

From 95c3bbdc1ce4b4e6bf23ce78a9a6eb4d86bbeb9b Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Wed, 9 Oct 2019 11:00:25 +0200
Subject: [PATCH 29/99] Removed un needed brackets from find callback function

---
 core/modules/catalog/components/ProductBundleOption.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/catalog/components/ProductBundleOption.ts b/core/modules/catalog/components/ProductBundleOption.ts
index a030effb5f..d902cbead3 100644
--- a/core/modules/catalog/components/ProductBundleOption.ts
+++ b/core/modules/catalog/components/ProductBundleOption.ts
@@ -64,7 +64,7 @@ export const ProductBundleOption = {
 
       if (product_links) {
         const defaultOption = Array.isArray(product_links)
-          ? product_links.find(pl => { return pl.is_default })
+          ? product_links.find(pl => pl.is_default)
           : product_links
 
         this.productOptionId = defaultOption ? defaultOption.id : product_links[0].id

From 16327c06756cd9384787ba4af20ab60d99d73f68 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 8 Oct 2019 15:02:45 +0200
Subject: [PATCH 30/99] reset nested menu

---
 .../components/core/blocks/SidebarMenu/SubCategory.vue       | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
index cddee21c82..9751967265 100644
--- a/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
+++ b/src/themes/default/components/core/blocks/SidebarMenu/SubCategory.vue
@@ -143,9 +143,10 @@ export default {
     }
   },
   methods: {
-    logout () {
-      this.$store.dispatch('user/logout', {})
+    async logout () {
+      await this.$store.dispatch('user/logout', {})
       this.$router.push(this.localizedRoute('/'))
+      this.$store.commit('ui/setSubmenu', { depth: false })
     },
     notify (title) {
       if (title === 'My loyalty card' || title === 'My product reviews') {

From 4da78a10f1f466bfdcfc929b9a9209ad9efa05d8 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 8 Oct 2019 15:04:56 +0200
Subject: [PATCH 31/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8fdf42c160..7142a6c990 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.11.0-rc.2] - unreleased
 
 ### Fixed
+- Reset nested menu after logout - @gibkigonzo (#3680)
 
  - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
  - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)

From 4176e2499525b9d8bd5d397f8ffeec41b11cd947 Mon Sep 17 00:00:00 2001
From: kskibinski <kskibinski@divante.pl>
Date: Thu, 10 Oct 2019 15:00:37 +0200
Subject: [PATCH 32/99] Add dependencies to Dockerfile to fix VSF build fails

---
 CHANGELOG.md                     | 3 ++-
 docker/vue-storefront/Dockerfile | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7142a6c990..5a6ef5697a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,8 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.11.0-rc.2] - unreleased
 
 ### Fixed
-- Reset nested menu after logout - @gibkigonzo (#3680)
 
+ - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
+ - Reset nested menu after logout - @gibkigonzo (#3680)
  - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
  - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
 
diff --git a/docker/vue-storefront/Dockerfile b/docker/vue-storefront/Dockerfile
index f0aa2896bd..5fb728d9b0 100644
--- a/docker/vue-storefront/Dockerfile
+++ b/docker/vue-storefront/Dockerfile
@@ -7,7 +7,7 @@ WORKDIR /var/www
 COPY package.json ./
 COPY yarn.lock ./
 
-RUN apk add --no-cache --virtual .build-deps ca-certificates wget git \
+RUN apk add --no-cache --virtual .build-deps ca-certificates wget git python make g++ \
   && yarn install --no-cache \
   && apk del .build-deps
 

From 75dc54c2932deb9733bddf31212b18649c659716 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 10 Oct 2019 17:24:52 +0200
Subject: [PATCH 33/99] add customOption helper

---
 .../components/ProductCustomOptions.ts        | 54 +++----------------
 core/modules/catalog/helpers/customOption.ts  | 40 ++++++++++++++
 2 files changed, 47 insertions(+), 47 deletions(-)
 create mode 100644 core/modules/catalog/helpers/customOption.ts

diff --git a/core/modules/catalog/components/ProductCustomOptions.ts b/core/modules/catalog/components/ProductCustomOptions.ts
index 09010443b7..821eecde03 100644
--- a/core/modules/catalog/components/ProductCustomOptions.ts
+++ b/core/modules/catalog/components/ProductCustomOptions.ts
@@ -1,50 +1,10 @@
+import { customOptionFieldName, selectedCustomOptionValue, defaultCustomOptionValue } from '@vue-storefront/core/modules/catalog/helpers/customOption';
 import { mapMutations } from 'vuex'
 import * as types from '../store/product/mutation-types'
 import rootStore from '@vue-storefront/core/store'
 import i18n from '@vue-storefront/i18n'
 import { Logger } from '@vue-storefront/core/lib/logger'
 
-function _defaultOptionValue (co) {
-  switch (co.type) {
-    case 'radio': {
-      return co.values && co.values.length ? co.values[0].option_type_id : 0
-    }
-    case 'checkbox': {
-      return []
-    }
-    default: {
-      return ''
-    }
-  }
-}
-
-function _fieldName (co) {
-  return 'customOption_' + co.option_id
-}
-
-function _getSelectedOptionValue (optionType, optionValues = [], inputValue) {
-  switch (optionType) {
-    case 'field': {
-      return inputValue
-    }
-    case 'radio':
-    case 'select':
-    case 'drop_down': {
-      const selectedValue = optionValues.find((value) => value.option_type_id === inputValue) || {}
-
-      return selectedValue.option_type_id || ''
-    }
-    case 'checkbox': {
-      return optionValues.filter((value) => (inputValue || []).includes(value.option_type_id))
-        .map((value) => value.option_type_id)
-        .join(',')
-    }
-    default: {
-      return ''
-    }
-  }
-}
-
 export const ProductCustomOptions = {
   name: 'ProductCustomOptions',
   props: {
@@ -70,8 +30,8 @@ export const ProductCustomOptions = {
       }
 
       return customOptions.reduce((selectedOptions, option) => {
-        const fieldName = _fieldName(option)
-        selectedOptions[fieldName] = _getSelectedOptionValue(option.type, option.values, this.inputValues[fieldName])
+        const fieldName = customOptionFieldName(option)
+        selectedOptions[fieldName] = selectedCustomOptionValue(option.type, option.values, this.inputValues[fieldName])
         return selectedOptions
       }, {})
     }
@@ -93,8 +53,8 @@ export const ProductCustomOptions = {
     }),
     setupInputFields () {
       for (const customOption of this.product.custom_options) {
-        const fieldName = _fieldName(customOption)
-        this['inputValues'][fieldName] = _defaultOptionValue(customOption)
+        const fieldName = customOptionFieldName(customOption)
+        this['inputValues'][fieldName] = defaultCustomOptionValue(customOption)
         if (customOption.is_require) { // validation rules are very basic
           this.validation.rules[fieldName] = 'required' // TODO: add custom validators for the custom options
         }
@@ -102,14 +62,14 @@ export const ProductCustomOptions = {
       }
     },
     optionChanged (option) {
-      const fieldName = _fieldName(option)
+      const fieldName = customOptionFieldName(option)
       this.validateField(option)
       this.setCustomOptionValue({ optionId: option.option_id, optionValue: this.selectedOptions[fieldName] })
       this.$store.dispatch('product/setCustomOptions', { product: this.product, customOptions: this.$store.state.product.current_custom_options }) // TODO: move it to "AddToCart"
       this.$bus.$emit('product-after-customoptions', { product: this.product, option: option, optionValues: this.selectedOptions })
     },
     validateField (option) {
-      const fieldName = _fieldName(option)
+      const fieldName = customOptionFieldName(option)
       const validationRule = this.validation.rules[fieldName]
       this.product.errors.custom_options = null
       if (validationRule) {
diff --git a/core/modules/catalog/helpers/customOption.ts b/core/modules/catalog/helpers/customOption.ts
new file mode 100644
index 0000000000..1efa0cba1d
--- /dev/null
+++ b/core/modules/catalog/helpers/customOption.ts
@@ -0,0 +1,40 @@
+export const defaultCustomOptionValue = (co) => {
+  switch (co.type) {
+    case 'radio': {
+      return co.values && co.values.length ? co.values[0].option_type_id : 0
+    }
+    case 'checkbox': {
+      return []
+    }
+    default: {
+      return ''
+    }
+  }
+}
+
+export const customOptionFieldName = (co) => {
+  return 'customOption_' + co.option_id
+}
+
+export const selectedCustomOptionValue = (optionType, optionValues = [], inputValue) => {
+  switch (optionType) {
+    case 'field': {
+      return inputValue
+    }
+    case 'radio':
+    case 'select':
+    case 'drop_down': {
+      const selectedValue = optionValues.find((value) => value.option_type_id === inputValue) || {}
+
+      return selectedValue.option_type_id || ''
+    }
+    case 'checkbox': {
+      return optionValues.filter((value) => (inputValue || []).includes(value.option_type_id))
+        .map((value) => value.option_type_id)
+        .join(',')
+    }
+    default: {
+      return ''
+    }
+  }
+}

From 510b48283ff70d4932e1d32ee93003047fa799eb Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 10 Oct 2019 18:24:25 +0200
Subject: [PATCH 34/99] add types

---
 core/modules/catalog/helpers/customOption.ts | 24 ++++++++++++--------
 core/modules/catalog/types/CustomOption.ts   | 24 ++++++++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)
 create mode 100644 core/modules/catalog/types/CustomOption.ts

diff --git a/core/modules/catalog/helpers/customOption.ts b/core/modules/catalog/helpers/customOption.ts
index 1efa0cba1d..dbd31387fc 100644
--- a/core/modules/catalog/helpers/customOption.ts
+++ b/core/modules/catalog/helpers/customOption.ts
@@ -1,7 +1,9 @@
-export const defaultCustomOptionValue = (co) => {
-  switch (co.type) {
+import { CustomOption, OptionValue, InputValue } from './../types/CustomOption';
+
+export const defaultCustomOptionValue = (customOption: CustomOption): InputValue => {
+  switch (customOption.type) {
     case 'radio': {
-      return co.values && co.values.length ? co.values[0].option_type_id : 0
+      return customOption.values && customOption.values.length ? customOption.values[0].option_type_id : 0
     }
     case 'checkbox': {
       return []
@@ -12,24 +14,26 @@ export const defaultCustomOptionValue = (co) => {
   }
 }
 
-export const customOptionFieldName = (co) => {
-  return 'customOption_' + co.option_id
+export const customOptionFieldName = (customOption: CustomOption): string => {
+  return 'customOption_' + customOption.option_id
 }
 
-export const selectedCustomOptionValue = (optionType, optionValues = [], inputValue) => {
+export const selectedCustomOptionValue = (optionType: string, optionValues: OptionValue[] = [], inputValue: InputValue): string => {
   switch (optionType) {
     case 'field': {
-      return inputValue
+      return inputValue as string
     }
     case 'radio':
     case 'select':
     case 'drop_down': {
-      const selectedValue = optionValues.find((value) => value.option_type_id === inputValue) || {}
+      const selectedValue = optionValues.find((value) => value.option_type_id === inputValue as number)
 
-      return selectedValue.option_type_id || ''
+      return String(selectedValue && selectedValue.option_type_id) || ''
     }
     case 'checkbox': {
-      return optionValues.filter((value) => (inputValue || []).includes(value.option_type_id))
+      const checkboxOptionValues = inputValue as number[] || []
+
+      return optionValues.filter((value) => checkboxOptionValues.includes(value.option_type_id))
         .map((value) => value.option_type_id)
         .join(',')
     }
diff --git a/core/modules/catalog/types/CustomOption.ts b/core/modules/catalog/types/CustomOption.ts
new file mode 100644
index 0000000000..d9c6c9a399
--- /dev/null
+++ b/core/modules/catalog/types/CustomOption.ts
@@ -0,0 +1,24 @@
+export interface CustomOption {
+  image_size_x: number,
+  image_size_y: number,
+  is_require: boolean,
+  max_characters: number,
+  option_id: number,
+  product_sku: string,
+  sort_order: number,
+  title: string,
+  type: string,
+  price?: number,
+  price_type?: string,
+  values?: OptionValue[]
+}
+
+export interface OptionValue {
+  option_type_id: number,
+  price: number,
+  price_type: string,
+  sort_order: number,
+  title: string
+}
+
+export type InputValue = string | number | number[]

From 177663f91d4952d277b59164ec080af2966ad9a8 Mon Sep 17 00:00:00 2001
From: kskibinski <kskibinski@divante.pl>
Date: Fri, 11 Oct 2019 11:42:26 +0200
Subject: [PATCH 35/99] Add unit tests for 'core/modules/mailer'

---
 .eslintrc.js                                  |  1 +
 CHANGELOG.md                                  |  3 ++
 .../mailer/test/unit/sendEmail.spec.ts        | 47 +++++++++++++++++++
 package.json                                  |  6 ++-
 test/unit/jest.conf.js                        |  2 +-
 test/unit/setupTestEnvironment.js             |  1 -
 test/unit/setupTestEnvironment.ts             |  6 +++
 yarn.lock                                     | 31 ++++++++++++
 8 files changed, 94 insertions(+), 3 deletions(-)
 create mode 100644 core/modules/mailer/test/unit/sendEmail.spec.ts
 delete mode 100644 test/unit/setupTestEnvironment.js
 create mode 100644 test/unit/setupTestEnvironment.ts

diff --git a/.eslintrc.js b/.eslintrc.js
index 2d98134c4d..3697d18fb2 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1,6 +1,7 @@
 module.exports = {
   root: true,
   env: { browser: true, jest: true },
+  globals: { fetchMock: true },
   parser: 'vue-eslint-parser',
   parserOptions: {
     parser: '@typescript-eslint/parser',
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26c6f2bc5a..a4ead8809b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+### Added
+
+- Added unit tests for `core/modules/mailer` - @krskibin (#3710)
 
 ## [1.11.0-rc.1] - 2019.10.03
 
diff --git a/core/modules/mailer/test/unit/sendEmail.spec.ts b/core/modules/mailer/test/unit/sendEmail.spec.ts
new file mode 100644
index 0000000000..a36001b3e8
--- /dev/null
+++ b/core/modules/mailer/test/unit/sendEmail.spec.ts
@@ -0,0 +1,47 @@
+import { mailerStore } from '../../store/index'
+import config from 'config'
+
+jest.mock('@vue-storefront/i18n', () => ({ t: jest.fn(str => str) }));
+jest.mock('@vue-storefront/core/lib/storage-manager', () => jest.fn())
+jest.mock('@vue-storefront/core/app', () => jest.fn())
+jest.mock('@vue-storefront/core/lib/multistore', () => jest.fn())
+jest.mock('@vue-storefront/core/store', () => ({ Module: jest.fn() }))
+jest.mock('@vue-storefront/core/lib/logger', () => ({
+  Logger: {
+    error: jest.fn(() => jest.fn())
+  }
+}))
+
+describe('Mailer store module', () => {
+  const letterMock = {}
+  const contextMock = {};
+  const wrapper = (actions: any) => actions.sendEmail(contextMock, letterMock)
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    fetchMock.resetMocks()
+  })
+
+  it('should send email succesfully', async () => {
+    fetchMock.mockResponses(
+      [ JSON.stringify({ code: 200 }), { status: 200 } ],
+      [ JSON.stringify({ send: true }), { status: 200 } ]
+    )
+
+    const res = await wrapper(mailerStore.actions);
+    const resData = await res.json()
+
+    expect(resData.send).toBe(true)
+  })
+
+  it('should thrown error when response code is wrong', async () => {
+    const wrongResponseCode = 201;
+    fetchMock.mockResponseOnce(JSON.stringify({ code: wrongResponseCode }))
+
+    try {
+      const res = await wrapper(mailerStore.actions)
+    } catch (e) {
+      expect(e.message).toBe(`Error: ${wrongResponseCode}`)
+    }
+  })
+})
diff --git a/package.json b/package.json
index 7421865ff4..9987f7098e 100755
--- a/package.json
+++ b/package.json
@@ -50,7 +50,10 @@
   },
   "lint-staged": {
     "*.{js,vue,ts}": "eslint",
-    "**/i18n/*.csv": ["node ./core/scripts/utils/sort-translations.js", "git add"]
+    "**/i18n/*.csv": [
+      "node ./core/scripts/utils/sort-translations.js",
+      "git add"
+    ]
   },
   "husky": {
     "hooks": {
@@ -145,6 +148,7 @@
     "inquirer": "^3.3.0",
     "is-windows": "^1.0.1",
     "jest": "^24.8.0",
+    "jest-fetch-mock": "^2.1.2",
     "jest-serializer-vue": "^2.0.2",
     "jsonfile": "^4.0.0",
     "lerna": "^3.14.1",
diff --git a/test/unit/jest.conf.js b/test/unit/jest.conf.js
index 6a11736922..dadde07caf 100644
--- a/test/unit/jest.conf.js
+++ b/test/unit/jest.conf.js
@@ -36,6 +36,6 @@ module.exports = {
     '<rootDir>/node_modules/(?!lodash-es/.*)'
   ],
   setupFiles: [
-    '<rootDir>/test/unit/setupTestEnvironment.js'
+    '<rootDir>/test/unit/setupTestEnvironment.ts'
   ]
 }
diff --git a/test/unit/setupTestEnvironment.js b/test/unit/setupTestEnvironment.js
deleted file mode 100644
index 33b7c42cf4..0000000000
--- a/test/unit/setupTestEnvironment.js
+++ /dev/null
@@ -1 +0,0 @@
-import '@babel/polyfill'
diff --git a/test/unit/setupTestEnvironment.ts b/test/unit/setupTestEnvironment.ts
new file mode 100644
index 0000000000..a225c14563
--- /dev/null
+++ b/test/unit/setupTestEnvironment.ts
@@ -0,0 +1,6 @@
+import '@babel/polyfill'
+import {GlobalWithFetchMock} from 'jest-fetch-mock';
+
+const customGlobal: GlobalWithFetchMock = global as GlobalWithFetchMock;
+customGlobal.fetch = require('jest-fetch-mock');
+customGlobal.fetchMock = customGlobal.fetch;
diff --git a/yarn.lock b/yarn.lock
index 3de0ff47e4..0bac2b2700 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4943,6 +4943,14 @@ cross-env@^3.1.4:
     cross-spawn "^5.1.0"
     is-windows "^1.0.0"
 
+cross-fetch@^2.2.2:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz#e8a0b3c54598136e037f8650f8e823ccdfac198e"
+  integrity sha512-PrWWNH3yL2NYIb/7WF/5vFG3DCQiXDOVf8k3ijatbrtnwNuhMWLC7YF7uqf53tbTFDzHIUD8oITw4Bxt8ST3Nw==
+  dependencies:
+    node-fetch "2.1.2"
+    whatwg-fetch "2.0.4"
+
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -8128,6 +8136,14 @@ jest-environment-node@^24.8.0:
     jest-mock "^24.8.0"
     jest-util "^24.8.0"
 
+jest-fetch-mock@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-2.1.2.tgz#1260b347918e3931c4ec743ceaf60433da661bd0"
+  integrity sha512-tcSR4Lh2bWLe1+0w/IwvNxeDocMI/6yIA2bijZ0fyWxC4kQ18lckQ1n7Yd40NKuisGmcGBRFPandRXrW/ti/Bw==
+  dependencies:
+    cross-fetch "^2.2.2"
+    promise-polyfill "^7.1.1"
+
 jest-get-type@^24.8.0:
   version "24.8.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.8.0.tgz#a7440de30b651f5a70ea3ed7ff073a32dfe646fc"
@@ -9815,6 +9831,11 @@ node-fetch-npm@^2.0.2:
     json-parse-better-errors "^1.0.0"
     safe-buffer "^5.1.1"
 
+node-fetch@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
+  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
+
 node-fetch@^1.0.1:
   version "1.7.3"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-1.7.3.tgz#980f6f72d85211a5347c6b2bc18c5b84c3eb47ef"
@@ -11201,6 +11222,11 @@ promise-inflight@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
 
+promise-polyfill@^7.1.1:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz#ab05301d8c28536301622d69227632269a70ca3b"
+  integrity sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ==
+
 promise-retry@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
@@ -13990,6 +14016,11 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
   dependencies:
     iconv-lite "0.4.24"
 
+whatwg-fetch@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
+  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
+
 whatwg-fetch@>=0.10.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz#fc804e458cc460009b1a2b966bc8817d2578aefb"

From 860d7aa5b71e881f8b5598d7a49e8152af1ec388 Mon Sep 17 00:00:00 2001
From: Patryk Andrzejewski <vox3r69@gmail.com>
Date: Fri, 11 Oct 2019 23:23:43 +0200
Subject: [PATCH 36/99] Update CHANGELOG.md

---
 CHANGELOG.md | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 315ddbfb0d..6b12223ad4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,20 @@ 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
+## [1.11.0-rc.2] - unreleased
+
+### Fixed
+- Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
+- Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
+- Fixed three problems you can run into when you have bundle products - @resubaka (#3692)
+- Reset nested menu after logout - @gibkigonzo (#3680)
+- Fixed handling checkbox custom option -  @gibkigonzo (#2781)
+- Get payment methods with billing address data - @rain2o (#2878)
+
+### Added
+- Added support for ES7 - @andrzejewsky (#3690)
+
+## [1.11.0-rc.1] - 2019.10.03
 
 ### Added
 
@@ -56,7 +69,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
 - Added tests for cart module actions - @andrzejewsky (#3023)
 - Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
-- Get payment methods with billing address data - @rain2o (#2878)
 - Fixed problem with bundle product where they have the same hash as other products - @resubaka (#3657)
 
 ### Fixed

From 71806f6908dd45ac5f49ea37604bd96c3209ea1e Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Fri, 11 Oct 2019 23:39:54 +0200
Subject: [PATCH 37/99] resolve conflicts

---
 core/i18n/package.json                        | 2 +-
 core/package.json                             | 2 +-
 docs/package.json                             | 2 +-
 package.json                                  | 2 +-
 packages/cli/boilerplates/module/package.json | 4 ++--
 src/themes/default-amp/package.json           | 2 +-
 src/themes/default/package.json               | 2 +-
 test/unit/package.json                        | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/core/i18n/package.json b/core/i18n/package.json
index 7b3313dc8e..64cba958ec 100644
--- a/core/i18n/package.json
+++ b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.11.0-rc.2",
+  "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 53d75e2c2a..dc7cea68f3 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/core",
-  "version": "1.11.0-rc.2",
+  "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 0612ce0bfb..7046b21434 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vue-storefront/docs",
   "private": true,
-  "version": "1.11.0-rc.2",
+  "version": "1.11.0-rc.1",
   "scripts": {
     "docs:dev": "vuepress dev",
     "docs:build": "vuepress build",
diff --git a/package.json b/package.json
index 9987f7098e..5b3ec19900 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront",
-  "version": "1.11.0-rc.2",
+  "version": "1.11.0-rc.1",
   "description": "A Vue.js, PWA eCommerce frontend",
   "private": true,
   "engines": {
diff --git a/packages/cli/boilerplates/module/package.json b/packages/cli/boilerplates/module/package.json
index 77b385d0c2..0506626c4f 100644
--- a/packages/cli/boilerplates/module/package.json
+++ b/packages/cli/boilerplates/module/package.json
@@ -12,13 +12,13 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.2",
+    "@vue-storefront/core": "^1.11.0-rc.1",
     "ts-loader": "^6.0.4",
     "typescript": "^3.5.2",
     "webpack": "^4.35.2",
     "webpack-cli": "^3.3.5"
   },
   "peerDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.2"
+    "@vue-storefront/core": "^1.11.0-rc.1"
   }
 }
diff --git a/src/themes/default-amp/package.json b/src/themes/default-amp/package.json
index 53248b805c..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.11.0-rc.2",
+  "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 73ef55c8ca..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.11.0-rc.2",
+  "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 3df062b2ab..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.11.0-rc.2"
+  "version": "1.11.0-rc.1"
 }

From 7843186287e1638bcdf2e726fc26ed23627def5f Mon Sep 17 00:00:00 2001
From: patzick <tomczyk.patryk@gmail.com>
Date: Thu, 3 Oct 2019 11:01:52 +0200
Subject: [PATCH 38/99] update versioning

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15aee575e1..a0eef5d9b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed three problems you can run into when you have bundle products - @resubaka (#3692)
 - Reset nested menu after logout - @gibkigonzo (#3680)
 - Fixed handling checkbox custom option -  @gibkigonzo (#2781)
+- Fixed typos in docs - @afozbek (#3709)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 2fa6728b604d98843f1a2ac0f61fa16434a0d79a Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Sat, 12 Oct 2019 13:57:27 +0200
Subject: [PATCH 39/99] resolve conflicts

---
 CONTRIBUTING.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 48784e9536..00130e0de7 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,10 +35,8 @@ Here are some thoughts on how to use TypeScript features in Vue Storefront: [Typ
 
 ## Pull Request Checklist
 
-Here's how to submit a pull request. **Pull request that don't meet these requirements will not be merged.**
-
-**ALWAYS** use the [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
-1. Fork the repository and clone it locally fro the 'develop' branch. Make sure it's up to date with current `develop` branch
+**ALWAYS** use [Pull Request template](https://github.com/DivanteLtd/vue-storefront/blob/master/PULL_REQUEST_TEMPLATE.md) it's automatically added to each PR.
+1. Fork the repository and clone it locally from the 'develop' branch. Make sure it's up to date with current `develop` branch
 2. Create a branch for your edits. Use the following branch naming conventions:
  * bugfix/task-title
  * feature/task-name
@@ -46,7 +44,7 @@ Here's how to submit a pull request. **Pull request that don't meet these requir
 4. Reference any relevant issues or supporting documentation in your PR (ex. “Issue: 39. Issue title.”).
 5. If you are adding new feature provide documentation along with the PR. Also, add it to [upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Upgrade%20notes.md)
 6. If you are removing/renaming something or changing its behavior also include it in [upgrade notes](https://github.com/DivanteLtd/vue-storefront/blob/master/doc/Upgrade%20notes.md)
-7. Test your changes! Run your changes against any existing tests and create new ones when needed. Make sure your changes don’t break the existing project. Make sure that your branch is passing Travis CI build. 
+7. Test your changes! Run your changes against any existing tests and create new ones when needed. Make sure your changes don’t break the existing project. Make sure that your branch is passing Travis CI build.
 8. If you have found a potential security vulnerability, please DO NOT report it on the public issue tracker. Instead, send it to us at contributors@vuestorefront.io. We will work with you to verify and fix it as soon as possible.
 (https://github.com/DivanteLtd/vue-storefront/blob/master/README.md#documentation--table-of-contents))
 
@@ -54,5 +52,5 @@ Here's how to submit a pull request. **Pull request that don't meet these requir
 
 Your pull request will be merged after meeting following criteria:
 - Everything from "Pull Request Checklist"
-- Pull request is proposed to appropriate branch 
+- PR is proposed to appropriate branch
 - There are at least two approvals from core team members

From c7cd210f16b54a783c3857ab365ad4954bbb5468 Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Sun, 13 Oct 2019 10:39:21 +0200
Subject: [PATCH 40/99] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba83c88b86..622c9b01a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -70,6 +70,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
 - Added tests for cart module actions - @andrzejewsky (#3023)
 - Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
+- Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713)
 
 ### Fixed
 

From e265bcbae20002e575b7407ff72cdfc1ec18aedb Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Sun, 13 Oct 2019 16:26:06 +0200
Subject: [PATCH 41/99] Add custom system filter fields as config value

---
 config/default.json                                | 1 +
 core/modules/catalog-next/helpers/filterHelpers.ts | 5 +++--
 docs/guide/basics/configuration.md                 | 6 ++++++
 docs/guide/cookbook/setup.md                       | 1 +
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/config/default.json b/config/default.json
index d917d5e340..3d17299236 100644
--- a/config/default.json
+++ b/config/default.json
@@ -311,6 +311,7 @@
     "setupVariantByAttributeCode": true,
     "endpoint": "/api/product",
     "defaultFilters": ["color", "size", "price", "erin_recommends"],
+    "systemFilterNames": ["sort", "pagesize"],
     "maxFiltersQuerySize": 999,
     "routerFiltersSource": "query",
     "filterFieldMapping": {
diff --git a/core/modules/catalog-next/helpers/filterHelpers.ts b/core/modules/catalog-next/helpers/filterHelpers.ts
index cac1d3702a..9981aba2bb 100644
--- a/core/modules/catalog-next/helpers/filterHelpers.ts
+++ b/core/modules/catalog-next/helpers/filterHelpers.ts
@@ -1,6 +1,7 @@
-import FilterVariant from 'core/modules/catalog-next/types/FilterVariant';
+import config from 'config'
+import FilterVariant from 'core/modules/catalog-next/types/FilterVariant'
 
-export const getSystemFilterNames: string[] = ['sort']
+export const getSystemFilterNames: string[] = config.products.systemFilterNames
 
 /**
  * Creates new filtersQuery (based on currentQuery) by modifying specific filter variant.
diff --git a/docs/guide/basics/configuration.md b/docs/guide/basics/configuration.md
index 21b2c3b32f..02ad8814eb 100644
--- a/docs/guide/basics/configuration.md
+++ b/docs/guide/basics/configuration.md
@@ -496,6 +496,12 @@ This is the `vue-storefront-api` endpoint for rendering product lists.
 
 Here, we have the sort field settings as they're displayed on the Category page.
 
+```json
+  "systemFilterNames": ["sort", "pagesize"],
+```
+
+This is array of query-fields which won't be treated as filter fields when in URL.
+
 ```json
   "gallery": {
       "mergeConfigurableChildren": true
diff --git a/docs/guide/cookbook/setup.md b/docs/guide/cookbook/setup.md
index 84075a4e6e..baccae9739 100644
--- a/docs/guide/cookbook/setup.md
+++ b/docs/guide/cookbook/setup.md
@@ -1131,6 +1131,7 @@ At [`vue-storefront/config/default.json`](https://github.com/DivanteLtd/vue-stor
   "setupVariantByAttributeCode": true,
   "endpoint": "http://localhost:8080/api/product",
   "defaultFilters": ["color", "size", "price", "erin_recommends"],
+  "systemFilterNames": ["sort", "pagesize"],
   "filterFieldMapping": {
     "category.name": "category.name.keyword"
   },

From c358e7ec6cc948131e0ba2750c902ee6930bf4c7 Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Sun, 13 Oct 2019 16:31:41 +0200
Subject: [PATCH 42/99] Fix typo in docs

---
 docs/guide/basics/configuration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/guide/basics/configuration.md b/docs/guide/basics/configuration.md
index 02ad8814eb..8668fa69d1 100644
--- a/docs/guide/basics/configuration.md
+++ b/docs/guide/basics/configuration.md
@@ -500,7 +500,7 @@ Here, we have the sort field settings as they're displayed on the Category page.
   "systemFilterNames": ["sort", "pagesize"],
 ```
 
-This is array of query-fields which won't be treated as filter fields when in URL.
+This is an array of query-fields which won't be treated as filter fields when in URL.
 
 ```json
   "gallery": {

From c0503f72e9477b302182024f2e3ad8e243dae41e Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Sun, 13 Oct 2019 10:36:19 +0200
Subject: [PATCH 43/99] Add custom `pageSize` parameter for
 `category-next/loadCategoryProducts`

---
 core/modules/catalog-next/store/category/actions.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/core/modules/catalog-next/store/category/actions.ts b/core/modules/catalog-next/store/category/actions.ts
index ec53f86148..82703450dc 100644
--- a/core/modules/catalog-next/store/category/actions.ts
+++ b/core/modules/catalog-next/store/category/actions.ts
@@ -23,7 +23,7 @@ import omit from 'lodash-es/omit'
 import config from 'config'
 
 const actions: ActionTree<CategoryState, RootState> = {
-  async loadCategoryProducts ({ commit, getters, dispatch, rootState }, { route, category } = {}) {
+  async loadCategoryProducts ({ commit, getters, dispatch, rootState }, { route, category, pageSize = 50 } = {}) {
     const searchCategory = category || getters.getCategoryFrom(route.path) || {}
     const categoryMappedFilters = getters.getFiltersMap[searchCategory.id]
     const areFiltersInQuery = !!Object.keys(route[products.routerFiltersSource]).length
@@ -36,7 +36,8 @@ const actions: ActionTree<CategoryState, RootState> = {
       query: filterQr,
       sort: searchQuery.sort,
       includeFields: entities.productList.includeFields,
-      excludeFields: entities.productList.excludeFields
+      excludeFields: entities.productList.excludeFields,
+      size: pageSize
     })
     await dispatch('loadAvailableFiltersFrom', {aggregations, category: searchCategory, filters: searchQuery.filters})
     commit(types.CATEGORY_SET_SEARCH_PRODUCTS_STATS, { perPage, start, total })

From 279475b90a9f0b578d411a02eecb2278ded96bad Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Sun, 13 Oct 2019 18:23:19 +0200
Subject: [PATCH 44/99] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 622c9b01a2..c673e48116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
+- Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 
 ## [1.11.0-rc.1] - 2019.10.03
 
@@ -70,7 +71,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
 - Added tests for cart module actions - @andrzejewsky (#3023)
 - Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
-- Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713)
 
 ### Fixed
 

From 4cdfd8cc47dbe9df6f38f6b94f0f7a4dc1e9a4af Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Mon, 14 Oct 2019 06:37:17 +0200
Subject: [PATCH 45/99] Remove unneeded "pagesize" config value item

---
 config/default.json                | 2 +-
 docs/guide/basics/configuration.md | 2 +-
 docs/guide/cookbook/setup.md       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/default.json b/config/default.json
index 3d17299236..a58bb56d61 100644
--- a/config/default.json
+++ b/config/default.json
@@ -311,7 +311,7 @@
     "setupVariantByAttributeCode": true,
     "endpoint": "/api/product",
     "defaultFilters": ["color", "size", "price", "erin_recommends"],
-    "systemFilterNames": ["sort", "pagesize"],
+    "systemFilterNames": ["sort"],
     "maxFiltersQuerySize": 999,
     "routerFiltersSource": "query",
     "filterFieldMapping": {
diff --git a/docs/guide/basics/configuration.md b/docs/guide/basics/configuration.md
index 8668fa69d1..4382698a95 100644
--- a/docs/guide/basics/configuration.md
+++ b/docs/guide/basics/configuration.md
@@ -497,7 +497,7 @@ This is the `vue-storefront-api` endpoint for rendering product lists.
 Here, we have the sort field settings as they're displayed on the Category page.
 
 ```json
-  "systemFilterNames": ["sort", "pagesize"],
+  "systemFilterNames": ["sort"],
 ```
 
 This is an array of query-fields which won't be treated as filter fields when in URL.
diff --git a/docs/guide/cookbook/setup.md b/docs/guide/cookbook/setup.md
index baccae9739..ea977f50b7 100644
--- a/docs/guide/cookbook/setup.md
+++ b/docs/guide/cookbook/setup.md
@@ -1131,7 +1131,7 @@ At [`vue-storefront/config/default.json`](https://github.com/DivanteLtd/vue-stor
   "setupVariantByAttributeCode": true,
   "endpoint": "http://localhost:8080/api/product",
   "defaultFilters": ["color", "size", "price", "erin_recommends"],
-  "systemFilterNames": ["sort", "pagesize"],
+  "systemFilterNames": ["sort"],
   "filterFieldMapping": {
     "category.name": "category.name.keyword"
   },

From b39ee28c60542cdce16a330de38fddc2935f1cb0 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 15 Oct 2019 15:21:24 +0200
Subject: [PATCH 46/99] Fixed error around sort option in graphql

---
 core/lib/search/adapter/graphql/gqlQuery.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/lib/search/adapter/graphql/gqlQuery.js b/core/lib/search/adapter/graphql/gqlQuery.js
index 0bb90a660e..c065a36689 100644
--- a/core/lib/search/adapter/graphql/gqlQuery.js
+++ b/core/lib/search/adapter/graphql/gqlQuery.js
@@ -45,7 +45,11 @@ export function prepareQueryVars (Request) {
 
   if (Request.sort !== '') {
     const sortParse = Request.sort.split(':')
-    queryVariables.sort[sortParse[0]] = sortParse[1].toUpperCase()
+    if (sortParse[1] !== undefined) {
+      queryVariables.sort[sortParse[0]] = sortParse[1].toUpperCase()
+    } else {
+      queryVariables.sort[sortParse[0]] = 'ASC'
+    }
   }
 
   queryVariables.pageSize = Request.size

From 28d1fed57091683e1d7ca9500d098d1a239b5c25 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 15 Oct 2019 15:22:01 +0200
Subject: [PATCH 47/99] Added in to cmsBlock items response in graphql

---
 core/lib/search/adapter/graphql/queries/cmsBlock.gql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/lib/search/adapter/graphql/queries/cmsBlock.gql b/core/lib/search/adapter/graphql/queries/cmsBlock.gql
index 74f5b6531a..e9cdb49214 100644
--- a/core/lib/search/adapter/graphql/queries/cmsBlock.gql
+++ b/core/lib/search/adapter/graphql/queries/cmsBlock.gql
@@ -5,9 +5,10 @@ query cmsBlocks ($filter: CmsInput) {
   {
     items {
       title
+      id
       identifier
       content
       creation_time
     }
   }
-}
\ No newline at end of file
+}

From 0627ab29210940e5eb9721f0e94ab00608ee7138 Mon Sep 17 00:00:00 2001
From: ResuBaka <resubaka@gmail.com>
Date: Tue, 15 Oct 2019 15:24:34 +0200
Subject: [PATCH 48/99] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98435d2516..bb42fb2920 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed handling checkbox custom option -  @gibkigonzo (#2781)
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
+- Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From a084ebc663b4859f976c18d74d6db388b53a0a59 Mon Sep 17 00:00:00 2001
From: ResuBaka <ResuBaka@users.noreply.github.com>
Date: Wed, 16 Oct 2019 06:35:05 +0200
Subject: [PATCH 49/99] Small fix to default sort order of _score

As _score needs to be default DESC and not ASC we need to check if the sort key is _score or not.
---
 core/lib/search/adapter/graphql/gqlQuery.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/lib/search/adapter/graphql/gqlQuery.js b/core/lib/search/adapter/graphql/gqlQuery.js
index c065a36689..80595a9f7d 100644
--- a/core/lib/search/adapter/graphql/gqlQuery.js
+++ b/core/lib/search/adapter/graphql/gqlQuery.js
@@ -48,7 +48,11 @@ export function prepareQueryVars (Request) {
     if (sortParse[1] !== undefined) {
       queryVariables.sort[sortParse[0]] = sortParse[1].toUpperCase()
     } else {
-      queryVariables.sort[sortParse[0]] = 'ASC'
+      if (sortParse[0] === '_score') {
+        queryVariables.sort[sortParse[0]] = 'DESC'
+      } else {
+        queryVariables.sort[sortParse[0]] = 'ASC'
+      }
     }
   }
 

From dd77bbac9ed5dc0c916814fb4a71936a6e892b40 Mon Sep 17 00:00:00 2001
From: cewald <c.ewald@impericon.com>
Date: Wed, 16 Oct 2019 07:57:02 +0200
Subject: [PATCH 50/99] Add config value to getter

---
 core/modules/catalog-next/store/category/getters.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/catalog-next/store/category/getters.ts b/core/modules/catalog-next/store/category/getters.ts
index dd54b83f2b..9cff3f2ca5 100644
--- a/core/modules/catalog-next/store/category/getters.ts
+++ b/core/modules/catalog-next/store/category/getters.ts
@@ -107,7 +107,7 @@ const getters: GetterTree<CategoryState, RootState> = {
   getCurrentSearchQuery: (state, getters, rootState) => getters.getCurrentFiltersFrom(rootState.route[products.routerFiltersSource]),
   getCurrentFilters: (state, getters) => getters.getCurrentSearchQuery.filters,
   hasActiveFilters: (state, getters) => !!Object.keys(getters.getCurrentFilters).length,
-  getSystemFilterNames: () => ['sort'],
+  getSystemFilterNames: () => products.systemFilterNames,
   getBreadcrumbs: (state, getters) => getters.getBreadcrumbsFor(getters.getCurrentCategory),
   getBreadcrumbsFor: (state, getters) => category => {
     if (!category) return []

From e09b890188490b2078f5defc5d53a2d06fc8faa0 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 15 Oct 2019 16:44:31 +0200
Subject: [PATCH 51/99] add product-quantity component

---
 .../components/core/ProductQuantity.vue       | 102 ++++++++++++++++++
 src/themes/default/pages/Product.vue          |  69 ++++--------
 2 files changed, 120 insertions(+), 51 deletions(-)
 create mode 100644 src/themes/default/components/core/ProductQuantity.vue

diff --git a/src/themes/default/components/core/ProductQuantity.vue b/src/themes/default/components/core/ProductQuantity.vue
new file mode 100644
index 0000000000..baa3b33d3e
--- /dev/null
+++ b/src/themes/default/components/core/ProductQuantity.vue
@@ -0,0 +1,102 @@
+<template>
+  <div class="product-quantity">
+    <base-input-number
+      :name="name"
+      :value="value"
+      :min="1"
+      :max="maxQuantity"
+      :disabled="disabled"
+      @input="$emit('input', $event)"
+      @blur="$v.$touch()"
+      :validations="[
+        {
+          condition: !$v.value.numeric || !$v.value.minValue || !$v.value.required,
+          text: $t(`Quantity must be positive integer`)
+        },
+        {
+          condition: maxQuantity && value && !$v.value.maxValue,
+          text: $t('Quantity must be below {quantity}', { quantity: maxQuantity })
+        }
+      ]"
+    />
+    <spinner v-if="loading" />
+  </div>
+</template>
+
+<script>
+import { minValue, maxValue, numeric, required } from 'vuelidate/lib/validators'
+import { onlineHelper } from '@vue-storefront/core/helpers'
+import BaseInputNumber from 'theme/components/core/blocks/Form/BaseInputNumber'
+import Spinner from 'theme/components/core/Spinner'
+
+export default {
+  components: {
+    Spinner,
+    BaseInputNumber
+  },
+  props: {
+    value: {
+      type: [Number, String],
+      required: true
+    },
+    showQuantity: {
+      type: Boolean,
+      default: false
+    },
+    maxQuantity: {
+      type: Number,
+      required: true
+    },
+    loading: {
+      type: Boolean,
+      default: false
+    },
+    isSimpleOrConfigurable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  computed: {
+    isOnline (value) {
+      return onlineHelper.isOnline
+    },
+    disabled () {
+      return this.isOnline ? !this.maxQuantity : false
+    },
+    name () {
+      if (this.isSimpleOrConfigurable && !this.loading && this.showQuantity) {
+        return this.$i18n.t(this.isOnline ? 'Quantity available' : 'Quantity available offline', { qty: this.maxQuantity })
+      }
+      return this.$i18n.t('Quantity')
+    }
+  },
+  validations () {
+    return {
+      value: {
+        minValue: minValue(1),
+        maxValue: maxValue(this.maxQuantity) && !this.isSimpleOrConfigurable,
+        numeric,
+        required
+      }
+    }
+  },
+  watch: {
+    '$v.$invalid' (error) {
+      this.$emit('error', error)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.product-quantity {
+  position: relative;
+  /deep/ .spinner {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    margin: auto;
+  }
+}
+</style>
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index 36b7aeb0ad..4e7fefb849 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -128,31 +128,16 @@
               v-else-if="getCurrentProduct.custom_options && getCurrentProduct.custom_options.length > 0"
               :product="getCurrentProduct"
             />
-            <div
+            <product-quantity
               class="row m0 mb35"
               v-if="getCurrentProduct.type_id !== 'grouped' && getCurrentProduct.type_id !== 'bundle'"
-            >
-              <base-input-number
-                :name="getInputName"
-                v-model="getCurrentProduct.qty"
-                :min="quantity ? 1 : 0"
-                :max="maxQuantity"
-                :disabled="quantityDisabled"
-                :value="quantity ? 1 : 0"
-                @blur="$v.$touch()"
-                :validations="[
-                  {
-                    condition: !$v.getCurrentProduct.qty.numeric || !$v.getCurrentProduct.qty.minValue,
-                    text: $t(`Quantity must be positive integer`)
-                  },
-                  {
-                    condition: quantity && getCurrentProduct.qty && !$v.getCurrentProduct.qty.maxValue,
-                    text: $t('Quantity must be below {quantity}', { quantity: quantity })
-                  }
-                ]"
-              />
-              <Spinner v-if="isStockInfoLoading" />
-            </div>
+              v-model="getCurrentProduct.qty"
+              :max-quantity="maxQuantity"
+              :loading="isStockInfoLoading"
+              :is-simple-or-configurable="isSimpleOrConfigurable"
+              show-quantity
+              @error="getQuantityError"
+            />
             <div class="row m0">
               <add-to-cart
                 :product="getCurrentProduct"
@@ -230,6 +215,7 @@ import ColorSelector from 'theme/components/core/ColorSelector.vue'
 import SizeSelector from 'theme/components/core/SizeSelector.vue'
 import Breadcrumbs from 'theme/components/core/Breadcrumbs.vue'
 import ProductAttribute from 'theme/components/core/ProductAttribute.vue'
+import ProductQuantity from 'theme/components/core/ProductQuantity.vue'
 import ProductLinks from 'theme/components/core/ProductLinks.vue'
 import ProductCustomOptions from 'theme/components/core/ProductCustomOptions.vue'
 import ProductBundleOptions from 'theme/components/core/ProductBundleOptions.vue'
@@ -273,10 +259,9 @@ export default {
     Reviews,
     SizeSelector,
     WebShare,
-    BaseInputNumber,
     SizeGuide,
-    Spinner,
-    LazyHydrate
+    LazyHydrate,
+    ProductQuantity
   },
   mixins: [ProductOption],
   directives: { focusClean },
@@ -287,7 +272,8 @@ export default {
   data () {
     return {
       detailsOpen: false,
-      quantity: 0,
+      maxQuantity: 0,
+      quantityError: false,
       isStockInfoLoading: false,
       hasAttributesLoaded: false
     }
@@ -351,18 +337,8 @@ export default {
       ) { return true }
       return false
     },
-    getInputName () {
-      if (this.isSimpleOrConfigurable && !this.isStockInfoLoading) { return this.$i18n.t(this.isOnline ? 'Quantity available' : 'Quantity available offline', { qty: this.quantity }) }
-      return this.$i18n.t('Quantity')
-    },
     isAddToCartDisabled () {
-      return this.$v.$invalid || this.isStockInfoLoading || (this.isOnline && (!this.quantity && this.isSimpleOrConfigurable))
-    },
-    maxQuantity () {
-      return this.isOnline ? this.quantity : null
-    },
-    quantityDisabled () {
-      return this.isOnline ? !this.quantity : false
+      return this.quantityError || this.isStockInfoLoading || (this.isOnline && (!this.maxQuantity && this.isSimpleOrConfigurable))
     }
   },
   async mounted () {
@@ -426,26 +402,17 @@ export default {
       if (this.isStockInfoLoading) return // stock info is already loading
       this.isStockInfoLoading = true
       try {
-        this.quantity = null
         const res = await this.$store.dispatch('stock/check', {
           product: this.getCurrentProduct,
           qty: this.getCurrentProduct.qty
         })
-        this.quantity = res.qty
+        this.maxQuantity = res.qty
       } finally {
         this.isStockInfoLoading = false
       }
-    }
-  },
-  validations () {
-    return {
-      getCurrentProduct: {
-        qty: {
-          minValue: minValue(1),
-          maxValue: maxValue(this.quantity) && !this.isSimpleOrConfigurable,
-          numeric: numeric
-        }
-      }
+    },
+    getQuantityError (error) {
+      this.quantityError = error
     }
   },
   metaInfo () {

From 4c3c3d55c2603632f064486bd29f606f9e2f7d4a Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 15 Oct 2019 17:27:01 +0200
Subject: [PATCH 52/99] add quantity check in microcart

---
 .../core/blocks/Microcart/EditMode.vue        | 16 +++-
 .../core/blocks/Microcart/Product.vue         | 95 ++++++++++++++++---
 src/themes/default/pages/Product.vue          |  1 -
 3 files changed, 96 insertions(+), 16 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Microcart/EditMode.vue b/src/themes/default/components/core/blocks/Microcart/EditMode.vue
index 70da1ab9c9..a4dc770ec7 100644
--- a/src/themes/default/components/core/blocks/Microcart/EditMode.vue
+++ b/src/themes/default/components/core/blocks/Microcart/EditMode.vue
@@ -1,10 +1,13 @@
 <script>
 import { mapGetters } from 'vuex'
+import get from 'lodash-es/get'
 
 export default {
   name: 'EditMode',
   computed: {
-    ...mapGetters('themeCart', ['isEditMode', 'getEditingProductId', 'getSelectedOptions', 'getEditingQty'])
+    ...mapGetters('themeCart', ['isEditMode', 'getEditingProductId', 'getSelectedOptions', 'getEditingQty']),
+    editedProduct () {
+    }
   },
   methods: {
     openEditMode () {
@@ -30,6 +33,17 @@ export default {
       }
       this.product.qty = this.getEditingQty
       this.$store.dispatch('cart/configureItem', { product: this.product, configuration })
+    },
+    getEditedProduct (filter = {}) {
+      const selectedFilters = {...this.getSelectedOptions, [filter.type]: filter}
+      const sizeId = get(selectedFilters, 'size.id', '')
+      const colorId = get(selectedFilters, 'color.id', '')
+      const children = this.product.configurable_children || []
+
+      return children.find((child) =>
+        Number(child.color) === Number(colorId) &&
+        Number(child.size) === Number(sizeId)
+      ) || this.product
     }
   }
 }
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index 2ca3351860..40b373d720 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -49,14 +49,16 @@
               {{ product.info | formatProductMessages }}
             </div>
           </div>
-          <div class="h5 cl-accent lh25 qty">
-            <base-input-number
-              :name="$t('Quantity')"
-              :value="productQty"
-              @input="updateProductQty"
-              :min="1"
-            />
-          </div>
+          <product-quantity
+            class="h5 cl-accent lh25 qty"
+            v-if="product.type_id !== 'grouped' && product.type_id !== 'bundle'"
+            :value="productQty"
+            :max-quantity="maxQuantity"
+            :loading="isStockInfoLoading"
+            :is-simple-or-configurable="isSimpleOrConfigurable"
+            @input="updateProductQty"
+            @error="getQuantityError"
+          />
         </div>
         <div class="flex mr10 align-right start-xs between-sm prices">
           <div class="prices" v-if="!displayItemDiscounts || !isOnline">
@@ -101,7 +103,7 @@
                 :key="filter.id"
                 :variant="filter"
                 :selected-filters="getSelectedOptions"
-                @change="editModeSetFilters"
+                @change="changeEditModeFilter"
               />
             </div>
             <div class="flex flex-wrap pt5" v-else-if="option.label == 'Size' && editMode">
@@ -112,12 +114,16 @@
                 :key="filter.id"
                 :variant="filter"
                 :selected-filters="getSelectedOptions"
-                @change="editModeSetFilters"
+                @change="changeEditModeFilter"
               />
             </div>
           </div>
         </div>
-        <button-full class="update-button mb10 mr10" @click.native="updateProductVariant">
+        <button-full
+          class="update-button mb10 mr10"
+          @click.native="updateProductVariant"
+          :disabled="isUpdateCartDisabled"
+        >
           {{ $t('Update item') }}
         </button-full>
       </div>
@@ -136,12 +142,12 @@ import { currentStoreView } from '@vue-storefront/core/lib/multistore'
 import { formatProductLink } from '@vue-storefront/core/modules/url/helpers'
 import Product from '@vue-storefront/core/compatibility/components/blocks/Microcart/Product'
 
+import ProductQuantity from 'theme/components/core/ProductQuantity.vue'
 import ProductImage from 'theme/components/core/ProductImage'
 import ColorSelector from 'theme/components/core/ColorSelector.vue'
 import SizeSelector from 'theme/components/core/SizeSelector.vue'
 import RemoveButton from './RemoveButton'
 import EditButton from './EditButton'
-import BaseInputNumber from 'theme/components/core/blocks/Form/BaseInputNumber'
 import { onlineHelper } from '@vue-storefront/core/helpers'
 import { ProductOption } from '@vue-storefront/core/modules/catalog/components/ProductOption'
 import { getThumbnailForProduct, getProductConfiguration } from '@vue-storefront/core/modules/cart/helpers'
@@ -149,6 +155,13 @@ import ButtonFull from 'theme/components/theme/ButtonFull'
 import EditMode from './EditMode'
 
 export default {
+  data () {
+    return {
+      maxQuantity: 0,
+      quantityError: false,
+      isStockInfoLoading: false
+    }
+  },
   props: {
     product: {
       type: Object,
@@ -157,12 +170,12 @@ export default {
   },
   components: {
     RemoveButton,
-    BaseInputNumber,
     ProductImage,
     ColorSelector,
     SizeSelector,
     EditButton,
-    ButtonFull
+    ButtonFull,
+    ProductQuantity
   },
   mixins: [Product, ProductOption, EditMode],
   computed: {
@@ -204,6 +217,16 @@ export default {
     },
     productQty () {
       return this.editMode ? this.getEditingQty : this.product.qty
+    },
+    isSimpleOrConfigurable () {
+      if (
+        this.product.type_id === 'simple' ||
+        this.product.type_id === 'configurable'
+      ) { return true }
+      return false
+    },
+    isUpdateCartDisabled () {
+      return this.quantityError || this.isStockInfoLoading || (this.isOnline && (!this.maxQuantity && this.isSimpleOrConfigurable))
     }
   },
   methods: {
@@ -224,6 +247,50 @@ export default {
     },
     updateQuantity (quantity) {
       this.$store.dispatch('cart/updateQuantity', { product: this.product, qty: quantity })
+    },
+    async getQuantity (product) {
+      if (this.isStockInfoLoading) return // stock info is already loading
+      this.isStockInfoLoading = true
+      try {
+        const validProduct = product || this.product
+        const res = await this.$store.dispatch('stock/check', {
+          product: validProduct,
+          qty: validProduct.qty
+        })
+        return res.qty
+      } finally {
+        this.isStockInfoLoading = false
+      }
+    },
+    getQuantityError (error) {
+      this.quantityError = error
+    },
+    async changeEditModeFilter (filter) {
+      const editedProduct = this.getEditedProduct(filter)
+      const maxQuantity = await this.getQuantity(editedProduct)
+      if (maxQuantity) {
+        this.maxQuantity = maxQuantity
+        this.editModeSetFilters(filter)
+      } else {
+        this.$store.dispatch('notification/spawnNotification', {
+          type: 'error',
+          message: this.$t(
+            'The product is out of stock and cannot be added to the cart!'
+          ),
+          action1: { label: this.$t('OK') }
+        })
+      }
+    }
+  },
+  watch: {
+    isOnline: {
+      async handler (isOnline) {
+        if (isOnline) {
+          const maxQuantity = await this.getQuantity()
+          this.maxQuantity = maxQuantity
+        }
+      },
+      immediate: true
     }
   }
 }
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index 4e7fefb849..7726f00917 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -202,7 +202,6 @@
 </template>
 
 <script>
-import { minValue, maxValue, numeric } from 'vuelidate/lib/validators'
 import i18n from '@vue-storefront/i18n'
 import Product from '@vue-storefront/core/pages/Product'
 import VueOfflineMixin from 'vue-offline/mixin'

From d6805e33214ca5c111b6d2fac3149337337210e7 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 15 Oct 2019 19:42:42 +0200
Subject: [PATCH 53/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98435d2516..5628df7435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for ES7 - @andrzejewsky (#3690)
 - Added unit tests for `core/modules/mailer` - @krskibin (#3710)
 - Get payment methods with billing address data - @rain2o (#2878)
+- check max quantity in microcart - @gibkigonzo (#3314)
 
 ## [1.11.0-rc.1] - 2019.10.03
 

From 817daecb0ef97f78ae984fde561ca50e6be37420 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 15 Oct 2019 20:18:25 +0200
Subject: [PATCH 54/99] add different notification if there are some products

---
 core/i18n/resource/i18n/cs-CZ.csv                |  2 ++
 core/i18n/resource/i18n/de-DE.csv                |  2 ++
 core/i18n/resource/i18n/en-US.csv                |  2 ++
 core/i18n/resource/i18n/es-ES.csv                |  2 ++
 core/i18n/resource/i18n/fr-FR.csv                |  2 ++
 core/i18n/resource/i18n/it-IT.csv                |  2 ++
 core/i18n/resource/i18n/jp-JP.csv                |  2 ++
 core/i18n/resource/i18n/nl-NL.csv                |  2 ++
 core/i18n/resource/i18n/pl-PL.csv                |  2 ++
 core/i18n/resource/i18n/pt-BR.csv                |  2 ++
 core/i18n/resource/i18n/pt-PT.csv                |  2 ++
 core/i18n/resource/i18n/ru-RU.csv                |  2 ++
 core/i18n/resource/i18n/zh-cn.csv                |  2 ++
 .../core/blocks/Microcart/EditMode.vue           |  4 +---
 .../components/core/blocks/Microcart/Product.vue | 16 +++++++++++-----
 15 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv
index b4ec79f7ca..036d4d3b93 100644
--- a/core/i18n/resource/i18n/cs-CZ.csv
+++ b/core/i18n/resource/i18n/cs-CZ.csv
@@ -26,6 +26,7 @@
 "No products synchronized for this category. Please come back while online!","V této kategorii nemáte žádné synchronizované produkty. Zkuste prosím znovu až budete online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Neexistuje žádná taková konfigurace pro daný výrobek. Vyberte prosím jinou kombinaci vlastností."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Vyprodáno!"
 "Out of the stock!","Není skladem!"
 "Payment Information","Informace o platbě"
@@ -67,4 +68,5 @@
 "most you may purchase","nejvíce co si můžete koupit"
 "not authorized","neautorizováno"
 "password","heslo"
+"products of this type are available!","products of this type are available!"
 "to account","na účet"
diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
index 06d8dc0bc9..1a9c274943 100644
--- a/core/i18n/resource/i18n/de-DE.csv
+++ b/core/i18n/resource/i18n/de-DE.csv
@@ -28,6 +28,7 @@
 "No products synchronized for this category. Please come back while online!","Es sind keine Produkte für diese Kategorie synchronisiert. Bitte versuchen Sie es erneut, wenn Sie online sind!"
 "No such configuration for the product. Please do choose another combination of attributes.","Diese Konfiguration ist für dieses Produkt nicht möglich. Bitte wählen Sie eine andere Kombination von Eigenschaften."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Nicht auf Lager!"
 "Out of the stock!","Nicht mehr auf Lager!"
 "Payment Information","Bezahlinformationen"
@@ -73,4 +74,5 @@
 "most you may purchase"," maximum das Sie kaufen können"
 "not authorized","Nicht authorisiert"
 "password","Passwort"
+"products of this type are available!","products of this type are available!"
 "to account","zum Account"
diff --git a/core/i18n/resource/i18n/en-US.csv b/core/i18n/resource/i18n/en-US.csv
index 5148be2325..50d777fb21 100644
--- a/core/i18n/resource/i18n/en-US.csv
+++ b/core/i18n/resource/i18n/en-US.csv
@@ -29,6 +29,7 @@
 "No products synchronized for this category. Please come back while online!","No products synchronized for this category. Please come back while online!"
 "No such configuration for the product. Please do choose another combination of attributes.","No such configuration for the product. Please do choose another combination of attributes."
 "OK","OK"
+"Only","Only"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back."
 "Out of stock!","Out of stock!"
 "Out of the stock!","Out of the stock!"
@@ -86,4 +87,5 @@
 "most you may purchase","most you may purchase"
 "not authorized","not authorized"
 "password","password"
+"products of this type are available!","products of this type are available!"
 "to account","to account"
diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv
index 2090c30774..b359f9446a 100644
--- a/core/i18n/resource/i18n/es-ES.csv
+++ b/core/i18n/resource/i18n/es-ES.csv
@@ -15,6 +15,7 @@
 "Newsletter preferences have successfully been updated","Las preferencias del boletín se han actualizado con éxito"
 "No products synchronized for this category. Please come back while online!","No hay productos sincronizados para esta categoría. Por favor regrese mientras esta en linea!"
 "No such configuration for the product. Please do choose another combination of attributes.","No hay tal configuración para el producto. Por favor, elija otra combinación de atributos."
+"Only","Only"
 "Out of stock!","¡Agotado!"
 "Please fix the validation errors","Corrija los errores de validación"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
@@ -40,3 +41,4 @@
 "You need to be logged in to see this page","Necesitas iniciar sesión para ver esta página"
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Estás desconectado"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv
index d56c864ddc..2bb9770a92 100644
--- a/core/i18n/resource/i18n/fr-FR.csv
+++ b/core/i18n/resource/i18n/fr-FR.csv
@@ -20,6 +20,7 @@
 "No products synchronized for this category. Please come back while online!","Aucun produit synchronisé dans cette catégorie. Merci de passer en ligne !"
 "No such configuration for the product. Please do choose another combination of attributes.","Aucune configuration de ce type pour le produit. Veuillez choisir une autre combinaison d'attributs."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Rupture de stock !"
 "Out of the stock!","Épuisé !"
 "Please configure product custom options and fix the validation errors","Veuillez configurer les options du produit et corriger les erreurs de validation"
@@ -50,3 +51,4 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Vous êtes déconnecté"
 "not authorized","pas autorisé"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/it-IT.csv b/core/i18n/resource/i18n/it-IT.csv
index 7e297eb330..c17488868c 100644
--- a/core/i18n/resource/i18n/it-IT.csv
+++ b/core/i18n/resource/i18n/it-IT.csv
@@ -29,6 +29,7 @@
 "No products synchronized for this category. Please come back while online!","Nessun prodotto in questa categoria. Verifica la connessione di rete e riprova!"
 "No such configuration for the product. Please do choose another combination of attributes.","Configurazione del prodotto inesistente. Scegli un'altra combinazione di attributi"
 "OK","OK"
+"Only","Only"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Oppure se rimarrai nella pagina di "Conferma ordine", l'ordine verrà automaticamente evaso senza conferma, una volta che la connessione sarà ripristinata."
 "Out of stock!","Non disponibile"
 "Out of the stock!","Non disponibile"
@@ -85,4 +86,5 @@
 "most you may purchase","most you may purchase"
 "not authorized","non autorizzato"
 "password","password"
+"products of this type are available!","products of this type are available!"
 "to account","al tuo account"
diff --git a/core/i18n/resource/i18n/jp-JP.csv b/core/i18n/resource/i18n/jp-JP.csv
index 289ca86e38..107aad3718 100644
--- a/core/i18n/resource/i18n/jp-JP.csv
+++ b/core/i18n/resource/i18n/jp-JP.csv
@@ -71,6 +71,7 @@
 "No products yet","商品はありません"
 "No reviews have been posted yet. Please don\","まだレビューは投稿されていません。"
 "No such configuration for the product. Please do choose another combination of attributes.","この商品へのこの構成はありません。別の組み合わせを試してみてください。"
+"Only","Only"
 "Open menu","メニューを開く"
 "Open microcart","マイクロカートを開く"
 "Open my account","アカウントを開く"
@@ -164,6 +165,7 @@
 "notification-progress-start","進捗お知らせ開始"
 "or write to us through","か私達に連絡してください"
 "or","か"
+"products of this type are available!","products of this type are available!"
 "register an account","アカウントを登録"
 "return to log in","戻ってログイン"
 "search","検索"
diff --git a/core/i18n/resource/i18n/nl-NL.csv b/core/i18n/resource/i18n/nl-NL.csv
index e38065ad62..95be21c691 100644
--- a/core/i18n/resource/i18n/nl-NL.csv
+++ b/core/i18n/resource/i18n/nl-NL.csv
@@ -1,6 +1,7 @@
  is out of stock!, is niet in voorraad!
 "Adding a review ...","Adding a review ..."
 "Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
+"Only","Only"
 "Product price is unknown, product cannot be added to the cart!",Productprijs onbekend. Dit product kan niet worden toegevoegd aan de winkelwagen!
 "Shopping cart is empty. Please add some products before entering Checkout",Uw winkelwagen is leeg. Voeg producten toe voordat u gaat afrekenen
 "Stock check in progress, please wait while available stock quantities are checked","Voorraadcontrole bezig. Een moment gedult alstublieft, we checken op dit moment de voorraden"
@@ -8,6 +9,7 @@
 "Unhandled error, wrong response format!","Unhandled error, wrong response format!"
 "You need to be logged in to see this page","U moet ingelogd zijn om deze pagina te bekijken"
 "You submitted your review for moderation.","You submitted your review for moderation."
+"products of this type are available!","products of this type are available!"
 404 Page Not Found,404 Pagina niet gevonden
 Account data has successfully been updated,Account gegevens succesvol geupdatet.
 Checkout,Afrekenen
diff --git a/core/i18n/resource/i18n/pl-PL.csv b/core/i18n/resource/i18n/pl-PL.csv
index e84d62ddcd..3fb501b6be 100644
--- a/core/i18n/resource/i18n/pl-PL.csv
+++ b/core/i18n/resource/i18n/pl-PL.csv
@@ -20,6 +20,7 @@
 "No products synchronized for this category. Please come back while online!","Brak produktów dla tej kategorii. Spróbuj ponownie po uzyskaniu dostępu do Internetu!"
 "No such configuration for the product. Please do choose another combination of attributes.","Wybrane opcje są niedostępne. Wybierz inne opcje."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Produkt niedostępny!"
 "Out of the stock!","Brak w magazynie!"
 "Please configure product custom options and fix the validation errors","Skonfiguruj opcje produktu i popraw będy walidacji"
@@ -49,3 +50,4 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Jesteś wylogowany"
 "not authorized","nieautoryzowany"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/pt-BR.csv b/core/i18n/resource/i18n/pt-BR.csv
index 7c1ed4a36b..d9cd664731 100644
--- a/core/i18n/resource/i18n/pt-BR.csv
+++ b/core/i18n/resource/i18n/pt-BR.csv
@@ -17,6 +17,7 @@
 "No products synchronized for this category. Please come back while online!","Nenhum produto sincronizado para essa categoria. Por favor volte quando estiver online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Nenhuma configuração desse tipo disponível para o produto. Por favor selecione outra combinação de opções."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Sem estoque!"
 "Please fix the validation errors","Por favor corrija os erros de validação"
 "Proceed to checkout","Finalizar Compra"
@@ -44,3 +45,4 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Você foi desconectado"
 "not authorized","não autorizado"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/pt-PT.csv b/core/i18n/resource/i18n/pt-PT.csv
index fc4b5a5d97..52cb03a203 100644
--- a/core/i18n/resource/i18n/pt-PT.csv
+++ b/core/i18n/resource/i18n/pt-PT.csv
@@ -17,6 +17,7 @@
 "No products synchronized for this category. Please come back while online!","Nenhum produto sincronizado para esta categoria. Por favor volte qundo estiver online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Esta configuração não é possível para este produto. Por favor selecione outra configuração de opções."
 "OK","OK"
+"Only","Only"
 "Out of stock!","Ruptura de stock!"
 "Please fix the validation errors","Por favor corrija os erros de validação"
 "Proceed to checkout","Ir para Finalizar Compra"
@@ -44,3 +45,4 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Você não está com sessão inicializada"
 "not authorized","não autorizado"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/ru-RU.csv b/core/i18n/resource/i18n/ru-RU.csv
index 96f5708889..5515943f50 100644
--- a/core/i18n/resource/i18n/ru-RU.csv
+++ b/core/i18n/resource/i18n/ru-RU.csv
@@ -15,6 +15,7 @@
 "Newsletter preferences have successfully been updated","Предпочтения по новостям успешно обновлены"
 "No products synchronized for this category. Please come back while online!","По данной категории товары не синхронизированы. Пожалуйста вернитесь когда будете онлайн!"
 "No such configuration for the product. Please do choose another combination of attributes.","У товара отсутствует данная конфигурация. Пожалуйста выберите другие значения атрибутов."
+"Only","Only"
 "Out of stock!","Нет в наличии!"
 "Please fix the validation errors","Пожалуйста исправьте валидационные ошибки"
 "Product has been added to the cart!","Товар добавлен в корзину!"
@@ -40,3 +41,4 @@
 "You need to be logged in to see this page","Вы должны войти в систему, чтобы увидеть эту страницу"
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Вы вышли из учетной записи"
+"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/zh-cn.csv b/core/i18n/resource/i18n/zh-cn.csv
index 803d2c8c68..7753d14e4c 100644
--- a/core/i18n/resource/i18n/zh-cn.csv
+++ b/core/i18n/resource/i18n/zh-cn.csv
@@ -25,6 +25,7 @@
 "No products synchronized for this category. Please come back while online!","没有为此类别的商品。 请等商品上线后再来看看!"
 "No such configuration for the product. Please do choose another combination of attributes.","没有这样的商品配置。 请选择其他属性组合."
 "OK","确定"
+"Only","Only"
 "Out of stock!","缺库存!"
 "Payment Information","付款信息"
 "Please configure product bundle options and fix the validation errors","请配置商品属性选项并修复验证错误"
@@ -68,4 +69,5 @@
 "most you may purchase","你最多可以买"
 "not authorized","没有权限"
 "password","密码"
+"products of this type are available!","products of this type are available!"
 "to account","我的账户"
diff --git a/src/themes/default/components/core/blocks/Microcart/EditMode.vue b/src/themes/default/components/core/blocks/Microcart/EditMode.vue
index a4dc770ec7..41ee04bb96 100644
--- a/src/themes/default/components/core/blocks/Microcart/EditMode.vue
+++ b/src/themes/default/components/core/blocks/Microcart/EditMode.vue
@@ -5,9 +5,7 @@ import get from 'lodash-es/get'
 export default {
   name: 'EditMode',
   computed: {
-    ...mapGetters('themeCart', ['isEditMode', 'getEditingProductId', 'getSelectedOptions', 'getEditingQty']),
-    editedProduct () {
-    }
+    ...mapGetters('themeCart', ['isEditMode', 'getEditingProductId', 'getSelectedOptions', 'getEditingQty'])
   },
   methods: {
     openEditMode () {
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index 40b373d720..c114741cff 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -255,7 +255,7 @@ export default {
         const validProduct = product || this.product
         const res = await this.$store.dispatch('stock/check', {
           product: validProduct,
-          qty: validProduct.qty
+          qty: this.productQty
         })
         return res.qty
       } finally {
@@ -268,10 +268,7 @@ export default {
     async changeEditModeFilter (filter) {
       const editedProduct = this.getEditedProduct(filter)
       const maxQuantity = await this.getQuantity(editedProduct)
-      if (maxQuantity) {
-        this.maxQuantity = maxQuantity
-        this.editModeSetFilters(filter)
-      } else {
+      if (!maxQuantity) {
         this.$store.dispatch('notification/spawnNotification', {
           type: 'error',
           message: this.$t(
@@ -279,6 +276,15 @@ export default {
           ),
           action1: { label: this.$t('OK') }
         })
+      } else if (maxQuantity < this.productQty) {
+        this.$store.dispatch('notification/spawnNotification', {
+          type: 'error',
+          message: this.$t('Only') + ` ${maxQuantity} ` + this.$t('products of this type are available!'),
+          action1: { label: this.$t('OK') }
+        })
+      } else {
+        this.maxQuantity = maxQuantity
+        this.editModeSetFilters(filter)
       }
     }
   },

From cba149c63ab873cb97280b5079cab212c6c350b7 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 17 Oct 2019 08:17:24 +0200
Subject: [PATCH 55/99] apply cr suggestions

---
 core/i18n/resource/i18n/cs-CZ.csv                      |  3 +--
 core/i18n/resource/i18n/de-DE.csv                      |  3 +--
 core/i18n/resource/i18n/en-US.csv                      |  3 +--
 core/i18n/resource/i18n/es-ES.csv                      |  3 +--
 core/i18n/resource/i18n/fr-FR.csv                      |  3 +--
 core/i18n/resource/i18n/it-IT.csv                      |  3 +--
 core/i18n/resource/i18n/jp-JP.csv                      |  3 +--
 core/i18n/resource/i18n/nl-NL.csv                      |  3 +--
 core/i18n/resource/i18n/pl-PL.csv                      |  3 +--
 core/i18n/resource/i18n/pt-BR.csv                      |  3 +--
 core/i18n/resource/i18n/pt-PT.csv                      |  3 +--
 core/i18n/resource/i18n/ru-RU.csv                      |  3 +--
 core/i18n/resource/i18n/zh-cn.csv                      |  3 +--
 .../components/core/blocks/Microcart/Product.vue       | 10 ++++++----
 src/themes/default/pages/Product.vue                   |  8 +++++---
 15 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv
index 036d4d3b93..247436f485 100644
--- a/core/i18n/resource/i18n/cs-CZ.csv
+++ b/core/i18n/resource/i18n/cs-CZ.csv
@@ -26,7 +26,7 @@
 "No products synchronized for this category. Please come back while online!","V této kategorii nemáte žádné synchronizované produkty. Zkuste prosím znovu až budete online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Neexistuje žádná taková konfigurace pro daný výrobek. Vyberte prosím jinou kombinaci vlastností."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Vyprodáno!"
 "Out of the stock!","Není skladem!"
 "Payment Information","Informace o platbě"
@@ -68,5 +68,4 @@
 "most you may purchase","nejvíce co si můžete koupit"
 "not authorized","neautorizováno"
 "password","heslo"
-"products of this type are available!","products of this type are available!"
 "to account","na účet"
diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
index 1a9c274943..8d83091c9a 100644
--- a/core/i18n/resource/i18n/de-DE.csv
+++ b/core/i18n/resource/i18n/de-DE.csv
@@ -28,7 +28,7 @@
 "No products synchronized for this category. Please come back while online!","Es sind keine Produkte für diese Kategorie synchronisiert. Bitte versuchen Sie es erneut, wenn Sie online sind!"
 "No such configuration for the product. Please do choose another combination of attributes.","Diese Konfiguration ist für dieses Produkt nicht möglich. Bitte wählen Sie eine andere Kombination von Eigenschaften."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Nicht auf Lager!"
 "Out of the stock!","Nicht mehr auf Lager!"
 "Payment Information","Bezahlinformationen"
@@ -74,5 +74,4 @@
 "most you may purchase"," maximum das Sie kaufen können"
 "not authorized","Nicht authorisiert"
 "password","Passwort"
-"products of this type are available!","products of this type are available!"
 "to account","zum Account"
diff --git a/core/i18n/resource/i18n/en-US.csv b/core/i18n/resource/i18n/en-US.csv
index 50d777fb21..ebee752413 100644
--- a/core/i18n/resource/i18n/en-US.csv
+++ b/core/i18n/resource/i18n/en-US.csv
@@ -29,7 +29,7 @@
 "No products synchronized for this category. Please come back while online!","No products synchronized for this category. Please come back while online!"
 "No such configuration for the product. Please do choose another combination of attributes.","No such configuration for the product. Please do choose another combination of attributes."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back."
 "Out of stock!","Out of stock!"
 "Out of the stock!","Out of the stock!"
@@ -87,5 +87,4 @@
 "most you may purchase","most you may purchase"
 "not authorized","not authorized"
 "password","password"
-"products of this type are available!","products of this type are available!"
 "to account","to account"
diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv
index b359f9446a..c615da7d41 100644
--- a/core/i18n/resource/i18n/es-ES.csv
+++ b/core/i18n/resource/i18n/es-ES.csv
@@ -15,7 +15,7 @@
 "Newsletter preferences have successfully been updated","Las preferencias del boletín se han actualizado con éxito"
 "No products synchronized for this category. Please come back while online!","No hay productos sincronizados para esta categoría. Por favor regrese mientras esta en linea!"
 "No such configuration for the product. Please do choose another combination of attributes.","No hay tal configuración para el producto. Por favor, elija otra combinación de atributos."
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","¡Agotado!"
 "Please fix the validation errors","Corrija los errores de validación"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
@@ -41,4 +41,3 @@
 "You need to be logged in to see this page","Necesitas iniciar sesión para ver esta página"
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Estás desconectado"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv
index 2bb9770a92..3cf61e69e9 100644
--- a/core/i18n/resource/i18n/fr-FR.csv
+++ b/core/i18n/resource/i18n/fr-FR.csv
@@ -20,7 +20,7 @@
 "No products synchronized for this category. Please come back while online!","Aucun produit synchronisé dans cette catégorie. Merci de passer en ligne !"
 "No such configuration for the product. Please do choose another combination of attributes.","Aucune configuration de ce type pour le produit. Veuillez choisir une autre combinaison d'attributs."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Rupture de stock !"
 "Out of the stock!","Épuisé !"
 "Please configure product custom options and fix the validation errors","Veuillez configurer les options du produit et corriger les erreurs de validation"
@@ -51,4 +51,3 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Vous êtes déconnecté"
 "not authorized","pas autorisé"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/it-IT.csv b/core/i18n/resource/i18n/it-IT.csv
index c17488868c..0eaa53d823 100644
--- a/core/i18n/resource/i18n/it-IT.csv
+++ b/core/i18n/resource/i18n/it-IT.csv
@@ -29,7 +29,7 @@
 "No products synchronized for this category. Please come back while online!","Nessun prodotto in questa categoria. Verifica la connessione di rete e riprova!"
 "No such configuration for the product. Please do choose another combination of attributes.","Configurazione del prodotto inesistente. Scegli un'altra combinazione di attributi"
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Or if you will stay on "Order confirmation" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Oppure se rimarrai nella pagina di "Conferma ordine", l'ordine verrà automaticamente evaso senza conferma, una volta che la connessione sarà ripristinata."
 "Out of stock!","Non disponibile"
 "Out of the stock!","Non disponibile"
@@ -86,5 +86,4 @@
 "most you may purchase","most you may purchase"
 "not authorized","non autorizzato"
 "password","password"
-"products of this type are available!","products of this type are available!"
 "to account","al tuo account"
diff --git a/core/i18n/resource/i18n/jp-JP.csv b/core/i18n/resource/i18n/jp-JP.csv
index 107aad3718..53b40dd3d7 100644
--- a/core/i18n/resource/i18n/jp-JP.csv
+++ b/core/i18n/resource/i18n/jp-JP.csv
@@ -71,7 +71,7 @@
 "No products yet","商品はありません"
 "No reviews have been posted yet. Please don\","まだレビューは投稿されていません。"
 "No such configuration for the product. Please do choose another combination of attributes.","この商品へのこの構成はありません。別の組み合わせを試してみてください。"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Open menu","メニューを開く"
 "Open microcart","マイクロカートを開く"
 "Open my account","アカウントを開く"
@@ -165,7 +165,6 @@
 "notification-progress-start","進捗お知らせ開始"
 "or write to us through","か私達に連絡してください"
 "or","か"
-"products of this type are available!","products of this type are available!"
 "register an account","アカウントを登録"
 "return to log in","戻ってログイン"
 "search","検索"
diff --git a/core/i18n/resource/i18n/nl-NL.csv b/core/i18n/resource/i18n/nl-NL.csv
index 95be21c691..48e3247d2f 100644
--- a/core/i18n/resource/i18n/nl-NL.csv
+++ b/core/i18n/resource/i18n/nl-NL.csv
@@ -1,7 +1,7 @@
  is out of stock!, is niet in voorraad!
 "Adding a review ...","Adding a review ..."
 "Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Product price is unknown, product cannot be added to the cart!",Productprijs onbekend. Dit product kan niet worden toegevoegd aan de winkelwagen!
 "Shopping cart is empty. Please add some products before entering Checkout",Uw winkelwagen is leeg. Voeg producten toe voordat u gaat afrekenen
 "Stock check in progress, please wait while available stock quantities are checked","Voorraadcontrole bezig. Een moment gedult alstublieft, we checken op dit moment de voorraden"
@@ -9,7 +9,6 @@
 "Unhandled error, wrong response format!","Unhandled error, wrong response format!"
 "You need to be logged in to see this page","U moet ingelogd zijn om deze pagina te bekijken"
 "You submitted your review for moderation.","You submitted your review for moderation."
-"products of this type are available!","products of this type are available!"
 404 Page Not Found,404 Pagina niet gevonden
 Account data has successfully been updated,Account gegevens succesvol geupdatet.
 Checkout,Afrekenen
diff --git a/core/i18n/resource/i18n/pl-PL.csv b/core/i18n/resource/i18n/pl-PL.csv
index 3fb501b6be..f746b1a628 100644
--- a/core/i18n/resource/i18n/pl-PL.csv
+++ b/core/i18n/resource/i18n/pl-PL.csv
@@ -20,7 +20,7 @@
 "No products synchronized for this category. Please come back while online!","Brak produktów dla tej kategorii. Spróbuj ponownie po uzyskaniu dostępu do Internetu!"
 "No such configuration for the product. Please do choose another combination of attributes.","Wybrane opcje są niedostępne. Wybierz inne opcje."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Produkt niedostępny!"
 "Out of the stock!","Brak w magazynie!"
 "Please configure product custom options and fix the validation errors","Skonfiguruj opcje produktu i popraw będy walidacji"
@@ -50,4 +50,3 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Jesteś wylogowany"
 "not authorized","nieautoryzowany"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/pt-BR.csv b/core/i18n/resource/i18n/pt-BR.csv
index d9cd664731..e1bdff4f3b 100644
--- a/core/i18n/resource/i18n/pt-BR.csv
+++ b/core/i18n/resource/i18n/pt-BR.csv
@@ -17,7 +17,7 @@
 "No products synchronized for this category. Please come back while online!","Nenhum produto sincronizado para essa categoria. Por favor volte quando estiver online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Nenhuma configuração desse tipo disponível para o produto. Por favor selecione outra combinação de opções."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Sem estoque!"
 "Please fix the validation errors","Por favor corrija os erros de validação"
 "Proceed to checkout","Finalizar Compra"
@@ -45,4 +45,3 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Você foi desconectado"
 "not authorized","não autorizado"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/pt-PT.csv b/core/i18n/resource/i18n/pt-PT.csv
index 52cb03a203..aeded9666b 100644
--- a/core/i18n/resource/i18n/pt-PT.csv
+++ b/core/i18n/resource/i18n/pt-PT.csv
@@ -17,7 +17,7 @@
 "No products synchronized for this category. Please come back while online!","Nenhum produto sincronizado para esta categoria. Por favor volte qundo estiver online!"
 "No such configuration for the product. Please do choose another combination of attributes.","Esta configuração não é possível para este produto. Por favor selecione outra configuração de opções."
 "OK","OK"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Ruptura de stock!"
 "Please fix the validation errors","Por favor corrija os erros de validação"
 "Proceed to checkout","Ir para Finalizar Compra"
@@ -45,4 +45,3 @@
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Você não está com sessão inicializada"
 "not authorized","não autorizado"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/ru-RU.csv b/core/i18n/resource/i18n/ru-RU.csv
index 5515943f50..768911388e 100644
--- a/core/i18n/resource/i18n/ru-RU.csv
+++ b/core/i18n/resource/i18n/ru-RU.csv
@@ -15,7 +15,7 @@
 "Newsletter preferences have successfully been updated","Предпочтения по новостям успешно обновлены"
 "No products synchronized for this category. Please come back while online!","По данной категории товары не синхронизированы. Пожалуйста вернитесь когда будете онлайн!"
 "No such configuration for the product. Please do choose another combination of attributes.","У товара отсутствует данная конфигурация. Пожалуйста выберите другие значения атрибутов."
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","Нет в наличии!"
 "Please fix the validation errors","Пожалуйста исправьте валидационные ошибки"
 "Product has been added to the cart!","Товар добавлен в корзину!"
@@ -41,4 +41,3 @@
 "You need to be logged in to see this page","Вы должны войти в систему, чтобы увидеть эту страницу"
 "You submitted your review for moderation.","You submitted your review for moderation."
 "You're logged out","Вы вышли из учетной записи"
-"products of this type are available!","products of this type are available!"
diff --git a/core/i18n/resource/i18n/zh-cn.csv b/core/i18n/resource/i18n/zh-cn.csv
index 7753d14e4c..0e2e209409 100644
--- a/core/i18n/resource/i18n/zh-cn.csv
+++ b/core/i18n/resource/i18n/zh-cn.csv
@@ -25,7 +25,7 @@
 "No products synchronized for this category. Please come back while online!","没有为此类别的商品。 请等商品上线后再来看看!"
 "No such configuration for the product. Please do choose another combination of attributes.","没有这样的商品配置。 请选择其他属性组合."
 "OK","确定"
-"Only","Only"
+"Only {maxQuantity} products of this type are available!","Only {maxQuantity} products of this type are available!"
 "Out of stock!","缺库存!"
 "Payment Information","付款信息"
 "Please configure product bundle options and fix the validation errors","请配置商品属性选项并修复验证错误"
@@ -69,5 +69,4 @@
 "most you may purchase","你最多可以买"
 "not authorized","没有权限"
 "password","密码"
-"products of this type are available!","products of this type are available!"
 "to account","我的账户"
diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index c114741cff..216125b55d 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -57,7 +57,7 @@
             :loading="isStockInfoLoading"
             :is-simple-or-configurable="isSimpleOrConfigurable"
             @input="updateProductQty"
-            @error="getQuantityError"
+            @error="handleQuantityError"
           />
         </div>
         <div class="flex mr10 align-right start-xs between-sm prices">
@@ -226,7 +226,9 @@ export default {
       return false
     },
     isUpdateCartDisabled () {
-      return this.quantityError || this.isStockInfoLoading || (this.isOnline && (!this.maxQuantity && this.isSimpleOrConfigurable))
+      return this.quantityError ||
+        this.isStockInfoLoading ||
+        (this.isOnline && !this.maxQuantity && this.isSimpleOrConfigurable)
     }
   },
   methods: {
@@ -262,7 +264,7 @@ export default {
         this.isStockInfoLoading = false
       }
     },
-    getQuantityError (error) {
+    handleQuantityError (error) {
       this.quantityError = error
     },
     async changeEditModeFilter (filter) {
@@ -279,7 +281,7 @@ export default {
       } else if (maxQuantity < this.productQty) {
         this.$store.dispatch('notification/spawnNotification', {
           type: 'error',
-          message: this.$t('Only') + ` ${maxQuantity} ` + this.$t('products of this type are available!'),
+          message: this.$t('Only {maxQuantity} products of this type are available!', { maxQuantity }),
           action1: { label: this.$t('OK') }
         })
       } else {
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index 7726f00917..7e5f366c5e 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -136,7 +136,7 @@
               :loading="isStockInfoLoading"
               :is-simple-or-configurable="isSimpleOrConfigurable"
               show-quantity
-              @error="getQuantityError"
+              @error="handleQuantityError"
             />
             <div class="row m0">
               <add-to-cart
@@ -337,7 +337,9 @@ export default {
       return false
     },
     isAddToCartDisabled () {
-      return this.quantityError || this.isStockInfoLoading || (this.isOnline && (!this.maxQuantity && this.isSimpleOrConfigurable))
+      return this.quantityError ||
+        this.isStockInfoLoading ||
+        (this.isOnline && !this.maxQuantity && this.isSimpleOrConfigurable)
     }
   },
   async mounted () {
@@ -410,7 +412,7 @@ export default {
         this.isStockInfoLoading = false
       }
     },
-    getQuantityError (error) {
+    handleQuantityError (error) {
       this.quantityError = error
     }
   },

From b7678b06aa144316a155e4ab0822bdac0f9b3c09 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 17 Oct 2019 14:05:57 +0200
Subject: [PATCH 56/99] change notification message object to factory fn

---
 core/i18n/resource/i18n/cs-CZ.csv             |  1 +
 core/i18n/resource/i18n/de-DE.csv             |  1 +
 core/i18n/resource/i18n/es-ES.csv             |  1 +
 core/i18n/resource/i18n/fr-FR.csv             |  1 +
 core/i18n/resource/i18n/jp-JP.csv             |  1 +
 core/i18n/resource/i18n/nl-NL.csv             |  1 +
 core/i18n/resource/i18n/pl-PL.csv             |  1 +
 core/i18n/resource/i18n/pt-BR.csv             |  1 +
 core/i18n/resource/i18n/pt-PT.csv             |  1 +
 core/i18n/resource/i18n/ru-RU.csv             |  1 +
 core/i18n/resource/i18n/zh-cn.csv             |  1 +
 core/modules/cart/helpers/notifications.ts    | 26 +++++++++----------
 .../modules/cart/store/actions/itemActions.ts |  6 ++---
 .../cart/store/actions/mergeActions.ts        |  2 +-
 14 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv
index b4ec79f7ca..ed53260f2a 100644
--- a/core/i18n/resource/i18n/cs-CZ.csv
+++ b/core/i18n/resource/i18n/cs-CZ.csv
@@ -36,6 +36,7 @@
 "Proceed to checkout","Přejděte k nákupu"
 "Product has been added to the cart!","Produkt byl přidán do košíku!"
 "Product price is unknown, product cannot be added to the cart!","Cena produktu není známa, produkt nelze přidat do košíku!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Produkt {productName} byl přidán k porovnání!"
 "Product {productName} has been added to wishlist!","Produkt {productName} byl přidán do seznamu přání!"
 "Product {productName} has been removed from compare!","Produkt {productName} byl odstraněn z porovnávání!"
diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
index 06d8dc0bc9..4877da17d3 100644
--- a/core/i18n/resource/i18n/de-DE.csv
+++ b/core/i18n/resource/i18n/de-DE.csv
@@ -40,6 +40,7 @@
 "Processing order...","Bestellung wird verarbeitet..."
 "Product has been added to the cart!","Produkt wurde zum Warenkorb hinzugefügt!"
 "Product price is unknown, product cannot be added to the cart!","Der Produktpreis ist unbekannt, daher kann dieses Produkt nicht zum Warenkorb hinzugefügt werden!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Das Produkt {productName} wurde zur Vergleichsliste hinzugefügt!"
 "Product {productName} has been added to wishlist!","Das Produkt {productName} wurde der Wunschliste hinzugefügt!"
 "Product {productName} has been removed from compare!","Das Produkt {productName} wurde von der Vergleichsliste entfernt!"
diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv
index 2090c30774..1df884c76f 100644
--- a/core/i18n/resource/i18n/es-ES.csv
+++ b/core/i18n/resource/i18n/es-ES.csv
@@ -19,6 +19,7 @@
 "Please fix the validation errors","Corrija los errores de validación"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
 "Product price is unknown, product cannot be added to the cart!","El precio del producto es desconocido, ¡el producto no se puede agregar al carrito!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","¡El producto {productName} se ha agregado a la comparación!"
 "Product {productName} has been added to wishlist!","¡El producto {productName} ha sido agregado a la lista de deseos!"
 "Product {productName} has been removed from compare!","¡El producto {productName} ha sido eliminado de la comparación!"
diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv
index d56c864ddc..2ee4b3dcc6 100644
--- a/core/i18n/resource/i18n/fr-FR.csv
+++ b/core/i18n/resource/i18n/fr-FR.csv
@@ -27,6 +27,7 @@
 "Proceed to checkout","Passer la commande"
 "Product has been added to the cart!","Le produit a été ajouté au panier !"
 "Product price is unknown, product cannot be added to the cart!","Le prix du produit est inconnu, le produit ne peut pas être ajouté au panier !"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Le produit {productName} a été ajouté au comparateur !"
 "Product {productName} has been added to wishlist!","Le produit {productName} a été ajouté à la liste des souhaits !"
 "Product {productName} has been removed from compare!","Le produit {productName} a été supprimé du comparateur !"
diff --git a/core/i18n/resource/i18n/jp-JP.csv b/core/i18n/resource/i18n/jp-JP.csv
index 289ca86e38..a7bdd39f37 100644
--- a/core/i18n/resource/i18n/jp-JP.csv
+++ b/core/i18n/resource/i18n/jp-JP.csv
@@ -87,6 +87,7 @@
 "Please check if all data are correct","全てのデータが正しいかチェックしてください"
 "Please confirm order you placed when you was offline","オフライン中に注文した商品を確認してください"
 "Please select the field which You like to sort by","ソートしたい項目を選んでください"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Products","商品"
 "Purchase","購入"
 "Register an account","アカウントを登録"
diff --git a/core/i18n/resource/i18n/nl-NL.csv b/core/i18n/resource/i18n/nl-NL.csv
index e38065ad62..ac302ad74f 100644
--- a/core/i18n/resource/i18n/nl-NL.csv
+++ b/core/i18n/resource/i18n/nl-NL.csv
@@ -2,6 +2,7 @@
 "Adding a review ...","Adding a review ..."
 "Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
 "Product price is unknown, product cannot be added to the cart!",Productprijs onbekend. Dit product kan niet worden toegevoegd aan de winkelwagen!
+"Product quantity has been updated!","Product quantity has been updated!"
 "Shopping cart is empty. Please add some products before entering Checkout",Uw winkelwagen is leeg. Voeg producten toe voordat u gaat afrekenen
 "Stock check in progress, please wait while available stock quantities are checked","Voorraadcontrole bezig. Een moment gedult alstublieft, we checken op dit moment de voorraden"
 "Thumbnail","Thumbnail"
diff --git a/core/i18n/resource/i18n/pl-PL.csv b/core/i18n/resource/i18n/pl-PL.csv
index e84d62ddcd..3681d62348 100644
--- a/core/i18n/resource/i18n/pl-PL.csv
+++ b/core/i18n/resource/i18n/pl-PL.csv
@@ -27,6 +27,7 @@
 "Proceed to checkout","Przejdź do kasy"
 "Product has been added to the cart!","Produkt został dodany do koszyka!"
 "Product price is unknown, product cannot be added to the cart!","Nie można dodać produktu do koszyka, nie można potwierdzić ceny produktu!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Produkt {productName} został dodany do porównania!"
 "Product {productName} has been added to wishlist!","Produkt {productName} został dodany do listy życzeń!"
 "Product {productName} has been removed from compare!","Produkt {productName} został usunięty z porównania!"
diff --git a/core/i18n/resource/i18n/pt-BR.csv b/core/i18n/resource/i18n/pt-BR.csv
index 7c1ed4a36b..a9005ca82b 100644
--- a/core/i18n/resource/i18n/pt-BR.csv
+++ b/core/i18n/resource/i18n/pt-BR.csv
@@ -22,6 +22,7 @@
 "Proceed to checkout","Finalizar Compra"
 "Product has been added to the cart!","Produto foi adicionado ao carrinho!"
 "Product price is unknown, product cannot be added to the cart!","Preço do produto é desconhecido, produto não pode ser adicionado ao carrinho!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Produto {productName} foi adicionado para comparação!"
 "Product {productName} has been added to wishlist!","Produto {productName} foi adicionado à lista de desejos!"
 "Product {productName} has been removed from compare!","Produto {productName} foi removido da comparação!"
diff --git a/core/i18n/resource/i18n/pt-PT.csv b/core/i18n/resource/i18n/pt-PT.csv
index fc4b5a5d97..5f5558d8a1 100644
--- a/core/i18n/resource/i18n/pt-PT.csv
+++ b/core/i18n/resource/i18n/pt-PT.csv
@@ -22,6 +22,7 @@
 "Proceed to checkout","Ir para Finalizar Compra"
 "Product has been added to the cart!","O produto foi adicionado ao Cesto de Compras!"
 "Product price is unknown, product cannot be added to the cart!","O preço do produto é desconhecido, o produto não pode ser adicionado ao Cesto de Compras!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Produto {productName} foi adicionado a Comparar Produtos!"
 "Product {productName} has been added to wishlist!","Produto {productName} foi adicionado à Lista de Desejos!"
 "Product {productName} has been removed from compare!","Produto {productName} foi removido de Comparar Produtos!"
diff --git a/core/i18n/resource/i18n/ru-RU.csv b/core/i18n/resource/i18n/ru-RU.csv
index 96f5708889..dd8c3b2df7 100644
--- a/core/i18n/resource/i18n/ru-RU.csv
+++ b/core/i18n/resource/i18n/ru-RU.csv
@@ -19,6 +19,7 @@
 "Please fix the validation errors","Пожалуйста исправьте валидационные ошибки"
 "Product has been added to the cart!","Товар добавлен в корзину!"
 "Product price is unknown, product cannot be added to the cart!","Цена товара неизвестна, товар нельзя добавить в корзину!"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","Товар {productName} добавлен к странице сравнения!"
 "Product {productName} has been added to wishlist!","Товар {productName} добавлен к списку пожеланий!"
 "Product {productName} has been removed from compare!","Товар {productName} удален из страницы сравнения!"
diff --git a/core/i18n/resource/i18n/zh-cn.csv b/core/i18n/resource/i18n/zh-cn.csv
index 803d2c8c68..884ad99867 100644
--- a/core/i18n/resource/i18n/zh-cn.csv
+++ b/core/i18n/resource/i18n/zh-cn.csv
@@ -36,6 +36,7 @@
 "Processing order...","订单处理中..."
 "Product has been added to the cart!","已成功将商品加入购物车!"
 "Product price is unknown, product cannot be added to the cart!","商品价格未确定，无法添加到购物车！"
+"Product quantity has been updated!","Product quantity has been updated!"
 "Product {productName} has been added to the compare!","商品 {productName} 已经添加到比较列表中!"
 "Product {productName} has been added to wishlist!","商品 {productName} 已添加到心愿单!"
 "Product {productName} has been removed from compare!","商品 {productName} 已从比较列表中移除!"
diff --git a/core/modules/cart/helpers/notifications.ts b/core/modules/cart/helpers/notifications.ts
index d614ccdd9c..06e5872d5d 100644
--- a/core/modules/cart/helpers/notifications.ts
+++ b/core/modules/cart/helpers/notifications.ts
@@ -3,39 +3,39 @@ import { currentStoreView, localizedRoute } from '@vue-storefront/core/lib/multi
 import i18n from '@vue-storefront/i18n';
 import config from 'config';
 
-const proceedToCheckoutAction = {
+const proceedToCheckoutAction = () => ({
   label: i18n.t('Proceed to checkout'),
   action: () => router.push(localizedRoute('/checkout', currentStoreView().storeCode))
-};
-const checkoutAction = !config.externalCheckout ? proceedToCheckoutAction : null;
+});
+const checkoutAction = () => !config.externalCheckout ? proceedToCheckoutAction() : null;
 
-const productAddedToCart = {
+const productAddedToCart = () => ({
   type: 'success',
   message: i18n.t('Product has been added to the cart!'),
   action1: { label: i18n.t('OK') },
-  action2: checkoutAction
-}
+  action2: checkoutAction()
+})
 
-const productQuantityUpdated = {
+const productQuantityUpdated = () => ({
   type: 'success',
   message: i18n.t('Product quantity has been updated!'),
   action1: { label: i18n.t('OK') },
-  action2: checkoutAction
-}
+  action2: checkoutAction()
+})
 
-const unsafeQuantity = {
+const unsafeQuantity = () => ({
   type: 'warning',
   message: i18n.t(
     'The system is not sure about the stock quantity (volatile). Product has been added to the cart for pre-reservation.'
   ),
   action1: { label: i18n.t('OK') }
-}
+})
 
-const outOfStock = {
+const outOfStock = () => ({
   type: 'error',
   message: i18n.t('The product is out of stock and cannot be added to the cart!'),
   action1: { label: i18n.t('OK') }
-}
+})
 
 const createNotification = ({ type, message }) => ({ type, message, action1: { label: i18n.t('OK') } })
 const createNotifications = ({ type, messages }) =>
diff --git a/core/modules/cart/store/actions/itemActions.ts b/core/modules/cart/store/actions/itemActions.ts
index 6cc595566a..3cc36d2f08 100644
--- a/core/modules/cart/store/actions/itemActions.ts
+++ b/core/modules/cart/store/actions/itemActions.ts
@@ -63,10 +63,10 @@ const itemActions = {
         const { status, onlineCheckTaskId } = await dispatch('checkProductStatus', { product })
 
         if (status === 'volatile') {
-          diffLog.pushNotification(notifications.unsafeQuantity)
+          diffLog.pushNotification(notifications.unsafeQuantity())
         }
         if (status === 'out_of_stock') {
-          diffLog.pushNotification(notifications.outOfStock)
+          diffLog.pushNotification(notifications.outOfStock())
         }
 
         if (status === 'ok' || status === 'volatile') {
@@ -75,7 +75,7 @@ const itemActions = {
           })
         }
         if (productIndex === (productsToAdd.length - 1) && (!getters.isCartSyncEnabled || forceServerSilence)) {
-          diffLog.pushNotification(notifications.productAddedToCart)
+          diffLog.pushNotification(notifications.productAddedToCart())
         }
         productIndex++
       }
diff --git a/core/modules/cart/store/actions/mergeActions.ts b/core/modules/cart/store/actions/mergeActions.ts
index ddddc0c571..448d87f0a2 100644
--- a/core/modules/cart/store/actions/mergeActions.ts
+++ b/core/modules/cart/store/actions/mergeActions.ts
@@ -57,7 +57,7 @@ const mergeActions = {
     if (!rootGetters['checkout/isUserInCheckout']) {
       const isThisNewItemAddedToTheCart = (!clientItem || !clientItem.server_item_id)
       diffLog.pushNotification(
-        isThisNewItemAddedToTheCart ? notifications.productAddedToCart : notifications.productQuantityUpdated
+        isThisNewItemAddedToTheCart ? notifications.productAddedToCart() : notifications.productQuantityUpdated()
       )
     }
 

From 6d8500ea0954f280e318361e4dfcaccc1935d4a3 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 17 Oct 2019 14:07:39 +0200
Subject: [PATCH 57/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..1de13e072d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Changed notification message object to factory fn - @gibkigozno (#3716)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 8967c80eeb23c458b8a28349e2e7990f672d589d Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 17 Oct 2019 14:36:48 +0200
Subject: [PATCH 58/99] load recently viewed module in my account page

---
 src/themes/default/pages/MyAccount.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/themes/default/pages/MyAccount.vue b/src/themes/default/pages/MyAccount.vue
index e348186a91..80f435aa09 100644
--- a/src/themes/default/pages/MyAccount.vue
+++ b/src/themes/default/pages/MyAccount.vue
@@ -45,6 +45,8 @@ import MyOrders from '../components/core/blocks/MyAccount/MyOrders'
 import MyOrder from '../components/core/blocks/MyAccount/MyOrder'
 import MyRecentlyViewed from '../components/core/blocks/MyAccount/MyRecentlyViewed'
 import NoSSR from 'vue-no-ssr'
+import {RecentlyViewedModule} from '@vue-storefront/core/modules/recently-viewed'
+import {registerModule} from '@vue-storefront/core/lib/modules'
 
 export default {
   data () {
@@ -70,6 +72,9 @@ export default {
     MyRecentlyViewed,
     'no-ssr': NoSSR
   },
+  beforeCreate () {
+    registerModule(RecentlyViewedModule)
+  },
   mixins: [MyAccount],
   methods: {
     notify (title) {

From 7a4a9089bd9920b56a9946a4703543e87b223a1b Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 17 Oct 2019 14:37:36 +0200
Subject: [PATCH 59/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..655c11ce10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Load recently viewed module in my account page - @gibkigonzo (#3722)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 5994d29b43b3aaf4e9cadae386883ea0d8031830 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Fri, 18 Oct 2019 07:30:43 +0200
Subject: [PATCH 60/99] apply suggestions and check quantity when page change

---
 .../core/blocks/Microcart/Product.vue          |  6 +-----
 src/themes/default/pages/Product.vue           | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Microcart/Product.vue b/src/themes/default/components/core/blocks/Microcart/Product.vue
index 216125b55d..8f183698b7 100644
--- a/src/themes/default/components/core/blocks/Microcart/Product.vue
+++ b/src/themes/default/components/core/blocks/Microcart/Product.vue
@@ -219,11 +219,7 @@ export default {
       return this.editMode ? this.getEditingQty : this.product.qty
     },
     isSimpleOrConfigurable () {
-      if (
-        this.product.type_id === 'simple' ||
-        this.product.type_id === 'configurable'
-      ) { return true }
-      return false
+      return ['simple', 'configurable'].includes(this.product.type_id)
     },
     isUpdateCartDisabled () {
       return this.quantityError ||
diff --git a/src/themes/default/pages/Product.vue b/src/themes/default/pages/Product.vue
index 7e5f366c5e..148f2ef18b 100644
--- a/src/themes/default/pages/Product.vue
+++ b/src/themes/default/pages/Product.vue
@@ -330,11 +330,7 @@ export default {
       return getSelectedFiltersByProduct(this.getCurrentProduct, this.getCurrentProductConfiguration)
     },
     isSimpleOrConfigurable () {
-      if (
-        this.getCurrentProduct.type_id === 'simple' ||
-        this.getCurrentProduct.type_id === 'configurable'
-      ) { return true }
-      return false
+      return ['simple', 'configurable'].includes(this.getCurrentProduct.type_id)
     },
     isAddToCartDisabled () {
       return this.quantityError ||
@@ -351,14 +347,22 @@ export default {
     if (isServer) await loadBreadcrumbsPromise
     catalogHooksExecutors.productPageVisited(product)
   },
+  beforeRouteEnter (to, from, next) {
+    if (isServer) {
+      next()
+    } else {
+      next((vm) => {
+        vm.getQuantity()
+      })
+    }
+  },
   watch: {
     isOnline: {
       handler (isOnline) {
         if (isOnline) {
           this.getQuantity()
         }
-      },
-      immediate: true
+      }
     }
   },
   methods: {

From 37de6a0646f7c487186c1afdc34d5a5a3b35ee49 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Fri, 18 Oct 2019 13:02:06 +0200
Subject: [PATCH 61/99] remove unused dayjs locales

---
 core/build/webpack.base.config.ts             |  2 ++
 core/i18n/helpers.ts                          | 29 +++++++++++++++++
 core/i18n/index.ts                            |  4 +--
 core/i18n/scripts/translation.preprocessor.js | 32 ++++++++++++-------
 4 files changed, 53 insertions(+), 14 deletions(-)
 create mode 100644 core/i18n/helpers.ts

diff --git a/core/build/webpack.base.config.ts b/core/build/webpack.base.config.ts
index 9f3f642a23..1cf00cb3eb 100644
--- a/core/build/webpack.base.config.ts
+++ b/core/build/webpack.base.config.ts
@@ -1,3 +1,4 @@
+import { buildLocaleIgnorePattern } from './../i18n/helpers';
 import path from 'path';
 import config from 'config';
 import fs from 'fs';
@@ -60,6 +61,7 @@ const isProd = process.env.NODE_ENV === 'production'
 // todo: usemultipage-webpack-plugin for multistore
 export default {
   plugins: [
+    new webpack.ContextReplacementPlugin(/dayjs[/\\]locale$/, buildLocaleIgnorePattern()),
     new webpack.ProgressPlugin(),
     // new BundleAnalyzerPlugin({
     //   generateStatsFile: true
diff --git a/core/i18n/helpers.ts b/core/i18n/helpers.ts
new file mode 100644
index 0000000000..d8e3d17ad9
--- /dev/null
+++ b/core/i18n/helpers.ts
@@ -0,0 +1,29 @@
+import config from 'config'
+
+export const currentBuildLocales = (): string[] => {
+  const defaultLocale = config.i18n.defaultLocale || 'en-US'
+  const multistoreLocales = config.storeViews.multistore
+    ? Object.values(config.storeViews)
+      .map((store: any) => store && typeof store === 'object' && store.i18n && store.i18n.defaultLocale)
+      .filter(Boolean)
+    : []
+  const locales = multistoreLocales.includes(defaultLocale)
+    ? multistoreLocales
+    : [defaultLocale, ...multistoreLocales]
+
+  return locales
+}
+
+export const transformToShortLocales = (locales: string[]): string[] => locales.map(locale => {
+  const separatorIndex = locale.indexOf('-')
+  const shortLocale = separatorIndex ? locale.substr(0, separatorIndex) : locale
+
+  return shortLocale
+})
+
+export const buildLocaleIgnorePattern = (): RegExp => {
+  const locales = transformToShortLocales(currentBuildLocales())
+  const localesRegex = locales.map(locale => `${locale}$`).join('|')
+
+  return new RegExp(localesRegex)
+}
diff --git a/core/i18n/index.ts b/core/i18n/index.ts
index e785373eb6..278aa2ba8a 100644
--- a/core/i18n/index.ts
+++ b/core/i18n/index.ts
@@ -28,12 +28,12 @@ function setI18nLanguage (lang: string): string {
 const loadDateLocales = async (lang: string = 'en'): Promise<void> => {
   let localeCode = lang.toLocaleLowerCase()
   try { // try to load full locale name
-    await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+    await import(/* webpackChunkName: "dayjs-locales-[request]" */ `dayjs/locale/${localeCode}`)
   } catch (e) { // load simplified locale name, example: de-DE -> de
     const separatorIndex = localeCode.indexOf('-')
     if (separatorIndex) {
       localeCode = separatorIndex ? localeCode.substr(0, separatorIndex) : localeCode
-      await import(/* webpackChunkName: "dayjs-locales" */ `dayjs/locale/${localeCode}`)
+      await import(/* webpackChunkName: "dayjs-locales-[request]" */ `dayjs/locale/${localeCode}`)
     }
   }
 }
diff --git a/core/i18n/scripts/translation.preprocessor.js b/core/i18n/scripts/translation.preprocessor.js
index 6b97d8719c..7164d39ed6 100644
--- a/core/i18n/scripts/translation.preprocessor.js
+++ b/core/i18n/scripts/translation.preprocessor.js
@@ -2,6 +2,7 @@ const fs = require('fs')
 const path = require('path')
 const dsvFormat = require('d3-dsv').dsvFormat
 const dsv = dsvFormat(',')
+const { currentBuildLocales } = require('../helpers')
 
 /**
  *  Converts an Array to an Object
@@ -15,14 +16,18 @@ function convertToObject (array) {
 }
 
 module.exports = function (csvDirectories, config = null) {
+  const currentLocales = currentBuildLocales()
+  const fallbackLocale = 'en-US'
   let messages = {}
   let languages = []
 
+  // get messages from CSV files
   csvDirectories.forEach(directory => {
     fs.readdirSync(directory).forEach(file => {
       const fullFileName = path.join(directory, file)
       const extName = path.extname(fullFileName)
       const baseName = path.posix.basename(file, extName)
+
       if (extName === '.csv') {
         const fileContent = fs.readFileSync(fullFileName, 'utf8')
         if (languages.indexOf(baseName) === -1) {
@@ -34,24 +39,27 @@ module.exports = function (csvDirectories, config = null) {
     })
   })
 
-  languages.forEach((language) => {
-    if (!config || !config.i18n.bundleAllStoreviewLanguages || (config.i18n.bundleAllStoreviewLanguages && language === 'en-US')) {
-      console.debug(`Writing JSON file: ${language}.json`)
-      fs.writeFileSync(path.join(__dirname, '../resource/i18n', `${language}.json`), JSON.stringify(messages[language]))
-    }
-  })
+  // create fallback
+  console.debug(`Writing JSON file fallback: ${fallbackLocale}.json`)
+  fs.writeFileSync(path.join(__dirname, '../resource/i18n', `${fallbackLocale}.json`), JSON.stringify(messages[fallbackLocale]))
 
+  // bundle all messages in one file
   if (config && config.i18n.bundleAllStoreviewLanguages) {
-    const bundledLanguages = { 'en-US': messages['en-US'] } // fallback locale
+    const bundledLanguages = { [fallbackLocale]: messages[fallbackLocale] } // fallback locale
     bundledLanguages[config.i18n.defaultLocale] = messages[config.i18n.defaultLocale] // default locale
-    Object.keys(config.storeViews).forEach((storeCode) => {
-      const store = config.storeViews[storeCode]
-      if (store && typeof store === 'object' && store.i18n) {
-        bundledLanguages[store.i18n.defaultLocale] = messages[store.i18n.defaultLocale]
-      }
+    currentLocales.forEach((locale) => {
+      bundledLanguages[locale] = messages[locale]
     })
+
+    console.debug(`Writing JSON file multistoreLanguages`)
     fs.writeFileSync(path.join(__dirname, '../resource/i18n', `multistoreLanguages.json`), JSON.stringify(bundledLanguages))
   } else {
+    currentLocales.forEach((language) => {
+      if (language !== fallbackLocale) return // it's already loaded
+      const filePath = path.join(__dirname, '../resource/i18n', `${language}.json`)
+      console.debug(`Writing JSON file: ${language}.json`)
+      fs.writeFileSync(filePath, JSON.stringify(messages[language]))
+    })
     fs.writeFileSync(path.join(__dirname, '../resource/i18n', `multistoreLanguages.json`), JSON.stringify({})) // fix for webpack compilation error in case of `bundleAllStoreviewLanguages` = `false` (#3188)
   }
 }

From 1fb6dbfdff1a5758eae320a6146d3b9d707dffea Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Fri, 18 Oct 2019 13:02:36 +0200
Subject: [PATCH 62/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..b91d443965 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added unit tests for `core/modules/mailer` - @krskibin (#3710)
 - Get payment methods with billing address data - @rain2o (#2878)
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
+- Remove unused dayjs locales - @gibkigonzo (#3498)
 
 ## [1.11.0-rc.1] - 2019.10.03
 

From 741c14559b21a3b1b1d06e0448c743450643f512 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Fri, 18 Oct 2019 15:35:10 +0300
Subject: [PATCH 63/99] Add validation message for city field

---
 .../components/core/blocks/Checkout/Shipping.vue       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Checkout/Shipping.vue b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
index 8d923e9f84..49122dc141 100644
--- a/src/themes/default/components/core/blocks/Checkout/Shipping.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
@@ -112,10 +112,16 @@
             v-model.trim="shipping.city"
             @blur="$v.shipping.city.$touch()"
             autocomplete="address-level2"
-            :validations="[{
+            :validations="[
+            {
               condition: $v.shipping.city.$error && !$v.shipping.city.required,
               text: $t('Field is required')
-            }]"
+            },
+            {
+              condition: $v.shipping.city.$error && $v.shipping.city.required,
+              text: $t('City must not include only digits')
+            }
+            ]"
           />
 
           <base-input

From 5061a7bf01532e4da8a2fe893c909dc561ffc362 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Fri, 18 Oct 2019 15:49:07 +0300
Subject: [PATCH 64/99] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..c42124238b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Added validation message for city field on checkout page - @dz3n (#3723)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From c459c962438c524aa99f61b5872ef0b39f93f6c9 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 21 Oct 2019 09:49:26 +0200
Subject: [PATCH 65/99] ignore all .map files for service worker cache

---
 core/build/webpack.prod.sw.config.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/build/webpack.prod.sw.config.ts b/core/build/webpack.prod.sw.config.ts
index 03dd0e38f4..64f90aa020 100644
--- a/core/build/webpack.prod.sw.config.ts
+++ b/core/build/webpack.prod.sw.config.ts
@@ -20,7 +20,9 @@ module.exports = merge(base, {
       filename: 'service-worker.js',
       staticFileGlobsIgnorePatterns: [/\.map$/],
       staticFileGlobs: [
-        'dist/**.*',
+        'dist/**.*.js',
+        'dist/**.*.json',
+        'dist/**.*.css',
         'assets/**.*',
         'assets/ig/**.*',
         'index.html',

From 06b72197088d6250061be8126befdbefe6318c46 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 21 Oct 2019 10:05:11 +0200
Subject: [PATCH 66/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..6a1dc2f4d6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Remove including .map files in service worker cache - @gibkigonzo (#3734)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From c3906539492cedccf8eaea354e3ed66f1a71ff64 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Mon, 21 Oct 2019 12:56:53 +0300
Subject: [PATCH 67/99] Update city field validation message

---
 src/themes/default/components/core/blocks/Checkout/Shipping.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/default/components/core/blocks/Checkout/Shipping.vue b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
index 49122dc141..a093fc0c0d 100644
--- a/src/themes/default/components/core/blocks/Checkout/Shipping.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
@@ -119,7 +119,7 @@
             },
             {
               condition: $v.shipping.city.$error && $v.shipping.city.required,
-              text: $t('City must not include only digits')
+              text: $t('Please provide valid city name')
             }
             ]"
           />

From de509ac5308261570316f878b329781c6495e807 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Mon, 21 Oct 2019 12:59:40 +0300
Subject: [PATCH 68/99] update message

---
 src/themes/default/components/core/blocks/Checkout/Shipping.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/themes/default/components/core/blocks/Checkout/Shipping.vue b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
index 49122dc141..a093fc0c0d 100644
--- a/src/themes/default/components/core/blocks/Checkout/Shipping.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Shipping.vue
@@ -119,7 +119,7 @@
             },
             {
               condition: $v.shipping.city.$error && $v.shipping.city.required,
-              text: $t('City must not include only digits')
+              text: $t('Please provide valid city name')
             }
             ]"
           />

From cd706eaeceecf168606bc607268186903eacbd00 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Mon, 21 Oct 2019 16:05:33 +0300
Subject: [PATCH 69/99] Add missing validation messages

---
 .../core/blocks/Checkout/Payment.vue          | 10 +++++--
 .../core/blocks/MyAccount/MyProfile.vue       | 26 ++++++++++++++-----
 .../blocks/MyAccount/MyShippingDetails.vue    | 23 +++++++++++-----
 3 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/src/themes/default/components/core/blocks/Checkout/Payment.vue b/src/themes/default/components/core/blocks/Checkout/Payment.vue
index ba81a82364..9fce7c6e37 100644
--- a/src/themes/default/components/core/blocks/Checkout/Payment.vue
+++ b/src/themes/default/components/core/blocks/Checkout/Payment.vue
@@ -121,10 +121,16 @@
             v-model.trim="payment.city"
             @blur="$v.payment.city.$touch()"
             autocomplete="address-level2"
-            :validations="[{
+            :validations="[
+            {
               condition: $v.payment.city.$error && !$v.payment.city.required,
               text: $t('Field is required')
-            }]"
+            },
+            {
+              condition: $v.payment.city.$error && $v.payment.city.required,
+              text: $t('Please provide valid city name')
+            }
+            ]"
           />
 
           <base-input
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue b/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
index 2fb6aceec0..729404f828 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyProfile.vue
@@ -195,10 +195,16 @@
           :placeholder="$t('City *')"
           v-model.trim="userCompany.city"
           @input="$v.userCompany.city.$touch()"
-          :validations="[{
+          :validations="[
+          {
             condition: !$v.userCompany.city.required && $v.userCompany.city.$error,
             text: $t('Field is required')
-          }]"
+          },
+          {
+            condition: $v.userCompany.city.$error && $v.userCompany.city.required,
+            text: $t('Please provide valid city name')
+          }
+          ]"
         />
 
         <base-input
@@ -348,6 +354,7 @@
 <script>
 import { required, minLength, email, sameAs } from 'vuelidate/lib/validators'
 import MyProfile from '@vue-storefront/core/compatibility/components/blocks/MyAccount/MyProfile'
+import { unicodeAlpha, unicodeAlphaNum } from '@vue-storefront/core/helpers/validators'
 
 import BaseCheckbox from 'theme/components/core/blocks/Form/BaseCheckbox'
 import BaseSelect from 'theme/components/core/blocks/Form/BaseSelect'
@@ -391,10 +398,12 @@ export default {
     currentUser: {
       firstname: {
         required,
-        minLength: minLength(2)
+        minLength: minLength(2),
+        unicodeAlpha
       },
       lastname: {
-        required
+        required,
+        unicodeAlpha
       },
       email: {
         required,
@@ -419,17 +428,20 @@ export default {
         required
       },
       street: {
-        required
+        required,
+        unicodeAlphaNum
       },
       house: {
-        required
+        required,
+        unicodeAlphaNum
       },
       postcode: {
         required,
         minLength: minLength(3)
       },
       city: {
-        required
+        required,
+        unicodeAlpha
       },
       taxId: {
         required,
diff --git a/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue b/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
index 73b98a6f60..1f2fb9a842 100644
--- a/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
+++ b/src/themes/default/components/core/blocks/MyAccount/MyShippingDetails.vue
@@ -101,10 +101,16 @@
           :placeholder="`${$t('City')} *`"
           v-model.trim="shippingDetails.city"
           @input="$v.shippingDetails.city.$touch()"
-          :validations="[{
+          :validations="[
+          {
             condition: !$v.shippingDetails.city.required && $v.shippingDetails.city.$error,
             text: $t('Field is required')
-          }]"
+          },
+          {
+            condition: $v.shippingDetails.city.$error && $v.shippingDetails.city.required,
+            text: $t('Please provide valid city name')
+          }
+          ]"
         />
 
         <base-input
@@ -224,6 +230,7 @@
 <script>
 import { required, minLength } from 'vuelidate/lib/validators'
 import MyShippingDetails from '@vue-storefront/core/compatibility/components/blocks/MyAccount/MyShippingDetails'
+import { unicodeAlpha, unicodeAlphaNum } from '@vue-storefront/core/helpers/validators'
 
 import ButtonFull from 'theme/components/theme/ButtonFull'
 import Tooltip from 'theme/components/core/Tooltip'
@@ -254,7 +261,8 @@ export default {
     shippingDetails: {
       firstName: {
         required,
-        minLength: minLength(2)
+        minLength: minLength(2),
+        unicodeAlpha
       },
       lastName: {
         required
@@ -263,17 +271,20 @@ export default {
         required
       },
       street: {
-        required
+        required,
+        unicodeAlphaNum
       },
       house: {
-        required
+        required,
+        unicodeAlphaNum
       },
       postcode: {
         required,
         minLength: minLength(3)
       },
       city: {
-        required
+        required,
+        unicodeAlpha
       }
     }
   }

From b921d0ef7d757b2ed5307c9b16f077bfa714fe9a Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 22 Oct 2019 12:24:52 +0200
Subject: [PATCH 70/99] remove loading language in i18n module scope

---
 core/i18n/index.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/i18n/index.ts b/core/i18n/index.ts
index e785373eb6..4979c74ff5 100644
--- a/core/i18n/index.ts
+++ b/core/i18n/index.ts
@@ -62,6 +62,4 @@ export async function loadLanguageAsync (lang: string): Promise<string> {
   return lang
 }
 
-loadLanguageAsync(config.i18n.defaultLocale)
-
 export default i18n

From 61dd8ef12df05ee947d9edd3519b922cc29f1fc1 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Tue, 22 Oct 2019 12:37:51 +0200
Subject: [PATCH 71/99] translate notification and change order notification
 for factory fn

---
 core/i18n/resource/i18n/cs-CZ.csv           | 2 +-
 core/i18n/resource/i18n/de-DE.csv           | 2 +-
 core/i18n/resource/i18n/es-ES.csv           | 2 +-
 core/i18n/resource/i18n/fr-FR.csv           | 2 +-
 core/i18n/resource/i18n/jp-JP.csv           | 2 +-
 core/i18n/resource/i18n/nl-NL.csv           | 2 +-
 core/i18n/resource/i18n/pl-PL.csv           | 2 +-
 core/i18n/resource/i18n/pt-BR.csv           | 2 +-
 core/i18n/resource/i18n/pt-PT.csv           | 2 +-
 core/i18n/resource/i18n/ru-RU.csv           | 2 +-
 core/i18n/resource/i18n/zh-cn.csv           | 2 +-
 core/modules/order/helpers/notifications.ts | 8 ++++----
 core/modules/order/store/actions.ts         | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/core/i18n/resource/i18n/cs-CZ.csv b/core/i18n/resource/i18n/cs-CZ.csv
index ed53260f2a..7ef6874d16 100644
--- a/core/i18n/resource/i18n/cs-CZ.csv
+++ b/core/i18n/resource/i18n/cs-CZ.csv
@@ -36,7 +36,7 @@
 "Proceed to checkout","Přejděte k nákupu"
 "Product has been added to the cart!","Produkt byl přidán do košíku!"
 "Product price is unknown, product cannot be added to the cart!","Cena produktu není známa, produkt nelze přidat do košíku!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","Množství produktu bylo aktualizováno!"
 "Product {productName} has been added to the compare!","Produkt {productName} byl přidán k porovnání!"
 "Product {productName} has been added to wishlist!","Produkt {productName} byl přidán do seznamu přání!"
 "Product {productName} has been removed from compare!","Produkt {productName} byl odstraněn z porovnávání!"
diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
index 4877da17d3..3c4a28933a 100644
--- a/core/i18n/resource/i18n/de-DE.csv
+++ b/core/i18n/resource/i18n/de-DE.csv
@@ -40,7 +40,7 @@
 "Processing order...","Bestellung wird verarbeitet..."
 "Product has been added to the cart!","Produkt wurde zum Warenkorb hinzugefügt!"
 "Product price is unknown, product cannot be added to the cart!","Der Produktpreis ist unbekannt, daher kann dieses Produkt nicht zum Warenkorb hinzugefügt werden!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","Produktmenge wurde aktualisiert!"
 "Product {productName} has been added to the compare!","Das Produkt {productName} wurde zur Vergleichsliste hinzugefügt!"
 "Product {productName} has been added to wishlist!","Das Produkt {productName} wurde der Wunschliste hinzugefügt!"
 "Product {productName} has been removed from compare!","Das Produkt {productName} wurde von der Vergleichsliste entfernt!"
diff --git a/core/i18n/resource/i18n/es-ES.csv b/core/i18n/resource/i18n/es-ES.csv
index 1df884c76f..fbc235ba41 100644
--- a/core/i18n/resource/i18n/es-ES.csv
+++ b/core/i18n/resource/i18n/es-ES.csv
@@ -19,7 +19,7 @@
 "Please fix the validation errors","Corrija los errores de validación"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
 "Product price is unknown, product cannot be added to the cart!","El precio del producto es desconocido, ¡el producto no se puede agregar al carrito!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","¡La cantidad del producto ha sido actualizada!"
 "Product {productName} has been added to the compare!","¡El producto {productName} se ha agregado a la comparación!"
 "Product {productName} has been added to wishlist!","¡El producto {productName} ha sido agregado a la lista de deseos!"
 "Product {productName} has been removed from compare!","¡El producto {productName} ha sido eliminado de la comparación!"
diff --git a/core/i18n/resource/i18n/fr-FR.csv b/core/i18n/resource/i18n/fr-FR.csv
index 2ee4b3dcc6..823cf649b8 100644
--- a/core/i18n/resource/i18n/fr-FR.csv
+++ b/core/i18n/resource/i18n/fr-FR.csv
@@ -27,7 +27,7 @@
 "Proceed to checkout","Passer la commande"
 "Product has been added to the cart!","Le produit a été ajouté au panier !"
 "Product price is unknown, product cannot be added to the cart!","Le prix du produit est inconnu, le produit ne peut pas être ajouté au panier !"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","La quantité de produit a été mise à jour!"
 "Product {productName} has been added to the compare!","Le produit {productName} a été ajouté au comparateur !"
 "Product {productName} has been added to wishlist!","Le produit {productName} a été ajouté à la liste des souhaits !"
 "Product {productName} has been removed from compare!","Le produit {productName} a été supprimé du comparateur !"
diff --git a/core/i18n/resource/i18n/jp-JP.csv b/core/i18n/resource/i18n/jp-JP.csv
index a7bdd39f37..e092984cd1 100644
--- a/core/i18n/resource/i18n/jp-JP.csv
+++ b/core/i18n/resource/i18n/jp-JP.csv
@@ -87,7 +87,7 @@
 "Please check if all data are correct","全てのデータが正しいかチェックしてください"
 "Please confirm order you placed when you was offline","オフライン中に注文した商品を確認してください"
 "Please select the field which You like to sort by","ソートしたい項目を選んでください"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","製品の数量が更新されました！"
 "Products","商品"
 "Purchase","購入"
 "Register an account","アカウントを登録"
diff --git a/core/i18n/resource/i18n/nl-NL.csv b/core/i18n/resource/i18n/nl-NL.csv
index ac302ad74f..5fce5c19ba 100644
--- a/core/i18n/resource/i18n/nl-NL.csv
+++ b/core/i18n/resource/i18n/nl-NL.csv
@@ -2,7 +2,7 @@
 "Adding a review ...","Adding a review ..."
 "Are you sure you would like to remove this item from the shopping cart?","Weet u zeker dat u dit artikel uit uw mandje wilt verwijderen?"
 "Product price is unknown, product cannot be added to the cart!",Productprijs onbekend. Dit product kan niet worden toegevoegd aan de winkelwagen!
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","Produktmængde er blevet opdateret!"
 "Shopping cart is empty. Please add some products before entering Checkout",Uw winkelwagen is leeg. Voeg producten toe voordat u gaat afrekenen
 "Stock check in progress, please wait while available stock quantities are checked","Voorraadcontrole bezig. Een moment gedult alstublieft, we checken op dit moment de voorraden"
 "Thumbnail","Thumbnail"
diff --git a/core/i18n/resource/i18n/pl-PL.csv b/core/i18n/resource/i18n/pl-PL.csv
index 3681d62348..acaf7952ab 100644
--- a/core/i18n/resource/i18n/pl-PL.csv
+++ b/core/i18n/resource/i18n/pl-PL.csv
@@ -27,7 +27,7 @@
 "Proceed to checkout","Przejdź do kasy"
 "Product has been added to the cart!","Produkt został dodany do koszyka!"
 "Product price is unknown, product cannot be added to the cart!","Nie można dodać produktu do koszyka, nie można potwierdzić ceny produktu!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","Ilość produktu została zaktualizowana!"
 "Product {productName} has been added to the compare!","Produkt {productName} został dodany do porównania!"
 "Product {productName} has been added to wishlist!","Produkt {productName} został dodany do listy życzeń!"
 "Product {productName} has been removed from compare!","Produkt {productName} został usunięty z porównania!"
diff --git a/core/i18n/resource/i18n/pt-BR.csv b/core/i18n/resource/i18n/pt-BR.csv
index a9005ca82b..f36fd8adb1 100644
--- a/core/i18n/resource/i18n/pt-BR.csv
+++ b/core/i18n/resource/i18n/pt-BR.csv
@@ -22,7 +22,7 @@
 "Proceed to checkout","Finalizar Compra"
 "Product has been added to the cart!","Produto foi adicionado ao carrinho!"
 "Product price is unknown, product cannot be added to the cart!","Preço do produto é desconhecido, produto não pode ser adicionado ao carrinho!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","A quantidade do produto foi atualizada!"
 "Product {productName} has been added to the compare!","Produto {productName} foi adicionado para comparação!"
 "Product {productName} has been added to wishlist!","Produto {productName} foi adicionado à lista de desejos!"
 "Product {productName} has been removed from compare!","Produto {productName} foi removido da comparação!"
diff --git a/core/i18n/resource/i18n/pt-PT.csv b/core/i18n/resource/i18n/pt-PT.csv
index 5f5558d8a1..149b49fb31 100644
--- a/core/i18n/resource/i18n/pt-PT.csv
+++ b/core/i18n/resource/i18n/pt-PT.csv
@@ -22,7 +22,7 @@
 "Proceed to checkout","Ir para Finalizar Compra"
 "Product has been added to the cart!","O produto foi adicionado ao Cesto de Compras!"
 "Product price is unknown, product cannot be added to the cart!","O preço do produto é desconhecido, o produto não pode ser adicionado ao Cesto de Compras!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","A quantidade do produto foi atualizada!"
 "Product {productName} has been added to the compare!","Produto {productName} foi adicionado a Comparar Produtos!"
 "Product {productName} has been added to wishlist!","Produto {productName} foi adicionado à Lista de Desejos!"
 "Product {productName} has been removed from compare!","Produto {productName} foi removido de Comparar Produtos!"
diff --git a/core/i18n/resource/i18n/ru-RU.csv b/core/i18n/resource/i18n/ru-RU.csv
index dd8c3b2df7..a224329722 100644
--- a/core/i18n/resource/i18n/ru-RU.csv
+++ b/core/i18n/resource/i18n/ru-RU.csv
@@ -19,7 +19,7 @@
 "Please fix the validation errors","Пожалуйста исправьте валидационные ошибки"
 "Product has been added to the cart!","Товар добавлен в корзину!"
 "Product price is unknown, product cannot be added to the cart!","Цена товара неизвестна, товар нельзя добавить в корзину!"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","Количество товара обновлено!"
 "Product {productName} has been added to the compare!","Товар {productName} добавлен к странице сравнения!"
 "Product {productName} has been added to wishlist!","Товар {productName} добавлен к списку пожеланий!"
 "Product {productName} has been removed from compare!","Товар {productName} удален из страницы сравнения!"
diff --git a/core/i18n/resource/i18n/zh-cn.csv b/core/i18n/resource/i18n/zh-cn.csv
index 884ad99867..ee83fcff1f 100644
--- a/core/i18n/resource/i18n/zh-cn.csv
+++ b/core/i18n/resource/i18n/zh-cn.csv
@@ -36,7 +36,7 @@
 "Processing order...","订单处理中..."
 "Product has been added to the cart!","已成功将商品加入购物车!"
 "Product price is unknown, product cannot be added to the cart!","商品价格未确定，无法添加到购物车！"
-"Product quantity has been updated!","Product quantity has been updated!"
+"Product quantity has been updated!","產品數量已更新！"
 "Product {productName} has been added to the compare!","商品 {productName} 已经添加到比较列表中!"
 "Product {productName} has been added to wishlist!","商品 {productName} 已添加到心愿单!"
 "Product {productName} has been removed from compare!","商品 {productName} 已从比较列表中移除!"
diff --git a/core/modules/order/helpers/notifications.ts b/core/modules/order/helpers/notifications.ts
index 4a33bd847a..2c419bcce1 100644
--- a/core/modules/order/helpers/notifications.ts
+++ b/core/modules/order/helpers/notifications.ts
@@ -1,17 +1,17 @@
 import i18n from '@vue-storefront/i18n'
 import config from 'config'
 
-const internalValidationError = {
+const internalValidationError = () => ({
   type: 'error',
   message: i18n.t('Internal validation error. Please check if all required fields are filled in. Please contact us on {email}', { email: config.mailer.contactAddress }),
   action1: { label: i18n.t('OK') }
-}
+})
 
-const orderCannotTransfered = {
+const orderCannotTransfered = () => ({
   type: 'error',
   message: i18n.t('The order can not be transfered because of server error. Order has been queued'),
   action1: { label: i18n.t('OK') }
-}
+})
 
 const notifications = { internalValidationError, orderCannotTransfered }
 
diff --git a/core/modules/order/store/actions.ts b/core/modules/order/store/actions.ts
index 6b3d17097c..145483c48c 100644
--- a/core/modules/order/store/actions.ts
+++ b/core/modules/order/store/actions.ts
@@ -69,7 +69,7 @@ const actions: ActionTree<OrderState, RootState> = {
       commit(types.ORDER_REMOVE_SESSION_ORDER_HASH, currentOrderHash)
 
       Logger.error('Internal validation error; Order entity is not compliant with the schema: ' + JSON.stringify(task.result), 'orders')()
-      dispatch('notification/spawnNotification', notifications.internalValidationError, { root: true })
+      dispatch('notification/spawnNotification', notifications.internalValidationError(), { root: true })
       dispatch('enqueueOrder', { newOrder: order })
 
       return task
@@ -80,7 +80,7 @@ const actions: ActionTree<OrderState, RootState> = {
   handlePlacingOrderFailed ({ commit, dispatch }, { newOrder, currentOrderHash }) {
     const order = { newOrder, transmited: false }
     commit(types.ORDER_REMOVE_SESSION_ORDER_HASH, currentOrderHash)
-    dispatch('notification/spawnNotification', notifications.orderCannotTransfered, { root: true })
+    dispatch('notification/spawnNotification', notifications.orderCannotTransfered(), { root: true })
     dispatch('enqueueOrder', { newOrder: order })
 
     EventBus.$emit('notification-progress-stop')

From 039e6554b5fd893cd2c9adcd45154cdc12764bc1 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Wed, 23 Oct 2019 11:42:23 +0300
Subject: [PATCH 72/99] Improving getAllComparableAttributes function for
 supporting boolean and 0/1

---
 .../catalog/store/attribute/getters.ts        |   2 +-
 yarn.lock                                     | 253 +++++++++++++++++-
 2 files changed, 242 insertions(+), 13 deletions(-)

diff --git a/core/modules/catalog/store/attribute/getters.ts b/core/modules/catalog/store/attribute/getters.ts
index 938eabea0f..bda43dcc05 100644
--- a/core/modules/catalog/store/attribute/getters.ts
+++ b/core/modules/catalog/store/attribute/getters.ts
@@ -13,7 +13,7 @@ const getters: GetterTree<AttributeState, RootState> = {
   getBlacklist: (state) => state.blacklist,
   getAllComparableAttributes: (state, getters) => {
     const attributesByCode = getters.getAttributeListByCode
-    return Object.values(attributesByCode).filter((a: any) => parseInt(a.is_comparable))
+    return Object.values(attributesByCode).filter((a: any) => ["1", true].includes(a.is_comparable)) //In some cases we get boolean instead of "0"/"1" that why we support both options
   }
 }
 
diff --git a/yarn.lock b/yarn.lock
index ee4a55fed8..d2fb6573e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2656,10 +2656,25 @@ ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
 
+ajv-keywords@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
+  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
+
 ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
 
+ajv@^5.2.3, ajv@^5.3.0:
+  version "5.5.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
+  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
+  dependencies:
+    co "^4.6.0"
+    fast-deep-equal "^1.0.0"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.3.0"
+
 ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
@@ -3061,7 +3076,7 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-code-frame@^6.26.0:
+babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -4123,12 +4138,24 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
+caller-path@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
+  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
+  dependencies:
+    callsites "^0.2.0"
+
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
   dependencies:
     caller-callsite "^2.0.0"
 
+callsites@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
+  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
+
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -4301,6 +4328,11 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+circular-json@^0.3.1:
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
+  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
+
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
@@ -4575,7 +4607,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.2, concat-stream@^1.5.0:
+concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -5291,7 +5323,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   dependencies:
@@ -5453,6 +5485,13 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -5678,6 +5717,22 @@ error-inject@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
 
+es-abstract@^1.12.0:
+  version "1.16.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
+  integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.0"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-inspect "^1.6.0"
+    object-keys "^1.1.1"
+    string.prototype.trimleft "^2.1.0"
+    string.prototype.trimright "^2.1.0"
+
 es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
@@ -5792,6 +5847,23 @@ eslint-module-utils@^2.4.0:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
+eslint-plugin-import@^2.12.0:
+  version "2.18.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
+  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
+  dependencies:
+    array-includes "^3.0.3"
+    contains-path "^0.1.0"
+    debug "^2.6.9"
+    doctrine "1.5.0"
+    eslint-import-resolver-node "^0.3.2"
+    eslint-module-utils "^2.4.0"
+    has "^1.0.3"
+    minimatch "^3.0.4"
+    object.values "^1.1.0"
+    read-pkg-up "^2.0.0"
+    resolve "^1.11.0"
+
 eslint-plugin-import@^2.13.0:
   version "2.17.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb"
@@ -5831,6 +5903,13 @@ eslint-plugin-vue-storefront@^0.0.1:
   dependencies:
     requireindex "~1.2.0"
 
+eslint-plugin-vue@^4.5.0:
+  version "4.7.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
+  integrity sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==
+  dependencies:
+    vue-eslint-parser "^2.0.3"
+
 eslint-plugin-vue@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
@@ -5870,6 +5949,50 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
+eslint@^4.16.0:
+  version "4.19.1"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
+  integrity sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==
+  dependencies:
+    ajv "^5.3.0"
+    babel-code-frame "^6.22.0"
+    chalk "^2.1.0"
+    concat-stream "^1.6.0"
+    cross-spawn "^5.1.0"
+    debug "^3.1.0"
+    doctrine "^2.1.0"
+    eslint-scope "^3.7.1"
+    eslint-visitor-keys "^1.0.0"
+    espree "^3.5.4"
+    esquery "^1.0.0"
+    esutils "^2.0.2"
+    file-entry-cache "^2.0.0"
+    functional-red-black-tree "^1.0.1"
+    glob "^7.1.2"
+    globals "^11.0.1"
+    ignore "^3.3.3"
+    imurmurhash "^0.1.4"
+    inquirer "^3.0.6"
+    is-resolvable "^1.0.0"
+    js-yaml "^3.9.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.4"
+    minimatch "^3.0.2"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.2"
+    path-is-inside "^1.0.2"
+    pluralize "^7.0.0"
+    progress "^2.0.0"
+    regexpp "^1.0.1"
+    require-uncached "^1.0.3"
+    semver "^5.3.0"
+    strip-ansi "^4.0.0"
+    strip-json-comments "~2.0.1"
+    table "4.0.2"
+    text-table "~0.2.0"
+
 eslint@^5.0.0:
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
@@ -5911,7 +6034,7 @@ eslint@^5.0.0:
     table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^3.5.2:
+espree@^3.5.2, espree@^3.5.4:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
@@ -6223,6 +6346,11 @@ eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
 
+fast-deep-equal@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
+  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
+
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -6294,6 +6422,14 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-entry-cache@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
+  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
+  dependencies:
+    flat-cache "^1.2.1"
+    object-assign "^4.0.1"
+
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -6412,6 +6548,16 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
+flat-cache@^1.2.1:
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
+  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
+  dependencies:
+    circular-json "^0.3.1"
+    graceful-fs "^4.1.2"
+    rimraf "~2.6.2"
+    write "^0.2.1"
+
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -6846,7 +6992,7 @@ global@^4.3.2:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.1.0, globals@^11.7.0:
+globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
 
@@ -7315,7 +7461,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.5, ignore@^3.3.6:
+ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
@@ -7437,7 +7583,7 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
-inquirer@^3.3.0:
+inquirer@^3.0.6, inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -7764,6 +7910,11 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
+
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -8350,7 +8501,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0:
+js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
@@ -8422,6 +8573,11 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
+json-schema-traverse@^0.3.0:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
+  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -10044,7 +10200,12 @@ object-hash@^1.1.4:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
 
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.0:
+object-inspect@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
+  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
+
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.0, object-keys@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
 
@@ -10083,6 +10244,16 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
+object.values@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.12.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 octokit-pagination-methods@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
@@ -10609,6 +10780,11 @@ please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
+pluralize@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
+  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
+
 pm2-axon-rpc@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.5.1.tgz#ad3c43c43811c71f13e5eee2821194d03ceb03fe"
@@ -11556,6 +11732,11 @@ regexp-tree@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.6.tgz#84900fa12fdf428a2ac25f04300382a7c0148479"
 
+regexpp@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
+  integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
+
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -11749,6 +11930,14 @@ require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
 
+require-uncached@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
+  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
+  dependencies:
+    caller-path "^0.1.0"
+    resolve-from "^1.0.0"
+
 requireindex@^1.2.0, requireindex@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
@@ -11770,6 +11959,11 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
+resolve-from@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
+  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -11799,7 +11993,7 @@ resolve@1.x, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, re
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.12.0:
+resolve@^1.11.0, resolve@^1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
@@ -11836,7 +12030,7 @@ retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   dependencies:
@@ -12521,6 +12715,22 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string.prototype.trimleft@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
+  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
+string.prototype.trimright@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
+  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
+  dependencies:
+    define-properties "^1.1.3"
+    function-bind "^1.1.1"
+
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
@@ -12710,6 +12920,18 @@ synchronous-promise@^2.0.6:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
 
+table@4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
+  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
+  dependencies:
+    ajv "^5.2.3"
+    ajv-keywords "^2.1.0"
+    chalk "^2.1.0"
+    lodash "^4.17.4"
+    slice-ansi "1.0.0"
+    string-width "^2.1.1"
+
 table@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
@@ -12820,7 +13042,7 @@ text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
 
-text-table@^0.2.0:
+text-table@^0.2.0, text-table@~0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -14118,6 +14340,13 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
+write@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
+  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
+  dependencies:
+    mkdirp "^0.5.1"
+
 ws@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"

From 087836e22eb05c2ea17084175d997731633a3ff8 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Wed, 23 Oct 2019 11:42:56 +0300
Subject: [PATCH 73/99] Improving getAllComparableAttributes function for
 supporting boolean and 0/1

---
 yarn.lock | 253 +++---------------------------------------------------
 1 file changed, 12 insertions(+), 241 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index d2fb6573e7..ee4a55fed8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2656,25 +2656,10 @@ ajv-errors@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
 
-ajv-keywords@^2.1.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762"
-  integrity sha1-YXmX/F9gV2iUxDX5QNgZ4TW4B2I=
-
 ajv-keywords@^3.0.0, ajv-keywords@^3.1.0:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.0.tgz#4b831e7b531415a7cc518cd404e73f6193c6349d"
 
-ajv@^5.2.3, ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
 ajv@^6.0.1, ajv@^6.1.0, ajv@^6.5.5, ajv@^6.9.1:
   version "6.10.0"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.0.tgz#90d0d54439da587cd7e843bfb7045f50bd22bdf1"
@@ -3076,7 +3061,7 @@ aws4@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
 
-babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
+babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
   dependencies:
@@ -4138,24 +4123,12 @@ caller-callsite@^2.0.0:
   dependencies:
     callsites "^2.0.0"
 
-caller-path@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
-  integrity sha1-lAhe9jWB7NPaqSREqP6U6CV3dR8=
-  dependencies:
-    callsites "^0.2.0"
-
 caller-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
   dependencies:
     caller-callsite "^2.0.0"
 
-callsites@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/callsites/-/callsites-0.2.0.tgz#afab96262910a7f33c19a5775825c69f34e350ca"
-  integrity sha1-r6uWJikQp/M8GaV3WCXGnzTjUMo=
-
 callsites@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
@@ -4328,11 +4301,6 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
-circular-json@^0.3.1:
-  version "0.3.3"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.3.3.tgz#815c99ea84f6809529d2f45791bdf82711352d66"
-  integrity sha512-UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==
-
 clap@^1.0.9:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
@@ -4607,7 +4575,7 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
-concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.6.0:
+concat-stream@1.6.2, concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   dependencies:
@@ -5323,7 +5291,7 @@ defaults@^1.0.3:
   dependencies:
     clone "^1.0.2"
 
-define-properties@^1.1.2, define-properties@^1.1.3:
+define-properties@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   dependencies:
@@ -5485,13 +5453,6 @@ doctrine@1.5.0:
     esutils "^2.0.2"
     isarray "^1.0.0"
 
-doctrine@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
-  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
-  dependencies:
-    esutils "^2.0.2"
-
 doctrine@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
@@ -5717,22 +5678,6 @@ error-inject@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
 
-es-abstract@^1.12.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.16.0.tgz#d3a26dc9c3283ac9750dca569586e976d9dcc06d"
-  integrity sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==
-  dependencies:
-    es-to-primitive "^1.2.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.0"
-    is-callable "^1.1.4"
-    is-regex "^1.0.4"
-    object-inspect "^1.6.0"
-    object-keys "^1.1.1"
-    string.prototype.trimleft "^2.1.0"
-    string.prototype.trimright "^2.1.0"
-
 es-abstract@^1.5.1, es-abstract@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
@@ -5847,23 +5792,6 @@ eslint-module-utils@^2.4.0:
     debug "^2.6.8"
     pkg-dir "^2.0.0"
 
-eslint-plugin-import@^2.12.0:
-  version "2.18.2"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz#02f1180b90b077b33d447a17a2326ceb400aceb6"
-  integrity sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==
-  dependencies:
-    array-includes "^3.0.3"
-    contains-path "^0.1.0"
-    debug "^2.6.9"
-    doctrine "1.5.0"
-    eslint-import-resolver-node "^0.3.2"
-    eslint-module-utils "^2.4.0"
-    has "^1.0.3"
-    minimatch "^3.0.4"
-    object.values "^1.1.0"
-    read-pkg-up "^2.0.0"
-    resolve "^1.11.0"
-
 eslint-plugin-import@^2.13.0:
   version "2.17.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.17.2.tgz#d227d5c6dc67eca71eb590d2bb62fb38d86e9fcb"
@@ -5903,13 +5831,6 @@ eslint-plugin-vue-storefront@^0.0.1:
   dependencies:
     requireindex "~1.2.0"
 
-eslint-plugin-vue@^4.5.0:
-  version "4.7.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-4.7.1.tgz#c829b9fc62582c1897b5a0b94afd44ecca511e63"
-  integrity sha512-esETKhVMI7Vdli70Wt4bvAwnZBJeM0pxVX9Yb0wWKxdCJc2EADalVYK/q2FzMw8oKN0wPMdqVCKS8kmR89recA==
-  dependencies:
-    vue-eslint-parser "^2.0.3"
-
 eslint-plugin-vue@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/eslint-plugin-vue/-/eslint-plugin-vue-5.2.2.tgz#86601823b7721b70bc92d54f1728cfc03b36283c"
@@ -5949,50 +5870,6 @@ eslint-visitor-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
 
-eslint@^4.16.0:
-  version "4.19.1"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-4.19.1.tgz#32d1d653e1d90408854bfb296f076ec7e186a300"
-  integrity sha512-bT3/1x1EbZB7phzYu7vCr1v3ONuzDtX8WjuM9c0iYxe+cq+pwcKEoQjl7zd3RpC6YOLgnSy3cTN58M2jcoPDIQ==
-  dependencies:
-    ajv "^5.3.0"
-    babel-code-frame "^6.22.0"
-    chalk "^2.1.0"
-    concat-stream "^1.6.0"
-    cross-spawn "^5.1.0"
-    debug "^3.1.0"
-    doctrine "^2.1.0"
-    eslint-scope "^3.7.1"
-    eslint-visitor-keys "^1.0.0"
-    espree "^3.5.4"
-    esquery "^1.0.0"
-    esutils "^2.0.2"
-    file-entry-cache "^2.0.0"
-    functional-red-black-tree "^1.0.1"
-    glob "^7.1.2"
-    globals "^11.0.1"
-    ignore "^3.3.3"
-    imurmurhash "^0.1.4"
-    inquirer "^3.0.6"
-    is-resolvable "^1.0.0"
-    js-yaml "^3.9.1"
-    json-stable-stringify-without-jsonify "^1.0.1"
-    levn "^0.3.0"
-    lodash "^4.17.4"
-    minimatch "^3.0.2"
-    mkdirp "^0.5.1"
-    natural-compare "^1.4.0"
-    optionator "^0.8.2"
-    path-is-inside "^1.0.2"
-    pluralize "^7.0.0"
-    progress "^2.0.0"
-    regexpp "^1.0.1"
-    require-uncached "^1.0.3"
-    semver "^5.3.0"
-    strip-ansi "^4.0.0"
-    strip-json-comments "~2.0.1"
-    table "4.0.2"
-    text-table "~0.2.0"
-
 eslint@^5.0.0:
   version "5.16.0"
   resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.16.0.tgz#a1e3ac1aae4a3fbd8296fcf8f7ab7314cbb6abea"
@@ -6034,7 +5911,7 @@ eslint@^5.0.0:
     table "^5.2.3"
     text-table "^0.2.0"
 
-espree@^3.5.2, espree@^3.5.4:
+espree@^3.5.2:
   version "3.5.4"
   resolved "https://registry.yarnpkg.com/espree/-/espree-3.5.4.tgz#b0f447187c8a8bed944b815a660bddf5deb5d1a7"
   dependencies:
@@ -6346,11 +6223,6 @@ eyes@0.1.x:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
@@ -6422,14 +6294,6 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-entry-cache@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-2.0.0.tgz#c392990c3e684783d838b8c84a45d8a048458361"
-  integrity sha1-w5KZDD5oR4PYOLjISkXYoEhFg2E=
-  dependencies:
-    flat-cache "^1.2.1"
-    object-assign "^4.0.1"
-
 file-entry-cache@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
@@ -6548,16 +6412,6 @@ findup-sync@^2.0.0:
     micromatch "^3.0.4"
     resolve-dir "^1.0.1"
 
-flat-cache@^1.2.1:
-  version "1.3.4"
-  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-1.3.4.tgz#2c2ef77525cc2929007dfffa1dd314aa9c9dee6f"
-  integrity sha512-VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==
-  dependencies:
-    circular-json "^0.3.1"
-    graceful-fs "^4.1.2"
-    rimraf "~2.6.2"
-    write "^0.2.1"
-
 flat-cache@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
@@ -6992,7 +6846,7 @@ global@^4.3.2:
     min-document "^2.19.0"
     process "~0.5.1"
 
-globals@^11.0.1, globals@^11.1.0, globals@^11.7.0:
+globals@^11.1.0, globals@^11.7.0:
   version "11.12.0"
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
 
@@ -7461,7 +7315,7 @@ ignore-walk@^3.0.1:
   dependencies:
     minimatch "^3.0.4"
 
-ignore@^3.3.3, ignore@^3.3.5, ignore@^3.3.6:
+ignore@^3.3.5, ignore@^3.3.6:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
 
@@ -7583,7 +7437,7 @@ init-package-json@^1.10.3:
     validate-npm-package-license "^3.0.1"
     validate-npm-package-name "^3.0.0"
 
-inquirer@^3.0.6, inquirer@^3.3.0:
+inquirer@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-3.3.0.tgz#9dd2f2ad765dcab1ff0443b491442a20ba227dc9"
   dependencies:
@@ -7910,11 +7764,6 @@ is-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-regexp/-/is-regexp-1.0.0.tgz#fd2d883545c46bac5a633e7b9a09e87fa2cb5069"
 
-is-resolvable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
-  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
-
 is-retry-allowed@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
@@ -8501,7 +8350,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
 
-js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0, js-yaml@^3.9.1:
+js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1, js-yaml@^3.9.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   dependencies:
@@ -8573,11 +8422,6 @@ json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-bet
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -10200,12 +10044,7 @@ object-hash@^1.1.4:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/object-hash/-/object-hash-1.3.1.tgz#fde452098a951cb145f039bb7d455449ddc126df"
 
-object-inspect@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.6.0.tgz#c70b6cbf72f274aab4c34c0c82f5167bf82cf15b"
-  integrity sha512-GJzfBZ6DgDAmnuaM3104jR4s1Myxr3Y3zfIyN4z3UdqN69oSRacNK8UhnobDdC+7J2AHCjGwxQubNJfE70SXXQ==
-
-object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.0, object-keys@^1.1.1:
+object-keys@^1.0.11, object-keys@^1.0.12, object-keys@^1.1.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
 
@@ -10244,16 +10083,6 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
-  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.12.0"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-
 octokit-pagination-methods@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
@@ -10780,11 +10609,6 @@ please-upgrade-node@^3.0.2, please-upgrade-node@^3.1.1:
   dependencies:
     semver-compare "^1.0.0"
 
-pluralize@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777"
-  integrity sha512-ARhBOdzS3e41FbkW/XWrTEtukqqLoK5+Z/4UeDaLuSW+39JPeFgs4gCGqsrJHVZX0fUrx//4OF0K1CUGwlIFow==
-
 pm2-axon-rpc@^0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/pm2-axon-rpc/-/pm2-axon-rpc-0.5.1.tgz#ad3c43c43811c71f13e5eee2821194d03ceb03fe"
@@ -11732,11 +11556,6 @@ regexp-tree@^0.1.0:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/regexp-tree/-/regexp-tree-0.1.6.tgz#84900fa12fdf428a2ac25f04300382a7c0148479"
 
-regexpp@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
-  integrity sha512-LOPw8FpgdQF9etWMaAfG/WRthIdXJGYp4mJ2Jgn/2lpkbod9jPn0t9UqN7AxBOKNfzRbYyVfgc7Vk4t/MpnXgw==
-
 regexpp@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
@@ -11930,14 +11749,6 @@ require-main-filename@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
 
-require-uncached@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
-  integrity sha1-Tg1W1slmL9MeQwEcS5WqSZVUIdM=
-  dependencies:
-    caller-path "^0.1.0"
-    resolve-from "^1.0.0"
-
 requireindex@^1.2.0, requireindex@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/requireindex/-/requireindex-1.2.0.tgz#3463cdb22ee151902635aa6c9535d4de9c2ef1ef"
@@ -11959,11 +11770,6 @@ resolve-dir@^1.0.0, resolve-dir@^1.0.1:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
-resolve-from@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-1.0.1.tgz#26cbfe935d1aeeeabb29bc3fe5aeb01e93d44226"
-  integrity sha1-Jsv+k10a7uq7Kbw/5a6wHpPUQiY=
-
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
@@ -11993,7 +11799,7 @@ resolve@1.x, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.2.0, resolve@^1.3.2, re
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.11.0, resolve@^1.12.0:
+resolve@^1.12.0:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.12.0.tgz#3fc644a35c84a48554609ff26ec52b66fa577df6"
   integrity sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==
@@ -12030,7 +11836,7 @@ retry@^0.10.0:
   version "0.10.1"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
 
-rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2, rimraf@~2.6.2:
+rimraf@2, rimraf@2.6.3, rimraf@^2.2.8, rimraf@^2.5.4, rimraf@^2.6.0, rimraf@^2.6.1, rimraf@^2.6.2:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   dependencies:
@@ -12715,22 +12521,6 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
-string.prototype.trimleft@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz#6cc47f0d7eb8d62b0f3701611715a3954591d634"
-  integrity sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
-string.prototype.trimright@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz#669d164be9df9b6f7559fa8e89945b168a5a6c58"
-  integrity sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==
-  dependencies:
-    define-properties "^1.1.3"
-    function-bind "^1.1.1"
-
 string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
@@ -12920,18 +12710,6 @@ synchronous-promise@^2.0.6:
   version "2.0.9"
   resolved "https://registry.yarnpkg.com/synchronous-promise/-/synchronous-promise-2.0.9.tgz#b83db98e9e7ae826bf9c8261fd8ac859126c780a"
 
-table@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/table/-/table-4.0.2.tgz#a33447375391e766ad34d3486e6e2aedc84d2e36"
-  integrity sha512-UUkEAPdSGxtRpiV9ozJ5cMTtYiqz7Ni1OGqLXRCynrvzdtR1p+cfOWe2RJLwvUG8hNanaSRjecIqwOjqeatDsA==
-  dependencies:
-    ajv "^5.2.3"
-    ajv-keywords "^2.1.0"
-    chalk "^2.1.0"
-    lodash "^4.17.4"
-    slice-ansi "1.0.0"
-    string-width "^2.1.1"
-
 table@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/table/-/table-4.0.3.tgz#00b5e2b602f1794b9acaf9ca908a76386a7813bc"
@@ -13042,7 +12820,7 @@ text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
 
-text-table@^0.2.0, text-table@~0.2.0:
+text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
 
@@ -14340,13 +14118,6 @@ write@1.0.3:
   dependencies:
     mkdirp "^0.5.1"
 
-write@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/write/-/write-0.2.1.tgz#5fc03828e264cea3fe91455476f7a3c566cb0757"
-  integrity sha1-X8A4KOJkzqP+kUVUdvejxWbLB1c=
-  dependencies:
-    mkdirp "^0.5.1"
-
 ws@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ws/-/ws-4.1.0.tgz#a979b5d7d4da68bf54efe0408967c324869a7289"

From 78adbe8fcfb09ab8f120c7069d211c550563f233 Mon Sep 17 00:00:00 2001
From: Petar Petrov <p.petrov@codecoda.com>
Date: Wed, 23 Oct 2019 11:47:02 +0300
Subject: [PATCH 74/99] update CHANGELOG

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c42124238b..c24d7bd1f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
 - Added validation message for city field on checkout page - @dz3n (#3723)
+- Improving is_comparable to work with booleans and digits - @dz3n (#3697)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 0cfa0a454ea0eb0213bf08a5386a0301b2a44f27 Mon Sep 17 00:00:00 2001
From: GrimLink <sean.grimlink@gmail.com>
Date: Wed, 23 Oct 2019 19:24:59 +0200
Subject: [PATCH 75/99] FIX: wrong urls in promoted banners

The demo content url's do match the actual Magento urls
---
 .../resource/banners/de_main-image.json       |  8 ++---
 .../resource/banners/de_promoted_offers.json  | 28 ++++++++---------
 .../resource/banners/it_main-image.json       |  8 ++---
 .../resource/banners/it_promoted_offers.json  | 28 ++++++++---------
 .../default/resource/promoted_offers.json     | 30 +++++++++----------
 5 files changed, 51 insertions(+), 51 deletions(-)

diff --git a/src/themes/default/resource/banners/de_main-image.json b/src/themes/default/resource/banners/de_main-image.json
index 7c1e4fa5c5..7129b792e1 100644
--- a/src/themes/default/resource/banners/de_main-image.json
+++ b/src/themes/default/resource/banners/de_main-image.json
@@ -1,8 +1,8 @@
 {
   "image": {
-      "title": "Neue Wege beschreiten.",
-      "subtitle": "Eine Mode kann sich zu einem neuen Stil durchsetzen und offenbart die neusten Kreationen von Designern, Technologen, Ingenieuren und Designmanagern.",
-      "image": "/assets/full_width_banner.jpg",
-      "link": "/women/frauen-20"
+    "title": "Neue Wege beschreiten.",
+    "subtitle": "Eine Mode kann sich zu einem neuen Stil durchsetzen und offenbart die neusten Kreationen von Designern, Technologen, Ingenieuren und Designmanagern.",
+    "image": "/assets/full_width_banner.jpg",
+    "link": "/women"
   }
 }
diff --git a/src/themes/default/resource/banners/de_promoted_offers.json b/src/themes/default/resource/banners/de_promoted_offers.json
index 16d54b5c3d..2d02ba6f9e 100644
--- a/src/themes/default/resource/banners/de_promoted_offers.json
+++ b/src/themes/default/resource/banners/de_promoted_offers.json
@@ -1,32 +1,32 @@
 {
   "mainBanners": [
-	  {
-	    "title": "Lässige Büro",
-	    "subtitle": "Kollektion",
-	    "image": "/assets/ban1.jpg",
-	    "link": "/women/frauen-20"
-	  }
+    {
+      "title": "Lässige Büro",
+      "subtitle": "Kollektion",
+      "image": "/assets/ban1.jpg",
+      "link": "/women"
+    }
   ],
   "smallBanners": [
     {
       "title": "Glänzen Sie mit",
       "subtitle": "Accessoires",
       "image": "/assets/ban2.jpg",
-      "link": "/men/herren-11"
+      "link": "/men"
     },
     {
       "title": "Der Frühling kommt",
       "subtitle": "Hüte",
       "image": "/assets/ban3.jpg",
-      "link": "/gear/gerat-3"
+      "link": "/gear"
     }
   ],
   "productBanners": [
-	  {
-	    "title": "Der Frühling kommt",
-	    "subtitle": "Hüte",
-	    "image": "/assets/ban3.jpg",
-	    "link": "/gear/gerat-3"
-	  }
+    {
+      "title": "Der Frühling kommt",
+      "subtitle": "Hüte",
+      "image": "/assets/ban3.jpg",
+      "link": "/gear"
+    }
   ]
 }
diff --git a/src/themes/default/resource/banners/it_main-image.json b/src/themes/default/resource/banners/it_main-image.json
index 0eb03931c8..7e75a506e6 100644
--- a/src/themes/default/resource/banners/it_main-image.json
+++ b/src/themes/default/resource/banners/it_main-image.json
@@ -1,8 +1,8 @@
 {
   "image": {
-      "title": "Cammina la passeggiata.",
-      "subtitle": "Una moda può diventare lo stile prevalente nel comportamento o manifestare le ultime creazioni di designer, tecnologi, ingegneri e responsabili del design.",
-      "image": "/assets/full_width_banner.jpg",
-      "link": "/women/la-donne-20"
+    "title": "Cammina la passeggiata.",
+    "subtitle": "Una moda può diventare lo stile prevalente nel comportamento o manifestare le ultime creazioni di designer, tecnologi, ingegneri e responsabili del design.",
+    "image": "/assets/full_width_banner.jpg",
+    "link": "/women"
   }
 }
diff --git a/src/themes/default/resource/banners/it_promoted_offers.json b/src/themes/default/resource/banners/it_promoted_offers.json
index da98c29b5d..701b45f46a 100644
--- a/src/themes/default/resource/banners/it_promoted_offers.json
+++ b/src/themes/default/resource/banners/it_promoted_offers.json
@@ -1,32 +1,32 @@
 {
   "mainBanners": [
-	  {
-	    "title": "Ufficio casual",
-	    "subtitle": "Collezione",
-	    "image": "/assets/ban1.jpg",
-	    "link": "/women/la-donne-20"
-	  }
+    {
+      "title": "Ufficio casual",
+      "subtitle": "Collezione",
+      "image": "/assets/ban1.jpg",
+      "link": "/women"
+    }
   ],
   "smallBanners": [
     {
       "title": "Brilla",
       "subtitle": "Accessori",
       "image": "/assets/ban2.jpg",
-      "link": "/men/signori-11"
+      "link": "/men"
     },
     {
       "title": "La primavera sta arrivando",
       "subtitle": "Cappelli",
       "image": "/assets/ban3.jpg",
-      "link": "/gear/equipaggiamento-3"
+      "link": "/gear"
     }
   ],
   "productBanners": [
-	  {
-	    "title": "La primavera sta arrivando",
-	    "subtitle": "Cappelli",
-	    "image": "/assets/ban3.jpg",
-	    "link": "/gear/equipaggiamento-3"
-	  }
+    {
+      "title": "La primavera sta arrivando",
+      "subtitle": "Cappelli",
+      "image": "/assets/ban3.jpg",
+      "link": "/gear"
+    }
   ]
 }
diff --git a/src/themes/default/resource/promoted_offers.json b/src/themes/default/resource/promoted_offers.json
index c5735fecdd..76dac0c9f8 100644
--- a/src/themes/default/resource/promoted_offers.json
+++ b/src/themes/default/resource/promoted_offers.json
@@ -1,32 +1,32 @@
 {
   "mainBanners": [
-	  {
-	    "title": "Office casual",
-	    "subtitle": "Collection",
-	    "image": "/assets/ban1.jpg",
-	    "link": "/women/women-20"
-	  }
+    {
+      "title": "Office casual",
+      "subtitle": "Collection",
+      "image": "/assets/ban1.jpg",
+      "link": "/women"
+    }
   ],
   "smallBanners": [
     {
       "title": "Shine on",
       "subtitle": "Accessories",
       "image": "/assets/ban2.jpg",
-      "link": "/men/men-11"
+      "link": "/men"
     },
     {
       "title": "Spring is coming",
       "subtitle": "Hats",
       "image": "/assets/ban3.jpg",
-      "link": "/gear/gear-3"
+      "link": "/gear"
     }
   ],
   "productBanners": [
-	  {
-	    "title": "Spring is coming",
-	    "subtitle": "Hats",
-	    "image": "/assets/ban3.jpg",
-	    "link": "/gear/gear-3"
-	  }
+    {
+      "title": "Spring is coming",
+      "subtitle": "Hats",
+      "image": "/assets/ban3.jpg",
+      "link": "/gear"
+    }
   ]
-}
\ No newline at end of file
+}

From 044b91c263853c50488e73f76914441898f187ee Mon Sep 17 00:00:00 2001
From: Aditya Sharma <iamadityasharma7@gmail.com>
Date: Tue, 22 Oct 2019 14:14:26 +0530
Subject: [PATCH 76/99] Use encodeURIComponent to encode get parameters in
 multimatch.js #3736 closes #3736

---
 core/lib/search/adapter/api/elasticsearch/multimatch.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/lib/search/adapter/api/elasticsearch/multimatch.js b/core/lib/search/adapter/api/elasticsearch/multimatch.js
index 64a71339e9..1abd481c3a 100644
--- a/core/lib/search/adapter/api/elasticsearch/multimatch.js
+++ b/core/lib/search/adapter/api/elasticsearch/multimatch.js
@@ -2,12 +2,10 @@ import config from 'config'
 
 function getConfig (queryText) {
   let scoringConfig = config.elasticsearch.hasOwnProperty('searchScoring') ? config.elasticsearch.searchScoring : {}
-  let minimumShouldMatch = ''
+  let minimumShouldMatch = scoringConfig.hasOwnProperty('minimum_should_match') ? scoringConfig.minimum_should_match : '75%'
   if (config.elasticsearch.queryMethod === 'GET') {
     // minimum_should_match param must be have a "%" suffix, which is an illegal char while sending over query string
-    minimumShouldMatch = scoringConfig.hasOwnProperty('minimum_should_match') ? scoringConfig.minimum_should_match + '25' : '75%25'
-  } else {
-    minimumShouldMatch = scoringConfig.hasOwnProperty('minimum_should_match') ? scoringConfig.minimum_should_match : '75%'
+    minimumShouldMatch = encodeURIComponent(minimumShouldMatch)
   }
   // Create config for multi match query
   let multiMatchConfig = {

From 18badcc1975c4e28690a4fbef9378bdeffe4cf0f Mon Sep 17 00:00:00 2001
From: Aditya Sharma <iamadityasharma7@gmail.com>
Date: Thu, 24 Oct 2019 10:31:59 +0530
Subject: [PATCH 77/99] Added changelog #3736

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1eab30696..de58343eea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - check max quantity in microcart - @gibkigonzo (#3314)
 
+### Changed / Improved
+- Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
+
 ## [1.11.0-rc.1] - 2019.10.03
 
 ### Added

From 5b819ca8415f5031626a89f2dee265f3fb5d053d Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 13:41:06 +0200
Subject: [PATCH 78/99] check in category if parent_id is same as id and allow
 different parent_id

---
 core/modules/catalog/store/category/actions.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/core/modules/catalog/store/category/actions.ts b/core/modules/catalog/store/category/actions.ts
index 9ac14abc9f..d1f0cd8f70 100644
--- a/core/modules/catalog/store/category/actions.ts
+++ b/core/modules/catalog/store/category/actions.ts
@@ -130,15 +130,13 @@ const actions: ActionTree<CategoryState, RootState> = {
             }
             if (category.parent_id >= config.entities.category.categoriesRootCategorylId) {
               dispatch('single', { key: 'id', value: category.parent_id, setCurrentCategory: false, setCurrentCategoryPath: false }).then((sc) => { // TODO: move it to the server side for one requests OR cache in indexedDb
-                if (!sc) {
+                if (!sc || sc.parent_id === sc.id) {
                   commit(types.CATEGORY_UPD_CURRENT_CATEGORY_PATH, currentPath)
                   EventBus.$emit('category-after-single', { category: mainCategory })
                   return resolve(mainCategory)
                 }
                 currentPath.unshift(sc)
-                if (sc.parent_id) {
-                  recurCatFinder(sc)
-                }
+                recurCatFinder(sc)
               }).catch(err => {
                 Logger.error(err)()
                 commit(types.CATEGORY_UPD_CURRENT_CATEGORY_PATH, currentPath) // this is the case when category is not binded to the root tree - for example 'Erin Recommends'

From ee633ed0e639c0dc1de3e4f3a390ec07c39373a7 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 13:48:59 +0200
Subject: [PATCH 79/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..7bf6588784 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Allow falsy value for `parent_id` when searching category - @gibkigonzo (#3732)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 3210a82bb94fe9f00a3ed276cdacc30ad67fc694 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 14:48:07 +0200
Subject: [PATCH 80/99] disable product mutation when making tax calculation

---
 core/modules/catalog/helpers/taxCalc.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/core/modules/catalog/helpers/taxCalc.ts b/core/modules/catalog/helpers/taxCalc.ts
index 55f90498ac..272badb7a6 100644
--- a/core/modules/catalog/helpers/taxCalc.ts
+++ b/core/modules/catalog/helpers/taxCalc.ts
@@ -1,3 +1,4 @@
+import cloneDeep from 'lodash-es/cloneDeep';
 // this is the mirror copy of taxcalc.js from VSF API
 
 function isSpecialPriceActive (fromDate, toDate) {
@@ -212,7 +213,8 @@ export function updateProductPrices ({ product, rate, sourcePriceInclTax = false
   }
 }
 
-export function calculateProductTax ({ product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
+export function calculateProductTax ({ product: productArg, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
+  const product = cloneDeep(productArg)
   let rateFound = false
   if (product.tax_class_id > 0) {
     let taxClass
@@ -270,4 +272,5 @@ export function calculateProductTax ({ product, taxClasses, taxCountry = 'PL', t
       }
     }
   }
+  return product
 }

From 654dde0ea8608f623c4ca7844b14dd1897588510 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 14:49:23 +0200
Subject: [PATCH 81/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f1abfdedd..0cdfbe04c3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed typos in docs - @afozbek (#3709)
 - Fixed VSF build fails for some people due to lack of dependencies in the container - @krskibin (#3699)
 - Fixed two graphql problems, one with cms_blocks and the other with default sort order - @resubaka (#3718)
+- Fixed product mutation when making tax calculation - @gibkigonzo (#3740)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 4435c9a5ffc19dd804529818073f663b0a4fa371 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 16:39:59 +0200
Subject: [PATCH 82/99] add flag to product after first calculation

---
 core/modules/catalog/helpers/taxCalc.ts   | 8 +++++---
 core/modules/catalog/store/tax/actions.ts | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/modules/catalog/helpers/taxCalc.ts b/core/modules/catalog/helpers/taxCalc.ts
index 272badb7a6..50211355d5 100644
--- a/core/modules/catalog/helpers/taxCalc.ts
+++ b/core/modules/catalog/helpers/taxCalc.ts
@@ -1,4 +1,3 @@
-import cloneDeep from 'lodash-es/cloneDeep';
 // this is the mirror copy of taxcalc.js from VSF API
 
 function isSpecialPriceActive (fromDate, toDate) {
@@ -213,8 +212,11 @@ export function updateProductPrices ({ product, rate, sourcePriceInclTax = false
   }
 }
 
-export function calculateProductTax ({ product: productArg, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
-  const product = cloneDeep(productArg)
+export function calculateProductTax ({ product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
+  if (product.isTaxCalculated) {
+    return product
+  }
+  product.isTaxCalculated = true
   let rateFound = false
   if (product.tax_class_id > 0) {
     let taxClass
diff --git a/core/modules/catalog/store/tax/actions.ts b/core/modules/catalog/store/tax/actions.ts
index 8847c2fa5e..2e9f251e5b 100644
--- a/core/modules/catalog/store/tax/actions.ts
+++ b/core/modules/catalog/store/tax/actions.ts
@@ -70,7 +70,7 @@ const actions: ActionTree<TaxState, RootState> = {
         isTaxWithUserGroupIsActive: getters.getIsUserGroupedTaxActive
       })
     )
-
+    console.log(recalculatedProducts)
     return doPlatformPricesSync(recalculatedProducts)
   }
 }

From e38c957c49d21c4c1702a59fa63bcd5bf32c1e3a Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Thu, 24 Oct 2019 16:42:35 +0200
Subject: [PATCH 83/99] clear code

---
 core/modules/catalog/store/tax/actions.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/modules/catalog/store/tax/actions.ts b/core/modules/catalog/store/tax/actions.ts
index 2e9f251e5b..8847c2fa5e 100644
--- a/core/modules/catalog/store/tax/actions.ts
+++ b/core/modules/catalog/store/tax/actions.ts
@@ -70,7 +70,7 @@ const actions: ActionTree<TaxState, RootState> = {
         isTaxWithUserGroupIsActive: getters.getIsUserGroupedTaxActive
       })
     )
-    console.log(recalculatedProducts)
+
     return doPlatformPricesSync(recalculatedProducts)
   }
 }

From 3b82f3014f5c227ae1982c95b266bd6527d6640c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Smyrek?= <psmyrek@divante.pl>
Date: Fri, 25 Oct 2019 07:49:41 +0200
Subject: [PATCH 84/99] Add unit tests for `core/modules/wishlist`

---
 CHANGELOG.md                                  |   4 +
 .../unit/components/AddToWishlist.spec.ts     |  61 ++++++++
 .../test/unit/components/IsOnWishlist.spec.ts |  63 ++++++++
 .../test/unit/components/Product.spec.ts      |  59 +++++++
 .../components/RemoveFromWishlist.spec.ts     |  54 +++++++
 .../test/unit/components/Wishlist.spec.ts     | 104 +++++++++++++
 .../unit/components/WishlistButton.spec.ts    |  57 +++++++
 .../unit/mixins/wishlistMountedMixin.spec.ts  |  25 +++
 .../wishlist/test/unit/store/actions.spec.ts  | 130 ++++++++++++++++
 .../wishlist/test/unit/store/getters.spec.ts  |  37 +++++
 .../test/unit/store/mutations.spec.ts         | 147 ++++++++++++++++++
 .../unit/store/whishListPersistPlugin.spec.ts |  64 ++++++++
 12 files changed, 805 insertions(+)
 create mode 100644 core/modules/wishlist/test/unit/components/AddToWishlist.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/components/IsOnWishlist.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/components/Product.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/components/RemoveFromWishlist.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/components/Wishlist.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/components/WishlistButton.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/mixins/wishlistMountedMixin.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/store/actions.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/store/getters.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/store/mutations.spec.ts
 create mode 100644 core/modules/wishlist/test/unit/store/whishListPersistPlugin.spec.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26c6f2bc5a..1cb37e78be 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - UNRELEASED
 
+### Added
+
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
+
 ### Fixed
 
 
diff --git a/core/modules/wishlist/test/unit/components/AddToWishlist.spec.ts b/core/modules/wishlist/test/unit/components/AddToWishlist.spec.ts
new file mode 100644
index 0000000000..00963618bc
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/AddToWishlist.spec.ts
@@ -0,0 +1,61 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { registerModule } from '@vue-storefront/core/lib/modules';
+import { WishlistModule } from '@vue-storefront/core/modules/wishlist';
+import { AddToWishlist } from '@vue-storefront/core/modules/wishlist/components/AddToWishlist';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({}));
+jest.mock('@vue-storefront/core/lib/modules', () => ({ registerModule: jest.fn() }));
+jest.mock('@vue-storefront/core/helpers', () => ({ once: () => ({}) }));
+jest.mock('@vue-storefront/core/modules/wishlist/store', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/store/whishListPersistPlugin', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('AddToWishlist', () => {
+  let product;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    product = {
+      sku: 'example_sku',
+      image: 'example_image'
+    };
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(AddToWishlist, {
+      propsData: { product }
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('component has been registered in "created" hook', () => {
+    mountMixin(AddToWishlist, {
+      propsData: { product }
+    });
+
+    expect(registerModule).toHaveBeenCalledWith(WishlistModule);
+  });
+
+  it('addToWishList method dispatches wishlist/addItem action', () => {
+    const mockStore = {
+      modules: {
+        wishlist: {
+          actions: {
+            addItem: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(AddToWishlist, mockStore, {
+      propsData: { product }
+    });
+
+    (wrapper.vm as any).addToWishlist(product);
+
+    expect(mockStore.modules.wishlist.actions.addItem).toHaveBeenCalledWith(expect.anything(), product, undefined);
+  });
+});
diff --git a/core/modules/wishlist/test/unit/components/IsOnWishlist.spec.ts b/core/modules/wishlist/test/unit/components/IsOnWishlist.spec.ts
new file mode 100644
index 0000000000..dcd3b54f68
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/IsOnWishlist.spec.ts
@@ -0,0 +1,63 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { registerModule } from '@vue-storefront/core/lib/modules';
+import { WishlistModule } from '@vue-storefront/core/modules/wishlist';
+import { IsOnWishlist } from '@vue-storefront/core/modules/wishlist/components/IsOnWishlist';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({}));
+jest.mock('@vue-storefront/core/lib/modules', () => ({ registerModule: jest.fn() }));
+jest.mock('@vue-storefront/core/helpers', () => ({ once: () => ({}) }));
+jest.mock('@vue-storefront/core/modules/wishlist/store', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/store/whishListPersistPlugin', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('IsOnWishlist', () => {
+  let product;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    product = {
+      sku: 'example_sku',
+      image: 'example_image'
+    };
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(IsOnWishlist, {
+      propsData: { product }
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('component has been registered in "created" hook', () => {
+    mountMixin(IsOnWishlist, {
+      propsData: { product }
+    });
+
+    expect(registerModule).toHaveBeenCalledWith(WishlistModule);
+  });
+
+  it('isOnWishlist computed property calls wishlist/isOnWishlist getter with product from prop', () => {
+    const isOnWishlistGetter = jest.fn(() => true);
+    const mockStore = {
+      modules: {
+        wishlist: {
+          getters: {
+            isOnWishlist: () => isOnWishlistGetter
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(IsOnWishlist, mockStore, {
+      propsData: { product }
+    });
+
+    const isOnWishlist = (wrapper.vm as any).isOnWishlist;
+
+    expect(isOnWishlistGetter).toHaveBeenCalledWith(product);
+    expect(isOnWishlist).toBe(true);
+  });
+});
diff --git a/core/modules/wishlist/test/unit/components/Product.spec.ts b/core/modules/wishlist/test/unit/components/Product.spec.ts
new file mode 100644
index 0000000000..dcd194f1b4
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/Product.spec.ts
@@ -0,0 +1,59 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { WishlistProduct } from '@vue-storefront/core/modules/wishlist/components/Product';
+
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('Product', () => {
+  let product;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    product = {
+      sku: 'example_sku',
+      image: 'example_image'
+    };
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(WishlistProduct, {
+      propsData: { product }
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('thumbnail computed property calls getThumbnail method', () => {
+    const getThumbnail = jest.fn(() => 'thumbnail');
+    const wrapper = mountMixin(WishlistProduct, {
+      propsData: { product },
+      methods: { getThumbnail }
+    });
+
+    const thumbnail = (wrapper.vm as any).thumbnail;
+
+    expect(getThumbnail).toHaveBeenCalledWith(product.image, 150, 150);
+    expect(thumbnail).toBe('thumbnail');
+  });
+
+  it('removeFromWishlist method dispatches wishlist/removeItem action', () => {
+    const mockStore = {
+      modules: {
+        wishlist: {
+          actions: {
+            removeItem: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(WishlistProduct, mockStore, {
+      propsData: { product }
+    });
+
+    (wrapper.vm as any).removeFromWishlist(product);
+
+    expect(mockStore.modules.wishlist.actions.removeItem).toHaveBeenCalledWith(expect.anything(), product, undefined);
+  });
+});
diff --git a/core/modules/wishlist/test/unit/components/RemoveFromWishlist.spec.ts b/core/modules/wishlist/test/unit/components/RemoveFromWishlist.spec.ts
new file mode 100644
index 0000000000..df38ebf7eb
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/RemoveFromWishlist.spec.ts
@@ -0,0 +1,54 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { registerModule } from '@vue-storefront/core/lib/modules';
+import { WishlistModule } from '@vue-storefront/core/modules/wishlist';
+import { RemoveFromWishlist } from '@vue-storefront/core/modules/wishlist/components/RemoveFromWishlist';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({}));
+jest.mock('@vue-storefront/core/lib/modules', () => ({ registerModule: jest.fn() }));
+jest.mock('@vue-storefront/core/helpers', () => ({ once: () => ({}) }));
+jest.mock('@vue-storefront/core/modules/wishlist/store', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/store/whishListPersistPlugin', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('RemoveFromWishlist', () => {
+  let product;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    product = {
+      sku: 'example_sku',
+      image: 'example_image'
+    };
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(RemoveFromWishlist, {
+      propsData: { product }
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('removeFromWishlist method registers component and dispatches wishlist/removeItem action', () => {
+    const mockStore = {
+      modules: {
+        wishlist: {
+          actions: {
+            removeItem: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(RemoveFromWishlist, mockStore, {
+      propsData: { product }
+    });
+
+    (wrapper.vm as any).removeFromWishlist(product);
+
+    expect(registerModule).toHaveBeenCalledWith(WishlistModule);
+    expect(mockStore.modules.wishlist.actions.removeItem).toHaveBeenCalledWith(expect.anything(), product, undefined);
+  });
+});
diff --git a/core/modules/wishlist/test/unit/components/Wishlist.spec.ts b/core/modules/wishlist/test/unit/components/Wishlist.spec.ts
new file mode 100644
index 0000000000..e23505b283
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/Wishlist.spec.ts
@@ -0,0 +1,104 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { registerModule } from '@vue-storefront/core/lib/modules';
+import { WishlistModule } from '@vue-storefront/core/modules/wishlist';
+import { Wishlist } from '@vue-storefront/core/modules/wishlist/components/Wishlist';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({}));
+jest.mock('@vue-storefront/core/lib/modules', () => ({ registerModule: jest.fn() }));
+jest.mock('@vue-storefront/core/helpers', () => ({ once: () => ({}) }));
+jest.mock('@vue-storefront/core/modules/wishlist/store', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/store/whishListPersistPlugin', () => ({}));
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('Wishlist', () => {
+  let product;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    product = {
+      sku: 'example_sku',
+      image: 'example_image'
+    };
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(Wishlist, {
+      propsData: { product }
+    });
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('component has been registered in "created" hook', () => {
+    mountMixin(Wishlist, {
+      propsData: { product }
+    });
+
+    expect(registerModule).toHaveBeenCalledWith(WishlistModule);
+  });
+
+  it('isWishlistOpen computed property returns ui/wishlist state', () => {
+    const mockStore = {
+      modules: {
+        ui: {
+          state: {
+            wishlist: true
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Wishlist, mockStore, {
+      propsData: { product }
+    });
+
+    const result = (wrapper.vm as any).isWishlistOpen;
+
+    expect(result).toBe(true);
+  });
+
+  it('productsInWishlist computed property returns wishlist/items state', () => {
+    const wishlistItems = [{ sku: 1 }, { sku: 2 }, { sku: 3 }];
+    const mockStore = {
+      modules: {
+        wishlist: {
+          state: {
+            items: wishlistItems
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Wishlist, mockStore, {
+      propsData: { product }
+    });
+
+    const result = (wrapper.vm as any).productsInWishlist;
+
+    expect(result).toBe(wishlistItems);
+  });
+
+  it('closeWishlist method dispatches ui/toggleWishlist action', () => {
+    const mockStore = {
+      modules: {
+        ui: {
+          actions: {
+            toggleWishlist: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(Wishlist, mockStore, {
+      propsData: { product }
+    });
+
+    (wrapper.vm as any).closeWishlist();
+
+    expect(mockStore.modules.ui.actions.toggleWishlist).toHaveBeenCalled();
+  });
+});
diff --git a/core/modules/wishlist/test/unit/components/WishlistButton.spec.ts b/core/modules/wishlist/test/unit/components/WishlistButton.spec.ts
new file mode 100644
index 0000000000..8ceb929a4c
--- /dev/null
+++ b/core/modules/wishlist/test/unit/components/WishlistButton.spec.ts
@@ -0,0 +1,57 @@
+import { mountMixin, mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import { WishlistButton } from '@vue-storefront/core/modules/wishlist/components/WishlistButton';
+
+jest.mock('@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin', () => ({}));
+
+describe('WishlistButton', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('creates a component', () => {
+    const wrapper = mountMixin(WishlistButton);
+
+    expect(wrapper.exists()).toBe(true);
+    expect(wrapper.isVueInstance()).toBe(true);
+  });
+
+  it('getWishlistItemsCount computed property calls wishlist/getWishlistItemsCount getter', () => {
+    const getWishlistItemsCountGetter = jest.fn(() => 42);
+    const mockStore = {
+      modules: {
+        wishlist: {
+          getters: {
+            getWishlistItemsCount: getWishlistItemsCountGetter
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(WishlistButton, mockStore);
+
+    const getWishlistItemsCount = (wrapper.vm as any).getWishlistItemsCount;
+
+    expect(getWishlistItemsCountGetter).toHaveBeenCalled();
+    expect(getWishlistItemsCount).toBe(42);
+  });
+
+  it('toggleWishlist method dispatches ui/toggleWishlist action', () => {
+    const mockStore = {
+      modules: {
+        ui: {
+          actions: {
+            toggleWishlist: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    const wrapper = mountMixinWithStore(WishlistButton, mockStore);
+
+    (wrapper.vm as any).toggleWishlist();
+
+    expect(mockStore.modules.ui.actions.toggleWishlist).toHaveBeenCalled();
+  });
+});
diff --git a/core/modules/wishlist/test/unit/mixins/wishlistMountedMixin.spec.ts b/core/modules/wishlist/test/unit/mixins/wishlistMountedMixin.spec.ts
new file mode 100644
index 0000000000..b966e4159d
--- /dev/null
+++ b/core/modules/wishlist/test/unit/mixins/wishlistMountedMixin.spec.ts
@@ -0,0 +1,25 @@
+import { mountMixinWithStore } from '@vue-storefront/unit-tests/utils';
+import wishlistMountedMixin from '@vue-storefront/core/modules/wishlist/mixins/wishlistMountedMixin';
+
+describe('wishlistMountedMixin', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('dispatches wishlist/load action on mount', () => {
+    const mockStore = {
+      modules: {
+        wishlist: {
+          actions: {
+            load: jest.fn()
+          },
+          namespaced: true
+        }
+      }
+    };
+
+    mountMixinWithStore(wishlistMountedMixin, mockStore);
+
+    expect(mockStore.modules.wishlist.actions.load).toHaveBeenCalled();
+  });
+});
diff --git a/core/modules/wishlist/test/unit/store/actions.spec.ts b/core/modules/wishlist/test/unit/store/actions.spec.ts
new file mode 100644
index 0000000000..f6eb698a3c
--- /dev/null
+++ b/core/modules/wishlist/test/unit/store/actions.spec.ts
@@ -0,0 +1,130 @@
+import * as types from '@vue-storefront/core/modules/wishlist/store/mutation-types';
+import wishlistActions from '@vue-storefront/core/modules/wishlist/store/actions';
+import { StorageManager } from '@vue-storefront/core/lib/storage-manager';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({
+  StorageManager: {
+    get: jest.fn()
+  }
+}));
+
+describe('Wishlist actions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('clear', () => {
+    it('should delete all items', () => {
+      const mockContext = {
+        commit: jest.fn()
+      };
+
+      (wishlistActions as any).clear(mockContext);
+
+      expect(mockContext.commit).toHaveBeenCalledWith(types.WISH_DEL_ALL_ITEMS, []);
+    });
+  });
+
+  describe('load', () => {
+    let wishlist;
+
+    beforeEach(() => {
+      wishlist = [{ sku: 1 }, { sku: 2 }, { sku: 3 }];
+    });
+
+    it('should not load wishlist if it is already loaded', () => {
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(),
+        getters: {
+          isWishlistLoaded: true
+        }
+      };
+
+      (wishlistActions as any).load(mockContext);
+
+      expect(mockContext.commit).not.toHaveBeenCalled();
+      expect(mockContext.dispatch).not.toHaveBeenCalled();
+    });
+
+    it('should load wishlist if it is not loaded', async () => {
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(() => {
+          return new Promise(resolve => resolve(wishlist));
+        }),
+        getters: {
+          isWishlistLoaded: false
+        }
+      };
+
+      await (wishlistActions as any).load(mockContext);
+
+      expect(mockContext.commit).toHaveBeenCalledTimes(2);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(1, types.SET_WISHLIST_LOADED);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(2, types.WISH_LOAD_WISH, wishlist);
+      expect(mockContext.dispatch).toHaveBeenCalledWith('loadFromCache');
+    });
+
+    it('should load wishlist with "force" argument even if it is already loaded', async () => {
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(() => {
+          return new Promise(resolve => resolve(wishlist));
+        }),
+        getters: {
+          isWishlistLoaded: true
+        }
+      };
+
+      await (wishlistActions as any).load(mockContext, true);
+
+      expect(mockContext.commit).toHaveBeenCalledTimes(2);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(1, types.SET_WISHLIST_LOADED);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(2, types.WISH_LOAD_WISH, wishlist);
+      expect(mockContext.dispatch).toHaveBeenCalledWith('loadFromCache');
+    });
+  });
+
+  describe('loadFromCache', () => {
+    it('should load wishlist from cache', () => {
+      const mockGetItem = jest.fn(() => ({}));
+
+      (StorageManager.get as jest.Mock).mockImplementation(() => ({
+        getItem: mockGetItem
+      }));
+
+      const wishlistStorage = (wishlistActions as any).loadFromCache();
+
+      expect(StorageManager.get).toHaveBeenCalledWith('wishlist');
+      expect(mockGetItem).toHaveBeenCalledWith('current-wishlist');
+      expect(wishlistStorage).toEqual({});
+    });
+  });
+
+  describe('addItem', () => {
+    it('should add product to wishlist', () => {
+      const product = { sku: 1 };
+      const mockContext = {
+        commit: jest.fn()
+      };
+
+      (wishlistActions as any).addItem(mockContext, product);
+
+      expect(mockContext.commit).toHaveBeenCalledWith(types.WISH_ADD_ITEM, { product });
+    });
+  });
+
+  describe('removeItem', () => {
+    it('should remove product from wishlist', () => {
+      const product = { sku: 1 };
+      const mockContext = {
+        commit: jest.fn()
+      };
+
+      (wishlistActions as any).removeItem(mockContext, product);
+
+      expect(mockContext.commit).toHaveBeenCalledWith(types.WISH_DEL_ITEM, { product });
+    });
+  });
+});
diff --git a/core/modules/wishlist/test/unit/store/getters.spec.ts b/core/modules/wishlist/test/unit/store/getters.spec.ts
new file mode 100644
index 0000000000..9bf2512ea8
--- /dev/null
+++ b/core/modules/wishlist/test/unit/store/getters.spec.ts
@@ -0,0 +1,37 @@
+import wishlistGetters from '@vue-storefront/core/modules/wishlist/store/getters';
+
+describe('Wishlist getters', () => {
+  it('should inform if given product is on wishlist', () => {
+    const mockState = {
+      items: [
+        { sku: 1 }, { sku: 2 }, { sku: 3 }
+      ]
+    };
+
+    const productExists = (wishlistGetters as any).isOnWishlist(mockState)({ sku: 1 });
+    const productDoesNotExist = (wishlistGetters as any).isOnWishlist(mockState)({ sku: 123 });
+
+    expect(productExists).toBe(true);
+    expect(productDoesNotExist).toBe(false);
+  });
+
+  it('should inform if wishlist is loaded', () => {
+    const wishlistIsLoaded = (wishlistGetters as any).isWishlistLoaded({ loaded: true });
+    const wishlistIsNotLoaded = (wishlistGetters as any).isWishlistLoaded({ loaded: false });
+
+    expect(wishlistIsLoaded).toBe(true);
+    expect(wishlistIsNotLoaded).toBe(false);
+  });
+
+  it('should return number of products in wishlist', () => {
+    const mockState = {
+      items: [
+        { sku: 1 }, { sku: 2 }, { sku: 3 }
+      ]
+    };
+
+    const numberOfProducts = (wishlistGetters as any).getWishlistItemsCount(mockState);
+
+    expect(numberOfProducts).toBe(mockState.items.length);
+  });
+});
diff --git a/core/modules/wishlist/test/unit/store/mutations.spec.ts b/core/modules/wishlist/test/unit/store/mutations.spec.ts
new file mode 100644
index 0000000000..bba28e6b4f
--- /dev/null
+++ b/core/modules/wishlist/test/unit/store/mutations.spec.ts
@@ -0,0 +1,147 @@
+import * as types from '../../../store/mutation-types';
+import wishlistMutations from '../../../store/mutations'
+
+describe('Wishlist mutations', () => {
+  let product1;
+  let product2;
+  let product3;
+
+  beforeEach(() => {
+    product1 = {
+      sku: 'example-product-id1',
+      qty: 123
+    };
+
+    product2 = {
+      sku: 'example-product-id2',
+      qty: 456
+    };
+
+    product3 = {
+      sku: 'example-product-id3',
+      qty: 789
+    };
+  });
+
+  describe('WISH_ADD_ITEM', () => {
+    it('should add exactly one product to wishlist if it does not exist there', () => {
+      const mockState = {
+        items: []
+      };
+
+      const expectedState = {
+        items: [{ ...product1, qty: 1 }]
+      };
+
+      (wishlistMutations as any)[types.WISH_ADD_ITEM](mockState, { product: product1 });
+
+      expect(mockState).toEqual(expectedState);
+    });
+
+    it('should not add product to wishlist if it exists there', () => {
+      const mockState = {
+        items: [{ ...product1 }]
+      };
+
+      const expectedState = {
+        items: [{ ...product1 }]
+      };
+
+      (wishlistMutations as any)[types.WISH_ADD_ITEM](mockState, { product: product1 });
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+
+  describe('WISH_DEL_ITEM', () => {
+    it('should remove existing product from wishlist', () => {
+      const mockState = {
+        items: [{ ...product1 }, { ...product2 }, { ...product3 }]
+      };
+
+      const expectedState = {
+        items: [{ ...product1 }, { ...product2 }]
+      };
+
+      (wishlistMutations as any)[types.WISH_DEL_ITEM](mockState, { product: product3 });
+
+      expect(mockState).toEqual(expectedState);
+    });
+
+    it('should not modify wishlist if product does not exist there', () => {
+      const mockState = {
+        items: [{ ...product1 }, { ...product2 }]
+      };
+
+      const expectedState = {
+        items: [{ ...product1 }, { ...product2 }]
+      };
+
+      (wishlistMutations as any)[types.WISH_DEL_ITEM](mockState, { product: product3 });
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+
+  describe('WISH_LOAD_WISH', () => {
+    it('should init wishlist', () => {
+      const mockState = {
+        items: [{ ...product1 }]
+      };
+
+      const expectedState = {
+        items: [{ ...product2 }, { ...product3 }]
+      };
+
+      (wishlistMutations as any)[types.WISH_LOAD_WISH](mockState, [{ ...product2 }, { ...product3 }]);
+
+      expect(mockState).toEqual(expectedState);
+    });
+
+    it('should init wishlist with empty array if loaded wishlist is falsy', () => {
+      const mockState = {
+        items: [{ ...product1 }]
+      };
+
+      const expectedState = {
+        items: []
+      };
+
+      (wishlistMutations as any)[types.WISH_LOAD_WISH](mockState, null);
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+
+  describe('WISH_DEL_ALL_ITEMS', () => {
+    it('should delete all products from wishlist', () => {
+      const mockState = {
+        items: [{ ...product1 }, { ...product2 }, { ...product3 }]
+      };
+
+      const expectedState = {
+        items: []
+      };
+
+      (wishlistMutations as any)[types.WISH_DEL_ALL_ITEMS](mockState);
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+
+  describe('SET_WISHLIST_LOADED', () => {
+    it('should set loaded state for wishlist', () => {
+      const mockState = {
+        loaded: false
+      };
+
+      const expectedState = {
+        loaded: true
+      };
+
+      (wishlistMutations as any)[types.SET_WISHLIST_LOADED](mockState);
+
+      expect(mockState).toEqual(expectedState);
+    });
+  });
+});
diff --git a/core/modules/wishlist/test/unit/store/whishListPersistPlugin.spec.ts b/core/modules/wishlist/test/unit/store/whishListPersistPlugin.spec.ts
new file mode 100644
index 0000000000..bc69e2365c
--- /dev/null
+++ b/core/modules/wishlist/test/unit/store/whishListPersistPlugin.spec.ts
@@ -0,0 +1,64 @@
+import * as types from '@vue-storefront/core/modules/wishlist/store/mutation-types';
+import whishListPersistPlugin from '@vue-storefront/core/modules/wishlist/store/whishListPersistPlugin';
+import { StorageManager } from '@vue-storefront/core/lib/storage-manager';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({
+  StorageManager: {
+    get: jest.fn()
+  }
+}));
+
+describe('whishListPersistPlugin', () => {
+  let mockSetItem;
+  let mockState;
+
+  beforeEach(() => {
+    mockSetItem = jest.fn();
+
+    (StorageManager.get as jest.Mock).mockImplementation(() => ({
+      setItem: mockSetItem
+    }));
+
+    mockState = {
+      wishlist: {
+        items: [
+          { sku: 1 }, { sku: 2 }, { sku: 3 }
+        ]
+      }
+    };
+
+    jest.clearAllMocks();
+  });
+
+  it('should store wishlist in cache for supported mutations', () => {
+    const mutations = [
+      { type: `wishlist/${types.WISH_ADD_ITEM}` },
+      { type: `wishlist/${types.WISH_DEL_ITEM}` },
+      { type: `wishlist/${types.WISH_DEL_ALL_ITEMS}` }
+    ];
+
+    mutations.forEach(mutation => whishListPersistPlugin(mutation, mockState));
+
+    expect(StorageManager.get).toHaveBeenCalledTimes(mutations.length);
+    expect(StorageManager.get).toHaveBeenCalledWith('wishlist');
+    expect(mockSetItem).toHaveBeenCalledTimes(mutations.length);
+    expect(mockSetItem).toHaveBeenCalledWith('current-wishlist', mockState.wishlist.items);
+  });
+
+  it('should not store wishlist in cache for unsupported mutations', () => {
+    const mutations = [
+      { type: 'a/b/c' },
+      { type: types.WISH_ADD_ITEM },
+      { type: types.WISH_DEL_ITEM },
+      { type: types.WISH_DEL_ALL_ITEMS },
+      { type: `wishlist/${types.WISH_LOAD_WISH}` },
+      { type: `wishlist/${types.SET_WISHLIST_LOADED}` }
+    ];
+
+    mutations.forEach(mutation => whishListPersistPlugin(mutation, mockState));
+
+    expect(StorageManager.get).toHaveBeenCalledTimes(mutations.length);
+    expect(StorageManager.get).toHaveBeenCalledWith('wishlist');
+    expect(mockSetItem).not.toHaveBeenCalled();
+  });
+});

From a76ef7091b1f9df9720a0d19aa549c3ab2331f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Smyrek?= <psmyrek@divante.pl>
Date: Fri, 25 Oct 2019 12:43:16 +0200
Subject: [PATCH 85/99] Add unit tests for `core/modules/newsletter`

---
 CHANGELOG.md                                  |   4 +
 .../newsletter/test/unit/store/index.spec.ts  | 201 ++++++++++++++++++
 2 files changed, 205 insertions(+)
 create mode 100644 core/modules/newsletter/test/unit/store/index.spec.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26c6f2bc5a..9bd8ccb974 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - UNRELEASED
 
+### Added
+
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+
 ### Fixed
 
 
diff --git a/core/modules/newsletter/test/unit/store/index.spec.ts b/core/modules/newsletter/test/unit/store/index.spec.ts
new file mode 100644
index 0000000000..5eaec3960a
--- /dev/null
+++ b/core/modules/newsletter/test/unit/store/index.spec.ts
@@ -0,0 +1,201 @@
+import * as types from '@vue-storefront/core/modules/newsletter/store/mutation-types';
+import { StorageManager } from '@vue-storefront/core/lib/storage-manager';
+import { NewsletterService } from '@vue-storefront/core/data-resolver';
+import { newsletterStore } from '@vue-storefront/core/modules/newsletter/store';
+
+jest.mock('@vue-storefront/core/lib/storage-manager', () => ({
+  StorageManager: {
+    get: jest.fn()
+  }
+}));
+
+jest.mock('@vue-storefront/core/data-resolver', () => ({
+  NewsletterService: {
+    isSubscribed: jest.fn(),
+    subscribe: jest.fn(),
+    unsubscribe: jest.fn()
+  }
+}));
+
+describe('Newsletter actions', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('status', () => {
+    it('should set e-mail and update newsletter status if it is subscribed', async () => {
+      const isSubscribed = true;
+      const email = 'example@domain.com';
+      const mockContext = {
+        commit: jest.fn()
+      };
+
+      (NewsletterService.isSubscribed as any).mockImplementation(() => (new Promise(resolve => resolve(isSubscribed))));
+
+      const status = await (newsletterStore.actions as any).status(mockContext, email);
+
+      expect(NewsletterService.isSubscribed).toHaveBeenCalledWith(email);
+      expect(mockContext.commit).toHaveBeenCalledTimes(2);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(1, types.SET_EMAIL, email);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(2, types.NEWSLETTER_SUBSCRIBE);
+      expect(status).toBe(isSubscribed);
+    });
+
+    it('should not set e-mail but only update newsletter status if it is not subscribed', async () => {
+      const isSubscribed = false;
+      const email = 'example@domain.com';
+      const mockContext = {
+        commit: jest.fn()
+      };
+
+      (NewsletterService.isSubscribed as any).mockImplementation(() => (new Promise(resolve => resolve(isSubscribed))));
+
+      const status = await (newsletterStore.actions as any).status(mockContext, email);
+
+      expect(NewsletterService.isSubscribed).toHaveBeenCalledWith(email);
+      expect(mockContext.commit).toHaveBeenCalledTimes(1);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(1, types.NEWSLETTER_UNSUBSCRIBE);
+      expect(status).toBe(isSubscribed);
+    });
+  });
+
+  describe('subscribe', () => {
+    it('should not subscribe if it is already subscribed', async () => {
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(),
+        getters: {
+          isSubscribed: true
+        }
+      };
+
+      await (newsletterStore.actions as any).subscribe(mockContext);
+
+      expect(NewsletterService.subscribe).not.toHaveBeenCalled();
+      expect(mockContext.commit).not.toHaveBeenCalled();
+      expect(mockContext.dispatch).not.toHaveBeenCalled();
+    });
+
+    it('should subscribe if it is not subscribed', async () => {
+      const email = 'example@domain.com';
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(),
+        getters: {
+          isSubscribed: false
+        }
+      };
+
+      (NewsletterService.subscribe as any).mockImplementation(() => (new Promise(resolve => resolve(true))));
+
+      const status = await (newsletterStore.actions as any).subscribe(mockContext, email);
+
+      expect(NewsletterService.subscribe).toHaveBeenCalledWith(email);
+      expect(mockContext.commit).toHaveBeenCalledTimes(2);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(1, types.NEWSLETTER_SUBSCRIBE);
+      expect(mockContext.commit).toHaveBeenNthCalledWith(2, types.SET_EMAIL, email);
+      expect(mockContext.dispatch).toHaveBeenCalledWith('storeToCache', { email });
+      expect(status).toBe(true);
+    });
+  });
+
+  describe('unsubscribe', () => {
+    it('should not unsubscribe if it is already unsubscribed', async () => {
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(),
+        getters: {
+          isSubscribed: false
+        }
+      };
+
+      await (newsletterStore.actions as any).unsubscribe(mockContext);
+
+      expect(NewsletterService.unsubscribe).not.toHaveBeenCalled();
+      expect(mockContext.commit).not.toHaveBeenCalled();
+      expect(mockContext.dispatch).not.toHaveBeenCalled();
+    });
+
+    it('should unsubscribe if it is subscribed', async () => {
+      const email = 'example@domain.com';
+      const mockContext = {
+        commit: jest.fn(),
+        dispatch: jest.fn(),
+        getters: {
+          isSubscribed: true
+        }
+      };
+
+      (NewsletterService.unsubscribe as any).mockImplementation(() => (new Promise(resolve => resolve(true))));
+
+      const status = await (newsletterStore.actions as any).unsubscribe(mockContext, email);
+
+      expect(NewsletterService.unsubscribe).toHaveBeenCalledWith(email);
+      expect(mockContext.commit).toHaveBeenCalledWith(types.NEWSLETTER_UNSUBSCRIBE);
+      expect(status).toBe(true);
+    });
+  });
+
+  describe('storeToCache', () => {
+    it('should store email in cache', () => {
+      const email = 'example@domain.com';
+      const mockSetItem = jest.fn(() => (new Promise(resolve => resolve(true))));
+
+      (StorageManager.get as jest.Mock).mockImplementation(() => ({
+        setItem: mockSetItem
+      }));
+
+      (newsletterStore.actions as any).storeToCache(null, { email });
+
+      expect(StorageManager.get).toHaveBeenCalledWith('newsletter');
+      expect(mockSetItem).toHaveBeenCalledWith('email', email);
+    });
+  });
+});
+
+describe('Newsletter mutations', () => {
+  it('NEWSLETTER_SUBSCRIBE should set subscription state', () => {
+    const mockState = { isSubscribed: false };
+    const expectedState = { isSubscribed: true };
+
+    (newsletterStore.mutations as any)[types.NEWSLETTER_SUBSCRIBE](mockState);
+
+    expect(mockState).toEqual(expectedState);
+  });
+
+  it('NEWSLETTER_UNSUBSCRIBE should set unsubscription state', () => {
+    const mockState = { isSubscribed: true };
+    const expectedState = { isSubscribed: false };
+
+    (newsletterStore.mutations as any)[types.NEWSLETTER_UNSUBSCRIBE](mockState);
+
+    expect(mockState).toEqual(expectedState);
+  });
+
+  it('SET_EMAIL should set email address', () => {
+    const email = 'example@domain.com';
+    const mockState = { email: '' };
+    const expectedState = { email };
+
+    (newsletterStore.mutations as any)[types.SET_EMAIL](mockState, email);
+
+    expect(mockState).toEqual(expectedState);
+  });
+});
+
+describe('Newsletter getters', () => {
+  it('should return subscription status', () => {
+    const isSubscribed = (newsletterStore.getters as any).isSubscribed({ isSubscribed: true });
+    const isNotSubscribed = (newsletterStore.getters as any).isSubscribed({ isSubscribed: false });
+
+    expect(isSubscribed).toBe(true);
+    expect(isNotSubscribed).toBe(false);
+  });
+
+  it('should return email address', () => {
+    const email = 'example@domain.com';
+    const expectedEmail = (newsletterStore.getters as any).email({ email });
+
+    expect(expectedEmail).toBe(email);
+  });
+});

From 369e11374a3c180212685cc70aa90856cd9b3fdb Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 28 Oct 2019 07:34:30 +0100
Subject: [PATCH 86/99] rewrite updateProductPrices

---
 core/modules/catalog/helpers/taxCalc.ts | 254 +++++++++---------------
 1 file changed, 94 insertions(+), 160 deletions(-)

diff --git a/core/modules/catalog/helpers/taxCalc.ts b/core/modules/catalog/helpers/taxCalc.ts
index 50211355d5..86db4b4132 100644
--- a/core/modules/catalog/helpers/taxCalc.ts
+++ b/core/modules/catalog/helpers/taxCalc.ts
@@ -1,3 +1,5 @@
+import camelCase from 'lodash-es/camelCase'
+
 // this is the mirror copy of taxcalc.js from VSF API
 
 function isSpecialPriceActive (fromDate, toDate) {
@@ -22,88 +24,99 @@ function isSpecialPriceActive (fromDate, toDate) {
   }
 }
 
+/**
+ * change object keys to camelCase
+ */
+function toCamelCase (obj: Record<string, any> = {}): Record<string, any> {
+  return Object.keys(obj).reduce((accObj, currKey) => {
+    accObj[camelCase(currKey)] = obj[currKey]
+    return accObj
+  }, {})
+}
+
+/**
+ * Create price object with base price and tax
+ * @param price - product price which is used to extract tax value
+ * @param rateFactor - tax % in decimal
+ * @param isPriceInclTax - determines if price already include tax
+ */
+function createSinglePrice (price: number, rateFactor: number, isPriceInclTax: boolean) {
+  const _price = isPriceInclTax ? price / (1 + rateFactor) : price
+  const tax = _price * rateFactor
+
+  return { price: _price, tax }
+}
+
+interface AssignPriceParams {
+  product: any,
+  target: string,
+  price: number,
+  tax: number,
+  deprecatedPriceFieldsSupport: boolean
+}
+/**
+ * assign price and tax to product with proper keys
+ * @param AssignPriceParams
+ */
+function assignPrice ({ product, target, price, tax = 0, deprecatedPriceFieldsSupport = true }: AssignPriceParams): void {
+  let priceUpdate = {
+    [target]: price,
+    [`${target}_tax`]: tax,
+    [`${target}_incl_tax`]: price + tax
+  }
+
+  if (deprecatedPriceFieldsSupport) {
+    /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
+    priceUpdate = Object.assign(priceUpdate, toCamelCase(priceUpdate))
+    /** END */
+  }
+
+  Object.assign(product, priceUpdate)
+}
+
 export function updateProductPrices ({ product, rate, sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true }) {
   const rate_factor = parseFloat(rate.rate) / 100
-  if (finalPriceInclTax) {
-    product.final_price_incl_tax = parseFloat(product.final_price) // final price does include tax
-    product.final_price = product.final_price_incl_tax / (1 + rate_factor)
-    product.final_price_tax = product.final_price_incl_tax - product.final_price
-  } else {
-    product.final_price = parseFloat(product.final_price) // final price does include tax
-    product.final_price_tax = product.final_price * rate_factor
-    product.final_price_incl_tax = product.final_price + product.final_price_tax
+  // build objects with original price and tax
+  // for first calculation use `price`, for next one use `original_price`
+  const priceWithTax = createSinglePrice(parseFloat(product.original_price || product.price), rate_factor, sourcePriceInclTax)
+  const finalPriceWithTax = createSinglePrice(parseFloat(product.original_final_price || product.final_price), rate_factor, finalPriceInclTax)
+  const specialPriceWithTax = createSinglePrice(parseFloat(product.original_special_price || product.special_price), rate_factor, sourcePriceInclTax)
+
+  // save original prices
+  const hasOriginalPrices = (product.original_price && product.original_final_price && product.original_special_price)
+  if (!hasOriginalPrices) {
+    assignPrice({product, target: 'original_price', ...priceWithTax, deprecatedPriceFieldsSupport})
+
+    product.original_final_price = finalPriceWithTax.price
+    product.original_special_price = specialPriceWithTax.price
   }
-  product.price = parseFloat(product.price)
-  product.special_price = parseFloat(product.special_price)
+
+  // reset previous calculation
+  assignPrice({product, target: 'price', ...priceWithTax, deprecatedPriceFieldsSupport})
+  assignPrice({product, target: 'final_price', ...finalPriceWithTax, deprecatedPriceFieldsSupport})
+  assignPrice({product, target: 'special_price', ...specialPriceWithTax, deprecatedPriceFieldsSupport})
 
   if (product.final_price) {
     if (product.final_price < product.price) { // compare the prices with the product final price if provided; final prices is used in case of active catalog promo rules for example
       if (product.final_price < product.special_price) { // for VS - special_price is any price lowered than regular price (`price`); in Magento there is a separate mechanism for setting the `special_prices`
-        product.price = product.special_price // if the `final_price` is lower than the original `special_price` - it means some catalog rules were applied over it
+        assignPrice({product, target: 'price', ...specialPriceWithTax, deprecatedPriceFieldsSupport}) // if the `final_price` is lower than the original `special_price` - it means some catalog rules were applied over it
       }
-      product.special_price = product.final_price
+      assignPrice({product, target: 'special_price', ...finalPriceWithTax, deprecatedPriceFieldsSupport})
     } else {
-      product.price = product.final_price
+      assignPrice({product, target: 'price', ...finalPriceWithTax, deprecatedPriceFieldsSupport})
     }
   }
 
-  let price_excl_tax = product.price
-  if (sourcePriceInclTax) {
-    price_excl_tax = product.price / (1 + rate_factor)
-    product.price = price_excl_tax
-  }
-
-  product.price_tax = price_excl_tax * rate_factor
-  product.price_incl_tax = price_excl_tax + product.price_tax
-
-  if (!product.original_price) {
-    product.original_price = price_excl_tax
-    product.original_price_incl_tax = product.price_incl_tax
-    product.original_price_tax = product.price_tax
-  }
-
-  let special_price_excl_tax = product.special_price
-  if (sourcePriceInclTax) {
-    special_price_excl_tax = product.special_price / (1 + rate_factor)
-    product.special_price = special_price_excl_tax
-  }
-
-  product.special_price_tax = special_price_excl_tax * rate_factor
-  product.special_price_incl_tax = special_price_excl_tax + product.special_price_tax
-
-  if (deprecatedPriceFieldsSupport) {
-    /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
-    product.priceTax = product.price_tax
-    product.priceInclTax = product.price_incl_tax
-    product.specialPriceTax = product.special_price_tax
-    product.specialPriceInclTax = product.special_price_incl_tax
-    /** END */
-  }
-
   if (product.special_price && (product.special_price < product.original_price)) {
     if (!isSpecialPriceActive(product.special_from_date, product.special_to_date)) {
-      product.special_price = 0 // out of the dates period
+      // out of the dates period
+      assignPrice({product, target: 'special_price', price: 0, tax: 0, deprecatedPriceFieldsSupport})
     } else {
-      product.original_price = price_excl_tax
-      product.original_price_incl_tax = product.price_incl_tax
-      product.original_price_tax = product.price_tax
-
-      product.price = special_price_excl_tax
-      product.price_incl_tax = product.special_price_incl_tax
-      product.price_tax = product.special_price_tax
-
-      if (deprecatedPriceFieldsSupport) {
-        /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
-        product.priceInclTax = product.price_incl_tax
-        product.priceTax = product.price_tax
-        product.originalPrice = product.original_price
-        product.originalPriceInclTax = product.original_price_incl_tax
-        product.originalPriceTax = product.original_price_tax
-        /** END */
-      }
+      assignPrice({product, target: 'price', ...specialPriceWithTax, deprecatedPriceFieldsSupport})
     }
   } else {
-    product.special_price = 0 // the same price as original; it's not a promotion
+    // the same price as original; it's not a promotion
+    assignPrice({product, target: 'special_price', price: 0, tax: 0, deprecatedPriceFieldsSupport})
   }
 
   if (product.configurable_children) {
@@ -113,110 +126,31 @@ export function updateProductPrices ({ product, rate, sourcePriceInclTax = false
           configurableChild[opt.attribute_code] = opt.value
         }
       }
-      configurableChild.price = parseFloat(configurableChild.price)
-      configurableChild.special_price = parseFloat(configurableChild.special_price)
-      configurableChild.final_price_incl_tax = parseFloat(configurableChild.final_price) // final price does include tax
-      configurableChild.final_price = configurableChild.final_price_incl_tax / (1 + rate_factor)
-
-      if (configurableChild.final_price) {
-        if (configurableChild.final_price < configurableChild.price) { // compare the prices with the product final price if provided; final prices is used in case of active catalog promo rules for example
-          if (configurableChild.final_price < configurableChild.special_price) { // for VS - special_price is any price lowered than regular price (`price`); in Magento there is a separate mechanism for setting the `special_prices`
-            configurableChild.price = configurableChild.special_price // if the `final_price` is lower than the original `special_price` - it means some catalog rules were applied over it
-          }
-          configurableChild.special_to_date = null
-          configurableChild.special_from_date = null
-          configurableChild.special_price = product.final_price
-        } else {
-          configurableChild.price = configurableChild.final_price
-        }
-      }
-
-      let price_excl_tax = configurableChild.price
-      if (sourcePriceInclTax) {
-        price_excl_tax = configurableChild.price / (1 + rate_factor)
-        configurableChild.price = price_excl_tax
-      }
-
-      configurableChild.price_tax = price_excl_tax * rate_factor
-      configurableChild.price_incl_tax = price_excl_tax + configurableChild.price_tax
-
-      let special_price_excl_tax = parseFloat(configurableChild.special_price)
-
-      if (sourcePriceInclTax) {
-        special_price_excl_tax = configurableChild.special_price / (1 + rate_factor)
-        configurableChild.special_price = special_price_excl_tax
-      }
 
-      configurableChild.special_price_tax = special_price_excl_tax * rate_factor
-      configurableChild.special_price_incl_tax = special_price_excl_tax + configurableChild.special_price_tax
-
-      if (deprecatedPriceFieldsSupport) {
-        /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
-        configurableChild.priceTax = configurableChild.price_tax
-        configurableChild.priceInclTax = configurableChild.price_incl_tax
-        configurableChild.specialPriceTax = configurableChild.special_price_tax
-        configurableChild.specialPriceInclTax = configurableChild.special_price_incl_tax
-        /** END */
-      }
-
-      if (configurableChild.special_price && (configurableChild.special_price < configurableChild.price)) {
-        if (!isSpecialPriceActive(configurableChild.special_from_date, configurableChild.special_to_date)) {
-          configurableChild.special_price = 0 // out of the dates period
-        } else {
-          configurableChild.original_price = price_excl_tax
-          configurableChild.original_price_incl_tax = configurableChild.price_incl_tax
-          configurableChild.original_price_tax = configurableChild.price_tax
-
-          configurableChild.price = special_price_excl_tax
-          configurableChild.price_incl_tax = configurableChild.special_price_incl_tax
-          configurableChild.price_tax = configurableChild.special_price_tax
-
-          if (deprecatedPriceFieldsSupport) {
-            /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
-            configurableChild.originalPrice = configurableChild.original_price
-            configurableChild.originalPriceInclTax = configurableChild.original_price_incl_tax
-            configurableChild.originalPriceTax = configurableChild.original_price_tax
-            configurableChild.priceInclTax = configurableChild.price_incl_tax
-            configurableChild.priceTax = configurableChild.price_tax
-            /** END */
-          }
-        }
-      } else {
-        configurableChild.special_price = 0
-      }
+      // update children prices
+      updateProductPrices({ product: configurableChild, rate, sourcePriceInclTax, deprecatedPriceFieldsSupport, finalPriceInclTax })
 
       if ((configurableChild.price_incl_tax <= product.price_incl_tax) || product.price === 0) { // always show the lowest price
-        product.price_incl_tax = configurableChild.price_incl_tax
-        product.price_tax = configurableChild.price_tax
-        product.price = configurableChild.price
-        product.special_price = configurableChild.special_price
-        product.special_price_incl_tax = configurableChild.special_price_incl_tax
-        product.special_price_tax = configurableChild.special_price_tax
-        product.original_price = configurableChild.original_price
-        product.original_price_incl_tax = configurableChild.original_price_incl_tax
-        product.original_price_tax = configurableChild.original_price_tax
-
-        if (deprecatedPriceFieldsSupport) {
-          /** BEGIN @deprecated - inconsitent naming kept just for the backward compatibility */
-          product.priceInclTax = product.price_incl_tax
-          product.priceTax = product.price_tax
-          product.specialPriceInclTax = product.special_price_incl_tax
-          product.specialPriceTax = product.special_price_tax
-          product.originalPrice = product.original_price
-          product.originalPriceInclTax = product.original_price_incl_tax
-          product.originalPriceTax = product.original_price_tax
-          /** END */
-        }
+        assignPrice({
+          product,
+          target: 'price',
+          price: configurableChild.price,
+          tax: configurableChild.price_tax,
+          deprecatedPriceFieldsSupport
+        })
+        assignPrice({
+          product,
+          target: 'special_price',
+          price: configurableChild.special_price,
+          tax: configurableChild.special_price_tax,
+          deprecatedPriceFieldsSupport
+        })
       }
     }
   }
 }
 
 export function calculateProductTax ({ product, taxClasses, taxCountry = 'PL', taxRegion = '', sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true, userGroupId = null, isTaxWithUserGroupIsActive }) {
-  if (product.isTaxCalculated) {
-    return product
-  }
-  product.isTaxCalculated = true
   let rateFound = false
   if (product.tax_class_id > 0) {
     let taxClass

From 3e25d230f6ff7fd2cb895393a409bd1657d5a7b1 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 28 Oct 2019 08:05:53 +0100
Subject: [PATCH 87/99] add missing fields to productListWithChildren in config

---
 config/default.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index a58bb56d61..01ab4b62d1 100644
--- a/config/default.json
+++ b/config/default.json
@@ -191,7 +191,7 @@
       "excludeFields": [ "description", "configurable_options", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options" ]
     },
     "productListWithChildren": {
-      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices"],
+      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices", "configurable_children.special_to_date", "configurable_children.special_from_date", "configurable_children.regular_price"],
       "excludeFields": [ "description", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options"]
     },
     "review": {

From a0c89230c8b2cfd1d9cfea202a65b7a530de2359 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 28 Oct 2019 08:08:01 +0100
Subject: [PATCH 88/99] update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 239b534cb5..04fa87c45d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed notification message object to factory fn - @gibkigozno (#3716)
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
-- Add flag to product after first tax calculation - @gibkigonzo (#3740)
+- Make price calculation based on saved original prices - @gibkigonzo (#3740)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From 434e35b1b93dbcdd5b470d9dd3c6e1584fd1664d Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 28 Oct 2019 12:03:30 +0100
Subject: [PATCH 89/99] update country in checkout

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

diff --git a/core/pages/Checkout.js b/core/pages/Checkout.js
index b4fb31ed88..19040a24b6 100644
--- a/core/pages/Checkout.js
+++ b/core/pages/Checkout.js
@@ -137,6 +137,7 @@ export default {
       this.shippingMethod = payload
     },
     onBeforeShippingMethods (country) {
+      this.$store.dispatch('checkout/updatePropValue', ['country', country])
       this.$store.dispatch('cart/syncTotals', { forceServerSync: true })
       this.$forceUpdate()
     },

From 81c92ed6d472842106aca696c34e4f2ac4ad83b0 Mon Sep 17 00:00:00 2001
From: tkostuch <tkostuch@divante.pl>
Date: Mon, 28 Oct 2019 13:08:47 +0100
Subject: [PATCH 90/99] add final price to productList and fix check if
 original price is set

---
 config/default.json                     |  4 ++--
 core/modules/catalog/helpers/taxCalc.ts | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/config/default.json b/config/default.json
index 01ab4b62d1..c00c97db79 100644
--- a/config/default.json
+++ b/config/default.json
@@ -187,11 +187,11 @@
     },
     "productList": {
       "sort": "updated_at:desc",
-      "includeFields": [ "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices"],
+      "includeFields": [ "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices", "final_price", "configurable_children.final_price"],
       "excludeFields": [ "description", "configurable_options", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options" ]
     },
     "productListWithChildren": {
-      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices", "configurable_children.special_to_date", "configurable_children.special_from_date", "configurable_children.regular_price"],
+      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "final_price", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices", "configurable_children.special_to_date", "configurable_children.special_from_date", "configurable_children.regular_price", "configurable_children.final_price"],
       "excludeFields": [ "description", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options"]
     },
     "review": {
diff --git a/core/modules/catalog/helpers/taxCalc.ts b/core/modules/catalog/helpers/taxCalc.ts
index 86db4b4132..927a2f2d23 100644
--- a/core/modules/catalog/helpers/taxCalc.ts
+++ b/core/modules/catalog/helpers/taxCalc.ts
@@ -76,14 +76,18 @@ function assignPrice ({ product, target, price, tax = 0, deprecatedPriceFieldsSu
 
 export function updateProductPrices ({ product, rate, sourcePriceInclTax = false, deprecatedPriceFieldsSupport = false, finalPriceInclTax = true }) {
   const rate_factor = parseFloat(rate.rate) / 100
+  const hasOriginalPrices = (
+    product.hasOwnProperty('original_price') &&
+    product.hasOwnProperty('original_final_price') &&
+    product.hasOwnProperty('original_special_price')
+  )
   // build objects with original price and tax
   // for first calculation use `price`, for next one use `original_price`
-  const priceWithTax = createSinglePrice(parseFloat(product.original_price || product.price), rate_factor, sourcePriceInclTax)
-  const finalPriceWithTax = createSinglePrice(parseFloat(product.original_final_price || product.final_price), rate_factor, finalPriceInclTax)
-  const specialPriceWithTax = createSinglePrice(parseFloat(product.original_special_price || product.special_price), rate_factor, sourcePriceInclTax)
+  const priceWithTax = createSinglePrice(parseFloat(product.original_price || product.price), rate_factor, sourcePriceInclTax && !hasOriginalPrices)
+  const finalPriceWithTax = createSinglePrice(parseFloat(product.original_final_price || product.final_price), rate_factor, finalPriceInclTax && !hasOriginalPrices)
+  const specialPriceWithTax = createSinglePrice(parseFloat(product.original_special_price || product.special_price), rate_factor, sourcePriceInclTax && !hasOriginalPrices)
 
   // save original prices
-  const hasOriginalPrices = (product.original_price && product.original_final_price && product.original_special_price)
   if (!hasOriginalPrices) {
     assignPrice({product, target: 'original_price', ...priceWithTax, deprecatedPriceFieldsSupport})
 

From f3ea71ea306d3f3c8a3e123a93419aa17f4cb1e6 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 29 Oct 2019 18:47:11 +0100
Subject: [PATCH 91/99] allow to fetch  avticity parameter

---
 CHANGELOG.md                                          | 11 +++--------
 config/default.json                                   |  6 +++---
 .../components/core/blocks/Compare/AddToCompare.vue   |  2 +-
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bdfa070c..048c503945 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - unreleased
 
-### Added
-
-- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
-
-### Added
-
-- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
-
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
 - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
@@ -31,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fixed missing parameter in the compare list - @andrzejewsky (#3757)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
@@ -39,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - Remove unused dayjs locales - @gibkigonzo (#3498)
 - check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
 
 ### Changed / Improved
 - Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
diff --git a/config/default.json b/config/default.json
index a58bb56d61..296c6e168b 100644
--- a/config/default.json
+++ b/config/default.json
@@ -183,15 +183,15 @@
       "validSearchOptionsFromRouteParams": ["url-key", "slug", "id"]
     },
     "attribute": {
-      "includeFields": [ "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable", "tier_prices", "frontend_input" ]
+      "includeFields": [ "activity", "attribute_code", "id", "entity_type_id", "options", "default_value", "is_user_defined", "frontend_label", "attribute_id", "default_frontend_label", "is_visible_on_front", "is_visible", "is_comparable", "tier_prices", "frontend_input" ]
     },
     "productList": {
       "sort": "updated_at:desc",
-      "includeFields": [ "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices"],
+      "includeFields": [ "activity", "type_id", "*sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "*image","*small_image", "configurable_children.color", "configurable_children.size", "configurable_children.tier_prices"],
       "excludeFields": [ "description", "configurable_options", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options" ]
     },
     "productListWithChildren": {
-      "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices"],
+      "includeFields": [ "activity", "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "price_incl_tax", "original_price_incl_tax", "original_price", "special_price_incl_tax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.price_incl_tax", "configurable_children.special_price_incl_tax", "configurable_children.original_price", "configurable_children.original_price_incl_tax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices"],
       "excludeFields": [ "description", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options"]
     },
     "review": {
diff --git a/src/themes/default/components/core/blocks/Compare/AddToCompare.vue b/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
index e3debf698e..5ba46572a9 100644
--- a/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
+++ b/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    @click="isOnCompare ? removeFromCompare(product) : addToCompare(product)"
+    @click="isOnCompare ? removeProsuct(product) : addProduct(product)"
     class="p0 inline-flex middle-xs bg-cl-transparent brdr-none action h5 pointer cl-secondary"
     type="button"
     data-testid="addToCompare"

From 34dd305b5996c6ac6c4db8164ddb57715b415d18 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 29 Oct 2019 18:49:06 +0100
Subject: [PATCH 92/99] fix typos

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

diff --git a/src/themes/default/components/core/blocks/Compare/AddToCompare.vue b/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
index 5ba46572a9..58707c97bd 100644
--- a/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
+++ b/src/themes/default/components/core/blocks/Compare/AddToCompare.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    @click="isOnCompare ? removeProsuct(product) : addProduct(product)"
+    @click="isOnCompare ? removeProduct(product) : addProduct(product)"
     class="p0 inline-flex middle-xs bg-cl-transparent brdr-none action h5 pointer cl-secondary"
     type="button"
     data-testid="addToCompare"
@@ -41,7 +41,7 @@ export default {
         action1: { label: i18n.t('OK') }
       }, { root: true })
     },
-    removeProsuct (product) {
+    removeProduct (product) {
       this.removeFromCompare(product)
       this.$store.dispatch('notification/spawnNotification', {
         type: 'success',

From b4604f49e4a7768df97a67374b3ca33c2e5379a4 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 29 Oct 2019 19:16:26 +0100
Subject: [PATCH 93/99] fix broken links

---
 CHANGELOG.md                                          | 11 +++--------
 .../default/components/core/blocks/Footer/Footer.vue  |  2 +-
 src/themes/default/pages/Static.vue                   |  3 ++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bdfa070c..6487f109bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - unreleased
 
-### Added
-
-- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
-
-### Added
-
-- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
-
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
 - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
@@ -31,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fixed broken link for store locator - @andrzejewsky (#3754)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
@@ -39,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - Remove unused dayjs locales - @gibkigonzo (#3498)
 - check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
 
 ### Changed / Improved
 - Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
diff --git a/src/themes/default/components/core/blocks/Footer/Footer.vue b/src/themes/default/components/core/blocks/Footer/Footer.vue
index 3fb7f1bce1..72224e668a 100644
--- a/src/themes/default/components/core/blocks/Footer/Footer.vue
+++ b/src/themes/default/components/core/blocks/Footer/Footer.vue
@@ -65,7 +65,7 @@
                 </router-link>
               </div>
               <div class="mt15">
-                <router-link class="cl-secondary" :to="getLinkFor('/store-locator')" exact>
+                <router-link class="cl-secondary" :to="localizedRoute('/store-locator')" exact>
                   {{ $t('Store locator') }}
                 </router-link>
               </div>
diff --git a/src/themes/default/pages/Static.vue b/src/themes/default/pages/Static.vue
index af56af741a..a06a35d1ed 100644
--- a/src/themes/default/pages/Static.vue
+++ b/src/themes/default/pages/Static.vue
@@ -36,6 +36,7 @@ import Breadcrumbs from 'theme/components/core/Breadcrumbs'
 import StaticExample from 'theme/components/theme/blocks/Static/Example'
 import StaticShortExample from 'theme/components/theme/blocks/Static/Short'
 import { getPathForStaticPage } from 'theme/helpers'
+import { localizedRoute } from '@vue-storefront/core/lib/multistore'
 
 export default {
   components: {
@@ -68,7 +69,7 @@ export default {
       navigation: [
         { title: i18n.t('About us'), link: getPathForStaticPage('/about-us'), component: StaticExample },
         { title: i18n.t('Customer service'), link: getPathForStaticPage('/customer-service'), component: StaticShortExample },
-        { title: i18n.t('Store locator'), link: getPathForStaticPage('/store-locator'), component: StaticExample },
+        { title: i18n.t('Store locator'), link: localizedRoute('/store-locator'), component: StaticExample },
         { title: i18n.t('Delivery'), link: '/delivery', component: StaticShortExample },
         { title: i18n.t('Return policy'), link: '/returns', component: StaticExample },
         { title: i18n.t('Privacy policy'), link: '/privacy', component: StaticShortExample },

From 5306854a5a6720be1e352672a20fdad0fdc6b750 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 29 Oct 2019 19:27:37 +0100
Subject: [PATCH 94/99] fix links to the promoted banners

---
 CHANGELOG.md                                          | 11 +++--------
 .../default/resource/banners/de_main-image.json       |  2 +-
 .../default/resource/banners/de_promoted_offers.json  |  8 ++++----
 .../default/resource/banners/it_main-image.json       |  2 +-
 .../default/resource/banners/it_promoted_offers.json  |  8 ++++----
 src/themes/default/resource/promoted_offers.json      |  8 ++++----
 6 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bdfa070c..31a1b89529 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - unreleased
 
-### Added
-
-- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
-
-### Added
-
-- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
-
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
 - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
@@ -31,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fix links to the promoted banners - @andrzejewsky (#3753)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
@@ -39,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - Remove unused dayjs locales - @gibkigonzo (#3498)
 - check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
 
 ### Changed / Improved
 - Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
diff --git a/src/themes/default/resource/banners/de_main-image.json b/src/themes/default/resource/banners/de_main-image.json
index 7129b792e1..16919a935f 100644
--- a/src/themes/default/resource/banners/de_main-image.json
+++ b/src/themes/default/resource/banners/de_main-image.json
@@ -3,6 +3,6 @@
     "title": "Neue Wege beschreiten.",
     "subtitle": "Eine Mode kann sich zu einem neuen Stil durchsetzen und offenbart die neusten Kreationen von Designern, Technologen, Ingenieuren und Designmanagern.",
     "image": "/assets/full_width_banner.jpg",
-    "link": "/women"
+    "link": "/women/frauen-20"
   }
 }
diff --git a/src/themes/default/resource/banners/de_promoted_offers.json b/src/themes/default/resource/banners/de_promoted_offers.json
index 2d02ba6f9e..7b8f09124d 100644
--- a/src/themes/default/resource/banners/de_promoted_offers.json
+++ b/src/themes/default/resource/banners/de_promoted_offers.json
@@ -4,7 +4,7 @@
       "title": "Lässige Büro",
       "subtitle": "Kollektion",
       "image": "/assets/ban1.jpg",
-      "link": "/women"
+      "link": "/women/frauen-20"
     }
   ],
   "smallBanners": [
@@ -12,13 +12,13 @@
       "title": "Glänzen Sie mit",
       "subtitle": "Accessoires",
       "image": "/assets/ban2.jpg",
-      "link": "/men"
+      "link": "/men/herren-11"
     },
     {
       "title": "Der Frühling kommt",
       "subtitle": "Hüte",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/gerat-3"
     }
   ],
   "productBanners": [
@@ -26,7 +26,7 @@
       "title": "Der Frühling kommt",
       "subtitle": "Hüte",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/gerat-3"
     }
   ]
 }
diff --git a/src/themes/default/resource/banners/it_main-image.json b/src/themes/default/resource/banners/it_main-image.json
index 7e75a506e6..9d46401de8 100644
--- a/src/themes/default/resource/banners/it_main-image.json
+++ b/src/themes/default/resource/banners/it_main-image.json
@@ -3,6 +3,6 @@
     "title": "Cammina la passeggiata.",
     "subtitle": "Una moda può diventare lo stile prevalente nel comportamento o manifestare le ultime creazioni di designer, tecnologi, ingegneri e responsabili del design.",
     "image": "/assets/full_width_banner.jpg",
-    "link": "/women"
+    "link": "/women/la-donne-20"
   }
 }
diff --git a/src/themes/default/resource/banners/it_promoted_offers.json b/src/themes/default/resource/banners/it_promoted_offers.json
index 701b45f46a..3e168dc66b 100644
--- a/src/themes/default/resource/banners/it_promoted_offers.json
+++ b/src/themes/default/resource/banners/it_promoted_offers.json
@@ -4,7 +4,7 @@
       "title": "Ufficio casual",
       "subtitle": "Collezione",
       "image": "/assets/ban1.jpg",
-      "link": "/women"
+      "link": "/women/la-donne-20"
     }
   ],
   "smallBanners": [
@@ -12,13 +12,13 @@
       "title": "Brilla",
       "subtitle": "Accessori",
       "image": "/assets/ban2.jpg",
-      "link": "/men"
+      "link": "/men/signori-11"
     },
     {
       "title": "La primavera sta arrivando",
       "subtitle": "Cappelli",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/equipaggiamento-3"
     }
   ],
   "productBanners": [
@@ -26,7 +26,7 @@
       "title": "La primavera sta arrivando",
       "subtitle": "Cappelli",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/equipaggiamento-3"
     }
   ]
 }
diff --git a/src/themes/default/resource/promoted_offers.json b/src/themes/default/resource/promoted_offers.json
index 76dac0c9f8..d08d39eaf2 100644
--- a/src/themes/default/resource/promoted_offers.json
+++ b/src/themes/default/resource/promoted_offers.json
@@ -4,7 +4,7 @@
       "title": "Office casual",
       "subtitle": "Collection",
       "image": "/assets/ban1.jpg",
-      "link": "/women"
+      "link": "/women/women-20"
     }
   ],
   "smallBanners": [
@@ -12,13 +12,13 @@
       "title": "Shine on",
       "subtitle": "Accessories",
       "image": "/assets/ban2.jpg",
-      "link": "/men"
+      "link": "/men/men-11"
     },
     {
       "title": "Spring is coming",
       "subtitle": "Hats",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/gear-3"
     }
   ],
   "productBanners": [
@@ -26,7 +26,7 @@
       "title": "Spring is coming",
       "subtitle": "Hats",
       "image": "/assets/ban3.jpg",
-      "link": "/gear"
+      "link": "/gear/gear-3"
     }
   ]
 }

From 98f0c861c003a804732a7d899f7c44039423c523 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Tue, 29 Oct 2019 20:35:12 +0100
Subject: [PATCH 95/99] fix dysplay categories in search menu

---
 CHANGELOG.md                                    | 11 +++--------
 .../core/blocks/SearchPanel/SearchPanel.vue     | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bdfa070c..e4767c0951 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - unreleased
 
-### Added
-
-- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
-
-### Added
-
-- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
-
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
 - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
@@ -31,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fixed displaying categories on search menu - @andrzejewsky (#3758)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
@@ -39,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - Remove unused dayjs locales - @gibkigonzo (#3498)
 - check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
 
 ### Changed / Improved
 - Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
diff --git a/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue b/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
index 12e37fbc87..342a9d3ec8 100644
--- a/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
+++ b/src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue
@@ -113,13 +113,16 @@ export default {
       return productList
     },
     categories () {
-      const categoriesMap = {}
-      this.products.forEach(product => {
-        [...product.category].forEach(category => {
-          categoriesMap[category.category_id] = category
-        })
-      })
-      return Object.keys(categoriesMap).map(categoryId => categoriesMap[categoryId])
+      const categories = this.products
+        .filter(p => p.category)
+        .map(p => p.category)
+        .flat()
+
+      const discinctCategories = Array.from(
+        new Set(categories.map(c => c.category_id))
+      ).map(catId => categories.find(c => c.category_id === catId))
+
+      return discinctCategories
     },
     getNoResultsMessage () {
       let msg = ''

From 37cda055a9faf47ba5f618f3281326b7948cf9fb Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 30 Oct 2019 11:39:47 +0100
Subject: [PATCH 96/99] fix instant checkout

---
 CHANGELOG.md                                          | 11 +++--------
 .../instant-checkout/components/InstantCheckout.vue   |  6 ++++++
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5bdfa070c..6a20e866aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.11.0-rc.2] - unreleased
 
-### Added
-
-- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
-
-### Added
-
-- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
-
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
 - Fixed problem around dynamic urls when default storeView is set with appendStoreCode false and url set to / . @resubaka (#3685)
@@ -31,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
+- Fixed instant checkout functionality - @andrzejewsky
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
@@ -39,6 +32,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713, #3714)
 - Remove unused dayjs locales - @gibkigonzo (#3498)
 - check max quantity in microcart - @gibkigonzo (#3314)
+- Add unit tests for `core/modules/newsletter` - @psmyrek (#3464)
+- Add unit test for `core/modules/wishlist` - @psmyrek (#3471)
 
 ### Changed / Improved
 - Use `encodeURIComponent` to encode get parameters in `multimatch.js` - @adityasharma7 (#3736)
diff --git a/src/modules/instant-checkout/components/InstantCheckout.vue b/src/modules/instant-checkout/components/InstantCheckout.vue
index dea5e0bc72..6987182579 100644
--- a/src/modules/instant-checkout/components/InstantCheckout.vue
+++ b/src/modules/instant-checkout/components/InstantCheckout.vue
@@ -12,10 +12,16 @@ import config from 'config'
 import i18n from '@vue-storefront/i18n'
 import rootStore from '@vue-storefront/core/store'
 import { currentStoreView } from '@vue-storefront/core/lib/multistore'
+import { registerModule } from '@vue-storefront/core/lib/modules'
+import { OrderModule } from '@vue-storefront/core/modules/order'
+
 const storeView = currentStoreView()
 
 export default {
   name: 'InstantCheckoutButton',
+  beforeCreate () {
+    registerModule(OrderModule)
+  },
   data () {
     return {
       supported: false,

From 1af9004aadd52ff7cf1a94996abee47c3d080852 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Wed, 30 Oct 2019 11:42:00 +0100
Subject: [PATCH 97/99] changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a20e866aa..fca0d9c2af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,7 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Load recently viewed module in my account page - @gibkigonzo (#3722)
 - Added validation message for city field on checkout page - @dz3n (#3723)
 - Improving is_comparable to work with booleans and digits - @dz3n (#3697)
-- Fixed instant checkout functionality - @andrzejewsky
+- Fixed instant checkout functionality - @andrzejewsky (#3765)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)

From ea086d0b57cb47cfa8ec63f18e0498dd716c0b0b Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Thu, 31 Oct 2019 17:11:36 +0100
Subject: [PATCH 98/99] bump version

---
 CHANGELOG.md                                  | 3 +--
 core/i18n/package.json                        | 2 +-
 core/package.json                             | 2 +-
 docs/package.json                             | 2 +-
 package.json                                  | 2 +-
 packages/cli/boilerplates/module/package.json | 4 ++--
 src/themes/default-amp/package.json           | 2 +-
 src/themes/default/package.json               | 2 +-
 test/unit/package.json                        | 2 +-
 9 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fa2e52b4c7..a30ddab53c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,8 +5,7 @@ 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.2] - unreleased
+## [1.11.0-rc.2] - 2019.10.31
 
 ### Fixed
 - Fixed deprecated getter in cmsBlock store - @resubaka (#3683)
diff --git a/core/i18n/package.json b/core/i18n/package.json
index 64cba958ec..7b3313dc8e 100644
--- a/core/i18n/package.json
+++ b/core/i18n/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",
diff --git a/core/package.json b/core/package.json
index dc7cea68f3..53d75e2c2a 100644
--- a/core/package.json
+++ b/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/core",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Vue Storefront Core",
   "license": "MIT",
   "main": "app.js",
diff --git a/docs/package.json b/docs/package.json
index 7046b21434..0612ce0bfb 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@vue-storefront/docs",
   "private": true,
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "scripts": {
     "docs:dev": "vuepress dev",
     "docs:build": "vuepress build",
diff --git a/package.json b/package.json
index 185492029f..a007fa378f 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-storefront",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "A Vue.js, PWA eCommerce frontend",
   "private": true,
   "engines": {
diff --git a/packages/cli/boilerplates/module/package.json b/packages/cli/boilerplates/module/package.json
index 0506626c4f..77b385d0c2 100644
--- a/packages/cli/boilerplates/module/package.json
+++ b/packages/cli/boilerplates/module/package.json
@@ -12,13 +12,13 @@
   "license": "MIT",
   "dependencies": {},
   "devDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.1",
+    "@vue-storefront/core": "^1.11.0-rc.2",
     "ts-loader": "^6.0.4",
     "typescript": "^3.5.2",
     "webpack": "^4.35.2",
     "webpack-cli": "^3.3.5"
   },
   "peerDependencies": {
-    "@vue-storefront/core": "^1.11.0-rc.1"
+    "@vue-storefront/core": "^1.11.0-rc.2"
   }
 }
diff --git a/src/themes/default-amp/package.json b/src/themes/default-amp/package.json
index f96a658fa8..53248b805c 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.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "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 612803d26e..73ef55c8ca 100644
--- a/src/themes/default/package.json
+++ b/src/themes/default/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-default",
-  "version": "1.11.0-rc.1",
+  "version": "1.11.0-rc.2",
   "description": "Default theme for Vue Storefront",
   "main": "index.js",
   "scripts": {
diff --git a/test/unit/package.json b/test/unit/package.json
index cf5fa8c359..3df062b2ab 100644
--- a/test/unit/package.json
+++ b/test/unit/package.json
@@ -1,5 +1,5 @@
 {
   "name": "@vue-storefront/unit-tests",
   "private": true,
-  "version": "1.11.0-rc.1"
+  "version": "1.11.0-rc.2"
 }

From 33be862da3407dfa1f7a82e4e163d746ae97a2e6 Mon Sep 17 00:00:00 2001
From: andrzejewsky <vox3r69@gmail.com>
Date: Sat, 2 Nov 2019 15:37:05 +0100
Subject: [PATCH 99/99] add media query for hover effect

---
 CHANGELOG.md                                  |  1 +
 .../default/components/core/ProductTile.vue   | 20 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a30ddab53c..1aae462ee6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed instant checkout functionality - @andrzejewsky (#3765)
 - Fixed links to the promoted banners - @andrzejewsky (#3753)
 - Fixed missing parameter in the compare list - @andrzejewsky (#3757)
+- Fixed product link on mobile - @andrzejewsky (#3772)
 
 ### Added
 - Added support for ES7 - @andrzejewsky (#3690)
diff --git a/src/themes/default/components/core/ProductTile.vue b/src/themes/default/components/core/ProductTile.vue
index af345733a5..7f931c0a39 100644
--- a/src/themes/default/components/core/ProductTile.vue
+++ b/src/themes/default/components/core/ProductTile.vue
@@ -208,16 +208,20 @@ $color-white: color(white);
     will-change: opacity, transform;
     transition: 0.3s opacity $motion-main, 0.3s transform $motion-main;
   }
-  &:hover {
-    .product-cover__thumb {
-      opacity: 1;
-      transform: scale(1.1);
-    }
-    &.sale::after,
-    &.new::after {
-      opacity: 0.8;
+
+  @media screen and (min-width: 768px) {
+    &:hover {
+      .product-cover__thumb {
+        opacity: 1;
+        transform: scale(1.1);
+      }
+      &.sale::after,
+      &.new::after {
+        opacity: 0.8;
+      }
     }
   }
+
   &.sale {
     &::after {
       @extend %label;