@escapenavigator/utils 1.9.36 → 1.9.38

package/dist/format-amount/index.js

@@ -33,14 +33,31 @@ const getCurrency = (currency) => {
     };
     return res[currency] || currency;
 };
+const currencyFirst = (currency) => currency === 'EUR' ||
+    currency === 'USD' ||
+    currency === 'CHF' ||
+    currency === 'GBP' ||
+    currency === 'CAD' ||
+    currency === 'AUD' ||
+    currency === 'TRY' ||
+    currency === 'GEL' ||
+    currency === 'UAH';
 const THINSP = String.fromCharCode(8201);
 const formatAmount = (amount, currency) => {
     const [major, minor] = ((+amount || 0) / 100).toFixed(2).split('.');
     const value = +minor;
+    const c = getCurrency(currency);
+    if (currencyFirst) {
+        if (!value)
+            return c + THINSP + major;
+        if (value < 10)
+            return `${c}${THINSP}${major},${value}0`;
+        return `${c}${THINSP}${major},${value}`;
+    }
     if (!value)
-        return major + THINSP + getCurrency(currency);
+        return major + THINSP + c;
     if (value < 10)
-        return `${major},${value}0${THINSP}${getCurrency(currency)}`;
-    return `${major},${value}${THINSP}${getCurrency(currency)}`;
+        return `${major},${value}0${THINSP}${c}`;
+    return `${major},${value}${THINSP}${c}`;
 };
 exports.formatAmount = formatAmount;

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.36",
+  "version": "1.9.38",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^1.9.36",
+    "@escapenavigator/types": "^1.9.37",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -55,5 +55,5 @@
       "node_modules"
     ]
   },
-  "gitHead": "a398bc8a26c8bccaa8e82e2fe741c669814767e1"
+  "gitHead": "1c23f2d861f888faada1a7f58ef1cfe97ea908b3"
 }