@recras/online-booking-js 2.0.2 → 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.2
+Version: 2.0.4
 
 JS library for easy online booking, contact form, and voucher integration
 

package/changelog.md

@@ -1,5 +1,11 @@
 # 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
+
 ## 2.0.2 (2022-06-29)
 * No changes from 2.0.1 - previous version on NPM contained wrong compiled version
 

package/dist/onlinebooking.js

@@ -20,7 +20,7 @@ function _objectEntries(obj) {
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
@@ -50,7 +50,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 
 /*******************************
 *  Recras integration library  *
-*  v 2.0.2                     *
+*  v 2.0.4                     *
 *******************************/
 var RecrasBooking = /*#__PURE__*/function () {
   function RecrasBooking() {
@@ -1473,7 +1473,7 @@ var RecrasBooking = /*#__PURE__*/function () {
     key: "addDateTimeSelectionHtml",
     value: function addDateTimeSelectionHtml() {
       var today = RecrasDateHelper.datePartOnly(new Date());
-      var html = "<form class=\"recras-datetime\">\n            <label for=\"recras-onlinebooking-date\">\n                ".concat(this.languageHelper.translate('DATE'), "\n            </label>\n            <input type=\"text\" id=\"recras-onlinebooking-date\" class=\"recras-onlinebooking-date\" min=\"").concat(today, "\" disabled readonly autocomplete=\"off\">\n            <label for=\"recras-onlinebooking-time\">\n                ").concat(this.languageHelper.translate('TIME'), "\n            </label>\n            <select id=\"recras-onlinebooking-time\" class=\"recras-onlinebooking-time\" disabled autocomplete=\"off\"></select>\n        </form>");
+      var html = "<form class=\"recras-datetime\">\n            <label for=\"recras-onlinebooking-date\">\n                ".concat(this.languageHelper.translate('DATE'), "\n            </label>\n            <input type=\"text\" id=\"recras-onlinebooking-date\" class=\"recras-onlinebooking-date\" min=\"").concat(today, "\" disabled autocomplete=\"off\">\n            <label for=\"recras-onlinebooking-time\">\n                ").concat(this.languageHelper.translate('TIME'), "\n            </label>\n            <select id=\"recras-onlinebooking-time\" class=\"recras-onlinebooking-time\" disabled autocomplete=\"off\"></select>\n        </form>");
       this.appendHtml(html);
     }
   }, {
@@ -1520,7 +1520,8 @@ var RecrasBooking = /*#__PURE__*/function () {
         },
         onSelect: function onSelect(date) {
           return _this24.calendarOnDateSelect(date, pack.id);
-        }
+        },
+        parse: RecrasDateHelper.parseMDY
       });
 
       this.datePicker = new Pikaday(pikadayOptions);
@@ -2513,7 +2514,8 @@ var RecrasContactForm = /*#__PURE__*/function () {
           var pikadayOptions = _extends(RecrasCalendarHelper.defaultOptions(), {
             field: _this38.findElement('[data-identifier="boeking.datum"]'),
             i18n: RecrasCalendarHelper.i18n(_this38.languageHelper),
-            numberOfMonths: 1
+            numberOfMonths: 1,
+            parse: RecrasDateHelper.parseMDY
           });
 
           new Pikaday(pikadayOptions);
@@ -2548,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",
@@ -2599,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;
       }
 
@@ -2749,6 +2764,15 @@ var RecrasDateHelper = /*#__PURE__*/function () {
 
       return date;
     }
+  }, {
+    key: "parseMDY",
+    value: function parseMDY(dateStr) {
+      var parts = dateStr.split('-');
+      var day = parseInt(parts[0], 10);
+      var month = parseInt(parts[1], 10) - 1;
+      var year = parseInt(parts[2], 10);
+      return new Date(year, month, day);
+    }
   }, {
     key: "setTimeForDate",
     value: function setTimeForDate(date, timeStr) {
@@ -3813,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;
       }