@viur/shop-components 0.5.0 → 0.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@viur/shop-components",
-  "version": "0.5.0",
+  "version": "0.6.2",
   "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,9 @@ function removeArticle(){
 
   .viur-shop-cart-leaf-quantity {
     align-self: center;
+    @media (max-width: 600px) {
+      grid-column: span 2;
+    }
   }
 
   .viur-shop-cart-leaf-unitprice {

package/src/components/PriceBox.vue

@@ -6,16 +6,16 @@
         type="currency"
         currency="EUR"
         :value="item.price.current * amount"
-        :class="{pricetag_current:!retail}"
+        :class="{'viur-shop-cart-leaf-value--current':!retail}"
       >
       </sl-format-number>
-    <div style="position: relative;" v-if="retail">
+    <div style="position: relative;" v-if="retail && (item.price.recommended > item.price.current)">
       <sl-format-number
-          class="viur-shop-cart-leaf-value viur-shop-cart-leaf-value--unitprice pricetag_old"
+          class="viur-shop-cart-leaf-value viur-shop-cart-leaf-value--unitprice viur-shop-cart-leaf-value--recommended"
           lang="de"
           type="currency"
           currency="EUR"
-          :value="item.price.retail * amount"
+          :value="item.price.recommended * amount"
         >
         </sl-format-number>
       </div>
@@ -42,24 +42,20 @@ const props = defineProps({
 </script>
 
 <style scoped>
-:is(.pricetag_old):before {
-    content: " ";
-    border-bottom: 2px solid var(--sl-color-primary-500);
-    width: 100%;
-    display: block;
-    position: absolute;
-    top:calc(0.7rem);
-}
 
-.pricetag_old{
+.viur-shop-cart-leaf-value--recommended {
     font-size: 0.8rem;
-
+    &:before {
+      content: " ";
+      border-bottom: 2px solid var(--sl-color-primary-500);
+      width: 100%;
+      display: block;
+      position: absolute;
+      top:calc(0.7rem);
+  }
 }
-.pricetag_current{
+
+.viur-shop-cart-leaf-value--current {
     margin-left:auto;
 }
-
-
 </style>
-<script setup lang="ts">
-</script>

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(){