@viur/shop-components 0.9.0 → 0.9.2

package/package.json

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

package/src/Shop.vue

@@ -120,12 +120,12 @@ onBeforeMount(()=>{
     }
 
     shopStore.state.moduleName= props.modulename
-    fetchCart()
     shopStore.fetchMetaData()
     const params = useUrlSearchParams('hash')
     if (Object.keys(params).includes('order')){
         shopStore.state.orderKey = params['order']
         fetchOrder(shopStore.state.orderKey).then(()=>{
+          fetchCart();  // load after cartKey has been loaded from order
           shopStore.state.orderReady = true
           // navigate to order state
           if(shopStore.state.order?.['is_ordered']){
@@ -135,6 +135,7 @@ onBeforeMount(()=>{
           }
         })
     }else{
+      fetchCart()
       shopStore.state.orderReady = true
     }
 

package/src/composables/cart.js

@@ -39,18 +39,18 @@ export function useCart() {
       //first fetch root then fetchItems for this root
       state.isLoading = true;
 
-      if (shopStore.state.order != null && shopStore.order?.cart?.key.length) {
-        shopStore.state.cartRoot = {};
-        shopStore.state.cartRoot = shopStore.state.order.cart;
+      if (shopStore.state.order != null && shopStore.state.order?.cart?.dest.key) {
+        // shopStore.state.cartRoot = {};
+        shopStore.state.cartRoot = shopStore.state.order.cart.dest;
 
-        return fetchCartItems(shopStore.state.order.cart.key).then(() => {
+        return fetchCartItems(shopStore.state.cartRoot["key"]).then(() => {  // TODO: duplicate code
           state.isLoading = false;
           shopStore.state.cartReady = true;
         });
       }
       return fetchCartRoot().then(() => {
         if (!shopStore.state.cartRoot?.["key"]) return 0;
-        fetchCartItems(shopStore.state.cartRoot["key"]).then(() => {
+        fetchCartItems(shopStore.state.cartRoot["key"]).then(() => {  // TODO: duplicate code
           state.isLoading = false;
           shopStore.state.cartReady = true;
         });

package/src/translations/en.js

@@ -57,7 +57,7 @@ export default {
       'order_step_verify': 'Review order',
       'order_step_complete': 'Order complete',
       'paypal_client_popup_info': 'Please make sure your browser allows the PayPal popup.',
-      'payment_link': 'Your browser does not open a popup? Then please click <a href="{{url}}" target="_blank">here</a>.',
+      'payment_link': 'Your browser does not open a popup? Then please click <a href="{url}" target="_blank">here</a>.',
     },
   },
   messages: {

package/src/translations/fr.js

@@ -57,7 +57,7 @@ export default {
       'order_step_verify': 'Vérifier la commande',
       'order_step_complete': 'Valider la commande',
       'paypal_client_popup_info':"Assurez-vous que votre navigateur autorise la fenêtre contextuelle PayPal.",
-      'payment_link': 'Votre navigateur n\'ouvre pas de popup ? Alors cliquez <a href="{{url}}" target="_blank">ici</a>.',
+      'payment_link': 'Votre navigateur n\'ouvre pas de popup ? Alors cliquez <a href="{url}" target="_blank">ici</a>.',
     },
   },
   messages: {