@escapenavigator/utils 1.10.4 → 1.10.6

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

@@ -12,11 +12,13 @@ declare type Props = {
     transactions: Array<{
         type: TransactionTypeEnum;
         amount: number;
+        includedIncrease: number;
     }>;
     certificates: Array<{
         nominal: number;
     }>;
     playersPrice: number;
+    forceFine?: number;
     payed: number;
     minimalPrice: number;
     slotDiscount: number;
@@ -33,7 +35,7 @@ export declare const isCancelationAllowed: ({ date, minHoursForFreeCanceling, }:
     date: string;
     minHoursForFreeCanceling: number;
 }) => boolean;
-export declare function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, certificates, minHoursForFreeCanceling, minHoursForFullFine, playersPrice, slotDiscount, payed, minimalPrice, }: Props): {
+export declare function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, forceFine, certificates, minHoursForFreeCanceling, minHoursForFullFine, playersPrice, slotDiscount, payed, minimalPrice, }: Props): {
     fineAmount: number;
     returnAmount: number;
     allowedCancelation: boolean;

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

@@ -24,7 +24,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, minHoursForFullFine, playersPrice, slotDiscount = 0, payed, minimalPrice, }) {
+function getOrderCancelationState({ cancelationReason, cancelationRule, cancelationAmount, transactions, date, returnCertificates, forceFine, certificates, minHoursForFreeCanceling, minHoursForFullFine, playersPrice, slotDiscount = 0, payed, minimalPrice, }) {
     const halfFineCancelation = cancelationRule !== questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.NO &&
         cancelationReason !== order_cancel_reson_enum_1.OrderCancelReasonEnum.QUESTROOM &&
         !(0, exports.isCancelationAllowed)({
@@ -38,9 +38,9 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, cancelat
             date,
             minHoursForFreeCanceling: minHoursForFullFine,
         });
-    const allowedCancelation = !halfFineCancelation && !foolFineCancelation;
+    const allowedCancelation = !forceFine && !halfFineCancelation && !foolFineCancelation;
     const receivedTransactions = getReceivedTransactions(transactions);
-    const receivedTransactionsAmount = receivedTransactions.reduce((acc, tr) => acc + tr.amount, 0);
+    const receivedTransactionsAmount = receivedTransactions.reduce((acc, tr) => acc + tr.amount - (tr.includedIncrease || 0), 0);
     const autoReturtAvailable = receivedTransactions.length === 1 &&
         receivedTransactions[0]?.type !== transaction_type_enum_1.TransactionTypeEnum.INSIDE;
     const orderPayment = returnCertificates
@@ -49,13 +49,14 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, cancelat
     const cancelationType = foolFineCancelation
         ? questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.FULL_PRICE
         : cancelationRule;
-    const fineAmount = +(0, get_cancelation_fee_amount_1.getCancelationFeeAmount)({
-        cancelationRule: cancelationType,
-        total: playersPrice,
-        slotDiscount,
-        minimalPrice,
-        cancelationAmount,
-    }).toFixed(0);
+    const fineAmount = (typeof forceFine === 'number' && forceFine) ||
+        +(0, get_cancelation_fee_amount_1.getCancelationFeeAmount)({
+            cancelationRule: cancelationType,
+            total: playersPrice,
+            slotDiscount,
+            minimalPrice,
+            cancelationAmount,
+        }).toFixed(0);
     const chargeAmount = fineAmount - orderPayment;
     /**
      * Кейсы, если игра отменяется в срок

package/dist/serialize-slot.js

@@ -6,6 +6,7 @@ const get_full_name_1 = require("./get-full-name");
 const serializeSlotOrderData = (order) => order && {
     id: order.id,
     players: order.players,
+    children: order.children,
     hasDiscounts: !!order.discounts?.length,
     hasComments: !!order.messages?.length || !!order.comment,
     hasCertificateApplies: !!order.certificates?.length,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "1.10.4",
+  "version": "1.10.6",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.10.4",
+    "@escapenavigator/types": "^1.10.6",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -55,5 +55,5 @@
       "node_modules"
     ]
   },
-  "gitHead": "09cfd021bca13eaa7a15ff93d537b040b1d3076a"
+  "gitHead": "7032754e57291be53744f898a89e37413318e3d3"
 }