tripstorekrabi-shared 1.13.70 → 1.13.72

package/booking.js

@@ -3,6 +3,7 @@ import advancedFormat from 'dayjs/plugin/advancedFormat.js';
 import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
 import { PAY_ON_TOUR, calculateTotalOperatorPrice } from './price.js';
+import { nanoid } from 'nanoid';
 
 dayjs.extend(advancedFormat);
 dayjs.extend(utc);
@@ -28,8 +29,6 @@ export function addBookingFromInvoice(
     return bookingNumberDoc.get().then(async (snapshot) => {
       let nextBookingNumber = (snapshot.get('last') ?? 0) + 1;
       let processed = 0;
-      comment =
-        [comment, invoice.comment].filter((item) => item).join(', ') ?? '';
 
       for (let i = 0; i < invoice.items.length; i++) {
         let item = invoice.items[i];
@@ -48,10 +47,37 @@ export function addBookingFromInvoice(
           productDescription = item.description;
         }
 
+        let notes = {};
+        if (item.dietary) {
+          notes[nanoid()] = {
+            description: item.dietary.trim(),
+            visibility: [CUSTOMER_NOTE, OPERATOR_NOTE],
+            lastModified: dayjs().toDate(),
+            lastModifiedBy: 'Trip Store Krabi Next',
+          };
+        }
+
+        if (comment) {
+          notes[nanoid()] = {
+            description: comment.trim(),
+            visibility: [],
+            lastModified: dayjs().toDate(),
+            lastModifiedBy: 'Trip Store Krabi Next',
+          };
+        }
+
+        if (invoice.comment) {
+          notes[nanoid()] = {
+            description: invoice.comment.trim(),
+            visibility: [],
+            lastModified: dayjs().toDate(),
+            lastModifiedBy: 'Trip Store Krabi Next',
+          };
+        }
+
         let data = {
           referenceNumber: 'TSK' + (nextBookingNumber + processed),
-          hint: '',
-          specialRequirements: item.dietary?.toUpperCase() ?? '',
+          notes,
           productDescription,
           productRef: hasProduct
             ? firestore.collection('products').doc(item.productId)
@@ -77,7 +103,6 @@ export function addBookingFromInvoice(
           roomNumber: item.roomNumber ?? '',
           flight: item.flight ?? null,
           train: item.train ?? null,
-          comment,
           customerPaymentStatus: 'Paid',
           operatorPaymentStatus: 'Pending',
           extraPayments: {},

package/package.json

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

package/utils.js

@@ -5,6 +5,7 @@ import isSameOrBefore from 'dayjs/plugin/isSameOrBefore.js';
 import utc from 'dayjs/plugin/utc.js';
 import timezone from 'dayjs/plugin/timezone.js';
 import { findEndPoint, findStartingPoint } from './price.js';
+import { CUSTOMER_NOTE } from './booking.js';
 
 dayjs.extend(customParseFormat);
 dayjs.extend(advancedFormat);
@@ -602,13 +603,13 @@ export function createVoucherRequest(booking, product) {
   let request = {
     booking: {
       referenceNumber: booking.referenceNumber,
-      specialRequirements: booking.specialRequirements
-        ? booking.specialRequirements.toUpperCase()
-        : '',
+      specialRequirements: Object.values(booking.notes ?? {})
+        .filter((item) => item.visibility.includes(CUSTOMER_NOTE))
+        .map((item) => item.description)
+        .join(', '),
       nationalParkFee:
         product && product.nationalPark
-          ? 'NATIONAL PARK ENTRANCE FEE: ' +
-            booking.nationalParkFee.toUpperCase()
+          ? 'NATIONAL PARK ENTRANCE FEE: ' + booking.nationalParkFee
           : '',
       productDescription: booking.productDescription,
       leadTraveller: booking.leadTraveller,