@qite/tide-booking-component 1.0.13 → 1.0.15

package/package.json

@@ -1,71 +1,71 @@
-{
-  "name": "@qite/tide-booking-component",
-  "version": "1.0.13",
-  "description": "React BookingWizard component for Tide",
-  "main": "build/build-cjs/index.js",
-  "module": "build/build-esm/index.js",
-  "scripts": {
-    "start": "rollup -c -w",
-    "build": "rollup -c",
-    "tsc": "tsc --noEmit",
-    "format": "prettier --write ."
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@bitbucket.org/qitegeneral/tide-booking-component.git"
-  },
-  "keywords": [
-    "tide",
-    "booking",
-    "react",
-    "component"
-  ],
-  "author": "Kristof Colpaert <kristof.colpaert@qite.be>",
-  "license": "OBSD",
-  "homepage": "https://bitbucket.org/qitegeneral/tide-booking-component#readme",
-  "devDependencies": {
-    "@jsonurl/jsonurl": "^1.1.4",
-    "@reach/router": "^1.3.4",
-    "@reduxjs/toolkit": "^1.6.0",
-    "@rollup/plugin-commonjs": "^19.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.2",
-    "@types/flat": "^5.0.2",
-    "@types/lodash": "^4.14.171",
-    "@types/reach__router": "^1.3.9",
-    "@types/react-dom": "^17.0.11",
-    "@types/uuid": "^8.3.1",
-    "date-fns": "^2.22.1",
-    "flat": "^5.0.2",
-    "formik": "^2.2.9",
-    "lodash": "^4.17.21",
-    "prettier": "^2.3.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-redux": "^7.2.4",
-    "rollup": "^2.53.2",
-    "rollup-plugin-delete": "^2.0.0",
-    "rollup-plugin-peer-deps-external": "^2.2.4",
-    "rollup-plugin-typescript2": "^0.30.0",
-    "tslib": "^2.3.1",
-    "typescript": "^4.3.5",
-    "uuid": "^8.3.2"
-  },
-  "peerDependencies": {
-    "@jsonurl/jsonurl": "^1.1.4",
-    "@reach/router": "^1.3.4",
-    "@reduxjs/toolkit": "^1.6.0",
-    "date-fns": "^2.22.1",
-    "flat": "^5.0.2",
-    "formik": "^2.2.9",
-    "immer": "^9.0.5",
-    "lodash": "^4.17.21",
-    "react": "^16.12.0",
-    "react-dom": "^16.12.0",
-    "react-redux": "^7.2.4",
-    "uuid": "^8.3.2"
-  },
-  "dependencies": {
-    "@qite/tide-client": "1.1.15"
-  }
-}
+{
+  "name": "@qite/tide-booking-component",
+  "version": "1.0.15",
+  "description": "React BookingWizard component for Tide",
+  "main": "build/build-cjs/index.js",
+  "module": "build/build-esm/index.js",
+  "scripts": {
+    "start": "rollup -c -w",
+    "build": "rollup -c",
+    "tsc": "tsc --noEmit",
+    "format": "prettier --write ."
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@bitbucket.org/qitegeneral/tide-booking-component.git"
+  },
+  "keywords": [
+    "tide",
+    "booking",
+    "react",
+    "component"
+  ],
+  "author": "Kristof Colpaert <kristof.colpaert@qite.be>",
+  "license": "OBSD",
+  "homepage": "https://bitbucket.org/qitegeneral/tide-booking-component#readme",
+  "devDependencies": {
+    "@jsonurl/jsonurl": "^1.1.4",
+    "@reach/router": "^1.3.4",
+    "@reduxjs/toolkit": "^1.6.0",
+    "@rollup/plugin-commonjs": "^19.0.1",
+    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-node-resolve": "^13.0.2",
+    "@types/flat": "^5.0.2",
+    "@types/lodash": "^4.14.171",
+    "@types/reach__router": "^1.3.9",
+    "@types/react-dom": "^17.0.11",
+    "@types/uuid": "^8.3.1",
+    "date-fns": "^2.22.1",
+    "flat": "^5.0.2",
+    "formik": "^2.2.9",
+    "lodash": "^4.17.21",
+    "prettier": "^2.3.2",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-redux": "^7.2.4",
+    "rollup": "^2.53.2",
+    "rollup-plugin-delete": "^2.0.0",
+    "rollup-plugin-peer-deps-external": "^2.2.4",
+    "rollup-plugin-typescript2": "^0.30.0",
+    "tslib": "^2.3.1",
+    "typescript": "^4.3.5",
+    "uuid": "^8.3.2"
+  },
+  "peerDependencies": {
+    "@jsonurl/jsonurl": "^1.1.4",
+    "@reach/router": "^1.3.4",
+    "@reduxjs/toolkit": "^1.6.0",
+    "date-fns": "^2.22.1",
+    "flat": "^5.0.2",
+    "formik": "^2.2.9",
+    "immer": "^9.0.5",
+    "lodash": "^4.17.21",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-redux": "^7.2.4",
+    "uuid": "^8.3.2"
+  },
+  "dependencies": {
+    "@qite/tide-client": "1.1.15"
+  }
+}

package/src/booking-wizard/features/travelers-form/travelers-form.tsx

@@ -485,24 +485,26 @@ const TravelersForm: React.FC<TravelersFormProps> = () => {
           </div>
         </div>
       ))}
-      <div className="form__region">
-        <div className="form__region-header">
-          <h5 className="form__region-heading">
-            {translations.TRAVELERS_FORM.MAIN_BOOKER}
-          </h5>
-          <p className="form__region-label">
-            {compact([
-              compact([mainBooker?.firstName, mainBooker?.lastName]).join(" "),
-              mainBooker?.birthDate &&
-                format(
-                  parse(mainBooker.birthDate, "yyyy-MM-dd", new Date()),
-                  "dd-MM-yyyy"
-                ),
-            ]).join(", ")}
-          </p>
-        </div>
 
-        {bookingType != "b2b" && (
+      {bookingType != "b2b" ? (
+        <div className="form__region">
+          <div className="form__region-header">
+            <h5 className="form__region-heading">
+              {translations.TRAVELERS_FORM.MAIN_BOOKER}
+            </h5>
+            <p className="form__region-label">
+              {compact([
+                compact([mainBooker?.firstName, mainBooker?.lastName]).join(
+                  " "
+                ),
+                mainBooker?.birthDate &&
+                  format(
+                    parse(mainBooker.birthDate, "yyyy-MM-dd", new Date()),
+                    "dd-MM-yyyy"
+                  ),
+              ]).join(", ")}
+            </p>
+          </div>
           <>
             <div className="form__twocolumn">
               <div className="form__twocolumn-column">
@@ -539,7 +541,6 @@ const TravelersForm: React.FC<TravelersFormProps> = () => {
                   />
                 </div>
               </div>
-
               <div className="form__twocolumn-column">
                 <div className="form__row">
                   <LabeledInput
@@ -633,8 +634,24 @@ const TravelersForm: React.FC<TravelersFormProps> = () => {
               />
             </div>
           </>
-        )}
-      </div>
+        </div>
+      ) : (
+        <div className="form__region">
+          <div className="form__row">
+            <LabeledInput
+              hasError={hasVisibleError("phone")}
+              extraClassName="form__group--md-33"
+              label={translations.TRAVELERS_FORM.PHONE}
+              required
+              name="phone"
+              onChange={formik.handleChange}
+              onBlur={formik.handleBlur}
+              value={formik.values.phone}
+            />
+          </div>
+        </div>
+      )}
+
       {showAgentSelection && (
         <div className="form__region">
           <div className="form__region-header">

package/src/booking-wizard/features/travelers-form/validate-form.ts

@@ -142,14 +142,18 @@ const validateForm = (
     } else if (values.emailConfirmation !== values.email) {
       errors.emailConfirmation = "Hoofdboeker: email komt niet overeen";
     }
-  }
 
-  if (isEmpty(values.country)) {
-    errors.country = "Hoofdboeker: land";
-  }
+    if (isEmpty(values.country)) {
+      errors.country = "Hoofdboeker: land";
+    }
 
-  if (isEmpty(values.phone)) {
-    errors.phone = "Hoofdboeker: telefoon";
+    if (isEmpty(values.phone)) {
+      errors.phone = "Hoofdboeker: telefoon";
+    }
+  } else {
+    if (isEmpty(values.phone)) {
+      errors.phone = "Hoofdboeker: telefoon";
+    }
   }
 
   if (agentRequired && !values.travelAgentId) {