tripstorekrabi-shared 1.13.58 → 1.13.60

package/booking.js

@@ -2,7 +2,7 @@ import dayjs from "dayjs";
 import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 import utc from "dayjs/plugin/utc.js";
 import timezone from "dayjs/plugin/timezone.js";
-import { calculateTotalOperatorPrice } from './price.js';
+import { PAY_ON_TOUR, calculateTotalOperatorPrice } from './price.js';
 
 dayjs.extend(advancedFormat);
 dayjs.extend(utc);
@@ -225,16 +225,17 @@ export function getStartingPointMessage(booking, product) {
       booking.specialRequirements.toUpperCase();
   }
 
-  if (booking.nationalParkFee == 'Pay on tour') {
-    text += '\n\nAs 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) {
-      text += ' to ' + product?.nationalPark.title;
+      item += ' to ' + product?.nationalPark.title;
     }
 
     if (product?.nationalPark?.pricing
     ) {
-      text +=
+      item +=
         ' of ' +
         product.nationalPark.pricing.adult +
         ' THB per adult and ' +
@@ -242,8 +243,13 @@ export function getStartingPointMessage(booking, product) {
         ' THB per child';
     }
 
-    text +=
-      ' to be paid at point of entry. Please bring the required amount in cash to the trip.';
+    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");
   }
 
   return text;

package/package.json

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