npm - @escapenavigator/utils - Versions diffs - 1.9.11 → 1.9.12 - Mend

@escapenavigator/utils 1.9.11 → 1.9.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

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

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

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

@@ -2,10 +2,12 @@
 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, }) => {
+const getCancelationFeeAmount = ({ cancelationRule, total, minimalPrice, cancelationAmount, }) => {
     switch (cancelationRule) {
         case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.MIN_PRICE:
             return 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);
         case questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE:

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

@@ -5,6 +5,7 @@ const _1 = require(".");
 describe('getCancelationFeeAmount function', () => {
     test('should return correct FULL_PRICE', () => {
         const result = (0, _1.getCancelationFeeAmount)({
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             total: 100,
             minimalPrice: 20,
@@ -13,6 +14,7 @@ describe('getCancelationFeeAmount function', () => {
     });
     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,
             minimalPrice: 20,
@@ -21,6 +23,7 @@ describe('getCancelationFeeAmount function', () => {
     });
     test('should return correct QuestroomCancelationTypeEnum MIN_PRICE', () => {
         const result = (0, _1.getCancelationFeeAmount)({
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.MIN_PRICE,
             total: 100,
             minimalPrice: 20,
@@ -29,6 +32,7 @@ describe('getCancelationFeeAmount function', () => {
     });
     test('should return correct QuestroomCancelationTypeEnum NO', () => {
         const result = (0, _1.getCancelationFeeAmount)({
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
             total: 100,
             minimalPrice: 20,

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

@@ -6,6 +6,7 @@ declare type Props = {
     minHoursForFreeCanceling: number;
     cancelationReason: OrderCancelReasonEnum;
     returnCertificates: boolean;
+    cancelationAmount: number;
     cancelationRule: QuestroomCancelationTypeEnum;
     transactions: Array<{
         type: TransactionTypeEnum;
@@ -30,7 +31,7 @@ export declare const isCancelationAllowed: ({ date, minHoursForFreeCanceling, }:
     date: string;
     minHoursForFreeCanceling: number;
 }) => boolean;
-export declare function getOrderCancelationState({ cancelationReason, cancelationRule, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }: Props): {
+export declare function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }: Props): {
     fineAmount: number;
     returnAmount: number;
     allowedCancelation: boolean;

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

@@ -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, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, payed, minimalPrice, }) {
+function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, total, 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)({
@@ -37,7 +37,9 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, transact
     const orderPayment = returnCertificates
         ? payed - certificates.reduce((acc, c) => acc + c.nominal, 0)
         : payed;
-    const fineAmount = +(0, get_cancelation_fee_amount_1.getCancelationFeeAmount)({ cancelationRule, total, minimalPrice }).toFixed(0);
+    const fineAmount = +(0, get_cancelation_fee_amount_1.getCancelationFeeAmount)({
+        cancelationRule, total, minimalPrice, cancelationAmount,
+    }).toFixed(0);
     const chargeAmount = fineAmount - orderPayment;
     /**
      * Кейсы, если игра отменяется в срок

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

@@ -10,6 +10,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / no return" if cancelationReason is QUESTROOM', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.QUESTROOM,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [],
             date: new Date().toISOString(),
@@ -31,6 +32,7 @@ describe('getOrderCancelationState function', () => {
     test('should return "no charge / no return" if cancelation in time', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [],
             date: (0, date_fns_1.addHours)(new Date(), 50).toISOString(),
@@ -53,6 +55,7 @@ describe('getOrderCancelationState function', () => {
         const result = (0, _1.getOrderCancelationState)({
             cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
+            cancelationAmount: 0,
             transactions: [],
             date: new Date().toISOString(),
             returnCertificates: true,
@@ -73,6 +76,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,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [
                 {
@@ -99,6 +103,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,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO,
             transactions: [
                 {
@@ -125,6 +130,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,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [
                 {
@@ -151,6 +157,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,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE,
             transactions: [
                 {
@@ -177,6 +184,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,
+            cancelationAmount: 0,
             cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE,
             transactions: [
                 {

package/dist/serialize-slot.js CHANGED Viewed

@@ -20,7 +20,7 @@ const serializeSlotOrderData = (order) => order && {
 };
 exports.serializeSlotOrderData = serializeSlotOrderData;
 const serializeSlot = ({ slot, order }) => {
-    const { prepayment, prepaymentType, title, minHoursForBooking, minHoursForFreeCanceling, cancelationRule, } = slot.rule || defailt_rule_1.defaultRule;
+    const { prepayment, prepaymentType, title, minHoursForBooking, minHoursForFreeCanceling, cancelationRule, cancelationAmount, } = slot.rule || defailt_rule_1.defaultRule;
     return {
         id: slot.id,
         questroomId: slot.questroomId,
@@ -33,6 +33,7 @@ const serializeSlot = ({ slot, order }) => {
         breakReason: slot.breakReason,
         rule: {
             prepayment,
+            cancelationAmount,
             prepaymentType,
             title,
             minHoursForBooking,

package/package.json CHANGED Viewed

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