Merge branch 'develop' of https://github.com/ECCdigital/smart-city-bo…

…oking-vue-app into develop
ECCdigital · Jun 19, 2024 · d4d71b4 · d4d71b4
2 parents 10cfaf1 + b8f0cc5
commit d4d71b4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/src/components/Checkout/CheckoutTimePeriodPicker.vue b/src/components/Checkout/CheckoutTimePeriodPicker.vue
@@ -119,8 +119,20 @@ export default {
     updateDisplayedMonth(val) {
       this.displayedMonth = val;
     },
+    scrollToElement(id) {
+      const el = this.$refs[id];
+      el.scrollIntoView({ behavior: "smooth" });
+    },
   },
   watch: {
+    date: {
+      handler: function (old, val) {
+        if (old && val) {
+          this.scrollToElement("time-periods");
+        }
+      },
+      immediate: true,
+    },
     timePeriod: {
       handler: function (val) {
         this.$emit("input", val);
@@ -153,6 +165,7 @@ export default {
       @update:picker-date="updateDisplayedMonth"
     >
     </v-date-picker>
+    <div ref="time-periods"></div>
     <v-row v-if="date" class="mt-10">
       <v-col>
         <span class="subtitle-1"

diff --git a/src/views/BundleCheckout/CheckoutContactDetails.vue b/src/views/BundleCheckout/CheckoutContactDetails.vue
@@ -6,7 +6,7 @@
         Zurück
       </v-btn>
       <v-spacer></v-spacer>
-      <v-btn color="primary" class="px-10" small @click="submit">
+      <v-btn :disabled="isNextButtonDisabled" color="primary" class="px-10" small @click="submit">
         Zur Zusammenfassung
       </v-btn>
     </div>
@@ -178,6 +178,9 @@ export default {
   },
 
   computed: {
+    isNextButtonDisabled() {
+      return !this.valid;
+    },
     agreements: function () {
       return this.leadItem.bookable.attachments.filter(
         (a) => a.type === "agreement" || a.type === "privacy-agreement"

diff --git a/src/views/BundleCheckout/CheckoutTimeSelector.vue b/src/views/BundleCheckout/CheckoutTimeSelector.vue
@@ -2,12 +2,11 @@
   <div>
     <div class="d-flex mb-5">
       <v-spacer></v-spacer>
-      <v-btn color="primary" class="px-10" small @click="submit">
+      <v-btn :disabled="isNextButtonDisabled" color="primary" class="px-10" small @click="submit">
         Weiter
         <v-icon right small>mdi-arrow-right</v-icon>
       </v-btn>
     </div>
-
     <v-form v-model="valid" ref="form">
       <h2>Buchungszeitraum</h2>
       <p>Bitte wählen Sie den Zeitraum für Ihre Buchung.</p>
@@ -316,6 +315,9 @@ export default {
   },
 
   computed: {
+    isNextButtonDisabled() {
+      return !this.leadItem.valid;
+    },
     timestampBegin() {
       if (this.dateBeginModel == null || this.timeBeginModel == null) {
         return 0;