tripstorekrabi-shared 1.13.63 → 1.13.65

package/package.json

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

package/price.js

@@ -311,6 +311,34 @@ export function getExtraPaymentsPaidWithPartner(booking, product) {
   });
 }
 
+export function getActiveExtraPayments(extraPayments) {
+  return extraPayments
+    .filter(([id, item]) => !item.disabled)
+    .sort(([id1, item1], [id2, item2]) =>
+      item1.description.localeCompare(item2.description)
+    );
+}
+
+export function getExtraPaymentsOperatorPrice(extraPayments) {
+  return getActiveExtraPayments(extraPayments).reduce(
+    (prev, curr) => {
+      let price;
+      let item = curr[1];
+      if (item.paymentMethod === PAY_ON_TOUR) {
+        let ourCommission = item.price - item.operatorPrice;
+        if (ourCommission > 0) {
+          price = -ourCommission;
+        }
+      } else {
+        price = item.operatorPrice;
+      }
+
+      return prev + price;
+    },
+    0
+  );
+}
+
 export function calculateAddOnsPrice(booking, product, options = { mode: SELLING_MODE }) {
   let total = 0;
   let isSelling = options.mode in [SELLING_MODE, PARTNER_MODE];

package/utils.js

@@ -353,41 +353,39 @@ export function getBookingSummary(booking, options = {}) {
 export function getItemSummary(item, product) {
   let summary = item.description;
 
-  if (product) {
-    if (item.departureDate) {
-      summary += ", " + dayjs(item.departureDate).tz("Asia/Bangkok").format("DD.MM.YYYY");
-    }
+  if (item.departureDate) {
+    summary += ", " + dayjs(item.departureDate).tz("Asia/Bangkok").format("DD.MM.YYYY");
+  }
 
-    if (item.schedule) {
-      summary += ", " + item.schedule;
-    }
+  if (item.schedule) {
+    summary += ", " + item.schedule;
+  }
 
-    if (item.adults || item.children || item.infants) {
-      summary += ", " + formatPeople(item) + ", ";
-    }
+  if (item.adults || item.children || item.infants) {
+    summary += ", " + formatPeople(item) + ", ";
+  }
 
-    if (item.startingPointId) {
-      let startingPointDescription = findStartingPoint(product, item.startingPointId).value;
-      if (isHotelPickup(startingPointDescription)) {
-        if (item.noHotelYet === true) {
-          summary += "Hotel pickup (hotel not known yet)";
-        } else {
-          summary += "Hotel pickup from " + item.pickupHotel;
+  if (item.startingPointId) {
+    let startingPointDescription = findStartingPoint(product, item.startingPointId).value;
+    if (isHotelPickup(startingPointDescription)) {
+      if (item.noHotelYet === true) {
+        summary += "Hotel pickup (hotel not known yet)";
+      } else {
+        summary += "Hotel pickup from " + item.pickupHotel;
 
-          if (item.roomNumber) {
-            summary += ` (${item.roomNumber})`;
-          }
+        if (item.roomNumber) {
+          summary += ` (${item.roomNumber})`;
         }
-      } else {
-        summary += startingPointDescription;
       }
+    } else {
+      summary += startingPointDescription;
     }
+  }
 
-    if (item.endPointId) {
-      let endPointDescription = findEndPoint(product, item.endPointId).value;
-      if (isHotelDropOff(endPointDescription) && item.dropoffHotel) {
-        summary += ", Hotel drop-off at " + item.dropoffHotel;
-      }
+  if (item.endPointId) {
+    let endPointDescription = findEndPoint(product, item.endPointId).value;
+    if (isHotelDropOff(endPointDescription) && item.dropoffHotel) {
+      summary += ", Hotel drop-off at " + item.dropoffHotel;
     }
   }