ti2-tourplan 1.0.38 → 1.0.40

package/index.js

@@ -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;
               }
@@ -525,7 +525,11 @@ class Plugin {
         Opt: optionId,
         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,
@@ -690,7 +694,11 @@ class Plugin {
         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),
       },
@@ -703,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),
@@ -740,6 +748,7 @@ class Plugin {
       purchaseDateStart,
       purchaseDateEnd,
       bookingId,
+      name,
     },
   }) {
     const getPayload = (RequestType, RequestInput) => ({
@@ -758,11 +767,18 @@ class Plugin {
       EnteredDateFrom: purchaseDateStart || moment().subtract(6, 'month').format('YYYY-MM-DD'),
       EnteredDateTo: purchaseDateEnd || moment().format('YYYY-MM-DD'),
     });
-    const allSearches = bookingId
-      ? ['BookingId', 'Ref', 'AgentRef'].map(async key => {
+    let searchCriterias = [];
+    if (bookingId) {
+      searchCriterias = ['BookingId', 'Ref', 'AgentRef'].map(key => ({ [key]: bookingId }));
+    }
+    if (name) {
+      searchCriterias.push({ NameContains: name });
+    }
+    const allSearches = searchCriterias.length
+      ? searchCriterias.map(async keyObj => {
         let reply;
         try {
-          reply = await this.callTourplan(getPayload('ListBookingsRequest', { [key]: bookingId }));
+          reply = await this.callTourplan(getPayload('ListBookingsRequest', keyObj));
         } catch (err) {
           if (err.includes && err.includes('Request failed with status code')) {
             throw Error(err);

package/package.json

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

package/resolvers/product.js

@@ -124,14 +124,14 @@ const translateTPOption = ({ optionsGroupedBySupplierId, supplierData }) => {
         }
         if (R.path(['OptGeneral', 'SType'], option) === 'Y' || R.path(['OptGeneral', 'SType'], option) === 'P') {
           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),
               },
             }));
         }