tripstorekrabi-shared 1.15.2 → 1.15.4

package/booking.js

@@ -4,7 +4,7 @@ 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';
-import { isHotelPickup, isHotelDropOff } from './utils.js';
+import { isHotelPickup } from './utils.js';
 
 dayjs.extend(advancedFormat);
 dayjs.extend(utc);
@@ -279,11 +279,14 @@ export function getStartingPointMessage(booking, product) {
     text += ' on the ' + date;
   }
 
-  if (booking.dropOffHotel && isHotelDropOff(booking.startingPointDescription)) {
-    text += ' with transfer to ' + booking.dropOffHotel;
+  text += ". ";
+
+  let transferTo = "with transfer to";
+  if (booking.productDescription.includes(transferTo)) {
+    text += "Your booking includes a " + booking.productDescription.substring(booking.productDescription.indexOf(transferTo)).replace(transferTo, "transfer to") + '. ';
   }
 
-  text += '. Please watch out for the staff of ' + booking.operator + '.';
+  text += 'Please watch out for the staff of ' + booking.operator + '.';
 
   if (booking.googleMapLocation?.length > 0) {
     text += `\n\n${isHotelPickup(booking.startingPointDescription)

package/package.json

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

package/utils.js

@@ -36,18 +36,7 @@ export function validateEmail(email) {
 }
 
 export function resizeGoogleImage(image, size) {
-  return image
-    .replace(/\/w.\d+-.\d+-p\//, '/' + size + '/')
-    .replace(/\/w.\d+-.\d+-c\//, '/' + size + '/')
-    .replace(/\/w.\d+-.\d+-no\//, '/' + size + '/')
-    .replace(/\/w.\d+-.\d+\//, '/' + size + '/')
-    .replace(/\/s.\d+\//, '/' + size + '/')
-    .replace(/\=w.\d+-.\d+-p/, '=' + size)
-    .replace(/\=w.\d+-.\d+-c/, '=' + size)
-    .replace(/\=w.\d+-.\d+-no/, '=' + size)
-    .replace(/\=w.\d+-.\d+/, '=' + size)
-    .replace(/\=s.\d+/, '=' + size)
-    .replace(/\=s.\d+/, '=' + size);
+  return image.replace(/(?=w|h|s)(w.\d+)?(-)?(h.\d+)?(s.\d+)?(-p)?(-c)?(-s)?(-no)?/, size)
 }
 
 export function resizeStorageImage(path, size) {