ti2-tourplan 1.0.45 → 1.0.47

package/index.js

@@ -187,9 +187,15 @@ class Plugin {
       return R.path(['Reply'], replyObj);
     };
 
-    this.getPaxConfigs = (paxConfigs, noPaxList) =>
+    this.getRoomConfigs = (paxConfigs, noPaxList) => {
+      // There should be only 1 RoomConfigs for AddServiceRequest
+      let RoomConfigs = {};
+      // add one RoomConfig for each room required (i.e. one for each PaxConfig)
+      RoomConfigs.RoomConfig = [];
+      let indexRoomConfig = 0;
       paxConfigs.map(({ roomType, passengers = [] }) => {
-        const RoomConfig = passengers.reduce((acc, p) => {
+        const EachRoomConfig = passengers.reduce((acc, p) => {
+          console.log(JSON.stringify(p));
           if (p.passengerType === 'Adult') {
             acc.Adults += 1;
           }
@@ -213,10 +219,14 @@ class Plugin {
           Quad: 'QD',
           Other: 'OT',
         })[roomType];
-        if (RoomType) RoomConfig.RoomType = RoomType;
+        if (RoomType) EachRoomConfig.RoomType = RoomType;
         if (passengers && passengers.length && !noPaxList) {
-          RoomConfig.PaxList = passengers.map(p => {
-            const PaxDetails = {
+          // There should be only 1 PaxList inside each EachRoomConfig
+          EachRoomConfig.PaxList = {};
+          // Inside PaxList, there should be 1 PaxDetails for each passenger (Pax)
+          EachRoomConfig.PaxList.PaxDetails = [];
+          passengers.forEach((p, indexEachPax) => {
+            const EachPaxDetails = {
               Forename: this.escapeInvalidXmlChars(p.firstName),
               Surname: this.escapeInvalidXmlChars(p.lastName),
               PaxType: {
@@ -225,20 +235,20 @@ class Plugin {
                 Infant: 'I',
               }[p.passengerType] || 'A',
             };
-            if (p.salutation) PaxDetails.Title = this.escapeInvalidXmlChars(p.salutation);
-            if (p.dob) PaxDetails.DateOfBirth = p.dob;
+            if (p.salutation) EachPaxDetails.Title = this.escapeInvalidXmlChars(p.salutation);
+            if (p.dob) EachPaxDetails.DateOfBirth = p.dob;
             if (!R.isNil(p.age) && !isNaN(p.age)) {
               if (!(p.passengerType === 'Adult' && p.age === 0)) {
-                PaxDetails.Age = p.age;
+                EachPaxDetails.Age = p.age;
               }
             }
-            return {
-              PaxDetails,
-            };
+            EachRoomConfig.PaxList.PaxDetails[indexEachPax] = EachPaxDetails;
           });
         }
-        return { RoomConfig };
+        RoomConfigs.RoomConfig[indexRoomConfig++] = EachRoomConfig
       });
+      return RoomConfigs;
+    };
     this.escapeInvalidXmlChars = str => {
       if (!str) return '';
       const convertAccentedChars = s => {
@@ -544,7 +554,7 @@ class Plugin {
           if (isNaN(num) || num < 1) return 1;
           return num;
         })(),
-        RoomConfigs: this.getPaxConfigs(paxConfigs, true),
+        RoomConfigs: this.getRoomConfigs(paxConfigs, true),
         AgentID: hostConnectAgentID,
         Password: hostConnectAgentPassword,
       },
@@ -712,7 +722,7 @@ class Plugin {
           return num;
         })(),
         AgentRef: reference,
-        RoomConfigs: this.getPaxConfigs(paxConfigs),
+        RoomConfigs: this.getRoomConfigs(paxConfigs),
       },
     };
     const replyObj = await this.callTourplan({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.45",
+  "version": "1.0.47",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {