@viur/shop-components 0.1.20 → 0.1.21

package/package.json

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

package/src/Shop.vue

@@ -110,7 +110,7 @@ const state = reactive({
 onBeforeMount(()=>{
     getTranslations([props.language], "viur.shop.*").then((resp)=>{
       state.translationsLoaded = true
-    }) 
+    })
     shopStore.state.language = props.language
     shopStore.state.showNodes = props.showCartNodes
     shopStore.state.debug = props.debug
@@ -213,6 +213,11 @@ watch(()=>shopStore.state.currentTab, (newVal,oldVal)=>{
     display: flex;
     flex-direction: column;
     grid-column: auto / span 12;
+
+    &.full-width {
+      grid-column: auto / span 12;
+    }
+
     @media (min-width: 1024px) {
       grid-column: auto / span var(--shop-main-columns);
     }
@@ -247,9 +252,7 @@ watch(()=>shopStore.state.currentTab, (newVal,oldVal)=>{
     grid-row-start: 2;
   }
 
-  .full-width {
-    grid-column: auto / span 12;
-  }
+
 
   .last-row {
     grid-row-start: 3;

package/src/ShopSummary.vue

@@ -27,16 +27,6 @@
       <sl-format-number lang="de" type="currency" currency="EUR" :value="state.shippingTotal">
       </sl-format-number>
     </div>
-    <div class="viur-shop-cart-sidebar-info viur-shop-cart-shipping-item" v-if="shopStore.state.order?.cart?.dest?.shipping">
-      <span v-html="$t('viur.shop.summary_delivery_time')"></span>
-      <span>
-        {{
-          shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range ?
-            shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range :
-            0
-        }} {{ shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range === 1 ? "Tag" : "Tage" }}
-      </span>
-    </div>
     <div class="viur-shop-cart-sidebar-info" v-if="shopStore.state.cartRoot.discount">
       <span v-html="$t('viur.shop.summary_discount')"></span>
       <sl-format-number lang="de" type="currency" currency="EUR" :value="state.discount">
@@ -58,6 +48,17 @@
       <sl-format-number lang="de" type="currency" currency="EUR" :value="vatObj.value">
       </sl-format-number>
     </div>
+    <div class="viur-shop-cart-sidebar-info viur-shop-cart-shipping-item" v-if="shopStore.state.order?.cart?.dest?.shipping">
+      <span v-html="$t('viur.shop.summary_delivery_time')"></span>
+      <span>
+        {{
+          shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range ?
+            shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range :
+            0
+        }} {{ shopStore.state.order?.cart?.dest?.shipping?.dest?.delivery_time_range === 1 ? "Tag" : "Tage" }}
+      </span>
+    </div>
+
     <slot name="action-buttons" >
       <div class="viur-shop-cart-sidebar-btn-wrap" v-if="false && !shopStore.state.order?.['is_paid']">
         <sl-button variant="success" size="large">{{ $t("shop.summary_checkout") }}</sl-button>

package/src/Steps/ShopPaymentProvider.vue

@@ -68,3 +68,10 @@ onBeforeMount(()=>{
   })
 })
 </script>
+
+<style scoped>
+  sl-radio-group {
+    margin-bottom: var(--ignt-spacing-medium);
+    margin-top: var(--ignt-spacing-medium);
+  }
+</style>

package/src/components/CardSelector.vue

@@ -51,12 +51,14 @@ onMounted(()=>{
 
 <style scoped>
 sl-radio-group {
-  margin-top: var(--ignt-spacing-small);
+  margin-bottom: var(--ignt-spacing-medium);
+  margin-top: var(--ignt-spacing-medium);
 }
 
 sl-card {
   width: calc(100% - 6px);
   margin-left: 3px;
+  margin-top: var(--ignt-spacing-small);
   &[selected]::part(base){
     border:1px solid var(--sl-color-primary-500);
     box-shadow: 0 0 0 var(--sl-focus-ring-width) var(--sl-input-focus-ring-color);

package/src/components/PaymentOption.vue

@@ -55,21 +55,25 @@
 </script>
 
 <style scoped>
-.payment-selection{
+sl-details {
+  margin-top: var(--ignt-spacing-small);
+}
+
+.payment-selection {
   display: flex;
+  align-items: center;
+  flex-wrap: nowrap;
+  flex-direction: row;
+  align-content: center;
+  justify-content: space-between;
+  width: 100%;
+
+  .start {
+    display: flex;
     align-items: center;
     flex-wrap: nowrap;
-    flex-direction: row;
-    align-content: center;
-    justify-content: space-between;
-    width: 100%;
-
-    .start{
-      display: flex;
-      align-items: center;
-      flex-wrap: nowrap;
-      gap:10px;
-    }
+    gap:10px;
+  }
 }
 
 .simple::part(content){

package/src/components/PaymentSelector.vue

@@ -11,7 +11,7 @@
                       @change="optionChanged"
 
       >
-        
+
       </payment-option>
 
     </sl-details-group>
@@ -51,5 +51,7 @@ function optionChanged(type){
 </script>
 
 <style scoped>
-
+  sl-radio-group {
+    margin-bottom: var(--ignt-spacing-small);
+  }
 </style>

package/src/translations/de.js

@@ -15,7 +15,7 @@ export default {
       'order_ready_to_ship': 'Ihre Bestellung ist fertig für den Versand.',
       'cart_empty': 'Es befinden sich noch keine Artikel im Warenkorb.',
       'order_summary': 'Bestellzusammenfassung',
-      'deliverytime': 'Lieferzeit',
+      'deliverytime': 'Voraussichtliche Lieferzeit',
       'day': 'Tag | Tage',
       'availability': 'Verfügbarkeit',
       'quantity': 'Anzahl',
@@ -25,6 +25,7 @@ export default {
       'payment': 'Zahlung',
       'pay': 'Bezahlen',
       'next': 'weiter',
+      'edit': 'bearbeiten',
       'add_discount': 'Hinzufügen',
       'add_discount_placeholder': 'Dein Rabattcode',
       'use_shipping_as_billing_address': 'Lieferung zur Rechnungsadresse',

package/src/translations/en.js

@@ -25,6 +25,7 @@ export default {
       'payment': 'Payment',
       'pay': 'Pay',
       'next': 'next',
+      'edit': 'edit',
       'add_discount': 'Add',
       'add_discount_placeholder': 'Your discount code',
       'use_shipping_as_billing_address': 'Use shipping address as billing address',

package/src/translations/fr.js

@@ -25,6 +25,7 @@ export default {
       'payment': 'Paiement',
       'pay': 'Payer',
       'next': 'continuer',
+      'edit': 'éditer',
       'add_discount': 'Valider',
       'add_discount_placeholder': 'Votre code promo',
       'use_shipping_as_billing_address': 'Livraison à l\'adresse de facturation',
@@ -39,7 +40,7 @@ export default {
       'summary_discount': 'Vous économisez sur votre achat',
       'summary_checkout': 'Acheter cet article',
       'summary_total': 'Montant total',
-      'summary_vat': 'TVA incluse ({vat_percentage})',
+      'summary_vat': 'TVA incluse ({percentage})',
       'discount_not_found': 'Ce code promo n’existe pas.',
       'discount_not_active': 'Ce code promo n’est pas actif.',
       'discount_not_available': 'Ce code promo n’est pas valable pour ce pays.',