@viur/shop-components 0.6.0 → 0.7.0

package/package.json

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

package/src/Steps/ShopPaymentProvider.vue

@@ -63,7 +63,6 @@ function optionChanged(type){
 }
 
 onBeforeMount(()=>{
-  // FIXME: Fetch this after ever country (address) change!
   fetchPaymentData().then(()=>{
     state.selection = shopStore.state.order?.['payment_provider']
   })

package/src/components/AddressForm.vue

@@ -21,9 +21,12 @@ import LoadingHandler from './LoadingHandler.vue';
 import ViForm from "@viur/vue-utils/forms/ViForm.vue";
 import {useViurShopStore} from "../shop";
 import {useAddress} from "../composables/address";
+import { usePayment } from '../composables/payment';
+
 
 const shopStore = useViurShopStore();
 const {state:addressState} = useAddress();
+const {state:paymentState, fetchPaymentData} = usePayment()
 
 const props = defineProps({
   formtype:{
@@ -71,6 +74,9 @@ const state = reactive({
 function formChange(data){
   if (data.name === "country"){
     state.language = data.value
+    if (state.formtype === 'billing'){
+      fetchPaymentData()
+    }
   }
 }
 

package/src/components/CartItem.vue

@@ -271,10 +271,6 @@ function removeArticle(){
       margin: 0;
     }
 
-    @media (max-width: 600px) {
-      grid-column: span 2;
-    }
-
     @media (max-width: 500px) {
       display: none;
     }
@@ -289,6 +285,10 @@ function removeArticle(){
 
   .viur-shop-cart-leaf-quantity {
     align-self: center;
+    grid-column: span 5;
+    @media (min-width: 600px) {
+      grid-column: span 2;
+    }
   }
 
   .viur-shop-cart-leaf-unitprice {

package/src/shop.js

@@ -160,6 +160,10 @@ export const useViurShopStore = defineStore("viurshopStore", () => {
 
         const params = useUrlSearchParams('hash')
         params['step'] = state.currentTab
+        window.scrollTo({
+          top: 0,
+          behavior: 'smooth'
+        });
     }
 
     function navigateToNext(){

package/src/translations/fr.js

@@ -36,7 +36,7 @@ export default {
       'summary_headline': 'Résumé',
       'summary_subtotal': 'Sous-total',
       'summary_shipping_total': 'Emballage et envoi',
-      'summary_delivery_time': 'Délai de livraison',
+      'summary_delivery_time': 'Délai de livraison estimé',
       'summary_discount': 'Vous économisez sur votre achat',
       'summary_checkout': 'Acheter cet article',
       'summary_total': 'Montant total',