@viur/shop-components 0.1.16 → 0.1.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viur/shop-components",
-  "version": "0.1.16",
+  "version": "0.1.18",
   "description": "Frontend Vue components for the shop module of ViUR",
   "repository": {
     "type": "git",

package/src/Steps/ShopUserDataGuest.vue

@@ -88,12 +88,11 @@ async function nextStep(){
     }
 
     let result = await saveAddresses(addressState.billingIsShipping)
-    if (result['action'] && result['action'].endsWith('Success')){
+    if (result?.['action'] && result['action'].endsWith('Success')){
       return true
     }
     return false
   } catch(error){
-    console.log(error)
     return false
   }
 }

package/src/components/AddressForm.vue

@@ -7,7 +7,7 @@
         :skelkey="state.skelkey"
         :values="{'address_type':state.address_type, 'customer_type':'private'}"
         :useCategories="false"
-        :layout="AddressFormLayout"
+        :layout="shopStore.state.UserDataLayout"
         @change="formChange"
         :default-language="state.language"
         error-style="decent"
@@ -18,7 +18,6 @@
 <script setup>
 import {computed, reactive, watch} from 'vue'
 import LoadingHandler from './LoadingHandler.vue';
-import AddressFormLayout from './AddressFormLayout.vue';
 import ViForm from "@viur/vue-utils/forms/ViForm.vue";
 import {useViurShopStore} from "../shop";
 import {useAddress} from "../composables/address";
@@ -91,4 +90,4 @@ watch(()=>addressState.billingIsShipping, (newVal,oldVal)=>{
 
 <style scoped>
 
-</style>
+</style>

package/src/composables/address.js

@@ -47,13 +47,16 @@ export const useAddress = defineStore("useAddressStore", () => {
       state[`${type}IsUpdating`] = true
       return state[`${type}Form`].sendData().then(async (resp)=>{
         let data = await resp.json()
-        
+
         if (['addSuccess','editSuccess'].includes(data['action'])){
           state[`${type}Data`] = data['values']
           await updateAddresses(type, billingIsShipping)
         }
         state[`${type}IsUpdating`] = undefined
         return data
+      }).catch(error=>{
+        state[`${type}Form`].state.loading = false
+        return {'action':"error"}
       })
     }
 
@@ -92,4 +95,4 @@ export const useAddress = defineStore("useAddressStore", () => {
         updateAddresses,
         saveAddresses
     }
-})
+})

package/src/custombones/EmailCheckBone.vue

@@ -56,11 +56,9 @@ import { useI18n } from "vue-i18n"
     const emailBone2 = ref(null)
 
     function changeEvent(event) {
-      console.dir(event.target)
       if(emailBone.value.value!==emailBone2.value.value){
-        emailBone.value.setCustomValidity(i18n.t("messages.password_equal_error"))
+        emailBone.value.setCustomValidity(i18n.t("messages.email_equal_error"))
         emailBone.value.reportValidity()
-        console.log(event.target.classList)
         if (!event.target.classList.contains('widget-bone-email-repeat')){
           emit("change", props.name, event.target.value, props.lang, props.index,false)
         }
@@ -68,9 +66,6 @@ import { useI18n } from "vue-i18n"
         emailBone.value.setCustomValidity('')
         emit("change", props.name, event.target.value, props.lang, props.index,true)
       }
-
-
-
     }
 
     watchEffect(() => {

package/src/custombones/PhoneCheckBone.vue

@@ -91,7 +91,6 @@ import { useI18n } from "vue-i18n"
       if(stringBone.value.value!==stringBone2.value.value){
         stringBone.value.setCustomValidity(i18n.t("messages.phone_equal_error"))
         stringBone.value.reportValidity()
-        console.log(event.target.classList)
         if (!event.target.classList.contains('widget-bone-string-repeat')){
           emit("change", props.name, event.target.value, props.lang, props.index,false)
         }

package/src/shop.js

@@ -3,6 +3,7 @@ import { reactive, computed, watch, shallowRef } from "vue";
 import {ShopCart, ShopUserDataGuest, ShopShippingMethod, ShopPaymentProvider, ShopOrderComplete, ShopOrderConfirm} from './Steps/index'
 import { defineStore } from "pinia";
 import { useUrlSearchParams } from '@vueuse/core'
+import AddressFormLayout from './components/AddressFormLayout.vue';
 
 import { Request } from "@viur/vue-utils";
 
@@ -119,8 +120,8 @@ export const useViurShopStore = defineStore("viurshopStore", () => {
 
 
         //checkout
-        paymentProviderData:null
-
+        paymentProviderData:null,
+        UserDataLayout: shallowRef(AddressFormLayout)
     })
 
     function addTab({name, component, displayname, iconname, iconlibrary,active})

package/src/translations/de.js

@@ -60,7 +60,7 @@ export default {
     wait_for_payment: 'Warte auf Zahlung...',
     remove_article_from_cart: 'Wollen sie den Artikel wirklich entfernen?',
     order_check_later: 'Sie können Ihre Bestellung am Ende noch einmal überprüfen.',
-    password_equal_error: 'E-Mail-Adressen stimmen nicht überein.',
+    email_equal_error: 'E-Mail-Adressen stimmen nicht überein.',
     phone_equal_error: "Telefonnummern stimmen nicht überein."
   },
 };

package/src/translations/fr.js

@@ -54,7 +54,7 @@ export default {
     wait_for_payment: 'Warte auf Zahlung...',
     remove_article_from_cart: 'Désirez-vous vraiment supprimer cet article du panier?',
     order_check_later: 'Vous pourrez revérifier vos données avant de valider votre commande.',
-    password_equal_error: "Les adresses e-mail ne correspondent pas.",
+    email_equal_error: "Les adresses e-mail ne correspondent pas.",
     phone_equal_error: "Les numéros de téléphone ne correspondent pas."
   },
 };