Merge branch 'develop' of https://github.com/DivanteLtd/vsf-capybara …

…into #555/ux-issue-on-microcart

CHANGELOG.md

@@ -5,7 +5,18 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [1.0.3] - UNRELEASED
+## [1.0.4] - UNRELEASED
+
+### Added
+
+### Changed / Improved
+
+- Fixed Broken tiles of mega menu on mobile (#465)
+
+- Removed: Overridden logo height (#490)
+- Fixed: duplicate image issue in offine mode (#498)
+
+## [1.0.3] - 20.09.2020
 
 ### Added
 
@@ -29,8 +40,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Replaced deprecated action product/list call with findProducts (#417)
 - Fix hydration errors with fresh installation (#462)
 - Fixed console warning related to  value of key 'Sort by' is not a string (#476)
+- Added phone number validation in shipping and payment (#4767)
 - Update pwacompat to avoid loading multiple favicons (https://github.com/DivanteLtd/vue-storefront/issues/4559)
 - Fixed changing and deleting shipping details on MyAccount (#4499)
+- Corrected displayed price when choosing configurable product second time (#493)
 
 ## [1.0.2] - 03.07.2020
 

components/atoms/a-logo.vue

@@ -32,9 +32,5 @@ export default {
 <style lang="scss" scoped>
 .a-logo {
   display: inline-flex;
-  ::v-deep .sf-header__logo {
-    --header-logo-width: 41px;
-    --header-logo-height: 41px;
-  }
 }
 </style>

components/molecules/m-menu.vue

@@ -121,21 +121,26 @@ export default {
 }
 .aside-menu {
   display: flex;
-  justify-content: space-between;
+  justify-content: stretch;
+  flex-wrap: wrap;
+  @include for-desktop {
+     justify-content: space-between;
+  }
 }
 .aside-banner {
-  margin: 0 1rem;
+  margin-bottom: var(--spacer-sm);
   text-transform: uppercase;
   --banner-height: 300px;
-  --banner-width: 300px;
   &--mobile {
     display: none;
     @include for-mobile {
       display: block;
     }
   }
   &--desktop {
+    --banner-width: 300px;
     display: none;
+    margin: 0 var(--spacer-sm);
     @include for-desktop {
       display: block;
     }

components/molecules/m-product-gallery.vue

@@ -1,9 +1,5 @@
 <template>
   <div class="m-product-gallery">
-    <SfImage
-      v-if="!isOnline"
-      :src="offlineImage"
-    />
     <SfGallery
       ref="gallery"
       :images="gallery"
@@ -13,14 +9,12 @@
 
 <script>
 import isEqual from 'lodash-es/isEqual';
-import { SfGallery, SfImage } from '@storefront-ui/vue';
-import { onlineHelper } from '@vue-storefront/core/helpers';
+import { SfGallery } from '@storefront-ui/vue';
 
 export default {
   name: 'MProductGallery',
   components: {
-    SfGallery,
-    SfImage
+    SfGallery
   },
   props: {
     gallery: {
@@ -30,17 +24,9 @@ export default {
     configuration: {
       type: Object,
       required: true
-    },
-    offlineImage: {
-      type: Object,
-      required: false,
-      default: () => ({})
     }
   },
   computed: {
-    isOnline () {
-      return onlineHelper.isOnline;
-    },
     variantImage () {
       let variantImage = this.gallery.find(image => {
         let selectThis = true

components/organisms/o-bottom-navigation.vue

@@ -90,6 +90,7 @@ export default {
       this.$store.commit('ui/setSearchpanel', !this.isSearchPanelVisible)
     },
     goToAccount () {
+      this.$store.commit('ui/closeMenu')
       if (this.isLoggedIn) {
         this.$router.push(this.localizedRoute('/my-account'))
       } else {

components/organisms/o-payment.vue

@@ -116,6 +116,10 @@
         class="form__element"
         name="phone"
         :label="$t('Phone Number')"
+        required
+        :valid="!$v.payment.phoneNumber.$error"
+        :error-message="$t('Please provide valid phone number')"
+        @blur="$v.payment.phoneNumber.$touch()"
       />
       <SfCheckbox
         v-model="generateInvoice"
@@ -194,7 +198,7 @@
 </template>
 <script>
 import { required, minLength } from 'vuelidate/lib/validators';
-import { unicodeAlpha, unicodeAlphaNum } from '@vue-storefront/core/helpers/validators';
+import { unicodeAlpha, unicodeAlphaNum, phoneNum } from '@vue-storefront/core/helpers/validators';
 import { Payment } from '@vue-storefront/core/modules/checkout/components/Payment';
 import {
   SfInput,
@@ -250,6 +254,10 @@ export default {
       },
       paymentMethod: {
         required
+      },
+      phoneNumber: {
+        required,
+        phoneNum
       }
     };
 

components/organisms/o-product-details.vue

@@ -5,7 +5,6 @@
     <meta itemprop="availability" :content="availability">
     <meta itemprop="url" :content="product.url_path">
     <MProductGallery
-      :offline-image="offlineImage"
       :gallery="gallery"
       :configuration="productConfiguration"
     />
@@ -108,20 +107,6 @@ export default {
     }
   },
   computed: {
-    offlineImage () {
-      const width = config.products.thumbnails.width;
-      const height = config.products.thumbnails.height;
-      return {
-        mobile: {
-          url: this.getThumbnail(this.product.image, width, height),
-          alt: this.product.name
-        },
-        desktop: {
-          url: this.getThumbnail(this.product.image, width, height),
-          alt: this.product.name
-        }
-      };
-    },
     gallery () {
       return this.productGallery.map(imageObject => ({
         id: imageObject.id,

components/organisms/o-shipping.vue

@@ -110,6 +110,10 @@
         class="form__element"
         name="phone"
         :label="$t('Phone Number')"
+        required
+        :valid="!$v.shipping.phoneNumber.$error"
+        :error-message="$t('Please provide valid phone number')"
+        @blur="$v.shipping.phoneNumber.$touch()"
       />
     </div>
     <SfHeading
@@ -158,7 +162,7 @@
 </template>
 <script>
 import { required, minLength } from 'vuelidate/lib/validators';
-import { unicodeAlpha, unicodeAlphaNum } from '@vue-storefront/core/helpers/validators';
+import { unicodeAlpha, unicodeAlphaNum, phoneNum } from '@vue-storefront/core/helpers/validators';
 import { Shipping } from '@vue-storefront/core/modules/checkout/components/Shipping';
 import {
   SfInput,
@@ -211,6 +215,10 @@ export default {
       city: {
         required,
         unicodeAlpha
+      },
+      phoneNumber: {
+        required,
+        phoneNum
       }
     }
   },

helpers/price.ts

@@ -43,7 +43,7 @@ export function getProductPrice (product, customOptions = {}) {
 
   const special = (priceInclTax + priceDelta) * product.qty || priceInclTax
   const original = (originalPriceInclTax + priceDelta) * product.qty || originalPriceInclTax
-  const regular = calculateBundleOptionsPrice(product) || (priceInclTax + priceDelta) * product.qty || priceInclTax
+  const regular = product.regular_price || calculateBundleOptionsPrice(product) || (priceInclTax + priceDelta) * product.qty || priceInclTax
 
   return {
     regular: isSpecialPrice ? formatPrice(original) : formatPrice(regular),

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-storefront/theme-capybara",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "New theme for Vue Storefront based on Storefront UI",
   "main": "index.js",
   "scripts": {

resource/i18n/ar-SY.csv

@@ -142,6 +142,7 @@
 "Please check if all data are correct","الرجاء التأكّد من صحّة كافة البيانات"
 "Please confirm order you placed when you was offline","الرجاء التأكيد على إتمام الطلبية التي أنشأتها عندما كنت غير متّصل بالإنترنت"
 "Please provide valid e-mail address.","يرجى إدخال بريد إلكتروني صحيح"
+"Please provide valid phone number","يرجى تقديم رقم هاتف صالح"
 "Price {variant}","السعر {variant}"
 "Price","السعر"
 "Privacy policy","سياسة الخصوصيّة"

resource/i18n/cs-CZ.csv

@@ -145,6 +145,7 @@
 "Please check if all data are correct","Zkontrolujte, zda jsou všechny údaje správné"
 "Please confirm order you placed when you was offline","Prosíme potvrďte objednávku, kterou jste zadali, když jste byli v režimu offline"
 "Please provide valid e-mail address.","Prosíme uveďte platnou e-mailovou adresu."
+"Please provide valid phone number","Uveďte prosím platné telefonní číslo"
 "Price {variant}","Cena {variant}"
 "Price","Cena"
 "Privacy policy","Zásady ochrany osobních údajů"

resource/i18n/de-DE.csv

@@ -148,6 +148,7 @@
 "Please check if all data are correct","Bitte überprüfen Sie, ob alle Daten korrekt sind"
 "Please confirm order you placed when you was offline","Bitte bestätigen Sie Ihre Bestellung, die Sie im Offline-Modus abgegeben haben"
 "Please provide valid e-mail address.","Bitte eine gültige E-Mail-Adresse eingeben."
+"Please provide valid phone number","Bitte geben Sie eine gültige Telefonnummer an"
 "Price {variant}","Preis {variant}"
 "Price","Preis"
 "Price: High to low","Preis: absteigend"

resource/i18n/en-US.csv

@@ -180,6 +180,7 @@
 "Please check if all data are correct","Please check if all data are correct"
 "Please confirm order you placed when you was offline","Please confirm order you placed when you was offline"
 "Please provide valid e-mail address.","Please provide valid e-mail address."
+"Please provide valid phone number","Please provide valid phone number."
 "Price {variant}","Price {variant}"
 "Price","Price"
 "Price: High to low","Price: High to low"
@@ -337,7 +338,7 @@
 "Remember me","Remember me"
 "Login","Login"
 "Forgotten password?","Forgotten password?"
-"Don't have and account yet?","Don't have and account yet?"
+"Don't have an account yet?","Don't have an account yet?"
 "Register now","Register now"
 "First Name","First Name"
 "Last Name","Last Name"

resource/i18n/es-ES.csv

@@ -95,6 +95,7 @@
 "Place the order","Hacer el pedido"
 "Please check if all data are correct","Por favor verifique si todos los datos son correctos"
 "Please provide valid e-mail address.","Proporcione una dirección de correo electrónico válida."
+"Please provide valid phone number","Proporcione un número de teléfono válido"
 "Price {variant}","Precio {variant}"
 "Price","Precio"
 "Privacy policy","Política de privacidad"

resource/i18n/et-EE.csv

@@ -276,3 +276,5 @@ color,värvus
 "Instant Checkout","Kiir ostuvormistamine"
 "Are you sure you would like to remove all the items from the wishlist?","Olete kindel, et soovite kõik tooted soovikorvist eemaldada?"
 "Filter by categories","Filtreeri kategooriate alusel"
+"Please provide valid phone number","Palun sisestage kehtiv telefoninumber."
+

resource/i18n/fr-FR.csv

@@ -137,6 +137,7 @@
 "Please check if all data are correct","Veuillez vérifier si toutes les données sont correctes"
 "Please confirm order you placed when you was offline","Veuillez confirmer la commande que vous avez passé lorsque vous étiez hors-ligne"
 "Please provide valid e-mail address.","Veuillez saisir une adresse e-mail valide."
+"Please provide valid phone number","Veuillez fournir un numéro de téléphone valide."
 "Price {variant}","Prix {variant}"
 "Price","Prix"
 "Privacy policy","Politique de confidentialité"

resource/i18n/it-IT.csv

@@ -157,6 +157,7 @@
 "Please check if all data are correct","Controlla che tutte le informazioni siano corrette"
 "Please confirm order you placed when you was offline","Conferma l'ordine che hai creato quando eri offline"
 "Please provide valid e-mail address.","Inserisci un indirizzo email valido"
+"Please provide valid phone number","Fornisci un numero di telefono valido."
 "Price {variant}","Prezzo {variant}"
 "Price","Prezzo"
 "Price: High to low","Prezzo: dal più caro al meno caro"

resource/i18n/ja-JP.csv

@@ -118,6 +118,7 @@
 "Place the order","注文を行う"
 "Please check if all data are correct","全てのデータが正しいかどうか確認してください"
 "Please provide valid e-mail address.","正しいメールアドレスを入力してください"
+"Please provide valid phone number","有効な電話番号を入力してください"
 "Price {variant}","価格 {variant}"
 "Price","価格"
 "Privacy policy","プライバシー・ポリシー"

resource/i18n/nl-NL.csv

@@ -148,6 +148,7 @@ Place the order,Plaats bestelling
 Please check if all data are correct,Controleer of alle gegevens correct zijn
 Please confirm order you placed when you was offline,Bevestig uw offline geplaatste order
 Please provide valid e-mail address.,Geef een geldig e-mailadres op.
+Please provide valid phone number,Geef een geldig telefoonnummer op
 Price ,Prijs
 Price,Prijs
 Price,Prijs

resource/i18n/pl-PL.csv

@@ -130,6 +130,7 @@
 "Please check if all data are correct","Sprawdź czy wszystkie dane są poprawne"
 "Please confirm order you placed when you was offline","Potwierdź zamówienie, które złożyłeś będąc w trybie offline"
 "Please provide valid e-mail address.","Podaj prawidłowy adres e-mail."
+"Please provide valid phone number","Podaj prawidłowy numer telefonu."
 "Price {variant}","Cena {variant}"
 "Price","Cena"
 "Privacy policy","Polityka prywatności"

resource/i18n/pt-BR.csv

@@ -118,6 +118,7 @@
 "Place the order","Enviar o pedido"
 "Please check if all data are correct","Por favor verifique se todos os dados informados estão corretos "
 "Please provide valid e-mail address.","Por favor informe um e-mail válido."
+"Please provide valid phone number","Forneça um número de telefone válido"
 "Price {variant}","Preço {variant}"
 "Price","Preço"
 "Privacy policy","Política de Privacidade"

resource/i18n/ru-RU.csv

@@ -118,6 +118,7 @@
 "Place the order","Оформить заказ"
 "Please check if all data are correct","Пожалуйста проверьте корректность всех данных"
 "Please provide valid e-mail address.","Пожалуйста укажите валидный электронный адрес."
+"Please provide valid phone number","Пожалуйста, укажите действующий номер телефона"
 "Price {variant}","Цена {variant}"
 "Price","Цена"
 "Privacy policy","Политика конфиденциальности"

resource/i18n/zh-cn.csv

@@ -140,6 +140,7 @@
 "Please check if all data are correct","请检查所有数据是否正确"
 "Please confirm order you placed when you was offline","请确认您离线时的订单"
 "Please provide valid e-mail address.","请提供有效的电子邮件地址."
+"Please provide valid phone number","请提供有效的电话号码"
 "Price {variant}","价格 {variant}"
 "Price","价格"
 "Price: High to low","价格:从高到低"