ti2-tourplan 1.0.49 → 1.0.51

package/index.js

@@ -590,11 +590,22 @@ class Plugin {
                   RateText: 'Std'
                 }
               },
-              RateId: 'Default',
+              RateId: '$NZD2016b81f44793096,4,DOUB,C5 A1INF KGB DOUB RONL',
               RateName: 'Std-Mon Sun',
               RateText: 'Std',
               SaleFrom: '2023-12-20',
-              TotalPrice: '51175'
+              TotalPrice: '51175',
+              ExternalRateDetails: {
+                ExtSupplierId: 'NZ000021',
+                ExtOptionId: 'DOUB',
+                ExtOptionDescr: 'Superior Room, 1 King Bed',
+                ExtRatePlanCode: 'C5 A1INF KGB DOUB RONL',
+                ExtRatePlanDescr: 'Room Only',
+                ExtGuarantee: 'N',
+              },
+              RoomList: {
+                RoomType: 'DB',
+              }
             },
             OptionNumber: '70461'
           }
@@ -602,8 +613,21 @@ class Plugin {
       }
     */
     const optionInfoReply = R.path(['OptionInfoReply'], replyObj);
+    let OptStayResults = R.pathOr([], ['Option', 'OptStayResults'], optionInfoReply);
+    if (!Array.isArray(OptStayResults)) OptStayResults = [OptStayResults];
     return {
       bookable: Boolean(optionInfoReply),
+      rates: OptStayResults.map(rate => {
+        let externalRateText = R.pathOr('', ['ExternalRateDetails', 'ExtOptionDescr'], rate);
+        const extRatePlanDescr = R.pathOr('', ['ExternalRateDetails', 'ExtRatePlanDescr'], rate);
+        if (extRatePlanDescr && !externalRateText.includes(extRatePlanDescr)) {
+          externalRateText = `${externalRateText} (${extRatePlanDescr})`;
+        }
+        return {
+          rateId: R.path(['RateId'], rate),
+          externalRateText,
+        };
+      }),
     };
     // 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);
@@ -679,11 +703,9 @@ class Plugin {
       puInfo,
       doInfo,
       notes,
+      directHeaderPayload,
     },
   }) {
-    const extraText = extras && extras.length
-      ? extras.map((e, i) => `Extra ${i + 1}: ${e.name} x ${e.quantity}`).join(`\n`)
-      : '';
     const model = {
       AddServiceRequest: {
         AgentID: hostConnectAgentID,
@@ -694,11 +716,9 @@ class Plugin {
           NewBookingInfo: {
             Name: this.escapeInvalidXmlChars(quoteName),
             QB: 'Q',
+            ...(directHeaderPayload || {}),
           },
         }),
-        ...(rateId ? {
-          RateId: rateId,
-        } : {}),
         ...(puInfo && (puInfo.time || puInfo.location || puInfo.flightDetails) ? {
           ...(puInfo.time && puInfo.time.replace(/\D/g, '') ? {
             puTime: puInfo.time.replace(/\D/g, ''),
@@ -716,10 +736,18 @@ class Plugin {
           ${doInfo.flightDetails ? `Flight: ${doInfo.flightDetails || 'NA'},` : ''}
           `),
         } : {}),
-        Remarks: this.escapeInvalidXmlChars(`${notes || ''} ${extraText ? `\nExtras: ${extraText}` : ''}`).slice(0, 220),
+        ...(extras && extras.filter(e => e.selectedExtra && e.selectedExtra.id).length ? {
+          ExtraQuantities: {
+            ExtraQuantityItem: extras.filter(e => e.selectedExtra && e.selectedExtra.id).map(e => ({
+              SequenceNumber: e.selectedExtra.id,
+              ExtraQuantity: e.quantity,
+            })),
+          },
+        } : {}),
+        Remarks: this.escapeInvalidXmlChars(notes).slice(0, 220),
         Opt: optionId,
         DateFrom: startDate,
-        RateId: 'Default',
+        RateId: rateId || 'Default',
         SCUqty: (() => {
           const num = parseInt(chargeUnitQuanity, 10);
           if (isNaN(num) || num < 1) return 1;

package/package.json

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

package/resolvers/product.js

@@ -44,6 +44,10 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
     options: optionsGroupedBySupplierId.map(option => {
       const comment = R.path(['OptGeneral', 'Comment'], option);
       const st = R.pathOr('', ['OptGeneral', 'ButtonName'], option);
+      // when only one extra is present, it is not an array
+      let OptExtras = R.pathOr([], ['OptGeneral', 'OptExtras', 'OptExtra'], option);
+      // console.log({ OptExtras })
+      if (!Array.isArray(OptExtras)) OptExtras = [OptExtras];
       const keyData = {
         optionId: R.path(['Opt'], option),
         optionName: `${R.path(['OptGeneral', 'Description'], option)}${
@@ -83,6 +87,13 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
             };
           }, {}),
         },
+        extras: OptExtras.map(obj => ({
+          id: R.path(['SequenceNumber'], obj),
+          name: R.path(['Description'], obj),
+          chargeBasis: R.path(['ChargeBasis'], obj),
+          isCompulsory: R.path(['IsCompulsory'], obj),
+          isPricePerPerson: R.path(['IsPricePerPerson'], obj),
+        })),
       };
       /*
       SType: One character that specifies the service type of the