@viur/shop-components 0.10.0 → 0.11.0

package/package.json

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

package/src/Steps/ShopCart.vue

@@ -5,7 +5,6 @@
         :nextfunction="nextStep"
     >
     </slot>
-
     <loading-handler :isLoading="cartState.isLoading" :isUpdating="cartState.isUpdating">
         <div class="viur-shop-item-wrapper" v-if="state.items.length>0">
             <cart-item v-for="item in state.items" :item="item"
@@ -55,7 +54,7 @@ const props = defineProps({
 })
 
 const state = reactive({
-    items: computed(()=>shopStore.state.cartList.filter(i=>i['skel_type']==='leaf'))
+    items: computed(()=>shopStore.state.cartList)
 })
 
 onBeforeMount(()=>{

package/src/components/DiscountInput.vue

@@ -36,9 +36,10 @@
 import { reactive } from "vue";
 import { useViurShopStore } from "../shop";
 import { useCart } from '../composables/cart';
+import {useI18n} from 'vue-i18n';
 const shopStore = useViurShopStore();
 const {addDiscount, removeDiscount} = useCart()
-
+  const i18n = useI18n();
 import ShopAlert from "./ShopAlert.vue";
 
 const state = reactive({
@@ -56,7 +57,7 @@ function addDiscountAction() {
     .catch((error) => {
       state.loading=false
       console.log("error bei rabatt", error);
-      state.alert.msg = "not found";
+      state.alert.msg = i18n.t('viur.shop.discount_not_found');
       state.alert.show = true;
       state.alert.variant = "danger";
     });
@@ -74,7 +75,7 @@ function removeDiscountAction(){
     .catch((error) => {
       state.loading=false
       console.log("error bei rabatt", error);
-      state.alert.msg = "not found";
+      state.alert.msg = $t('viur.shop.discount_not_found');
       state.alert.show = true;
       state.alert.variant = "danger";
     });

package/src/composables/cart.js

@@ -69,11 +69,24 @@ export function useCart() {
 
     function fetchCartItems(key, parentKey=null){
         //fetch cart items
+        if (key === shopStore.state.cartRoot["key"]){ // initial
+          shopStore.state.cartList = []
+        }
         return Request.get(`${shopStore.state.shopApiUrl}/cart_list`,{dataObj:{
             cart_key:key
         }}).then(async( resp) =>{
             let data = await resp.clone().json()
-            shopStore.state.cartList=data
+
+            let currentLeafs = []
+            for (const item of data){
+              if (item["skel_type"]==="leaf"){
+                currentLeafs.push(item)
+              }else{
+                await fetchCartItems(item['key'])
+              }
+            }
+
+            shopStore.state.cartList=shopStore.state.cartList.concat(currentLeafs)
             return resp
         })
     }

package/src/translations/de.js

@@ -37,7 +37,7 @@ export default {
       'summary_headline': 'Zusammenfassung',
       'summary_subtotal': 'Zwischensumme',
       'summary_shipping_total': 'Versand- und Bearbeitungspauschale',
-      'summary_delivery_time': 'Lieferzeit',
+      'summary_delivery_time': 'Voraussichtliche Lieferzeit',
       'summary_discount': 'Sie sparen bei Ihrem Einkauf im Aktionszeitraum',
       'summary_checkout': 'Zur Kasse gehen',
       'summary_total': 'Gesamtbetrag',

package/src/translations/fr.js

@@ -40,7 +40,7 @@ export default {
       'summary_delivery_time': 'Délai de livraison estimé',
       'summary_discount': 'Vous économisez sur votre achat',
       'summary_checkout': 'Acheter cet article',
-      'summary_total': 'Montant total',
+      'summary_total': 'Montant TTC',
       'summary_vat': 'TVA incluse ({percentage})',
       'discount_not_found': 'Ce code promo n’existe pas.',
       'discount_not_active': 'Ce code promo n’est pas actif.',