@viur/shop-components 0.10.0 → 0.12.0

package/package.json

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

package/src/Shop.vue

@@ -52,7 +52,8 @@
           readytoship: {{ shopStore.state.order?.['is_rts'] }}<br>
           paid: {{ shopStore.state.order?.['is_paid'] }}<br><br>
 
-          OrderObject: {{shopStore.state.order}}
+          OrderObject: {{shopStore.state.order}}<br><br>
+          activeDiscounts: {{ shopStore.state.discounts }}
 
       </sl-details>
     </template>

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

@@ -1,26 +1,27 @@
 <template>
-  {{ state.alert.msg }}
     <shop-alert
       v-if="state.alert.show"
       :variant="state.alert.variant"
       @onHide="state.alert = {}"
-      duration="infinity"
+      duration="5000"
     >
   <template #alertMsg>
     {{ state.alert.msg }}
   </template>
   </shop-alert>
 
-  <template v-if="shopStore.state.cartRoot.discount">
+  <template v-if="shopStore.state.discounts">
+    <template v-for="discount in shopStore.state.discounts">
     <div class="viur-shop-discount-view">
-    <span>Code: {{ shopStore.state.cartRoot.discount.dest.name }}</span>
-    <sl-button size="small"  outline variant="danger" @click="removeDiscountAction" :loading="state.loading">
+    <span>Code: {{ discount.dest.name }}</span>
+    <sl-button size="small"  outline variant="danger" @click="removeDiscountAction(discount.dest.key)" :loading="state.loading">
       <sl-icon name="x-lg" slot="prefix"></sl-icon>
 
     </sl-button>
     </div>
+    </template>
   </template>
-  <sl-button-group v-else>
+  <sl-button-group>
     <sl-input
       class="viur-shop-discount-input"
       :placeholder="$t('viur.shop.add_discount_placeholder')"
@@ -36,9 +37,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,25 +58,25 @@ 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";
     });
 }
 
-function removeDiscountAction(){
+function removeDiscountAction(key){
   state.loading=true
-  removeDiscount()
+  removeDiscount(key)
     .then(async (resp) => {
       state.loading=false
-      state.alert.msg = "Discount removed";
+      state.alert.msg = $t('viur.shop.discount_removed');
       state.alert.show = true;
       state.alert.variant = "success";
     })
     .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

@@ -48,6 +48,7 @@ export function useCart() {
           shopStore.state.cartReady = true;
         });
       }
+      shopStore.state.discounts = {}
       return fetchCartRoot().then(() => {
         if (!shopStore.state.cartRoot?.["key"]) return 0;
         fetchCartItems(shopStore.state.cartRoot["key"]).then(() => {  // TODO: duplicate code
@@ -59,21 +60,39 @@ export function useCart() {
 
     function fetchCartRoot(){
         // fetch list of Rootnodes and saves the first one
-
         return Request.get(`${shopStore.state.shopUrl}/cart/listRootNodes`).then(async (resp)=>{
             let data = await resp.clone().json()
             shopStore.state.cartRoot = data.filter(i=>i['cart_type']==='basket')?.[0] ? data.filter(i=>i['cart_type']==='basket')[0]:[]
+            if (shopStore.state.cartRoot.discount){
+              shopStore.state.discounts = {[shopStore.state.cartRoot.discount.dest.key]:shopStore.state.cartRoot.discount}
+            }
             return resp
         })
     }
 
     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{
+                if(item.discount){
+                  shopStore.state.discounts[item.discount.dest.key] = item.discount
+                }
+                await fetchCartItems(item['key'])
+              }
+            }
+
+            shopStore.state.cartList=shopStore.state.cartList.concat(currentLeafs)
             return resp
         })
     }
@@ -155,11 +174,11 @@ export function useCart() {
     });
     }
 
-    function removeDiscount() {
+    function removeDiscount(key) {
         return new Promise((resolve, reject) => {
           Request.securePost(`${shopStore.state.shopApiUrl}/discount_remove`, {
             dataObj: {
-                discount_key: shopStore.state.cartRoot.discount.dest.key,
+                discount_key: key,
             },
           })
         .then(async (resp) => {

package/src/shop.js

@@ -122,7 +122,8 @@ export const useViurShopStore = defineStore("viurshopStore", () => {
 
         //checkout
         paymentProviderData:null,
-        UserDataLayout: shallowRef(AddressFormLayout)
+        UserDataLayout: shallowRef(AddressFormLayout),
+        discounts:{}
     })
 
     function addTab({name, component, displayname, iconname, iconlibrary,active})

package/src/translations/de.js

@@ -37,12 +37,13 @@ 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',
       'summary_vat': 'inkl. {percentage} MwSt.',
       'discount_not_found': 'Dieser Rabattcode existiert nicht.',
+      'discount_not_found': 'Rabattcode entfernt.',
       'discount_not_active': 'Dieser Rabattcode ist nicht aktiv.',
       'discount_not_available': 'Dieser Rabattcode ist für dieses Land nicht verfügbar.',
       'discount_already_used': 'Dieser Rabattcode wurde bereits benutzt.',

package/src/translations/fr.js

@@ -40,9 +40,10 @@ 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_removed': 'Code promo supprimé.',
       'discount_not_active': 'Ce code promo n’est pas actif.',
       'discount_not_available': 'Ce code promo n’est pas valable pour ce pays.',
       'discount_already_used': 'Ce code promo a déjà été utilisé.',