tripstorekrabi-shared 1.24.3 → 1.24.5

package/booking.js

@@ -21,155 +21,128 @@ const PHONE_REGEXP = /[^\d+]/g;
 
 export function addBookingFromInvoice(
   firestore,
-  admin,
   invoice,
   paymentData,
   comment = ''
 ) {
   let bookingNumberDoc = firestore.collection('meta').doc('BOOKING_NUMBER');
 
-  return firestore.runTransaction((transaction) => {
-    return bookingNumberDoc.get().then(async (snapshot) => {
-      let nextBookingNumber = (snapshot.get('last') ?? 0) + 1;
-      let processed = 0;
-
-      for (let i = 0; i < invoice.items.length; i++) {
-        let item = invoice.items[i];
-
-        // process only product items
-        let hasProduct = item.productId?.length > 0;
-        let productSnapshot = null;
-        let productDescription;
-        if (hasProduct) {
-          productSnapshot = await firestore
-            .collection('products')
-            .doc(item.productId)
-            .get();
-          productDescription = productSnapshot.get('shortName');
-        } else {
-          productDescription = item.description;
-        }
+  return firestore.runTransaction(async (transaction) => {
+    const snapshot = await transaction.get(bookingNumberDoc);
+    const currentLast = snapshot.get('last') ?? 0;
 
-        let notes = {};
+    const productSnapshots = {};
+    for (const item of invoice.items) {
+      if (item.productId?.length > 0 && !productSnapshots[item.productId]) {
+        const productRef = firestore.collection('products').doc(item.productId);
+        productSnapshots[item.productId] = await transaction.get(productRef);
+      }
+    }
 
-        if (comment) {
-          notes[nanoid()] = {
-            description: comment.trim(),
-            visibility: [],
-            lastModified: dayjs().toDate(),
-            lastModifiedBy: 'Trip Store Krabi Next',
-          };
-        }
+    let nextBookingNumber = currentLast + 1;
+    let processed = 0;
 
-        if (invoice.comment) {
-          notes[nanoid()] = {
-            description: invoice.comment.trim(),
-            visibility: [],
-            lastModified: dayjs().toDate(),
-            lastModifiedBy: 'Trip Store Krabi Next',
-          };
-        }
+    for (let i = 0; i < invoice.items.length; i++) {
+      let item = invoice.items[i];
+      let hasProduct = item.productId?.length > 0;
+
+      let productSnapshot = hasProduct ? productSnapshots[item.productId] : null;
+      let productDescription = hasProduct ? productSnapshot.get('shortName') : item.description;
 
-        let data = {
-          referenceNumber: 'TSK' + (nextBookingNumber + processed),
-          notes,
-          productDescription,
-          productRef: hasProduct
-            ? firestore.collection('products').doc(item.productId)
-            : null,
-          operator: productSnapshot?.get('operator.default.name') ?? '',
-          departureDate: admin.firestore.Timestamp.fromDate(
-            dayjs(item.departureDate).toDate()
-          ),
-          schedule: item.schedule ?? '',
-          pickupTime: '?',
-          adults: item.adults ?? 0,
-          children: item.children ?? 0,
-          infants: item.infants ?? 0,
-          leadTraveller: invoice.name,
-          email: invoice.email ?? '',
-          phoneNumber: invoice.phoneNumber ?? '',
-          cc: '',
-          customerBookingStatus: 'Pending',
-          operatorBookingStatus: 'Pending',
-          sentToOperator: false,
-          startingPointDescription: item.startingPointDescription ?? "",
-          pickupHotel: item.pickupHotel ?? null,
-          roomNumber: item.roomNumber ?? '',
-          googleMapsLocation: item.googleMapsLocation ?? '',
-          dietary: item.dietary ?? "",
-          flight: item.flight ?? null,
-          train: item.train ?? null,
-          customerPaymentStatus: 'Paid',
-          operatorPaymentStatus: 'Pending',
-          extraPayments: {},
-          addOns: item.addOns ?? null,
-          labels: ['NEW'],
-          paypalInvoiceId: '',
-          paypalTransactionId: '',
-          omiseChargeId: '',
-          invoiceNumber: '',
-          date: admin.firestore.FieldValue.serverTimestamp(),
-          createdBy: 'Trip Store Krabi Next',
+      let notes = {};
+
+      if (comment) {
+        notes[nanoid()] = {
+          description: comment.trim(),
+          visibility: [],
           lastModified: dayjs().toDate(),
           lastModifiedBy: 'Trip Store Krabi Next',
         };
+      }
 
-        if (item.startingPointId) {
-          data.startingPointId = item.startingPointId;
-        }
-
-        if (item.dropoffHotel && item.dropoffHotel.length > 0) {
-          data.dropoffHotel = item.dropoffHotel;
-        }
-
-        if (i > 0) {
-          data.partnerNetPrice = 0;
-        }
-
-        if (item.nationalParkFee) {
-          data.nationalParkFee = item.nationalParkFee;
-        }
-
-        if (item.tourGuideLanguage) {
-          data.tourGuideLanguage = item.tourGuideLanguage;
-        }
+      if (invoice.comment) {
+        notes[nanoid()] = {
+          description: invoice.comment.trim(),
+          visibility: [],
+          lastModified: dayjs().toDate(),
+          lastModifiedBy: 'Trip Store Krabi Next',
+        };
+      }
 
-        let endPointId = item.endPointId;
-        if (!endPointId) {
-          let endPoints = productSnapshot?.get('endPoints');
-          if (endPoints && endPoints.length === 1) {
-            endPointId = endPoints[0].id;
-          }
-        }
-        if (endPointId) {
-          data.endPointId = endPointId;
+      let data = {
+        date: dayjs().toDate(),
+        departureDate: dayjs(item.departureDate).toDate(),
+        referenceNumber: 'TSK' + (nextBookingNumber + processed),
+        notes,
+        productDescription,
+        productRef: hasProduct ? firestore.collection('products').doc(item.productId) : null,
+        operator: productSnapshot?.get('operator.default.name') ?? '',
+        schedule: item.schedule ?? '',
+        pickupTime: '?',
+        adults: item.adults ?? 0,
+        children: item.children ?? 0,
+        infants: item.infants ?? 0,
+        leadTraveller: invoice.name,
+        email: invoice.email ?? '',
+        phoneNumber: invoice.phoneNumber ?? '',
+        cc: '',
+        customerBookingStatus: 'Pending',
+        operatorBookingStatus: 'Pending',
+        sentToOperator: false,
+        startingPointDescription: item.startingPointDescription ?? "",
+        pickupHotel: item.pickupHotel ?? null,
+        roomNumber: item.roomNumber ?? '',
+        googleMapsLocation: item.googleMapsLocation ?? '',
+        dietary: item.dietary ?? "",
+        flight: item.flight ?? null,
+        train: item.train ?? null,
+        customerPaymentStatus: 'Paid',
+        operatorPaymentStatus: 'Pending',
+        extraPayments: {},
+        addOns: item.addOns ?? null,
+        labels: ['NEW'],
+        paypalInvoiceId: '',
+        paypalTransactionId: '',
+        omiseChargeId: '',
+        invoiceNumber: '',
+        createdBy: 'Trip Store Krabi Next',
+        lastModified: dayjs().toDate(),
+        lastModifiedBy: 'Trip Store Krabi Next',
+      };
+
+      if (item.startingPointId) data.startingPointId = item.startingPointId;
+      if (item.dropoffHotel && item.dropoffHotel.length > 0) data.dropoffHotel = item.dropoffHotel;
+      if (i > 0) data.partnerNetPrice = 0;
+      if (item.nationalParkFee) data.nationalParkFee = item.nationalParkFee;
+      if (item.tourGuideLanguage) data.tourGuideLanguage = item.tourGuideLanguage;
+
+      let endPointId = item.endPointId;
+      if (!endPointId) {
+        let endPoints = productSnapshot?.get('endPoints');
+        if (endPoints && endPoints.length === 1) {
+          endPointId = endPoints[0].id;
         }
+      }
+      if (endPointId) data.endPointId = endPointId;
 
-        if (productSnapshot) {
-          data.operatorNetPrice = calculateTotalOperatorPrice(
-            data,
-            productSnapshot.data()
-          );
-        } else {
-          data.operatorNetPrice = 0;
-        }
+      if (productSnapshot) {
+        data.operatorNetPrice = calculateTotalOperatorPrice(data, productSnapshot.data());
+      } else {
+        data.operatorNetPrice = 0;
+      }
 
-        data = { ...data, ...paymentData };
+      data = { ...data, ...paymentData };
 
-        let doc = firestore.collection('bookings').doc();
-        transaction.set(doc, data);
-        processed++;
-      }
+      let doc = firestore.collection('bookings').doc();
+      transaction.set(doc, data);
+      processed++;
+    }
 
-      transaction.set(
-        bookingNumberDoc,
-        {
-          last: admin.firestore.FieldValue.increment(processed),
-        },
-        { merge: true }
-      );
-    });
+    transaction.set(
+      bookingNumberDoc,
+      { last: currentLast + processed },
+      { merge: true }
+    );
   });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.24.3",
+  "version": "1.24.5",
   "description": "Shared library for Trip Store Krabi",
   "author": "Stefan Sommer <tonprince@gmail.com>",
   "repository": {
@@ -18,8 +18,9 @@
   },
   "dependencies": {
     "dayjs": "^1.11.21",
-    "libphonenumber-js": "^1.13.5",
-    "nanoid": "^5.1.11"
+    "libphonenumber-js": "^1.13.6",
+    "nanoid": "^5.1.11",
+    "firebase-admin": "^14.0.0"
   },
   "scripts": {
     "deploy": "npm publish"

package/product.js

@@ -1,5 +1,4 @@
-import dayjs from 'dayjs';
-import { calculateProductSellingPrice, countMinPeople, getActiveRevision } from "./price.js";
+import { calculateProductSellingPrice, countMinPeople } from "./price.js";
 
 const MATCH_HTML_REGEXP = /(<([^>]+)>)/ig;