@recras/online-booking-js 2.0.3 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recras/online-booking-js",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "JS library for easy integration of Recras online booking and voucher sales",
   "main": "dist/onlinebooking.js",
   "scripts": {
@@ -31,22 +31,22 @@
   },
   "homepage": "https://github.com/Recras/online-booking-js#readme",
   "devDependencies": {
-    "@babel/cli": "7.18.6",
-    "@babel/core": "7.18.6",
+    "@babel/cli": "7.18.9",
+    "@babel/core": "7.18.9",
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-transform-arrow-functions": "7.18.6",
     "@babel/plugin-transform-for-of": "7.18.8",
     "@babel/plugin-transform-object-assign": "7.18.6",
-    "@babel/preset-env": "7.18.6",
+    "@babel/preset-env": "7.18.9",
     "babel-plugin-transform-es2017-object-entries": "0.0.5",
-    "jasmine-core": "4.2.0",
+    "jasmine-core": "4.3.0",
     "jasmine-spec-reporter": "7.0.0",
-    "jshint": "2.13.4",
-    "karma": "6.3.19",
+    "jshint": "2.13.5",
+    "karma": "6.4.0",
     "karma-chrome-launcher": "3.1.0",
     "karma-firefox-launcher": "2.1.2",
-    "karma-jasmine": "4.0.2",
+    "karma-jasmine": "5.1.0",
     "karma-spec-reporter": "0.0.34",
-    "uglify-js": "3.15.4"
+    "uglify-js": "3.16.3"
   }
 }

package/src/booking.js

@@ -1,6 +1,6 @@
 /*******************************
 *  Recras integration library  *
-*  v 2.0.3                     *
+*  v 2.0.4                     *
 *******************************/
 
 class RecrasBooking {

package/src/contactForm.js

@@ -457,24 +457,32 @@ class RecrasContactForm {
         );
     }
 
-    showInlineErrors() {
+    showErrors() {
+        let errors = [];
         for (let el of this.getEmptyRequiredFields()) {
             const labelEl = el.parentNode.querySelector('label');
             const requiredText = this.languageHelper.translate('CONTACT_FORM_FIELD_REQUIRED', {
                 FIELD_NAME: labelEl.innerText,
             });
-            el.parentNode.insertAdjacentHTML(
-                'afterend',
-                `<div class="booking-error">${ requiredText }</div>`
-            );
+            errors.push(requiredText);
         }
         for (let el of this.getInvalidFields()) {
-            const labelEl = el.parentNode.querySelector('label');
+            let parentEl = el.closest('div');
+            if (parentEl.classList.contains('radioGroup')) {
+                parentEl = parentEl.parentNode.closest('div');
+            }
+            const labelEl = parentEl.querySelector('label');
+            console.log(labelEl, parentEl.querySelectorAll('label'));
             const invalidText = this.languageHelper.translate('CONTACT_FORM_FIELD_INVALID', {
                 FIELD_NAME: labelEl.innerText,
             });
-            this.showInlineError(el, invalidText);
+            errors.push(invalidText);
         }
+        errors = [...new Set(errors)]; // Only unique text
+        this.findElement('button[type="submit"]').insertAdjacentHTML(
+            'afterend',
+            `<div class="booking-error"><ul><li>${ errors.join('<li>') }</ul></div>`
+        );
     }
 
     showLabel(field, idx) {
@@ -502,7 +510,7 @@ class RecrasContactForm {
             );
             return false;
         } else if (this.hasEmptyRequiredFields() || !this.isValid()) {
-            this.showInlineErrors();
+            this.showErrors();
             return false;
         }
 

package/src/vouchers.js

@@ -184,7 +184,7 @@ class RecrasVoucher {
         let shouldDisable = false;
         this.contactForm.removeErrors();
         if (this.contactForm.hasEmptyRequiredFields() || !this.contactForm.isValid() || !this.contactForm.checkRequiredCheckboxes()) {
-            this.contactForm.showInlineErrors();
+            this.contactForm.showErrors();
             shouldDisable = true;
         }