FIX CartID entity = null

CHANGELOG.md

@@ -9,6 +9,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - ESlint throwing errors about undefined jest globals in tests - @lukeromanowicz (#2702)
 - Fixed changing the country when entering shipping address in checkout not updating shipping costs - @revlis-x (#2691)
+- Infinite loop on multistore page after reload - @patzick (#2713)
+- Refreshing MyAccount page on multistore - @patzick (#2780)
+- "Toggle password visible" button in password fields works the right way - @lromanowicz (#2772)
+- Range queries to elasticsearch - @oskar1233 (#2746)
+- BaseInput has min height now to avoid jumping on forms - @patzick (#2771)
+- Orders with invalid address don't stack anymore in the queue and have proper notification popup - @AndreiBelokopytov, @lukeromanowicz (#2663)
+- Offline orders with out of stock products don't stack anymore and get canceled after going back to online - @lukeromanowicz (#2740)
+- Build ServiceWorker on Docker - @patzick (#2793)
 
 ## [1.9.0-rc.2] - 2019.04.10
 

core/client-entry.ts

@@ -147,6 +147,7 @@ const invokeClientEntry = async () => {
             const orderId = id
 
             Logger.log('Pushing out order ' + orderId)()
+            /** @todo refactor order synchronisation to proper handling through vuex actions to avoid code duplication */
             return fetch(config.orders.endpoint,
               {
                 method: 'POST',
@@ -162,10 +163,31 @@ const invokeClientEntry = async () => {
               }
             })
               .then(jsonResponse => {
-                if (jsonResponse && jsonResponse.code === 200) {
+                if (jsonResponse) {
                   Logger.info('Response for: ' + orderId + ' = ' + JSON.stringify(jsonResponse.result))()
-                  orderData.transmited = true
+                  orderData.transmited = true // by default don't retry to transmit this order
                   orderData.transmited_at = new Date()
+
+                  if (jsonResponse.code !== 200) {
+                    Logger.error(jsonResponse, 'order-sync')()
+
+                    if (jsonResponse.code === 400) {
+                      rootStore.dispatch('notification/spawnNotification', {
+                        type: 'error',
+                        message: i18n.t('Address provided in checkout contains invalid data. Please check if all required fields are filled in and also contact us on {email} to resolve this issue for future. Your order has been canceled.', { email: config.mailer.contactAddress }),
+                        action1: { label: i18n.t('OK') }
+                      })
+                    } else if (jsonResponse.code === 500 && jsonResponse.result === i18n.t('Error: Error while adding products')) {
+                      rootStore.dispatch('notification/spawnNotification', {
+                        type: 'error',
+                        message: i18n.t('Some products you\'ve ordered are out of stock. Your order has been canceled.'),
+                        action1: { label: i18n.t('OK') }
+                      })
+                    } else {
+                      orderData.transmited = false // probably some server related error. Enqueue
+                    }
+                  }
+
                   ordersCollection.setItem(orderId.toString(), orderData)
                 } else {
                   Logger.error(jsonResponse)()

core/i18n/resource/i18n/cs-CZ.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Tato funkce zatím nebyla zavedena! Prosíme, podívejte se na https://github.com/DivanteLtd/vue-storefront/issues pro podrobný návod!"
 "The product is out of stock and cannot be added to the cart!","Produkt není na skladě a nelze ho přidat do košíku!"
 "Product has been added to the cart!","Produkt byl přidán do košíku!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Interní chyba ověření. Zkontrolujte, zda jsou vyplněna všechna povinná pole. Kontaktujte nás prosím na contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Interní chyba ověření. Zkontrolujte, zda jsou vyplněna všechna povinná pole. Kontaktujte nás prosím na {email}"
 "Product {productName} has been added to the compare!","Produkt {productName} byl přidán k porovnání!"
 "Product {productName} has been removed from compare!","Produkt {productName} byl odstraněn z porovnávání!"
 "Product {productName} has been added to wishlist!","Produkt {productName} byl přidán do seznamu přání!"

core/i18n/resource/i18n/de-DE.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Diese Funktion wurde noch nicht implementiert. Für weitere Details schau dir bitte auf https://github.com/DivanteLtd/vue-storefront/issues unsere Roadmap an!"
 "The product is out of stock and cannot be added to the cart!","Das Produkt ist nicht auf Lager und kann daher nicht zum Warenkorb hinzugefügt werden!"
 "Product has been added to the cart!","Produkt wurde zum Warenkorb hinzugefügt!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Interner Validierungsfehler. Bitte überprüfe, ob alle erforderlichen Felder ausgefüllt sind. Bei Problemen kontaktiere uns bitte über contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Interner Validierungsfehler. Bitte überprüfe, ob alle erforderlichen Felder ausgefüllt sind. Bei Problemen kontaktiere uns bitte über {email}"
 "Product {productName} has been added to the compare!","Das Produkt {productName} wurde zur Vergleichsliste hinzugefügt!"
 "Product {productName} has been removed from compare!","Das Produkt {productName} wurde von der Vergleichsliste entfernt!"
 "Product {productName} has been added to wishlist!","Das Produkt {productName} wurde der Wunschliste hinzugefügt!"

core/i18n/resource/i18n/en-US.csv

@@ -11,7 +11,8 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!"
 "The product is out of stock and cannot be added to the cart!","The product is out of stock and cannot be added to the cart!"
 "Product has been added to the cart!","Product has been added to the cart!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Internal validation error. Please check if all required fields are filled in. Please contact us on {email}"
+"Address provided in checkout contains invalid data. Please check if all required fields are filled in and also contact us on {email} to resolve this issue for future. Your order has been canceled.","Address provided in checkout contains invalid data. Please check if all required fields are filled in and also contact us on {email} to resolve this issue for future. Your order has been canceled."
 "Product {productName} has been added to the compare!","Product {productName} has been added to the compare!"
 "Product {productName} has been removed from compare!","Product {productName} has been removed from compare!"
 "Product {productName} has been added to wishlist!","Product {productName} has been added to wishlist!"
@@ -68,4 +69,5 @@
 "Please configure product bundle options and fix the validation errors","Please configure product bundle options and fix the validation errors"
 "Processing order...","Processing order..."
 "You need to be logged in to see this page","You need to be logged in to see this page"
-"Quantity must be above 0","Quantity must be above 0"
+"Quantity must be above 0","Quantity must be above 0"
+"Error: Error while adding products","Error: Error while adding products"

core/i18n/resource/i18n/es-ES.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","¡Esta característica aún no está implementada! ¡Por favor, eche un vistazo a https://github.com/DivanteLtd/vue-storefront/issues para nuestra Hoja de ruta!"
 "The product is out of stock and cannot be added to the cart!","¡El producto no está disponible y no se puede agregar al carrito!"
 "Product has been added to the cart!","¡El producto ha sido agregado al carrito!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Error de validación interna. Por favor, compruebe si se completan todos los campos obligatorios. Póngase en contacto con nosotros en contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Error de validación interna. Por favor, compruebe si se completan todos los campos obligatorios. Póngase en contacto con nosotros en {email}"
 "Product {productName} has been added to the compare!","¡El producto {productName} se ha agregado a la comparación!"
 "Product {productName} has been removed from compare!","¡El producto {productName} ha sido eliminado de la comparación!"
 "Product {productName} has been added to wishlist!","¡El producto {productName} ha sido agregado a la lista de deseos!"

core/i18n/resource/i18n/fr-FR.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Cette fonctionnalité n'est pas encore implémentée! Veuillez vous rendre sur https://github.com/DivanteLtd/vue-storefront/issues pour consulter notre Roadmap!"
 "The product is out of stock and cannot be added to the cart!","Le produit est en rupture de stock et ne peut être ajouté au panier !"
 "Product has been added to the cart!","Le produit a été ajouté au panier !"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Erreur de validation interne Veuillez vérifier si tous les champs requis sont remplis. Veuillez nous contacter sur contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Erreur de validation interne Veuillez vérifier si tous les champs requis sont remplis. Veuillez nous contacter sur {email}"
 "Product {productName} has been added to the compare!","Le produit {productName} a été ajouté au comparateur !"
 "Product {productName} has been removed from compare!","Le produit {productName} a été supprimé du comparateur !"
 "Product {productName} has been added to wishlist!","Le produit {productName} a été ajouté à la liste des souhaits !"

core/i18n/resource/i18n/it-IT.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Questa funzionalità non è ancora stata implementata! Dai un'occhiata alla nostra roadmap qui https://github.com/DivanteLtd/vue-storefront/issues!"
 "The product is out of stock and cannot be added to the cart!","Il prodotto non è più disponibile e non può essere aggiunto al carrello"
 "Product has been added to the cart!","Il prodotto è stato aggiunto al carrello!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Errore di validazione interno. Se tutti i campi sono stati compilati contattare contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Errore di validazione interno. Se tutti i campi sono stati compilati contattare {email}"
 "Product {productName} has been added to the compare!","Il prodotto {productName} è stato aggiunto al comparatore!"
 "Product {productName} has been removed from compare!","Il prodotto {productName} è stato rimosso dal comparatore"
 "Product {productName} has been added to wishlist!","Il prodotto {productName} è stato aggiunto alla lista dei desideri!"

core/i18n/resource/i18n/nl-NL.csv

@@ -11,7 +11,7 @@ The system is not sure about the stock quantity (volatile). Product has been add
 This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!,"Helaas, deze feature is nog niet geimplementeerd. Kijk op https://github.com/DivanteLtd/vue-storefront/issues om de roadmap te zien."
 The product is out of stock and cannot be added to the cart!,Dit product is niet in voorraad en kan niet toegevoegd worden aan de winkelwagen!
 Product has been added to the cart!,Product is toegevoegd aan de winkelwagen!
-Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io,Interne validatie fout. Check of alle verplichte velden ingevuld zijn. Neem contact met ons op via contributors@vuestorefront.io.
+Internal validation error. Please check if all required fields are filled in. Please contact us on {email},Interne validatie fout. Check of alle verplichte velden ingevuld zijn. Neem contact met ons op via {email}.
 Product {productName} has been added to the compare!,Product {productName} is toegevoegd aan de vergelijking!
 Product {productName} has been removed from compare!,Product {productName} is verwijderd van de vergelijking!
 Product {productName} has been added to wishlist!,Product {productName} is toegevoegd aan de verlanglijst!

core/i18n/resource/i18n/pl-PL.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Wybrana opcja jest niedostępna!"
 "The product is out of stock and cannot be added to the cart!","Produkt jest niedostępny!"
 "Product has been added to the cart!","Produkt został dodany do koszyka!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Błąd walidacji. Sprawdź czy wszystkie wymagane pola zostały wybrane."
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Błąd walidacji. Sprawdź czy wszystkie wymagane pola zostały wybrane. Proszę, skontaktuj się z nami na adres {email}"
 "Product {productName} has been added to the compare!","Produkt {productName} został dodany do porównania!"
 "Product {productName} has been removed from compare!","Produkt {productName} został usunięty z porównania!"
 "Product {productName} has been added to wishlist!","Produkt {productName} został dodany do listy życzeń!"

core/i18n/resource/i18n/pt-BR.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Essa funcionalidade não foi implementada ainda! Por favor dê uma olhada em https://github.com/DivanteLtd/vue-storefront/issues nosso planejamento!"
 "The product is out of stock and cannot be added to the cart!","Produto não possui estoque e não pode ser adicionado ao carrinho!"
 "Product has been added to the cart!","Produto foi adicionado ao carrinho!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Erro interno de validação. Por favor verifique se todos os campos obrigatórios estão preenchidos. Por favor contate-nos em contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Erro interno de validação. Por favor verifique se todos os campos obrigatórios estão preenchidos. Por favor contate-nos em {email}"
 "Product {productName} has been added to the compare!","Produto {productName} foi adicionado para comparação!"
 "Product {productName} has been removed from compare!","Produto {productName} foi removido da comparação!"
 "Product {productName} has been added to wishlist!","Produto {productName} foi adicionado à lista de desejos!"

core/i18n/resource/i18n/ru-RU.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Данная возможность пока не реализована! Пожалуйста ознакомьтесь с нашей дорожной картой тут: https://github.com/DivanteLtd/vue-storefront/issues"
 "The product is out of stock and cannot be added to the cart!","Товара нет в наличии и его нельзя добавить в корзину"
 "Product has been added to the cart!","Товар добавлен в корзину!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","Внутренняя валидационная ошибка. Пожалуйста проверьте заполненность всех обязательных полей. Пожалуйста свяжитесь с нами по contributors@vuestorefront.io"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Внутренняя валидационная ошибка. Пожалуйста проверьте заполненность всех обязательных полей. Пожалуйста свяжитесь с нами по {email}"
 "Product {productName} has been added to the compare!","Товар {productName} добавлен к странице сравнения!"
 "Product {productName} has been removed from compare!","Товар {productName} удален из страницы сравнения!"
 "Product {productName} has been added to wishlist!","Товар {productName} добавлен к списку пожеланий!"

core/i18n/resource/i18n/zh-cn.csv

@@ -11,7 +11,7 @@
 "This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","此功能尚未实现！ 请查看我们的开发路线图https://github.com/DivanteLtd/vue-storefront/issues!"
 "The product is out of stock and cannot be added to the cart!","该商品缺货，无法添加到购物车!"
 "Product has been added to the cart!","已成功将商品加入购物车!"
-"Internal validation error. Please check if all required fields are filled in. Please contact us on contributors@vuestorefront.io","内部验证错误。 请检查是否填写了所有必填字段。请通过contributors@vuestorefront.io与我们联系"
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","内部验证错误。 请检查是否填写了所有必填字段。请通过 {email} 与我们联系"
 "Product {productName} has been added to the compare!","商品 {productName} 已经添加到比较列表中!"
 "Product {productName} has been removed from compare!","商品 {productName} 已从比较列表中移除!"
 "Product {productName} has been added to wishlist!","商品 {productName} 已添加到心愿单!"

core/lib/multistore.ts

@@ -143,7 +143,7 @@ export function localizedDispatcherRoute (routeObj: LocalizedRoute | string, sto
 export function setupMultistoreRoutes (config, router: VueRouter, routes: RouteConfig[]): void  {
   if (config.storeViews.mapStoreUrlsFor.length > 0 && config.storeViews.multistore === true) {
     for (let storeCode of config.storeViews.mapStoreUrlsFor) {
-      if (storeCode) {
+      if (storeCode && (config.defaultStoreCode !== storeCode)) {
         let storeRoutes = []
         for (let route of routes) {
           const localRoute = localizedRoute(Object.assign({}, route), storeCode)