@escapenavigator/utils 1.8.5 → 1.8.6

package/dist/validate-promocode.d.ts

@@ -1,14 +1,28 @@
 import { PromocodeRO } from '@escapenavigator/types/dist/promocode/promocode.ro';
-export declare function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, hasPromocodes, isInside, }: {
-    promocode: PromocodeRO;
-    isInside: boolean;
+declare type Cert = {
+    questroomId?: never;
+    players?: never;
+    hasCertificates?: never;
+    orderDate?: never;
+    timeZone: string;
+    type: 'certificate';
+};
+declare type Order = {
     questroomId: number;
     players: number;
     hasCertificates: boolean;
-    hasPromocodes: boolean;
     orderDate: string;
     timeZone: string;
-}): {
+    type: 'order';
+};
+export declare function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, isInside, type, }: {
+    promocode: PromocodeRO;
+    isInside: boolean;
+    otherPromocodes: Array<{
+        canUseWithOtherPromocodes: boolean;
+    }>;
+} & (Order | Cert)): {
     valid: boolean;
     errors: any[];
 };
+export {};

package/dist/validate-promocode.js

@@ -5,15 +5,21 @@ function getWeekdayNumber(date) {
     const day = new Date(date).getDay();
     return (day === 0 ? 7 : day) - 1;
 }
-function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, hasPromocodes, isInside, }) {
+function validatePromocode({ promocode, players, questroomId, timeZone, orderDate, hasCertificates, otherPromocodes, isInside, type, }) {
     const errors = [];
-    const orderDateInTimeZone = new Date(new Date(orderDate).toLocaleString('en-US', { timeZone }));
-    const currentDate = orderDateInTimeZone.toISOString().split('T')[0];
-    const orderDayOfWeek = getWeekdayNumber(orderDateInTimeZone);
-    const localOrderTime = new Date(orderDate).toLocaleTimeString('en-GB', { timeZone });
-    const currentHour = localOrderTime;
+    const orderDateInTimeZone = type === 'order' && new Date(new Date(orderDate).toLocaleString('en-US', { timeZone }));
+    const currentDate = type === 'order' && orderDateInTimeZone.toISOString().split('T')[0];
+    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];
+    if (type === 'certificate' && !promocode.availableForCertificates) {
+        errors.push('The promocode can\'t be applied for certificates.');
+    }
+    if (type === 'order' && !promocode.availableForBookings) {
+        errors.push('The promocode can\'t be applied for certificates.');
+    }
     if (promocode.inside && !isInside) {
         errors.push('The promocode can be applied by phone.');
     }
@@ -26,7 +32,7 @@ function validatePromocode({ promocode, players, questroomId, timeZone, orderDat
     else if (promocode.applyings > 0) {
         errors.push('The promocode can only be used once.');
     }
-    if (!promocode.canUseWithOtherPromocodes && hasPromocodes) {
+    if (!promocode.canUseWithOtherPromocodes && otherPromocodes.length) {
         errors.push('The promocode cannot be used with other promocodes.');
     }
     if (!promocode.canUseWithOtherCertificates && hasCertificates) {
@@ -38,22 +44,22 @@ function validatePromocode({ promocode, players, questroomId, timeZone, orderDat
     if (promocode.validTo && todayDate > promocode.validTo) {
         errors.push(`The promocode has expired. It was valid until ${promocode.validTo}.`);
     }
-    if (promocode.forOrdersFrom && currentDate < promocode.forOrdersFrom) {
+    if (type === 'order' && promocode.forOrdersFrom && currentDate < promocode.forOrdersFrom) {
         errors.push(`The promocode is valid for games starting from ${promocode.forOrdersFrom}.`);
     }
-    if (promocode.forOrdersTo && currentDate > promocode.forOrdersTo) {
+    if (type === 'order' && promocode.forOrdersTo && currentDate > promocode.forOrdersTo) {
         errors.push(`The promocode is not valid for games after ${promocode.forOrdersTo}.`);
     }
     if (!promocode.allQuestrooms && !promocode.questroomsIds?.includes(questroomId)) {
         errors.push('The promocode is not valid for the selected escape room.');
     }
-    if (promocode.availableFrom && currentHour < promocode.availableFrom) {
+    if (type === 'order' && promocode.availableFrom && currentHour < promocode.availableFrom) {
         errors.push(`The promocode is available from ${promocode.availableFrom}.`);
     }
-    if (promocode.availableTo && currentHour > promocode.availableTo) {
+    if (type === 'order' && promocode.availableTo && currentHour > promocode.availableTo) {
         errors.push(`The promocode is only available until ${promocode.availableTo}.`);
     }
-    if (promocode.availableDays && !promocode.availableDays.includes(orderDayOfWeek)) {
+    if (type === 'order' && promocode.availableDays && !promocode.availableDays.includes(orderDayOfWeek)) {
         errors.push('The promocode is not valid for the selected day.');
     }
     if (promocode.minPlayers && players < promocode.minPlayers) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.8.5",
+    "@escapenavigator/types": "^1.8.6",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -55,5 +55,5 @@
       "node_modules"
     ]
   },
-  "gitHead": "f810b0697a133402f07a2c6077ef61bbb0c19ac1"
+  "gitHead": "ad7056985c8d13d98cde69ec89bb048bc9eb32bf"
 }