@escapenavigator/utils 1.9.31 → 1.9.33

package/dist/get-cancelation-fee-amount/index.d.ts

@@ -1,7 +1,8 @@
 import { QuestroomCancelationTypeEnum } from '@escapenavigator/types/dist/questroom/enum/questroom-cancelation-type.enum';
-export declare const getCancelationFeeAmount: ({ cancelationRule, total, minimalPrice, cancelationAmount, }: {
+export declare const getCancelationFeeAmount: ({ cancelationRule, total, minimalPrice, cancelationAmount, slotDiscount, }: {
     cancelationRule: QuestroomCancelationTypeEnum;
     total: number;
     minimalPrice: number;
     cancelationAmount: number;
+    slotDiscount: number;
 }) => number;

package/dist/get-cancelation-fee-amount/index.js

@@ -2,16 +2,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCancelationFeeAmount = void 0;
 const questroom_cancelation_type_enum_1 = require("@escapenavigator/types/dist/questroom/enum/questroom-cancelation-type.enum");
-const getCancelationFeeAmount = ({ cancelationRule, total, minimalPrice, cancelationAmount, }) => {
+const getCancelationFeeAmount = ({ cancelationRule, total, minimalPrice, cancelationAmount, slotDiscount = 0, }) => {
+    const actualAmount = total - slotDiscount;
     switch (cancelationRule) {
         case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.MIN_PRICE:
-            return minimalPrice;
+            return minimalPrice > actualAmount ? actualAmount : minimalPrice;
         case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FIXED:
-            return cancelationAmount;
-        case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE:
-            return Math.floor(total / 2);
+            return cancelationAmount > actualAmount ? actualAmount : cancelationAmount;
+        case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE: {
+            const fine = Math.floor(total / 2) - slotDiscount;
+            return fine > actualAmount ? actualAmount : fine;
+        }
         case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE:
-            return total;
+            return total - slotDiscount;
         default:
             return 0;
     }

package/dist/get-cancelation-fee-amount/index.test.js

@@ -8,15 +8,27 @@ describe('getCancelationFeeAmount function', () => {
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             total: 100,
+            slotDiscount: 0,
             minimalPrice: 20,
         });
         expect(result).toBe(100);
     });
+    test('should return correct FULL_PRICE', () => {
+        const result = (0, _1.getCancelationFeeAmount)({
+            cancelationAmount: 0,
+            cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
+            total: 100,
+            slotDiscount: 20,
+            minimalPrice: 20,
+        });
+        expect(result).toBe(80);
+    });
     test('should return correct QuestroomCancelationTypeEnum HALF_PRICE', () => {
         const result = (0, _1.getCancelationFeeAmount)({
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE,
             total: 100,
+            slotDiscount: 0,
             minimalPrice: 20,
         });
         expect(result).toBe(50);
@@ -24,6 +36,7 @@ describe('getCancelationFeeAmount function', () => {
     test('should return correct QuestroomCancelationTypeEnum MIN_PRICE', () => {
         const result = (0, _1.getCancelationFeeAmount)({
             cancelationAmount: 0,
+            slotDiscount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.MIN_PRICE,
             total: 100,
             minimalPrice: 20,
@@ -33,6 +46,7 @@ describe('getCancelationFeeAmount function', () => {
     test('should return correct QuestroomCancelationTypeEnum NO', () => {
         const result = (0, _1.getCancelationFeeAmount)({
             cancelationAmount: 0,
+            slotDiscount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
             total: 100,
             minimalPrice: 20,

package/dist/get-order-cancelation-state/index.d.ts

@@ -18,6 +18,7 @@ declare type Props = {
     total: number;
     payed: number;
     minimalPrice: number;
+    slotDiscount: number;
 };
 export declare enum FineDescriptions {
     FINE_TON_SETUP = "descriptionFineNotSetup",
@@ -31,7 +32,7 @@ export declare const isCancelationAllowed: ({ date, minHoursForFreeCanceling, }:
     date: string;
     minHoursForFreeCanceling: number;
 }) => boolean;
-export declare function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }: Props): {
+export declare function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, slotDiscount, payed, minimalPrice, }: Props): {
     fineAmount: number;
     returnAmount: number;
     allowedCancelation: boolean;

package/dist/get-order-cancelation-state/index.js

@@ -23,7 +23,7 @@ var FineDescriptions;
 })(FineDescriptions = exports.FineDescriptions || (exports.FineDescriptions = {}));
 const isCancelationAllowed = ({ date, minHoursForFreeCanceling = 0, }) => (0, differenceInHours_1.default)(new Date(date), new Date()) >= minHoursForFreeCanceling;
 exports.isCancelationAllowed = isCancelationAllowed;
-function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }) {
+function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, slotDiscount = 0, payed, minimalPrice, }) {
     const minHours = cancelationRule === questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO ? 0 : minHoursForFreeCanceling;
     const allowedCancelation = cancelationReason === order_cancel_reson_enum_1.OrderCancelReasonEnum.QUESTROOM ||
         (0, exports.isCancelationAllowed)({
@@ -40,6 +40,7 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, cancelat
     const fineAmount = +(0, get_cancelation_fee_amount_1.getCancelationFeeAmount)({
         cancelationRule,
         total,
+        slotDiscount,
         minimalPrice,
         cancelationAmount,
     }).toFixed(0);

package/dist/get-order-cancelation-state/index.test.js

@@ -17,6 +17,7 @@ describe('getOrderCancelationState function', () => {
             returnCertificates: true,
             certificates: [],
             minHoursForFreeCanceling: 48,
+            slotDiscount: 0,
             total: 100,
             payed: 20,
             minimalPrice: 50,
@@ -37,6 +38,7 @@ describe('getOrderCancelationState function', () => {
             transactions: [],
             date: (0, date_fns_1.addHours)(new Date(), 50).toISOString(),
             returnCertificates: true,
+            slotDiscount: 0,
             certificates: [],
             minHoursForFreeCanceling: 48,
             total: 100,
@@ -57,6 +59,7 @@ describe('getOrderCancelationState function', () => {
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
             cancelationAmount: 0,
             transactions: [],
+            slotDiscount: 0,
             date: new Date().toISOString(),
             returnCertificates: true,
             certificates: [],
@@ -76,6 +79,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / hand return" if alowed cancelation has payments', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 0,
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [
@@ -103,6 +107,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / hand return" if not alowed cancelation has inside transaction', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 0,
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
             transactions: [
@@ -130,6 +135,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / no return" if not alowed cancelation payed same price', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 0,
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [
@@ -157,6 +163,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / auto return" if not alowed cancelation has overpayment', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 0,
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE,
             transactions: [
@@ -184,6 +191,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "with charge / no return" if not alowed cancelation has overpayment', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 0,
             cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [

package/package.json

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