ti2-tourplan 1.0.46 → 1.0.49

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,13 +219,13 @@ class Plugin {
           Quad: 'QD',
           Other: 'OT',
         })[roomType];
-        if (RoomType) RoomConfig.RoomType = RoomType;
+        if (RoomType) EachRoomConfig.RoomType = RoomType;
         if (passengers && passengers.length && !noPaxList) {
-          // There should be only 1 PaxList inside each RoomConfig
-          RoomConfig.PaxList = {};
+          // There should be only 1 PaxList inside each EachRoomConfig
+          EachRoomConfig.PaxList = {};
           // Inside PaxList, there should be 1 PaxDetails for each passenger (Pax)
-          RoomConfig.PaxList.PaxDetails = [];
-          passengers.forEach((p, index) => {
+          EachRoomConfig.PaxList.PaxDetails = [];
+          passengers.forEach((p, indexEachPax) => {
             const EachPaxDetails = {
               Forename: this.escapeInvalidXmlChars(p.firstName),
               Surname: this.escapeInvalidXmlChars(p.lastName),
@@ -236,11 +242,13 @@ class Plugin {
                 EachPaxDetails.Age = p.age;
               }
             }
-            RoomConfig.PaxList.PaxDetails[index] = EachPaxDetails;
+            EachRoomConfig.PaxList.PaxDetails[indexEachPax] = EachPaxDetails;
           });
         }
-        return { RoomConfig };
+        RoomConfigs.RoomConfig[indexRoomConfig++] = EachRoomConfig
       });
+      return RoomConfigs;
+    };
     this.escapeInvalidXmlChars = str => {
       if (!str) return '';
       const convertAccentedChars = s => {
@@ -466,9 +474,13 @@ class Plugin {
     const products = R.call(R.compose(
       R.map(optionsGroupedBySupplierId => {
         const OptGeneral = R.pathOr({}, [0, 'OptGeneral'], optionsGroupedBySupplierId);
+        let supplierName = R.path(['SupplierName'], OptGeneral);
+        if (R.path(['SupplierName'], OptGeneral).toLocaleLowerCase() === 'transfers') {
+          supplierName = `${R.path(['VoucherName'], OptGeneral)} (${R.path(['SupplierName'], OptGeneral)})`;
+        }
         const supplierData = {
           supplierId: R.path(['SupplierId'], OptGeneral),
-          supplierName: R.path(['SupplierName'], OptGeneral),
+          supplierName: supplierName,
           supplierAddress: `${R.pathOr('', ['Address1'], OptGeneral)}, ${R.pathOr('', ['Address2'], OptGeneral)},  ${R.pathOr('', ['Address3'], OptGeneral)}, ${R.pathOr('', ['Address4'], OptGeneral)}, ${R.pathOr('', ['Address5'], OptGeneral)}`,
           serviceTypes: R.uniq(optionsGroupedBySupplierId.map(R.path(['OptGeneral', 'ButtonName']))),
         };
@@ -546,7 +558,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,
       },
@@ -714,7 +726,7 @@ class Plugin {
           return num;
         })(),
         AgentRef: reference,
-        RoomConfigs: this.getPaxConfigs(paxConfigs),
+        RoomConfigs: this.getRoomConfigs(paxConfigs),
       },
     };
     const replyObj = await this.callTourplan({
@@ -801,6 +813,20 @@ class Plugin {
           console.log('error in searchBooking', err);
           reply = { ListBookingsReply: { BookingHeaders: { BookingHeader: [] } } };
         }
+
+        // {"ListBookingsReply":
+        //  {"BookingHeaders":
+        //    {"BookingHeader":[
+        //        {"AgentRef":"2399181","BookingId":"314164","BookingStatus":"Quotation","BookingType":"F",
+        //          "Consult":null,"Currency":"GBP","EnteredDate":"2024-05-23","IsInternetBooking":"Y",
+        //          "Name":"Mr. Robert Slavonia x2 2399181","QB":"Q","Ref":"ALFI393309","TotalPrice":"583143",
+        //          "TravelDate":"2024-07-09"},{"AgentRef":"666666/1","BookingId":"315357",
+        //          "BookingStatus":"Quotation","BookingType":"F","Consult":null,"Currency":"GBP",
+        //          "EnteredDate":"2024-06-04","IsInternetBooking":"Y","Name":"Robert Guerrerio x3 2413898",
+        //          "QB":"Q","Ref":"ALFI393503","TotalPrice":"2309452","TravelDate":"2024-08-31"
+        //        }
+        //     ]}
+        // }}
         return reply;
       })
       : [this.callTourplan(listBookingPayload)];

package/package.json

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