Merge pull request #135 from MultinetInteractive/master

1.0.22

Author: itssimple

content/script/frontendjs.js

@@ -355,7 +355,8 @@ var eduBookingView = {
 				}
 			}
 		}
-
+        var bookBtn = document.getElementById('edu-book-btn');
+        bookBtn.disabled = true;
 		return true;
 	},
 	ValidateCivicRegNo: function () {

content/style/frontendstyle.css

@@ -179,8 +179,8 @@ h1.courseTitle:hover,
   width: 100%;
   padding: 48px 0;
   text-align: center;
-  font-size: 1.2rem;
-  font-weight: 500px;
+  font-size: 20px;
+  font-weight: 500;
 }
 
 .eduadmin.loginForm form .title .checkEmailForm {
@@ -193,7 +193,7 @@ h1.courseTitle:hover,
   font-weight: normal;
   color: hsl(0, 0%, 40%);
   font-style: italic;
-  font-size: .95rem;
+  font-size: 16px;
   margin: 0 0 16px 0;
   padding: 0;
 }
@@ -211,12 +211,37 @@ h1.courseTitle:hover,
 
 
 @media (min-width: 700px) {
+  .eduadmin.loginForm form .title .checkEmailForm {
+    width: 100%;
+    flex-direction: row;
+    flex-wrap: wrap;
+    align-items: center;
+    /* justify-content: center; */
+  }
+
+  .eduadmin.loginForm form .title .checkEmailForm h3 {
+    width: 100%;
+    /* text-align: center; */
+  }
+
   .eduadmin.loginForm form .title .checkEmailForm .bookingLoginButton {
     align-self: flex-end;
   }
   .eduadmin.loginForm form .title .dateInfo {
     padding: 72px 0;
+    text-align: left;
+  }
+
+  .eduadmin.loginForm form .title .checkEmailForm label {
+    margin: 0
+  }
+
+  .eduadmin.loginForm form .title .checkEmailForm label .inputHolder {
+    flex: 1;
+    width: 350px;
+    margin: 0 16px 0 0;
   }
+
 }
 
 /* ------------------------
@@ -242,7 +267,7 @@ h1.courseTitle:hover,
   padding: 48px 0 0;
   text-align: center;
   font-size: 1.2rem;
-  font-weight: 500px;
+  font-weight: 500;
 }
 .eduadmin.booking-page form .notUserCheck a {margin: 0 0 0 8px; color: hsl(0, 0%, 40%);}
 .eduadmin.booking-page form .notUserCheck {
@@ -520,7 +545,7 @@ h1.courseTitle:hover,
 
   display: flex;
   flex-direction: column;
-  justify-content: flex-end;
+  justify-content: space-between;
 }
 
 .eduadmin .objectBlock.brick .objectImage {
@@ -594,4 +619,4 @@ h1.courseTitle:hover,
     width: 100%;
     margin: auto;
     font-size: 14px;
-}
+}

content/template/bookingTemplate/participantView.php

@@ -102,7 +102,7 @@ class="contactFirstName" class="first-name"
                     <div class="inputHolder">
                         <select name="contactPriceName" class="edudropdown participantPriceName edu-pricename" required
                                 onchange="eduBookingView.UpdatePrice();">
-                            <option value=""><?php edu_e( "Choose price" ); ?></option>
+                            <option data-price="0" value=""><?php edu_e( "Choose price" ); ?></option>
 							<?php foreach ( $prices as $price ) { ?>
                                 <option
                                         data-price="<?php echo esc_attr( $price->Price ); ?>"
@@ -228,7 +228,7 @@ class="participantFirstName first-name" name="participantFirstName[]"
                         <select name="participantPriceName[]" required
                                 class="edudropdown participantPriceName edu-pricename"
                                 onchange="eduBookingView.UpdatePrice();">
-                            <option value=""><?php edu_e( "Choose price" ); ?></option>
+                            <option data-price="0" value=""><?php edu_e( "Choose price" ); ?></option>
 							<?php foreach ( $prices as $price ) { ?>
                                 <option
                                         data-price="<?php echo esc_attr( $price->Price ); ?>"

content/template/bookingTemplate/template_A.php

@@ -302,7 +302,7 @@
 							<?php edu_e( "Price name" ); ?>
                             <select id="edu-pricename" name="edu-pricename" required class="edudropdown edu-pricename"
                                     onchange="eduBookingView.UpdatePrice();">
-                                <option value=""><?php edu_e( "Choose price" ); ?></option>
+                                <option data-price="0" value=""><?php edu_e( "Choose price" ); ?></option>
 								<?php foreach ( $prices as $price ): ?>
                                     <option
                                             data-price="<?php echo esc_attr( $price->Price ); ?>"
@@ -368,7 +368,7 @@
                                 </label>
                             </div>
 						<?php endif; ?>
-                        <input type="submit" class="bookButton cta-btn"
+                        <input type="submit" class="bookButton cta-btn" id="edu-book-btn"
                                onclick="var validated = eduBookingView.CheckValidation(); return validated;"
 							<?php if ( $event->MaxParticipantNr > 0 && $event->TotalParticipantNr >= $event->MaxParticipantNr ) : ?>
                                 disabled title="<?php esc_attr( edu_e( 'No free spots left on this event' ) ); ?>"

eduadmin.php

@@ -8,7 +8,7 @@
 	 * Plugin URI:	http://www.eduadmin.se
 	 * Description:	EduAdmin plugin to allow visitors to book courses at your website
 	 * Tags:	booking, participants, courses, events, eduadmin, lega online
-	 * Version:	1.0.21
+	 * Version:	1.0.22
 	 * GitHub Plugin URI: multinetinteractive/eduadmin-wordpress
 	 * GitHub Plugin URI: https://github.com/multinetinteractive/eduadmin-wordpress
 	 * Requires at least: 4.7

readme.txt

@@ -8,7 +8,7 @@ Requires at least: 4.7
 
 Tested up to: 4.9.2
 
-Stable tag: 1.0.21
+Stable tag: 1.0.22
 
 Requires PHP: 5.0.1 (with SoapClient)
 
@@ -39,20 +39,30 @@ Requires at least PHP 5.0.1 (with [SoapClient](http://php.net/manual/en/book.soa
 
 == Upgrade Notice ==
 
-### [1.0.21]
+= 1.0.22 =
+If you are using an older version than 1.0.21, please test this version on a development server before deploying live.
+Since version 1.0.21, there are a lot of design changes in the CSS, that might require you to reset style settings,
+and redo your own customization.
+
+= 1.0.21 =
 - LOTS of design changes, please update to a development server to see if anything breaks
 
-### [1.0.11]
+= 1.0.11 =
 - Bugfix with REST API, we don't need to pass the token now, so we can always get a valid token when needed.
 
-### [1.0.10]
+= 1.0.10 =
 - Changing to REST API instead, hopefully this will increase the speed again.
 
 ### [1.0.9]
 - We changed to admin-ajax here (It will be slow)
 
 == Changelog ==
 
+### [1.0.22]
+- Disabling the book-button when the form is valid and the booking is under way
+- Fixes some styles to use `px` instead of `rem`
+- Adding `data-price` to the fields that were missing, that (for some reason) the price-calculation wanted
+
 ### [1.0.21]
 - Lots of design fixes and changes, to make the plugin more mobile friendly
 - Login widget bug fixed