@recras/online-booking-js 2.0.2 → 2.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@recras/online-booking-js",
-  "version": "2.0.2",
+  "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.17.6",
-    "@babel/core": "7.17.9",
-    "@babel/plugin-proposal-class-properties": "7.16.7",
-    "@babel/plugin-transform-arrow-functions": "7.16.7",
-    "@babel/plugin-transform-for-of": "7.16.7",
-    "@babel/plugin-transform-object-assign": "7.16.7",
-    "@babel/preset-env": "7.16.11",
+    "@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.9",
     "babel-plugin-transform-es2017-object-entries": "0.0.5",
-    "jasmine-core": "4.0.1",
+    "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.2                     *
+*  v 2.0.4                     *
 *******************************/
 
 class RecrasBooking {
@@ -1194,7 +1194,7 @@ class RecrasBooking {
             <label for="recras-onlinebooking-date">
                 ${ this.languageHelper.translate('DATE') }
             </label>
-            <input type="text" id="recras-onlinebooking-date" class="recras-onlinebooking-date" min="${ today }" disabled readonly autocomplete="off">
+            <input type="text" id="recras-onlinebooking-date" class="recras-onlinebooking-date" min="${ today }" disabled autocomplete="off">
             <label for="recras-onlinebooking-time">
                 ${ this.languageHelper.translate('TIME') }
             </label>
@@ -1238,6 +1238,7 @@ class RecrasBooking {
                 i18n: RecrasCalendarHelper.i18n(this.languageHelper),
                 onDraw: (pika) => this.calendarOnDraw(pika, pack.id),
                 onSelect: (date) => this.calendarOnDateSelect(date, pack.id),
+                parse: RecrasDateHelper.parseMDY,
             }
         );
 

package/src/contactForm.js

@@ -424,6 +424,7 @@ class RecrasContactForm {
                             field: this.findElement('[data-identifier="boeking.datum"]'),
                             i18n: RecrasCalendarHelper.i18n(this.languageHelper),
                             numberOfMonths: 1,
+                            parse: RecrasDateHelper.parseMDY,
                         }
                     );
                     new Pikaday(pikadayOptions);
@@ -456,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) {
@@ -501,7 +510,7 @@ class RecrasContactForm {
             );
             return false;
         } else if (this.hasEmptyRequiredFields() || !this.isValid()) {
-            this.showInlineErrors();
+            this.showErrors();
             return false;
         }
 

package/src/dateHelper.js

@@ -20,6 +20,14 @@ class RecrasDateHelper {
         return date;
     }
 
+    static parseMDY(dateStr) {
+        const parts = dateStr.split('-');
+        const day = parseInt(parts[0], 10);
+        const month = parseInt(parts[1], 10) - 1;
+        const year = parseInt(parts[2], 10);
+        return new Date(year, month, day);
+    }
+
     static setTimeForDate(date, timeStr) {
         date.setHours(timeStr.substr(0, 2), timeStr.substr(3, 2));
         return date;

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;
         }
 

package/test/js-unit/recrasBookingSpec.js

@@ -511,16 +511,6 @@ describe('RecrasBooking', () => {
             expect(rb.setMinMaxAmountWarning).toHaveBeenCalledWith('packageline0', 5, 'minimum');
         });
 
-        it('gives error if amount is less than the line minimum', async () => {
-            await rb.promise;
-
-            let el = document.getElementById('packageline2');
-            el.value = '1';
-            el.dispatchEvent(new Event('input'));
-
-            expect(rb.setMinMaxAmountWarning).toHaveBeenCalledWith('packageline2', 10, 'minimum');
-        });
-
         it('gives error if amount is more than the maximum', async () => {
             await rb.promise;
 

package/test/js-unit/recrasDateHelperSpec.js

@@ -21,6 +21,15 @@ describe('RecrasDateHelper', () => {
         });
     });
 
+    describe('parseMDY', () => {
+        it('correctly parses entered date', () => {
+            const dateStr = '11-09-2022';
+            const date = RecrasDateHelper.parseMDY(dateStr);
+            expect(date.getMonth()).toEqual(8); // months are 0-indexed
+            expect(date.getDate()).toEqual(11);
+        });
+    });
+
     describe('setTimeForDate', () => {
         it('Correctly sets the time', () => {
             let date = new Date(2018, 3, 20);