From 5982a798522649290bc715007046651a14d78e66 Mon Sep 17 00:00:00 2001
From: Alex Tselegidis <alextselegidis@gmail.com>
Date: Mon, 24 Jan 2022 15:22:34 +0100
Subject: [PATCH] Skip the first booking step if both service and provider were
 preselected (#1117).

---
 .../views/components/booking_header.php       | 12 ++++++++++-
 assets/css/layouts/booking_layout.scss        | 10 +++++++++-
 assets/js/pages/booking.js                    | 20 +++++++++++++++++++
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/application/views/components/booking_header.php b/application/views/components/booking_header.php
index 8d7d3075..e9809a46 100644
--- a/application/views/components/booking_header.php
+++ b/application/views/components/booking_header.php
@@ -7,7 +7,17 @@
 ?>
 
 <div id="header">
-    <span id="company-name"><?= $company_name ?></span>
+    <div id="company-name">
+        <?= $company_name ?>
+        <div class="d-flex justify-content-between">
+            <span class="display-selected-service">
+                &nbsp;
+            </span>
+            <span class="display-selected-provider">
+                &nbsp;
+            </span>
+        </div>
+    </div>
 
     <div id="steps">
         <div id="step-1" class="book-step active-step"
diff --git a/assets/css/layouts/booking_layout.scss b/assets/css/layouts/booking_layout.scss
index 077ce53e..45ea221f 100644
--- a/assets/css/layouts/booking_layout.scss
+++ b/assets/css/layouts/booking_layout.scss
@@ -51,6 +51,14 @@ body {
     font-weight: lighter;
     color: #fff;
     margin: 20px 0;
+    
+    .display-selected-service,
+    .display-selected-provider {
+        color: #225d4d;
+        font-size: 60%;
+        font-weight: normal;
+    }
+
 }
 
 #book-appointment-wizard #steps {
@@ -280,7 +288,7 @@ body {
     #book-appointment-wizard #company-name {
         display: inline-block;
         float: left;
-        margin: 10px auto;
+        margin: 0 auto;
     }
 
     #book-appointment-wizard #steps {
diff --git a/assets/js/pages/booking.js b/assets/js/pages/booking.js
index 285d003a..81778127 100644
--- a/assets/js/pages/booking.js
+++ b/assets/js/pages/booking.js
@@ -199,6 +199,22 @@ App.Pages.Booking = (function () {
             if (selectedProviderId && $selectProvider.find('option[value="' + selectedProviderId + '"]').length > 0) {
                 $selectProvider.val(selectedProviderId).trigger('change');
             }
+
+            if (selectedServiceId && selectedProviderId) {
+                $selectService.closest('.wizard-frame').find('.button-next').trigger('click');
+
+                $(document).find('.book-step:first').hide();
+
+                $(document).find('.button-back:first').css('visibility', 'hidden');
+
+                $(document)
+                    .find('.book-step:not(:first)')
+                    .each((index, bookStepEl) =>
+                        $(bookStepEl)
+                            .find('strong')
+                            .text(index + 1)
+                    );
+            }
         }
     }
 
@@ -571,6 +587,10 @@ App.Pages.Booking = (function () {
             }
         });
 
+        $(document).find('.display-selected-service').text($selectService.find('option:selected').text());
+
+        $(document).find('.display-selected-provider').text($selectProvider.find('option:selected').text());
+
         $('#appointment-details').empty();
 
         $('<div/>', {