tripstorekrabi-shared 1.24.3 → 1.24.4

package/booking.js

@@ -2,6 +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 { FieldValue, Timestamp } from 'firebase-admin/firestore';
 import { PAY_ON_TOUR, calculateTotalOperatorPrice } from './price.js';
 import { nanoid } from 'nanoid';
 import { CHECK_IN_LATE, IN_HOUSE, isAirportDropOff, isAirportPickup, isHotelPickup, isTrainStation, KEEP_PRIVATE, NO_PICKUP_HOTEL_YET, NO_ROOM, STAY_NEARBY } from './utils.js';
@@ -21,7 +22,6 @@ const PHONE_REGEXP = /[^\d+]/g;
 
 export function addBookingFromInvoice(
   firestore,
-  admin,
   invoice,
   paymentData,
   comment = ''
@@ -78,7 +78,7 @@ export function addBookingFromInvoice(
             ? firestore.collection('products').doc(item.productId)
             : null,
           operator: productSnapshot?.get('operator.default.name') ?? '',
-          departureDate: admin.firestore.Timestamp.fromDate(
+          departureDate: Timestamp.fromDate(
             dayjs(item.departureDate).toDate()
           ),
           schedule: item.schedule ?? '',
@@ -109,7 +109,7 @@ export function addBookingFromInvoice(
           paypalTransactionId: '',
           omiseChargeId: '',
           invoiceNumber: '',
-          date: admin.firestore.FieldValue.serverTimestamp(),
+          date: FieldValue.serverTimestamp(),
           createdBy: 'Trip Store Krabi Next',
           lastModified: dayjs().toDate(),
           lastModifiedBy: 'Trip Store Krabi Next',
@@ -165,7 +165,7 @@ export function addBookingFromInvoice(
       transaction.set(
         bookingNumberDoc,
         {
-          last: admin.firestore.FieldValue.increment(processed),
+          last: FieldValue.increment(processed),
         },
         { merge: true }
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tripstorekrabi-shared",
-  "version": "1.24.3",
+  "version": "1.24.4",
   "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;