@escapenavigator/utils 1.9.38 → 1.9.40

package/dist/serialize-slot.js

@@ -16,6 +16,7 @@ const serializeSlotOrderData = (order) => order && {
     confirmed: order.confirmed,
     total: order.total,
     payed: order.payed,
+    slotDiscount: order.slotDiscount,
     code: order.code,
     clientName: (0, get_full_name_1.getFullName)(order.client),
 };
@@ -26,6 +27,7 @@ const serializeSlot = ({ slot, order }) => {
         id: slot.id,
         questroomId: slot.questroomId,
         hold: slot.hold,
+        old: slot.old,
         date: slot.date,
         discount: slot.discount,
         onlyPhone: slot.onlyPhone,

package/dist/validate-promocode.js

@@ -1,19 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePromocode = void 0;
+const date_fns_1 = require("date-fns");
+const date_fns_tz_1 = require("date-fns-tz");
 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, }) {
     const errors = [];
-    const orderDateInTimeZone = type === 'order' && new Date(new Date(orderDate).toLocaleString('en-US', { timeZone }));
-    const currentDate = type === 'order' && orderDateInTimeZone.toISOString().split('T')[0];
+    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');
     const orderDayOfWeek = type === 'order' && getWeekdayNumber(orderDateInTimeZone);
-    const localOrderTime = type === 'order' && new Date(orderDate).toLocaleTimeString('en-GB', { timeZone });
-    const currentHour = type === 'order' && localOrderTime;
-    const today = new Date(new Date().toLocaleString('en-US', { timeZone }));
-    const todayDate = today.toISOString().split('T')[0];
+    const localOrderTime = type === 'order' && (0, date_fns_1.format)(orderDateInTimeZone, 'HH:mm');
+    const todayDate = (0, date_fns_1.format)((0, date_fns_tz_1.utcToZonedTime)(new Date(), timeZone), 'yyyy-MM-dd');
+    console.log({
+        currentDate, orderDayOfWeek, localOrderTime, orderDate, timeZone,
+    });
     if (type === 'certificate' && !promocode.availableForCertificates) {
         errors.push("The promocode can't be applied for certificates.");
     }
@@ -56,10 +59,10 @@ function validatePromocode({ promocode, players, questroomId, timeZone, orderDat
     if (!promocode.allQuestrooms && !promocode.questroomsIds?.includes(questroomId)) {
         errors.push('The promocode is not valid for the selected escape room.');
     }
-    if (type === 'order' && promocode.availableFrom && currentHour < promocode.availableFrom) {
+    if (type === 'order' && promocode.availableFrom && localOrderTime < promocode.availableFrom) {
         errors.push(`The promocode is available from ${promocode.availableFrom}.`);
     }
-    if (type === 'order' && promocode.availableTo && currentHour > promocode.availableTo) {
+    if (type === 'order' && promocode.availableTo && localOrderTime > promocode.availableTo) {
         errors.push(`The promocode is only available until ${promocode.availableTo}.`);
     }
     if (type === 'order' &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.9.38",
+  "version": "1.9.40",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.9.37",
+    "@escapenavigator/types": "^1.9.38",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -55,5 +55,5 @@
       "node_modules"
     ]
   },
-  "gitHead": "1c23f2d861f888faada1a7f58ef1cfe97ea908b3"
+  "gitHead": "3292197490e3df9bc3410ba0b0e45214b1023a37"
 }