ti2-tourplan 1.0.37 → 1.0.39

package/index.js

@@ -201,7 +201,7 @@ class Plugin {
           Double: 'DB',
           Twin: 'TW',
           Triple: 'TR',
-          Quad: 'QU',
+          Quad: 'QD',
         })[roomType];
         if (RoomType) RoomConfig.RoomType = RoomType;
         if (passengers && passengers.length && !noPaxList) {
@@ -214,10 +214,10 @@ class Plugin {
                 Child: 'C',
                 Infant: 'I',
               }[p.passengerType] || 'A',
-              Title: p.salutation,
             };
+            if (p.salutation) PaxDetails.Title = p.salutation;
             if (p.dob) PaxDetails.DateOfBirth = p.dob;
-            if (!isNaN(p.age)) {
+            if (!R.isNil(p.age) && !isNaN(p.age)) {
               if (!(p.passengerType === 'Adult' && p.age === 0)) {
                 PaxDetails.Age = p.age;
               }
@@ -242,7 +242,12 @@ class Plugin {
         .replace(/>/g, '>')
         .replace(/"/g, '"')
         .replace(/'/g, ''')
-    }
+    };
+
+    // this.errorPathsAxiosErrors = () => ([ // axios triggered errors
+    //   ['response', 'data', 'error'],
+    // ]);
+    // this.errorPathsAxiosAny = () => ([]); // 200's that should be errors
   }
 
   async validateToken({
@@ -518,9 +523,13 @@ class Plugin {
     const model = {
       OptionInfoRequest: {
         Opt: optionId,
-        Info: 'A',
+        Info: 'S',
         DateFrom: startDate,
-        DateTo: startDate,
+        SCUqty: (() => {
+          const num = parseInt(chargeUnitQuanity, 10);
+          if (isNaN(num) || num < 1) return 1;
+          return num;
+        })(),
         RoomConfigs: this.getPaxConfigs(paxConfigs, true),
         AgentID: hostConnectAgentID,
         Password: hostConnectAgentPassword,
@@ -532,47 +541,84 @@ class Plugin {
       axios,
       xmlOptions: hostConnectXmlOptions,
     });
-    const optAvail = R.path(['OptionInfoReply', 'Option', 'OptAvail'], replyObj);
     /*
-    FROM TP DOCS:
-    Each integer in the list gives the availability for one of the days in the range requested,
-    from the start date through to the end date. The integer values are to be interpreted as
-    follows:
-    Greater than 0 means that inventory is available, with the integer specifying the
-    number of units available. For options with a service type of Y , the inventory is in
-    units of rooms. For other service types, the inventory is in units of pax.
-    -1 Not available.
-    -2 Available on free sell.
-    -3 Available on request.
-    Note: A return value of 0 or something less than -3 is impossible.
+      If not rates, optionInfoReply is null, meaning it's not bookable
+      otherwise, example data:
+      {
+        optionInfoReply: {
+          Option: {
+            Opt: 'LHRTRDAVIDSHABTVC',
+            OptStayResults: {
+              AgentPrice: '51175',
+              Availability: 'RQ',
+              CancelHours: '96',
+              CommissionPercent: '0.00',
+              Currency: 'GBP',
+              PeriodValueAdds: {
+                PeriodValueAdd: {
+                  DateFrom: '2024-08-10',
+                  DateTo: '2024-08-10',
+                  RateName: 'Std-Mon Sun',
+                  RateText: 'Std'
+                }
+              },
+              RateId: 'Default',
+              RateName: 'Std-Mon Sun',
+              RateText: 'Std',
+              SaleFrom: '2023-12-20',
+              TotalPrice: '51175'
+            },
+            OptionNumber: '70461'
+          }
+        }
+      }
     */
-    if (optAvail === -1) {
-      return {
-        available: false,
-      };
-    }
-    if (optAvail === -2) {
-      return {
-        available: true,
-        type: 'free sell',
-      };
-    }
-    if (optAvail === -3) {
-      return {
-        available: true,
-        type: 'on request',
-      };
-    }
-    if (optAvail > 0) {
-      return {
-        available: true,
-        type: 'inventory',
-        quantity: optAvail,
-      };
-    }
+    const optionInfoReply = R.path(['OptionInfoReply'], replyObj);
     return {
-      available: false,
+      bookable: Boolean(optionInfoReply),
     };
+    // THE BELOW CODE is for A check, might still need it on user's future request
+    // const optAvail = parseInt(R.pathOr('-4', ['OptionInfoReply', 'Option', 'OptAvail'], replyObj), 10);
+    // /*
+    // FROM TP DOCS:
+    // Each integer in the list gives the availability for one of the days in the range requested,
+    // from the start date through to the end date. The integer values are to be interpreted as
+    // follows:
+    // Greater than 0 means that inventory is available, with the integer specifying the
+    // number of units available. For options with a service type of Y , the inventory is in
+    // units of rooms. For other service types, the inventory is in units of pax.
+    // -1 Not available.
+    // -2 Available on free sell.
+    // -3 Available on request.
+    // Note: A return value of 0 or something less than -3 is impossible.
+    // */
+    // if (optAvail === -1) {
+    //   return {
+    //     available: false,
+    //   };
+    // }
+    // if (optAvail === -2) {
+    //   return {
+    //     available: true,
+    //     type: 'free sell',
+    //   };
+    // }
+    // if (optAvail === -3) {
+    //   return {
+    //     available: true,
+    //     type: 'on request',
+    //   };
+    // }
+    // if (optAvail > 0) {
+    //   return {
+    //     available: true,
+    //     type: 'inventory',
+    //     quantity: optAvail,
+    //   };
+    // }
+    // return {
+    //   available: false,
+    // };
   }
 
   async searchQuote({
@@ -625,30 +671,34 @@ class Plugin {
         ...(rateId ? {
           RateId: rateId,
         } : {}),
-        ...(puInfo ? {
+        ...(puInfo && (puInfo.time || puInfo.location || puInfo.flightDetails) ? {
           ...(puInfo.time && puInfo.time.replace(/\D/g, '') ? {
             puTime: puInfo.time.replace(/\D/g, ''),
           } : {}),
-          puRemark: this.escapeInvalidXmlChars(`Time: ${puInfo.time || 'NA'},
-          Location: ${puInfo.location || 'NA'},
-          Flight: ${puInfo.flightDetails || 'NA'},
+          puRemark: this.escapeInvalidXmlChars(`${puInfo.time ? `Time: ${puInfo.time || 'NA'},` : ''}
+          ${puInfo.location ? `Location: ${puInfo.location || 'NA'},` : ''}
+          ${puInfo.flightDetails ? `Flight: ${puInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
-        ...(doInfo ? {
+        ...(doInfo && (doInfo.time || doInfo.location || doInfo.flightDetails) ? {
           // only get numbers from doInfo.time
           ...(doInfo.time && doInfo.time.replace(/\D/g, '') ? {
             doTime: doInfo.time.replace(/\D/g, ''),
           } : {}),
-          doRemark: this.escapeInvalidXmlChars(`Time: ${doInfo.time || 'NA'},
-          Location: ${doInfo.location || 'NA'},
-          Flight: ${doInfo.flightDetails || 'NA'},
+          doRemark: this.escapeInvalidXmlChars(`${doInfo.time ? `Time: ${doInfo.time || 'NA'},` : ''}
+          ${doInfo.location ? `Location: ${doInfo.location || 'NA'},` : ''}
+          ${doInfo.flightDetails ? `Flight: ${doInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
-        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`),
+        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 240),
         Opt: optionId,
         DateFrom: startDate,
         RateId: 'Default',
-        SCUqty: chargeUnitQuanity || 1,
+        SCUqty: (() => {
+          const num = parseInt(chargeUnitQuanity, 10);
+          if (isNaN(num) || num < 1) return 1;
+          return num;
+        })(),
         AgentRef: reference,
         RoomConfigs: this.getPaxConfigs(paxConfigs),
       },
@@ -661,7 +711,7 @@ class Plugin {
     });
     return {
       message: R.path(['AddServiceReply', 'Status'], replyObj)
-        === 'NO' ? 'Service cannot be added to quote' : '',
+        === 'NO' ? 'Service cannot be added to quote (could be due to no rates)' : '',
       quote: {
         id: R.path(['AddServiceReply', 'BookingId'], replyObj),
         reference: R.path(['AddServiceReply', 'Ref'], replyObj),
@@ -722,6 +772,10 @@ class Plugin {
         try {
           reply = await this.callTourplan(getPayload('ListBookingsRequest', { [key]: bookingId }));
         } catch (err) {
+          if (err.includes && err.includes('Request failed with status code')) {
+            throw Error(err);
+          }
+          // if it's not server error, we just considered as no booking is found
           console.log('error in searchBooking', err);
           reply = { ListBookingsReply: { BookingHeaders: { BookingHeader: [] } } };
         }

package/package.json

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

package/resolvers/product.js

@@ -123,15 +123,16 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
           } : null].filter(Boolean);
         }
         if (R.path(['OptGeneral', 'SType'], option) === 'Y' || R.path(['OptGeneral', 'SType'], option) === 'P') {
+          console.log('hit here')
           return ['Single', 'Twin', 'Double', 'Quad']
-            .map(([unitId, unitName]) => ({
+            .map((unitId) => ({
               unitId,
-              unitName,
+              unitName: unitId,
               pricing: [],
               restrictions: {
-                allowed: R.path(['OptGeneral', `${unitName}_Avail`], option) === 'Y',
-                paxCount: R.path(['OptGeneral', `${unitName}_Max`], option)
-                || R.path(['OptGeneral', `${unitName}_Ad_Max`], option),
+                allowed: R.path(['OptGeneral', `${unitId}_Avail`], option) === 'Y',
+                paxCount: R.path(['OptGeneral', `${unitId}_Max`], option)
+                || R.path(['OptGeneral', `${unitId}_Ad_Max`], option),
               },
             }));
         }