ti2-tourplan 1.0.36 → 1.0.38

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) {
@@ -229,6 +229,25 @@ class Plugin {
         }
         return { RoomConfig };
       });
+    this.escapeInvalidXmlChars = str => {
+      if (!str) return '';
+      return str.replace(/[^\x00-\x7F]+/g, '')
+        .replace(/’/g, "'")
+        .replace(/‘/g, "'")
+        .replace(/“/g, '"')
+        .replace(/”/g, '"')
+        .replace(/–/g, '-')
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;')
+        .replace(/'/g, '&apos;')
+    };
+
+    // this.errorPathsAxiosErrors = () => ([ // axios triggered errors
+    //   ['response', 'data', 'error'],
+    // ]);
+    // this.errorPathsAxiosAny = () => ([]); // 200's that should be errors
   }
 
   async validateToken({
@@ -401,7 +420,7 @@ class Plugin {
       hostConnectAgentPassword,
       configuration,
     },
-    payload: { optionId, forceRefresh },
+    payload: { optionId, forceRefresh, searchInput },
   }) {
     const model = {
       OptionInfoRequest: {
@@ -448,6 +467,19 @@ class Plugin {
         }),
         R.values,
         R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
+        root => {
+          if (!searchInput) return root;
+          const getFullSearchStr = o => {
+            const fullPptionName = `${R.path(['OptGeneral', 'Description'], o) || ''}-${R.path(['OptGeneral', 'Comment'], o) || ''}`;
+            return `${R.path(['OptGeneral', 'SupplierName'], o) || ''} ${fullPptionName} ${R.path(['Opt'], o)} ${R.path(['OptGeneral', 'SupplierId'], o) || ''}`;
+          };
+          const inputValueLower = searchInput.trim().toLowerCase();
+          const parts = inputValueLower.split(' ').filter(Boolean); // Filter out any empty strings just in case
+          return root.filter(option => {
+            const fullSearchStr = getFullSearchStr(option).toLowerCase();
+            return parts.every(part => fullSearchStr.includes(part));
+          });
+        },
         root => {
           const options = R.pathOr([], ['OptionInfoReply', 'Option'], root);
           // due to the new parser, single option will be returned as an object
@@ -460,7 +492,7 @@ class Plugin {
     return {
       products,
       productFields: [],
-      ...configuration,
+      ...(searchInput || optionId ? {} : configuration),
     };
   }
 
@@ -491,7 +523,7 @@ class Plugin {
     const model = {
       OptionInfoRequest: {
         Opt: optionId,
-        Info: 'A',
+        Info: 'S',
         DateFrom: startDate,
         DateTo: startDate,
         RoomConfigs: this.getPaxConfigs(paxConfigs, true),
@@ -505,47 +537,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({
@@ -590,31 +659,34 @@ class Plugin {
         ...(quoteId ? {
           ExistingBookingInfo: { BookingId: quoteId },
         } : {
-          NewBookingInfo: { Name: quoteName, QB: 'Q' },
+          NewBookingInfo: {
+            Name: this.escapeInvalidXmlChars(quoteName),
+            QB: 'Q',
+          },
         }),
         ...(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: `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: `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: `${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`,
+        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 240),
         Opt: optionId,
         DateFrom: startDate,
         RateId: 'Default',
@@ -692,6 +764,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.36",
+  "version": "1.0.38",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {