ti2-tourplan 1.0.47 → 1.0.50

package/index.js

@@ -474,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']))),
         };
@@ -677,9 +681,6 @@ class Plugin {
       notes,
     },
   }) {
-    const extraText = extras && extras.length
-      ? extras.map((e, i) => `Extra ${i + 1}: ${e.name} x ${e.quantity}`).join(`\n`)
-      : '';
     const model = {
       AddServiceRequest: {
         AgentID: hostConnectAgentID,
@@ -712,7 +713,15 @@ 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',
@@ -809,6 +818,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.47",
+  "version": "1.0.50",
   "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