Merge pull request #4031 from DivanteLtd/hotfix/v1.11.1

Hotfix/v1.11.1

Author: andrzejewsky

CHANGELOG.md

@@ -5,6 +5,42 @@ 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.1] - 2020.02.05
+
+### Added
+- Add `ProductPrice` component with bundleOptions and customOptions prices - @gibkigonzo (#3978)
+- Add lazy create cart token - @gibkigonzo (#3994)
+
+### Changed / Improved
+- Set cache tag when loading a category - @haelbichalex (#3940)
+- In development build `webpack.config.js` in theme folder is now called without the `default` key
+
+### Fixed
+- Added Finnish translations - @mattiteraslahti and @alphpkeemik
+- Updated Estonian translations to match 1.11 - @alphpkeemik
+- CookieNotification CSR&SSR mismatch fixed - @Fifciu (#3922)
+- The attribute filter in `attribute/list` was not filtering the already loaded attributes properly - @pkarw (#3964)
+- Update `hasProductErrors` in Product component and support additional sku in custom options - @gibkigonzo (#3976)
+- Fixed logic for generating ${lang}.json files in multi-store setup - @jpkempf
+- Fixed logic for collecting valid locales in single-store, multi-lang setup - @jpkempf
+- Make initial custom option value reactive - @gibkigonzo
+- Fixed No image thumbnails leaded on 404 page - @andrzejewsky (#3955)
+- Fixed Stock logic not working with manage_stock set to false - @andrzejewsky - (#3957)
+- Support old price format in `ProductPrice` - @gibkigonzo (#3978)
+- Fixed product bundle comparison condition - @gk-daniel (#4004)
+- Add event callback for checkout load initial data - @gibkigonzo(#3985)
+- Fixed `Processing order...` modal closing too early - @grimasod (#4021)
+- Keep registered payment methods after `syncTotals`  - @grimasod (#4020)
+- Added status code to the cache content and use it in cache response - @resubaka (#4014)
+- Fixed sku attribute is missing on compare page - @gibkigonzo (#4036)
+- Fixed z-index for aside in compare list - @gibkigonzo (#4037)
+- Disable checking max quantity when manage stock is set to false - @gibkigonzo (#4038)
+- Add products quantity only when token is created - @gibkigonzo (#4017)
+- Revert init filters in Vue app - add storeView to global/store and pass it to filters - @gibkigonzo (#3929)
+- Fix v-model not working in BaseRadioButton - @lukeromanowicz (#4035)
+- always keep filters values as array of object - @gibkigonzo (#4045)
+- Fix ecosystem config to work with ts-node - @andrzejewsky (#3981)
+
 ## [1.11.0] - 2019.12.20
 
 ### Added

config/default.json

@@ -270,7 +270,6 @@
       "width": 150,
       "height": 150
     },
-    "bypassCartLoaderForAuthorizedUsers": true,
     "serverMergeByDefault": true,
     "serverSyncCanRemoveLocalItems": false,
     "serverSyncCanModifyLocalItems": false,

core/app.ts

@@ -77,16 +77,6 @@ const createApp = async (ssrContext, config, storeCode = null): Promise<{app: Vu
     })
   })
 
-  // @todo remove this part when we'll get rid of global multistore mixin
-  if (isServer) {
-    Object.defineProperty(ssrContext, 'helpers', {
-      value: {
-        currentStoreView
-      },
-      writable: true
-    })
-  }
-
   let vueOptions = {
     router: routerProxy,
     store,

core/build/dev-server.js

@@ -2,14 +2,14 @@ const path = require('path')
 const webpack = require('webpack')
 const MFS = require('memory-fs')
 
-let baseClientConfig = require('./webpack.client.config')
-let baseServerConfig = require('./webpack.server.config')
+let baseClientConfig = require('./webpack.client.config').default
+let baseServerConfig = require('./webpack.server.config').default
 
 const themeRoot = require('./theme-path')
 const extendedConfig = require(path.join(themeRoot, '/webpack.config.js'))
 
-let clientConfig = extendedConfig(baseClientConfig, { isClient: true, isDev: true }).default;
-let serverConfig = extendedConfig(baseServerConfig, { isClient: false, isDev: true }).default;
+let clientConfig = extendedConfig(baseClientConfig, { isClient: true, isDev: true })
+let serverConfig = extendedConfig(baseServerConfig, { isClient: false, isDev: true })
 
 module.exports = function setupDevServer (app, cb) {
   let bundle

core/filters/date.js

@@ -12,9 +12,10 @@ once('__VUE_EXTEND_DAYJS_LOCALIZED_FORMAT__', () => {
  * @param {String} date
  * @param {String} format
  */
-export function date (date, format) {
-  const displayFormat = format || currentStoreView().i18n.dateFormat
-  let storeLocale = currentStoreView().i18n.defaultLocale.toLocaleLowerCase()
+export function date (date, format, storeView) {
+  const _storeView = storeView || currentStoreView()
+  const displayFormat = format || _storeView.i18n.dateFormat
+  let storeLocale = _storeView.i18n.defaultLocale.toLocaleLowerCase()
   const separatorIndex = storeLocale.indexOf('-')
   const languageCode = (separatorIndex > -1) ? storeLocale.substr(0, separatorIndex) : storeLocale
 

core/filters/price.js

@@ -13,15 +13,15 @@ const applyCurrencySign = (formattedPrice, { currencySign, priceFormat }) => {
  * Converts number to price string
  * @param {Number} value
  */
-export function price (value) {
+export function price (value, storeView) {
   if (isNaN(value)) {
     return value;
   }
-  const storeView = currentStoreView();
-  if (!storeView.i18n) {
+  const _storeView = storeView || currentStoreView();
+  if (!_storeView.i18n) {
     return value;
   }
-  const { defaultLocale, currencySign, priceFormat } = storeView.i18n
+  const { defaultLocale, currencySign, priceFormat } = _storeView.i18n
 
   const formattedValue = formatValue(value, defaultLocale);
   const valueWithSign = applyCurrencySign(formattedValue, { currencySign, priceFormat })

core/i18n/helpers.ts

@@ -6,7 +6,7 @@ export const currentBuildLocales = (): string[] => {
     ? Object.values(config.storeViews)
       .map((store: any) => store && typeof store === 'object' && store.i18n && store.i18n.defaultLocale)
       .filter(Boolean)
-    : []
+    : config.i18n.availableLocale
   const locales = multistoreLocales.includes(defaultLocale)
     ? multistoreLocales
     : [defaultLocale, ...multistoreLocales]

core/i18n/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/i18n",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Vue Storefront i18n",
   "license": "MIT",
   "main": "index.ts",

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

@@ -30,7 +30,7 @@
 "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 {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."
+"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!"
 "Payment Information","Payment Information"

core/i18n/resource/i18n/et-EE.csv

@@ -1,77 +1,90 @@
-"Registering the account ...","Konto loomine…"
+" is out of stock!","ei ole laos!"
+"404 Page Not Found","404 Lehekülge ei leitud"
+"Account data has successfully been updated","Konto andmed uuendatud"
+"Add review","Lisa kommentaar"
+"Adding a review ...","Lisan kommentaari ..."
+"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.","Ostuvormistamisel sisestatud aadress sisaldab vigu! Palun kontrolli, et kõik kohustuslikud väljad oleksid täidetud või kirjuta meile {email}."
+"Allow notification about the order","Luba tellimusge seotud teadete edastamine"
+"Are you sure you would like to remove this item from the shopping cart?","Olete kindel, et soovite antud toote ostukorvist eemaldada?"
+"Compare Products","Võrdle tooteid"
+"Compare products","Võrdle tooteid"
+"Confirm your order","Kinnitage oma tellimus"
+"Error refreshing user token. User is not authorized to access the resource","Kasutaja tokeni uuendamisel esineb probleeme. Kasutajal puuduvad õigused antud lehele sisenemiseks"
+"Error with response - bad content-type!","Viga sisu laadimisel"
+"Error: Error while adding products","Viga toote lisamisel."
+"Extension developers would like to thank you for placing an order!","Mooduli loojad tänavad tellimuse tegemise eest!"
+"Field is required",Kohustuslik
+"Field is required.",Kohustuslik.
+"Grand total",Kokku
+"Home Page",Esileht
+"In stock!",Laos
+"Internal Application error while refreshing the tokens. Please clear the storage and refresh page.","Tokeni värskendamisel esines viga. Palun tühjendage vahemälu ja uuendage lehekülge."
+"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Viga! Palun kontrolli, et kõik kohustuslikud väljad oleksid täidetud või kirjuta meile {email}."
+"Must be greater than 0","Peab olema suurem, kui 0"
+"My Account","Minu konto"
+"Newsletter preferences have successfully been updated","Uudiskirjaga liitumine uuendatud"
+"No available product variants","Toote valikvariandid puuduvad"
 "No products synchronized for this category. Please come back while online!","Kategooria on tühi."
-"Shopping cart is empty. Please add some products before entering Checkout","Otsukorv on tühi."
-"Out of stock!","Laost otsas!"
-" is out of the stock!"," on laost otsas!"
-"Some of the ordered products are not available!","Mõned tellitud tooted ei ole kahjuks enam saadaval."
-"Please wait ...","Palun oota…"
-"Stock check in progress, please wait while available stock quantities are checked","Palun oota, kontrollime laoseise."
-"There is no Internet connection. You can still place your order. We will notify you if any of ordered products is not available because we cannot check it right now.","Interneti ühendus puudub. Saad sellegi poolest tellimuse luua. Kontrollime interneti ühenduse taastudes tellitud toodete laoseisu üle. Anname märku, kui mõni tellitud toodetest vahepeal otsa on saanud. "
 "No such configuration for the product. Please do choose another combination of attributes.","Sellise kombinatsiooniga toodet ei saa tellida."
-"The system is not sure about the stock quantity (volatile). Product has been added to the cart for pre-reservation.","Antud toodet ostetakse väga palju ja me ei ole laoseisu osas kindlad. Toode on ostukorvi lisatud ja Teie jaoks broneeritud."
-"This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Sellist funktsionaalsust ei ole veel lisatud. Saad meie arendusplaanidega tutvuda https://github.com/DivanteLtd/vue-storefront/issues."
-"The product is out of stock and cannot be added to the cart!","Toode on kahjuks laost otsa saanud."
+"Only {maxQuantity} products of this type are available!","Ainult {maxQuantity} seda tüüpi toodet on saadaval!"
+"Or if you will stay on ""Order confirmation"" page, the order will be placed automatically without confirmation, once the internet connection will be back.","Või kui sa jäää ""Tellimuse kinnitus"" lehele, tellimus esitatakse internetiühenduse taastudes tellimus automaatselt."
+"Out of stock!","Laost otsas!"
+"Out of the stock!","Laost otsas"
+"Payment Information","Makse informatsioon"
+"Please configure product bundle options and fix the validation errors","Toode on valikutega. Palun valige sobivad valikud"
+"Please configure product custom options and fix the validation errors","Palun valige sobiv toode"
+"Please confirm order you placed when you was offline","Palun kinnitage oma tellimuse, mille ilma interneti ühenduseta varasemalt tegite"
+"Please fix the validation errors","Palun parandage valideerimise vead"
+"Please select the field which You like to sort by","Palun valige sorteerimise viis"
+"Please wait ...","Palun oota ..."
+"Proceed to checkout","Vormista ost"
+"Processing order...","Tellimuse loomine ..."
 "Product has been added to the cart!","Toode lisati ostukorvi."
+"Product price is unknown, product cannot be added to the cart!","Tootel puudub hind. Toodet ei saa ostukorvi lisada."
 "Product quantity has been updated!","Toote laoseis on uuendatud."
-"Internal validation error. Please check if all required fields are filled in. Please contact us on {email}","Viga! Palun kontrolli, et kõik kohustuslikud väljad oleksid täidetud või kirjuta meile {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.","Ostuvormistamisel sisestatud aadress sisaldab vigu! Palun kontrolli, et kõik kohustuslikud väljad oleksid täidetud või kirjuta meile {email}."
 "Product {productName} has been added to the compare!","{productName} lisati võrdlusesse."
-"Product {productName} has been removed from compare!","{productName} võrdlusest eemaldatud."
 "Product {productName} has been added to wishlist!","{productName} Lisati soovikorvi."
-"Product {productName} has been removed from wishlit!","{productName} eemaldati soovikorvist"
-"Account data has successfully been updated","Konto andmed uuendatud"
-"Newsletter preferences have successfully been updated","Uudiskirjaga liitumine uuendatud"
+"Product {productName} has been removed from compare!","{productName} võrdlusest eemaldatud."
+"Product {productName} has been removed from wishlist!","{productName} on sooviloendist eemaldatud."
+"Quantity available offline","Kogus on saadaval internetiühenduseta"
+"Quantity available","Kogus on saadaval"
+"Quantity must be above 0","Laokogus peab olema suurem, kui 0"
+"Quantity must be below {quantity}","Laokogus peab olema alla {quantity}"
+"Quantity must be positive integer","Laokogus peab olema positiivne täisarv"
+"Registering the account ...","Konto loomine..."
 "Reset password feature does not work while offline!","Parooli ei saa kahjuks ilma interneti ühenduseta muuta."
-"You are logged in!","Olete sisse logitud."
-"Please fix the validation errors","Palun parandage valideerimise vead"
-"Product price is unknown, product cannot be added to the cart!","Tootel puudub hind. Toodet ei saa ostukorvi lisada."
-"My Account","Minu konto"
-"Type what you are looking for...",Otsi…
-"Home Page",Esileht
-Checkout,Ostuvormistamine
+"Select 0","Vali 0"
+"Select 1","Vali 1"
+"Shopping cart is empty. Please add some products before entering Checkout","Otsukorv on tühi."
+"Some of the ordered products are not available!","Mõned tellitud tooted ei ole kahjuks enam saadaval."
+"Stock check in progress, please wait while available stock quantities are checked","Palun oota, kontrollime laoseise."
 "Subtotal incl. tax","Kokku (sisaldab käibemaksu)"
-"Grand total",Kokku
-"Field is required",Kohustuslik
-"Field is required.",Kohustuslik.
-"You're logged out","Olete välja logitud"
-"Compare Products","Võrdle tooteid"
-"404 Page Not Found","404 Lehekülge ei leitud"
-"Error with response - bad content-type!","Viga sisu laadimisel"
+"The product is out of stock and cannot be added to the cart!","Toode on kahjuks laost otsa saanud."
+"The product, category or CMS page is not available in Offline mode. Redirecting to Home.","Antud toode, kategooria või sisuleht ei ole kahjuks ilma internetiühenduseta saadaval. Suuname ümber esilehele."
+"The system is not sure about the stock quantity (volatile). Product has been added to the cart for pre-reservation.","Antud toodet ostetakse väga palju ja me ei ole laoseisu osas kindlad. Toode on ostukorvi lisatud ja Teie jaoks broneeritud."
+"There is no Internet connection. You can still place your order. We will notify you if any of ordered products is not available because we cannot check it right now.","Interneti ühendus puudub. Saad sellegi poolest tellimuse luua. Kontrollime interneti ühenduse taastudes tellitud toodete laoseisu üle. Anname märku, kui mõni tellitud toodetest vahepeal otsa on saanud. "
+"This feature is not implemented yet! Please take a look at https://github.com/DivanteLtd/vue-storefront/issues for our Roadmap!","Sellist funktsionaalsust ei ole veel lisatud. Saad meie arendusplaanidega tutvuda https://github.com/DivanteLtd/vue-storefront/issues."
+"Type what you are looking for...","Otsi ..."
+"Unexpected authorization error. Check your Network conection.","Internetiühenduse viga. Palun kontrollige oma internetiühendust."
 "Unhandled error, wrong response format!","Vale päringu formaat"
-"not authorized","Ligipääs puudub"
-"Internal Application error while refreshing the tokens. Please clear the storage and refresh page.","Tokeni värskendamisel esines viga. Palun tühjendage vahemälu ja uuendage lehekülge."
-"Proceed to checkout","Vormista ost"
-OK,Ok
-"Out of the stock!","Laost otsas"
-"In stock!",Laos
-"Please configure product custom options and fix the validation errors","Palun valige sobiv toode"
-"Error refreshing user token. User is not authorized to access the resource","Kasutaja tokeni uuendamisel esineb probleeme. Kasutajal puuduvad õigused antud lehele sisenemiseks"
-"Must be greater than 0","Peab olema suurem, kui 0"
-"Please select the field which You like to sort by","Palun valige sorteerimise viis"
-"No available product variants","Toote valikvariandid puuduvad"
-email,E-mail
-password,Parool
-"Confirm your order","Kinnitage oma tellimus"
-"Please confirm order you placed when you was offline","Palun kinnitage oma tellimuse, mille ilma interneti ühenduseta varasemalt tegite"
-"Payment Information","Makse informatsioon"
+"Vue Storefront","Vue Storefront"
+"You are going to pay for this order upon delivery.","Maksmine toimub tellimuse kättesaamisel."
+"You are logged in!","Olete sisse logitud."
 "You are to pay for this order upon delivery.","Saate makse teostada tellimuse kätte saamisel."
-"Allow notification about the order","Luba tellimusge seotud teadete edastamine"
-"Extension developers would like to thank you for placing an order!","Mooduli loojad tänavad tellimuse tegemise eest!"
-"most you may purchase","maksimum ostu kogus"
+"You need to be logged in to see this page","Palun logige lehe nägemisesse sisse"
+"You submitted your review for moderation.","Tagasiside on edastatud üle vaatamiseks."
+"You're logged out","Olete välja logitud"
 "have as many","osta kuni"
-"Compare products","Võrdle tooteid"
-Reviews,Kommentaarid
+"most you may purchase","maksimum ostu kogus"
+"not authorized","Ligipääs puudub"
+"to account",kontole
+Checkout,Ostuvormistamine
+Columns,Tulbad
+OK,Ok
 Review,Kommentaar
-"Add review","Lisa kommentaar"
+Reviews,Kommentaarid
 Summary,Kokkuvõte
+Thumbnail,Pisipilt
+email,E-post
 login,"logi sisse"
-"to account",kontole
-"Are you sure you would like to remove this item from the shopping cart?","Olete kindel, et soovite antud toote ostukorvist eemaldada?"
-"The product, category or CMS page is not available in Offline mode. Redirecting to Home.","Antud toode, kategooria või sisuleht ei ole kahjuks ilma internetiühenduseta saadaval. Suuname ümber esilehele."
-"Please configure product bundle options and fix the validation errors","Toode on valikutega. Palun valige sobivad valikud"
-"Processing order...","Tellimuse loomine…"
-"You need to be logged in to see this page","Palun logige lehe nägemisesse sisse"
-"Quantity must be above 0","Laokogus peab olema suurem, kui 0"
-"Error: Error while adding products","Viga toote lisamisel."
-"Unexpected authorization error. Check your Network conection.","Internetiühenduse viga. Palun kontrollige oma internetiühendust."
-Columns,Tulbad
+password,Parool