@viur/shop-components 0.2.2 → 0.4.0

package/package.json

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

package/src/Steps/ShopShippingMethod.vue

@@ -20,7 +20,8 @@
               </sl-format-number>
               <span v-else>{{ $t('viur.shop.free_shipping') }}</span>
             </div>
-            <!--{{ option['dest']['name'] }}
+            <span slot="right">{{ option['dest']['description'] }}</span>
+            <!--
             <span slot="right">{{$t('viur.shop.deliverytime')}}: {{ option['dest']['delivery_time_range'] }} {{  $t('viur.shop.day',option['dest']['delivery_time_max'] - option['dest']['delivery_time_min']) }}</span>-->
           </sl-bar>
       </template>
@@ -73,7 +74,16 @@ async function nextStep(){
   return await fetchOrder(shopStore.state.orderKey)
 }
 
-onBeforeMount(()=>{
+onBeforeMount(() => {
+  // console.debug(shopStore.state.cartRoot?.['shipping_status']);
+  // By default a cart has always the cheapest shipping set, therefore we can skip this step.
+  // But with the link on verify the user is still able to choose a different shipping.
+  if (shopStore.state.cartRoot?.['shipping_status'] === 'cheapest') {
+    console.debug(`Skip cheapest shipping @ %o`, shopStore.state.cartRoot);
+    nextStep().then(() => shopStore.navigateToNext());
+    return;
+  }
+
   fetchShippingData()
   state.selectedShippingMethod = shopStore.state.cartRoot?.['shipping']
 })

package/src/composables/cart.js

@@ -94,12 +94,12 @@ export function useCart() {
             name:name?name:shopStore.state.cartRoot['name'],
             customer_comment:customer_comment?customer_comment:shopStore.state.cartRoot['customer_comment'],
             shipping_address_key:shipping_address_key?shipping_address_key:shippingAddressKey.value,
-            shipping_key:shipping_key?shipping_key:shopStore.state.cartRoot?.['shipping']?.['dest']?.['key'],
+            shipping_key: shipping_key, // only after explicit user selection
             discount_key:discount_key?discount_key:shopStore.state.cartRoot?.['discount']?.['dest']?.['key'],
             cart_key:cart_key ? cart_key : shopStore.state.cartRoot['key'],
         }
 
-        if (commission) {
+        if (commission) { // TODO: that's not standard, must be more generic!
           data.commission = commission
         }
 

package/src/translations/fr.js

@@ -25,7 +25,7 @@ export default {
       'payment': 'Paiement',
       'pay': 'Payer',
       'next': 'continuer',
-      'edit': 'éditer',
+      'edit': 'Modifier',
       'add_discount': 'Valider',
       'add_discount_placeholder': 'Votre code promo',
       'use_shipping_as_billing_address': 'Livraison à l\'adresse de facturation',
@@ -50,11 +50,11 @@ export default {
       'discount_no_sale_article': 'Bon d’achat non cumulable avec d’autres promotions en cours.',
       'discount_scope_not_satisfied': 'Le code promo n’est pas applicable pour ce panier / cet ou ces article(s).',
       'order_step_cart': 'Panier',
-      'order_step_data': 'Données',
+      'order_step_data': 'Données personnelles',
       'order_step_shipping': 'Mode de livraison',
       'order_step_payment': 'Mode de paiement',
       'order_step_verify': 'Vérifier la commande',
-      'order_step_complete': 'Commande terminée',
+      'order_step_complete': 'Valider la commande',
     },
   },
   messages: {