@escapenavigator/utils 1.9.35 → 1.9.37

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

@@ -82,7 +82,7 @@ function getOrderCancelationState({ cancelationReason, cancelationRule, cancelat
     }
     if (chargeAmount < 0) {
         const returnAmount = +(chargeAmount * -1).toFixed(0);
-        const allowAutoReturn = autoReturtAvailable && receivedTransactionsAmount >= returnAmount;
+        const allowAutoReturn = !slotDiscount && autoReturtAvailable && receivedTransactionsAmount >= returnAmount;
         return {
             type: allowAutoReturn ? FineDescriptions.AUTO_RETURN : FineDescriptions.HAND_RETURN,
             fineAmount,

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

@@ -188,6 +188,34 @@ describe('getOrderCancelationState function', () => {
             allowedCancelation: false,
         });
     });
+    test('should return "no charge / hand return / with slot discount" if not alowed cancelation has overpayment', () => {
+        const result = (0, _1.getOrderCancelationState)({
+            cancelationReason: order_cancel_reson_enum_1.OrderCancelReasonEnum.CLIENT,
+            slotDiscount: 10,
+            cancelationAmount: 0,
+            cancelationRule: questroom_cancelation_type_enum_1.QuestroomCancelationTypeEnum.HALF_PRICE,
+            transactions: [
+                {
+                    amount: 100,
+                    type: transaction_type_enum_1.TransactionTypeEnum.SUCCEEDED,
+                },
+            ],
+            date: new Date().toISOString(),
+            returnCertificates: true,
+            certificates: [],
+            minHoursForFreeCanceling: 48,
+            total: 100,
+            payed: 100,
+            minimalPrice: 50,
+        });
+        expect(result).toEqual({
+            type: 'descriptionFineWithReturn',
+            fineAmount: 50,
+            returnAmount: 40,
+            chargeAmount: 0,
+            allowedCancelation: false,
+        });
+    });
     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,

package/package.json

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