@recras/online-booking-js 2.0.3 → 2.0.4

package/.github/workflows/npmpublish.yml

@@ -8,10 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 16
       - run: npm ci
       - run: npm test
 
@@ -19,10 +19,10 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
-          node-version: 12
+          node-version: 16
           registry-url: https://registry.npmjs.org/
       - run: npm ci
       - run: npm run build

package/README.md

@@ -1,7 +1,7 @@
 [![Build Status](https://travis-ci.org/Recras/online-booking-js.svg?branch=master)](https://travis-ci.org/Recras/online-booking-js)
 
 # Recras JS Integration Library
-Version: 2.0.3
+Version: 2.0.4
 
 JS library for easy online booking, contact form, and voucher integration
 

package/changelog.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.0.4 (2022-10-07)
+* Contact form/Voucher sales no longer shows error messages inline, but after the form
+
 ## 2.0.3 (2022-07-21)
 * Fix entering DD-MM-YYYY dates by hand
 

package/dist/onlinebooking.js

@@ -50,7 +50,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 /*******************************
 *  Recras integration library  *
-*  v 2.0.3                     *
+*  v 2.0.4                     *
 *******************************/
 var RecrasBooking = /*#__PURE__*/function () {
   function RecrasBooking() {
@@ -2550,27 +2550,40 @@ var RecrasContactForm = /*#__PURE__*/function () {
       element.parentNode.insertAdjacentHTML('afterend', "<div class=\"booking-error\">".concat(errorMsg, "</div>"));
     }
   }, {
-    key: "showInlineErrors",
-    value: function showInlineErrors() {
+    key: "showErrors",
+    value: function showErrors() {
+      var errors = [];
+
       for (var _i20 = 0, _this$getEmptyRequire2 = this.getEmptyRequiredFields(); _i20 < _this$getEmptyRequire2.length; _i20++) {
         var el = _this$getEmptyRequire2[_i20];
         var labelEl = el.parentNode.querySelector('label');
         var requiredText = this.languageHelper.translate('CONTACT_FORM_FIELD_REQUIRED', {
           FIELD_NAME: labelEl.innerText
         });
-        el.parentNode.insertAdjacentHTML('afterend', "<div class=\"booking-error\">".concat(requiredText, "</div>"));
+        errors.push(requiredText);
       }
 
       for (var _i22 = 0, _this$getInvalidField2 = this.getInvalidFields(); _i22 < _this$getInvalidField2.length; _i22++) {
         var _el = _this$getInvalidField2[_i22];
 
-        var _labelEl = _el.parentNode.querySelector('label');
+        var parentEl = _el.closest('div');
+
+        if (parentEl.classList.contains('radioGroup')) {
+          parentEl = parentEl.parentNode.closest('div');
+        }
+
+        var _labelEl = parentEl.querySelector('label');
 
+        console.log(_labelEl, parentEl.querySelectorAll('label'));
         var invalidText = this.languageHelper.translate('CONTACT_FORM_FIELD_INVALID', {
           FIELD_NAME: _labelEl.innerText
         });
-        this.showInlineError(_el, invalidText);
+        errors.push(invalidText);
       }
+
+      errors = _toConsumableArray(new Set(errors)); // Only unique text
+
+      this.findElement('button[type="submit"]').insertAdjacentHTML('afterend', "<div class=\"booking-error\"><ul><li>".concat(errors.join('<li>'), "</ul></div>"));
     }
   }, {
     key: "showLabel",
@@ -2601,7 +2614,7 @@ var RecrasContactForm = /*#__PURE__*/function () {
         submitButton.parentNode.insertAdjacentHTML('beforeend', "<div class=\"booking-error\">".concat(this.languageHelper.translate('ERR_CONTACT_FORM_EMPTY'), "</div>"));
         return false;
       } else if (this.hasEmptyRequiredFields() || !this.isValid()) {
-        this.showInlineErrors();
+        this.showErrors();
         return false;
       }
 
@@ -3824,7 +3837,7 @@ var RecrasVoucher = /*#__PURE__*/function () {
       this.contactForm.removeErrors();
 
       if (this.contactForm.hasEmptyRequiredFields() || !this.contactForm.isValid() || !this.contactForm.checkRequiredCheckboxes()) {
-        this.contactForm.showInlineErrors();
+        this.contactForm.showErrors();
         shouldDisable = true;
       }