ti2-ventrata 1.0.32 → 1.0.34

package/index.js

@@ -24,7 +24,7 @@ const getHeaders = ({
   ...acceptLanguage ? { 'Accept-Language': acceptLanguage } : {},
   'Content-Type': 'application/json',
   // ...resellerId ? { Referer: resellerId } : {},+
-  'Octo-Capabilities': 'octo/pricing,octo/pickups,octo/cart,octo/offers',
+  'Octo-Capabilities': 'octo/pricing,octo/pickups,octo/cart,octo/offers,octo/questions',
   // 'Octo-Capabilities': 'octo/pricing',
 });
 
@@ -332,15 +332,17 @@ class Plugin {
       endpoint,
       octoEnv,
       acceptLanguage,
-      resellerId,
     },
     payload: {
+      orderId,
+      partialOrder,
       rebookingId,
       availabilityKey,
       holder,
       notes,
       reference,
       pickupPoint,
+      customFieldValues,
     },
     typeDefsAndQueries: {
       bookingTypeDefs,
@@ -355,22 +357,48 @@ class Plugin {
       endpoint,
       octoEnv,
       acceptLanguage,
-      resellerId,
     });
     const dataForCreateBooking = await jwt.verify(availabilityKey, this.jwtKey);
     let booking = R.path(['data'], await axios({
       method: rebookingId ? 'patch' : 'post',
       url: `${endpoint || this.endpoint}/bookings${rebookingId ? `/${rebookingId}` : ''}`,
       data: {
-        settlementMethod: 'DEFERRED',
+        orderId,
+        settlementMethod: reference ? 'VOUCHER' : 'DEFERRED',
         ...dataForCreateBooking,
         notes,
         ...(pickupPoint ? { pickupRequested: true, pickupPointId: pickupPoint } : {}),
       },
       headers,
     }));
+    const answers = customFieldValues && customFieldValues.length
+      ? customFieldValues.filter(o => !R.isNil(o.value)).map(o => ({
+        questionId: o.field.id,
+        value: o.value,
+      })) : [];
+    // for answers to custom fields, ventrata suggest to modify the booking
+    if (answers.length) {
+      const modifierBooking = {
+        questionAnswers: booking.questionAnswers.map(o => {
+          const answer = answers.find(a => a.questionId === o.questionId);
+          return answer || o;
+        }),
+        unitItems: booking.unitItems.map(u => ({
+          questionAnswers: u.questionAnswers.map(o => {
+            const answer = answers.find(a => a.questionId === o.questionId);
+            return answer || o;
+          }),
+        })).filter(u => u.questionAnswers.length),
+      };
+      booking = R.path(['data'], await axios({
+        method: 'patch',
+        url: `${endpoint || this.endpoint}/bookings/${booking.uuid}`,
+        data: modifierBooking,
+        headers,
+      }));
+    }
     // for booking update, we may not need to confirm again
-    if (!booking.utcConfirmedAt) {
+    if (!booking.utcConfirmedAt && !partialOrder) {
       const dataForConfirmBooking = {
         contact: {
           fullName: `${holder.name} ${holder.surname}`,
@@ -381,7 +409,7 @@ class Plugin {
         },
         notes,
         resellerReference: reference,
-        settlementMethod: 'DEFERRED',
+        settlementMethod: reference ? 'VOUCHER' : 'DEFERRED',
       };
       booking = R.path(['data'], await axios({
         method: 'post',
@@ -580,11 +608,81 @@ class Plugin {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  async getCreateBookingFields() {
-    const customFields = [];
+  async getCreateBookingFields({
+    axios,
+    token: {
+      apiKey,
+      endpoint,
+      octoEnv,
+      acceptLanguage,
+      resellerId,
+    },
+    query: {
+      productId,
+      date,
+      dateFormat,
+    },
+  }) {
+    const headers = getHeaders({
+      apiKey,
+      endpoint,
+      octoEnv,
+      acceptLanguage,
+      resellerId,
+    });
+    const convertQToField = o => ({
+      id: o.id,
+      subtitle: o.description === o.label ? '' : o.description,
+      title: o.label,
+      type: (() => {
+        if (o.inputType === 'radio') return 'radio';
+        if (Array.isArray(o.selectOptions) && o.selectOptions.length) return 'extended-option';
+        if (o.inputType === 'number') return 'count';
+        if (o.inputType === 'text') return 'long';
+        if (o.inputType === 'textarea') return 'long';
+        return 'long';
+      })(),
+      options: o.selectOptions,
+    });
+    if (!productId) {
+      const allProducts = R.pathOr([], ['data'], await axios({
+        method: 'get',
+        url: `${endpoint || this.endpoint}/products`,
+        headers,
+      }));
+      const allOptions = R.chain(R.propOr([], 'options'), allProducts);
+      const allUnits = R.chain(R.propOr([], 'units'), allOptions);
+      const allQuestions = R.call(R.compose(
+        R.uniqBy(R.prop('id')),
+        R.chain(R.propOr([], 'questions')),
+        R.filter(o => o.questions && o.questions.length),
+      ), [...allOptions, ...allUnits]);
+      console.log(allQuestions);
+      return {
+        fields: [],
+        customFields: allQuestions.map(convertQToField),
+      };
+    }
+    const url = `${endpoint || this.endpoint}/products/${productId}`;
+    const product = R.pathOr([], ['data'], await axios({
+      method: 'get',
+      url,
+      headers,
+    }));
+
+    const allOptions = R.propOr([], 'options', product);
+    const allQuestions = R.call(R.compose(
+      R.uniqBy(R.prop('id')),
+      R.chain(R.propOr([], 'questions')),
+      R.filter(o => o.questions && o.questions.length),
+    ), [
+      ...allOptions,
+      ...R.chain(R.propOr([], 'units'), allOptions),
+    ]);
+    if (!product) return { fields: [] };
     return {
       fields: [],
-      customFields,
+      customFields: allQuestions.map(convertQToField),
     };
   }
 }

package/index.test.js

@@ -212,7 +212,8 @@ describe('search tests', () => {
             country: faker.address.countryCode(),
             locales: ['en-US', 'en', 'es'],
           },
-          reference,
+          // our api key doesn't allow us to set the reference and settlementMethod as VOUCHER
+          // reference,
         },
       });
       expect(retVal.booking).toBeTruthy();
@@ -312,7 +313,7 @@ describe('search tests', () => {
             country: faker.address.countryCode(),
             locales: ['en-US', 'en', 'es'],
           },
-          reference,
+          // reference,
           referrer: 'referrerforapitest',
           settlementMethod: 'DEFERRED',
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-ventrata",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "description": "Ventrata's TI2 Plugin",
   "main": "index.js",
   "scripts": {

package/resolvers/booking.js

@@ -11,7 +11,8 @@ const resolvers = {
   Query: {
     id: R.path(['id']),
     bookingId: R.path(['id']),
-    orderId: R.path(['orderReference']),
+    orderId: R.path(['orderId']),
+    orderReference: R.path(['orderReference']),
     supplierBookingId: R.path(['supplierReference']),
     resellerReference: R.propOr('', 'resellerReference'),
     status: e => capitalize(R.path(['status'], e)),
@@ -29,11 +30,11 @@ const resolvers = {
     allDay: R.path(['availability', 'allDay']),
     bookingDate: R.path(['utcCreatedAt']),
     holder: root => ({
-      name: R.path(['contact', 'fullName'], root).split(' ')[0],
-      surname: R.last(R.path(['contact', 'fullName'], root).split(' ')),
-      fullName: R.path(['contact', 'fullName'], root),
-      phoneNumber: R.path(['contact', 'phoneNumber'], root),
-      emailAddress: R.path(['contact', 'emailAddress'], root),
+      name: R.pathOr('', ['contact', 'fullName'], root).split(' ')[0],
+      surname: R.last(R.pathOr('', ['contact', 'fullName'], root).split(' ')),
+      fullName: R.pathOr('', ['contact', 'fullName'], root),
+      phoneNumber: R.pathOr('', ['contact', 'phoneNumber'], root),
+      emailAddress: R.pathOr('', ['contact', 'emailAddress'], root),
     }),
     notes: root => root.notes || '',
     price: root => root.pricing,