Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- add redirection in component for simple product related to configurable product - @gibkigonzo (#4359)
- disable sending carrier_code or method_code for virtual products,
adjust vue-carousel and vuelidate to newest versions api,
add aplha validators for register fields - @gibkigonzo (#4455)
add aplha validators for register fields - @gibkigonzo (#4455, #4461)

## [1.11.3] - 2020.04.27

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,8 @@ export default {
navigate (index) {
this.currentPage = index
},
selectVariant () {
async selectVariant (configuration) {
await this.$nextTick()
if (config.products.gallery.mergeConfigurableChildren) {
const option = reduce(map(this.configuration, 'attribute_code'), (result, attribute) => {
result[attribute] = this.configuration[attribute].id
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
>
{{ $t('I accept terms and conditions') }} *
</base-checkbox>
<button-full class="mb20" type="submit">
<button-full :disabled="$v.$invalid" class="mb20" type="submit">
{{ $t('Register an account') }}
</button-full>
<div class="center-xs">
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/ar-SY.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","من نحن"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","أدخل رمز الخصم"
"Add discount code","إرسال"
"Add to cart","أضف إلى السلّة"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/cs-CZ.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","O nás"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Přidejte kód pro slevu"
"Add discount code","Použít"
"Add to cart","Přidat do košíku"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/de-DE.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"About us (Magento CMS)","Über uns (Magento CMS)"
"About us","Über uns"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Einen Rabatt-Code hinzufügen"
"Add discount code","Rabatt-Code hinzufügen"
"Add to cart","In den Warenkorb"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/en-US.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"A customer with the same email already exists in an associated website.","A customer with the same email already exists in an associated website."
"About us (Magento CMS)","About us (Magento CMS)"
"About us","About us"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Add a discount code"
"Add discount code","Apply"
"Add to cart","Add to cart"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/es-ES.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","Sobre nosotros"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add to cart","Añadir a la cesta"
"Add to compare","Añadir a comparar"
"Add to favorite","Agregar a Favoritos"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/et-EE.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"A customer with the same email already exists in an associated website.","Sama e-postiga klient juba eksisteerib."
"About us (Magento CMS)","About us (Magento CMS)"
"About us",Meist
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Lisa sooduskood"
"Add discount code","Lisa sooduskood"
"Add to cart",Osta
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/fi-FI.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"A customer with the same email already exists in an associated website.","Samalla sähköpostiosoitteella on jo asiakas samalla sivustolla."
"About us (Magento CMS)","Tietoja verkkokaupasta (Magento CMS)"
"About us","Tietoja verkkokaupasta"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Lisää alennuskoodi"
"Add discount code","Lisää alennuskoodi"
"Add to cart","Lisää koriin"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/fr-FR.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","À propos"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Ajouter un code de réduction"
"Add discount code","Appliquer"
"Add to cart","Ajouter au panier"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/it-IT.csv
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"A customer with the same email already exists in an associated website.","Esiste già un account registrato con questo indirizzo email."
"About us (Magento CMS)","Chi siamo (Magento CMS)"
"About us","Chi siamo"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Aggiungi un codice sconto"
"Add discount code","Applica"
"Add to cart","Aggiungi al carrello"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/ja-JP.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","About us"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","ディスカウントコードを追加する"
"Add discount code","申し込み"
"Add to cart","カートに追加"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/nl-NL.csv
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Please change Your search criteria and try again. If still not finding anything relevant, please visit the Home page and try out some of our bestsellers!","Pas uw zoekcriteria aan en probeer het opnieuw. Als u nog steeds niks relevants kan vinden, bezoek dan de homepage en bekijk onze bestsellers!"
"Select ","Selecteer "
"You are offline. Some features might not be available.","U bent momenteel offline, niet alle onderdelen van de shop zullen volledig werken"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/pl-PL.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","O nas"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Dodaj kod rabatowy"
"Add discount code","Dodaj kod rabatowy"
"Add to cart","Dodaj do koszyka"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/pt-BR.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","Sobre nós"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Adicionar cupom de desconto"
"Add discount code","Aplicar"
"Add to cart","Adicionar ao carrinho"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/ru-RU.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"About us","О нас"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","Ввести скидочный код"
"Add discount code","Применить"
"Add to cart","Добавить в корзину"
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/resource/i18n/zh-cn.csv
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"About us (Magento CMS)","关于我们(Magento CMS)"
"About us","关于我们"
"Accepts only alphabet characters."Accepts only alphabet characters."
"Accepts only alphabet characters.","Accepts only alphabet characters."
"Add a discount code","A添加折扣代码"
"Add to cart","加入购物车"
"Add to compare","商品比较"
Expand Down