@escapenavigator/utils 1.10.39 → 1.10.41

package/dist/tz-date.js

@@ -13,6 +13,8 @@ const convertDateToZonedDate = ({ date, timeZone, time, offset, }) => {
 };
 exports.convertDateToZonedDate = convertDateToZonedDate;
 const convertUTCDateToZonedDate = ({ date, timeZone, offset = 0, format = 'dd.MM.yyyy, HH:mm', showTZ = false, }) => {
+    if (!date)
+        return '';
     const d = (0, date_fns_tz_1.utcToZonedTime)(date, timeZone);
     const dt = (0, date_fns_1.addHours)(d, offset);
     const res = (0, date_fns_1.format)(dt, format);

package/dist/validate-promocode.d.ts

@@ -15,9 +15,10 @@ type Order = {
     timeZone: string;
     type: 'order';
 };
-export declare function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, isInside, type, }: {
+export declare function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, slotDiscount, isInside, type, }: {
     promocode: PromocodeRO;
     isInside: boolean;
+    slotDiscount: number;
     otherPromocodes: Array<{
         canUseWithOtherPromocodes: boolean;
         code: string;

package/dist/validate-promocode.js

@@ -7,7 +7,7 @@ function getWeekdayNumber(date) {
     const day = new Date(date).getDay();
     return (day === 0 ? 7 : day) - 1;
 }
-function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, isInside, type, }) {
+function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, slotDiscount, isInside, type, }) {
     const errors = [];
     const orderDateInTimeZone = type === 'order' && (0, date_fns_tz_1.utcToZonedTime)(new Date(orderDate).toISOString(), timeZone);
     const currentDate = type === 'order' && (0, date_fns_1.format)(orderDateInTimeZone, 'yyyy-MM-dd');
@@ -35,8 +35,8 @@ function validatePromocode({ promocode, players, questroomId, timeZone, orderDat
     else if (promocode.applyings > 0) {
         errors.push('The promocode can only be used once.');
     }
-    if (!promocode.canUseWithOtherPromocodes && otherPromocodes.length) {
-        errors.push('The promocode cannot be used with other promocodes.');
+    if (!promocode.canUseWithOtherPromocodes && (otherPromocodes.length || slotDiscount)) {
+        errors.push('The promocode cannot be used with other promocodes or discounts.');
     }
     if (!promocode.canUseWithOtherCertificates && hasCertificates) {
         errors.push('The promocode cannot be used with other certificates.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.10.39",
+  "version": "1.10.41",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.10.35",
+    "@escapenavigator/types": "^1.10.37",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -47,5 +47,5 @@
     "utility-types": "^3.10.0",
     "uuid": "^8.3.2"
   },
-  "gitHead": "cbe185b5195f29cb156e5d6b6b9c4623fb78431a"
+  "gitHead": "aabf60144b705a756b1f228d5f2702d1021274f1"
 }