tripstorekrabi-shared 1.19.6 → 1.19.8

package/booking.js

@@ -251,7 +251,7 @@ function addPhoneNumbers(phoneNumbers, phoneNumber) {
   }
 }
 
-export function getStartingPointMessage(booking, product) {
+export function getStartingPointMessage(booking, product, options = { compact: false }) {
   let text = booking.startingPointDescription;
   if (booking.pickupTime.indexOf('-') != -1) {
     text +=
@@ -282,76 +282,78 @@ export function getStartingPointMessage(booking, product) {
 
   text += 'Kindly watch for staff representing ' + booking.operator + '.';
 
-  if (booking.googleMapsLocation?.length > 0) {
-    text += `\n\n${isHotelPickup(booking.startingPointDescription)
-      ? 'PICKUP COORDINATES ON GOOGLE MAP'
-      : 'MEETING COORDINATES ON GOOGLE MAP'
-      }:\n${booking.googleMapsLocation}`;
-  }
+  if (!options.compact) {
+    if (booking.googleMapsLocation?.length > 0) {
+      text += `\n\n${isHotelPickup(booking.startingPointDescription)
+        ? 'PICKUP COORDINATES ON GOOGLE MAP'
+        : 'MEETING COORDINATES ON GOOGLE MAP'
+        }:\n${booking.googleMapsLocation}`;
+    }
 
-  if (product?.whatToBring?.length > 0) {
-    text += '\n\nWHAT TO BRING: ' + product.whatToBring;
-  }
+    if (product?.whatToBring?.length > 0) {
+      text += '\n\nWHAT TO BRING: ' + product.whatToBring;
+    }
 
-  let notes = Object.values(booking.notes ?? {})
-    .filter((item) => item.visibility.includes(CUSTOMER_NOTE))
-    .map((item) => item.description);
-  if (notes.length > 0) {
-    text += '\n\nSPECIAL CUSTOMER NEEDS: ' + notes.join(', ');
-  }
+    let notes = Object.values(booking.notes ?? {})
+      .filter((item) => item.visibility.includes(CUSTOMER_NOTE))
+      .map((item) => item.description);
+    if (notes.length > 0) {
+      text += '\n\nSPECIAL CUSTOMER NEEDS: ' + notes.join(', ');
+    }
 
-  // add customer information from starting point
-  let important = [];
-  if (product) {
-    let startingPoint = product.startingPoints.find(
-      (item) => item.id === booking.startingPointId
-    );
+    // add customer information from starting point
+    let important = [];
+    if (product) {
+      let startingPoint = product.startingPoints.find(
+        (item) => item.id === booking.startingPointId
+      );
 
-    if (startingPoint?.customerInformation) {
-      important.push(startingPoint.customerInformation.trim());
+      if (startingPoint?.customerInformation) {
+        important.push(startingPoint.customerInformation.trim());
+      }
     }
-  }
 
-  if (product?.customerInformation?.length > 0) {
-    important.push(product.customerInformation);
-  }
+    if (product?.customerInformation?.length > 0) {
+      important.push(product.customerInformation);
+    }
 
-  if (important.length > 0) {
-    text += '\n\nIMPORTANT INFORMATION: ' + important.join("\n\n");
-  }
+    if (important.length > 0) {
+      text += '\n\nIMPORTANT INFORMATION: ' + important.join("\n\n");
+    }
 
-  if (booking.dietary?.length > 0) {
-    text += '\n\nDIETARY NEEDS: ' + booking.dietary;
-  }
+    if (booking.dietary?.length > 0) {
+      text += '\n\nDIETARY NEEDS: ' + booking.dietary;
+    }
 
-  let payOnTour = [];
-  if (booking.nationalParkFee == PAY_ON_TOUR) {
-    let item = 'As stated on the website, there is an entrance fee';
+    let payOnTour = [];
+    if (booking.nationalParkFee == PAY_ON_TOUR) {
+      let item = 'As stated on the website, there is an entrance fee';
 
-    if (product?.nationalPark) {
-      item += ' to ' + product?.nationalPark.title;
-    }
+      if (product?.nationalPark) {
+        item += ' to ' + product?.nationalPark.title;
+      }
 
-    if (product?.nationalPark?.pricing) {
-      item +=
-        ' of ' +
-        product.nationalPark.pricing.adult +
-        ' THB per adult and ' +
-        product.nationalPark.pricing.child +
-        ' THB per child';
-    }
-    item += ' to be paid at the point of entry';
+      if (product?.nationalPark?.pricing) {
+        item +=
+          ' of ' +
+          product.nationalPark.pricing.adult +
+          ' THB per adult and ' +
+          product.nationalPark.pricing.child +
+          ' THB per child';
+      }
+      item += ' to be paid at the point of entry';
 
-    payOnTour.push(`  • ${item}`);
-  }
+      payOnTour.push(`  • ${item}`);
+    }
 
-  let extraPayments = Object.values(booking.extraPayments)
-    .filter((item) => !item.disabled && item.paymentMethod === PAY_ON_TOUR)
-    .map((item) => `  • ${item.description}: ${item.price} THB`);
-  payOnTour = [...payOnTour, ...extraPayments];
-  if (payOnTour.length > 0) {
-    text += '\n\nTO BE PAID ON TOUR:\n' + payOnTour.join('\n');
-    text += '\n\nPlease bring the total amount in cash to the trip.';
+    let extraPayments = Object.values(booking.extraPayments)
+      .filter((item) => !item.disabled && item.paymentMethod === PAY_ON_TOUR)
+      .map((item) => `  • ${item.description}: ${item.price} THB`);
+    payOnTour = [...payOnTour, ...extraPayments];
+    if (payOnTour.length > 0) {
+      text += '\n\nTO BE PAID ON TOUR:\n' + payOnTour.join('\n');
+      text += '\n\nPlease bring the total amount in cash to the trip.';
+    }
   }
 
   return text;
@@ -373,8 +375,8 @@ export function createTodos(booking, product) {
   );
 
   let customerBookingStatus = booking.customerBookingStatus;
-  if (customerBookingStatus !== 'Canceled') {
-    if (isHotelPickup(booking.startingPointDescription) && !pastTravelDate) {
+  if (customerBookingStatus !== 'Canceled' && !pastTravelDate) {
+    if (isHotelPickup(booking.startingPointDescription)) {
       if (booking.startingPointDescription === NO_PICKUP_HOTEL_YET) {
         todos.pickupHotel = "missing";
       }
@@ -386,7 +388,7 @@ export function createTodos(booking, product) {
         booking.roomNumber !== STAY_NEARBY &&
         booking.roomNumber !== KEEP_PRIVATE &&
         booking.roomNumber !== CHECK_IN_LATE &&
-        !booking.roomNumber &&
+        !booking.roomNumber
       ) {
         todos.roomNumber = "missing";
       } else if (
@@ -397,13 +399,13 @@ export function createTodos(booking, product) {
         booking.roomNumber !== KEEP_PRIVATE &&
         booking.roomNumber !== CHECK_IN_LATE &&
         booking.roomNumber &&
-        booking.sentToOperator === true &&
+        booking.sentToOperator === true
       ) {
         todos.roomNumber = "sendToOperator";
       }
     }
 
-    if (product && hasFood(product) && !pastTravelDate) {
+    if (product && hasFood(product)) {
       if (!booking.dietary) {
         todos.dietary = "missing";
       } else if (!booking.dietaryConfirmed && booking.dietary?.length > 0 && booking.dietary !== 'None' && booking.sentToOperator === true) {
@@ -412,7 +414,7 @@ export function createTodos(booking, product) {
     }
 
     // hotel dropoff
-    if (booking.productDescription.includes('with transfer to hotel') && !pastTravelDate) {
+    if (booking.productDescription.includes('with transfer to hotel')) {
       if ((booking.dropoffHotel ?? "").length === 0) {
         todos.dropoffHotel = "missing";
       } else if (!booking.dropoffHotelConfirmed) {
@@ -420,7 +422,7 @@ export function createTodos(booking, product) {
       }
     }
 
-    if (isAirportPickup(booking.startingPointDescription) && !pastTravelDate) {
+    if (isAirportPickup(booking.startingPointDescription)) {
       if (!booking.flight) {
         todos.inboundFlightDetails = "missing";
       } else if (!booking.flightConfirmed) {
@@ -428,7 +430,7 @@ export function createTodos(booking, product) {
       }
     }
 
-    if (isAirportDropOff(booking.productDescription) && !pastTravelDate) {
+    if (isAirportDropOff(booking.productDescription)) {
       if (!booking.flight) {
         todos.outboundFlightDetails = "missing";
       } else if (!booking.flightConfirmed) {
@@ -436,7 +438,7 @@ export function createTodos(booking, product) {
       }
     }
 
-    if (isTrainStation(booking.startingPointDescription) && !pastTravelDate) {
+    if (isTrainStation(booking.startingPointDescription)) {
       if (!booking.train) {
         todos.inboundTrainDetails = "missing";
       } else if (!booking.trainConfirmed) {
@@ -444,7 +446,7 @@ export function createTodos(booking, product) {
       }
     }
 
-    if (isTrainStation(booking.productDescription) && !pastTravelDate) {
+    if (isTrainStation(booking.productDescription)) {
       if (!booking.train) {
         todos.outboundTrainDetails = "missing";
       } else if (!booking.trainConfirmed) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.19.6",
+  "version": "1.19.8",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {