vuestorefront · cewald · Aug 2, 2019 · Aug 3, 2019 · Aug 5, 2019 · Aug 5, 2019
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -20,7 +20,7 @@ module.exports = {
     '@typescript-eslint/no-var-requires': 1,
     '@typescript-eslint/indent': ['error', 2],
     '@typescript-eslint/camelcase': 0,
-    semi: 'off',
+    'semi': 'off',
     '@typescript-eslint/semi': 0,
     '@typescript-eslint/member-delimiter-style': ['error', { 'multiline': { 'delimiter': 'comma', 'requireLast': false }, 'singleline': { 'delimiter': 'comma' } }],
     '@typescript-eslint/no-empty-interface': 1,

diff --git a/.gitignore b/.gitignore
@@ -5,7 +5,8 @@ dist/
 npm-debug.log
 .vscode/
 .idea/
-config/local.json
+config/local*.json
+config/custom-environment-variables.json
 var
 build/config.json
 core/build/config.json

diff --git a/.huskyrc.js b/.huskyrc.js
@@ -4,9 +4,11 @@ module.exports = {
   'hooks': {
     'pre-commit': tasks([
       'lint-staged'
-    ]),
-    'pre-push': tasks([
-      'yarn test:unit'
     ])
+    // We don't have valid tests yet
+    // And it's slow as f$*! ...
+    // 'pre-push': tasks([
+    //   'yarn test:unit'
+    // ])
   }
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add global Category and Breadcrumb filters, defined in local.json - @grimasod (#3691)
 - Add constant which conditions the number of products loading per page - @AdKamil (#3630)
 - Added price filtering key as config - @roywcm
+- Add `or` operator for Elasticsearch filters in `quickSearchByQuery` and use exists if value is `null` - @cewald #3834
 
 ### Fixed
 - Fixed missing parameter to query function from cms/store/block/actions - @georgiev-ivan (#3909)
@@ -57,6 +58,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Add defense for incomplete config in preferchCachedAttributes helper
+- Add `or` operator for Elasticsearch filters in `quickSearchByQuery` and use exists if value is `null` - @cewald #3834
 - Add unit test for \`core/modules/cms\` - @krskibin (#3738)
 
 ### Fixed

diff --git a/config/custom-environment-variables.json b/config/custom-environment-variables.json
diff --git a/config/default.json b/config/default.json
@@ -111,63 +111,7 @@
   "defaultStoreCode": "",
   "storeViews": {
     "multistore": false,
-    "commonCache": false,
-    "mapStoreUrlsFor": ["de", "it"],
-    "de": {
-      "storeCode": "de",
-      "storeId": 3,
-      "name": "German Store",
-      "url": "/de",
-      "appendStoreCode": true,
-      "elasticsearch": {
-        "host": "/api/catalog",
-        "index": "vue_storefront_catalog_de"
-      },
-      "tax": {
-        "sourcePriceIncludesTax": false,
-        "defaultCountry": "DE",
-        "defaultRegion": "",
-        "calculateServerSide": true
-      },
-      "i18n": {
-        "fullCountryName": "Germany",
-        "fullLanguageName": "German",
-        "defaultLanguage": "DE",
-        "defaultCountry": "DE",
-        "defaultLocale": "de-DE",
-        "currencyCode": "EUR",
-        "currencySign": "EUR",
-        "dateFormat": "HH:mm D-M-YYYY"
-      },
-      "seo": {
-        "defaultTitle": "Vue Storefront"
-      }
-    },
-    "it": {
-      "extend": "de",
-      "storeCode": "it",
-      "storeId": 4,
-      "name": "Italian Store",
-      "url": "/it",
-      "appendStoreCode": true,
-      "elasticsearch": {
-        "host": "/api/catalog",
-        "index": "vue_storefront_catalog_it"
-      },
-      "tax": {
-        "defaultCountry": "IT"
-      },
-      "i18n": {
-        "fullCountryName": "Italy",
-        "fullLanguageName": "Italian",
-        "defaultCountry": "IT",
-        "defaultLanguage": "IT",
-        "defaultLocale": "it-IT"
-      },
-      "seo": {
-        "defaultTitle": "Vue Storefront"
-      }
-    }
+    "commonCache": false
   },
   "entities": {
     "optimize": true,
@@ -326,11 +270,7 @@
       "attribute": "updated_at",
       "order": "desc"
     },
-    "sortByAttributes": {
-      "Latest": "updated_at:desc",
-      "Price: Low to high":"final_price",
-      "Price: High to low":"final_price:desc"
-    },
+    "sortByAttributes": { },
     "gallery": {
       "mergeConfigurableChildren": true,
       "imageAttributes": ["image","thumbnail","small_image"],

diff --git a/core/i18n/resource/i18n/de-DE.csv b/core/i18n/resource/i18n/de-DE.csv
@@ -35,7 +35,7 @@
 "Please configure product bundle options and fix the validation errors","Bitte konfigurieren Sie die Produktbündel-Optionen und beheben Sie die Validierungsfehler"
 "Please configure product custom options and fix the validation errors","Bitte konfigurieren Sie die angepassten Produktoptionen und beheben Sie die Validierungsfehler"
 "Please confirm order you placed when you was offline","Bitte bestätigen Sie ihre Bestellung, welche Sie getätigt haben während Sie offline waren"
-"Please fix the validation errors","Bitte beheben Sie die Validierungsfehler"
+"Please fix the validation errors","Bitte prüfe deine Eingabe"
 "Please select the field which You like to sort by","Bitte wählen Sie das Feld aus, nach dem Sie sortieren möchten"
 "Proceed to checkout","Weiter zur Kasse"
 "Processing order...","Bestellung wird verarbeitet..."

diff --git a/core/i18n/resource/i18n/et-EE.csv b/core/i18n/resource/i18n/et-EE.csv
@@ -1,77 +1,77 @@
-"Registering the account ...","Konto loomine…"
+" is out of the stock!"," on laost otsas!"
+"404 Page Not Found","404 Lehekülge ei leitud"
+"Account data has successfully been updated","Konto andmed uuendatud"
+"Add review","Lisa kommentaar"
+"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."
+"No such configuration for the product. Please do choose another combination of attributes.","Sellise kombinatsiooniga toodet ei saa tellida."
 "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."
+"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…"
-"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."
+"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 compare!","{productName} võrdlusest eemaldatud."
 "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"
+"Quantity must be above 0","Laokogus peab olema suurem, kui 0"
+"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
+"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"
+"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'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
+email,E-mail
 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
diff --git a/core/lib/search/adapter/api/elasticsearchQuery.js b/core/lib/search/adapter/api/elasticsearchQuery.js
@@ -25,11 +25,26 @@ export async function prepareElasticsearchQueryBody (searchQuery) {
           query = query.filter('range', filter.attribute, filter.value)
         } else {
           // process terms filters
+          const operator = Object.keys(filter.value)[0]
           filter.value = filter.value[Object.keys(filter.value)[0]]
-          if (!Array.isArray(filter.value)) {
+          if (!Array.isArray(filter.value) && filter.value !== null) {
             filter.value = [filter.value]
           }
-          query = query.filter('terms', getMapping(filter.attribute), filter.value)
+          if (operator === 'or') {
+            if (filter.value === null) {
+              query = query.orFilter('bool', (b) => {
+                return b.notFilter('exists', getMapping(filter.attribute))
+              })
+            } else {
+              query = query.orFilter('terms', getMapping(filter.attribute), filter.value)
+            }
+          } else {
+            if (filter.value === null) {
+              query = query.filter('exists', getMapping(filter.attribute))
+            } else {
+              query = query.notFilter('terms', getMapping(filter.attribute), filter.value)
+            }
+          }
         }
       } else if (filter.scope === 'catalog') {
         hasCatalogFilters = true

diff --git a/core/modules/newsletter/mixins/SubscriptionStatus.ts b/core/modules/newsletter/mixins/SubscriptionStatus.ts
@@ -38,6 +38,11 @@ export default {
   beforeMount () {
     // the user might already be logged in, so check the subscription status
     if (this.$store.state.user.current) this.onLoggedIn()
+
+    /**
+     * This line causes an exception login because mailchimp isn't connected
+     * @todo Fetch newsletter status correctly
+     */
     this.$bus.$on('user-after-loggedin', this.onLoggedIn)
   },
   beforeDestroy () {