@escapenavigator/utils 2.1.27 → 2.1.28

package/dist/get-promocode-discount.d.ts

@@ -1,10 +1,15 @@
+import { PromocodeDiscountTargetEnum } from '@escapenavigator/types/dist/promocode/emun/promocode-discount-target.enum';
 import { PromocodeTypeEnum } from '@escapenavigator/types/dist/promocode/emun/promocode-type.enum';
 import { OrderComposition, TariffCategory } from '@escapenavigator/types/dist/tariff/tariff-category';
 import { ReducedPricingConfig } from './reduced-price';
-export declare const getPromocodeDiscount: ({ slotId, slotDiscount, slotDiscountAmount, total, promocodeType, promocodeDiscount, price, players, children, reducedPlayers, composition, categories, reducedRateMode, reducedRate, minGameAmount, }: ReducedPricingConfig & {
+export declare const getPromocodeDiscount: ({ slotId, slotDiscountAmount, promocodeType, promocodeDiscount, discountTargets, upsellingsTotal, productsTotal, price, players, children, reducedPlayers, composition, categories, reducedRateMode, reducedRate, minGameAmount, }: ReducedPricingConfig & {
     slotId: number;
     children?: number;
     total: number;
+    /** Явные части заказа; отсутствие временно мапится из legacy type. */
+    discountTargets?: PromocodeDiscountTargetEnum[] | null;
+    upsellingsTotal?: number;
+    productsTotal?: number;
     players: number;
     /** Сколько мест идёт по льготной ставке (снимок с заказа). */
     reducedPlayers?: number | null;

package/dist/get-promocode-discount.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPromocodeDiscount = void 0;
+const promocode_discount_target_enum_1 = require("@escapenavigator/types/dist/promocode/emun/promocode-discount-target.enum");
 const promocode_type_enum_1 = require("@escapenavigator/types/dist/promocode/emun/promocode-type.enum");
 const get_players_price_1 = require("./get-players-price");
-const reduced_price_1 = require("./reduced-price");
-const getPromocodeDiscount = ({ slotId, slotDiscount, slotDiscountAmount = 0, total, promocodeType, promocodeDiscount, price, players, children = 0, reducedPlayers = 0, composition, categories, reducedRateMode = null, reducedRate = 0, minGameAmount = 0, }) => {
-    const orderTotal = slotId ? total - slotDiscount : total;
+const getPromocodeDiscount = ({ slotId, slotDiscountAmount = 0, promocodeType, promocodeDiscount, discountTargets, upsellingsTotal = 0, productsTotal = 0, price, players, children = 0, reducedPlayers = 0, composition, categories, reducedRateMode = null, reducedRate = 0, minGameAmount = 0, }) => {
     const game = {
         price,
         players,
@@ -17,15 +16,28 @@ const getPromocodeDiscount = ({ slotId, slotDiscount, slotDiscountAmount = 0, to
         reducedRate,
         minGameAmount,
     };
+    const targets = (0, promocode_discount_target_enum_1.resolvePromocodeDiscountTargets)(discountTargets, promocodeType);
+    const appliesToGame = targets.includes(promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.GAME);
+    const gameBase = appliesToGame
+        ? Math.max(0, (0, get_players_price_1.getPlayersPrice)(game) - (slotId ? slotDiscountAmount : 0))
+        : 0;
+    const nonGameBase = (targets.includes(promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.UPSELLINGS) ? upsellingsTotal : 0) +
+        (targets.includes(promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.PRODUCTS) ? productsTotal : 0);
+    const eligibleBase = gameBase + nonGameBase;
     let amount = 0;
     if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.PROMOTIONAL)
         return 0;
     if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.FIXED)
-        amount = promocodeDiscount;
-    if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.PERCENT_BASE_SUM)
-        amount = Math.floor(((0, get_players_price_1.getPlayersPrice)(game) / 10000) * promocodeDiscount);
-    if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.PERCENT_ALL_SUM)
-        amount = Math.floor((orderTotal / 10000) * promocodeDiscount);
+        amount = Math.min(promocodeDiscount, eligibleBase);
+    if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.PERCENT_BASE_SUM ||
+        promocodeType === promocode_type_enum_1.PromocodeTypeEnum.PERCENT_ALL_SUM) {
+        const gameBudget = appliesToGame
+            ? Math.max(0, (0, get_players_price_1.getMaxGameDiscount)(game) - (slotId ? slotDiscountAmount : 0))
+            : 0;
+        const gameDiscount = Math.min(Math.floor((gameBase / 10000) * promocodeDiscount), gameBudget);
+        const nonGameDiscount = Math.floor((nonGameBase / 10000) * promocodeDiscount);
+        return Math.max(0, gameDiscount + nonGameDiscount);
+    }
     if (promocodeType === promocode_type_enum_1.PromocodeTypeEnum.FLASH_PRICE) {
         // «Флеш цена»: promocodeDiscount хранит итоговую цену за игроков.
         // Скидка = базовая цена за игроков (за вычетом слот-скидки) − флеш-цена.
@@ -35,13 +47,11 @@ const getPromocodeDiscount = ({ slotId, slotDiscount, slotDiscountAmount = 0, to
         const playersPriceAfterSlot = playersPrice - (slotId ? slotDiscountAmount : 0);
         amount = Math.max(0, playersPriceAfterSlot - promocodeDiscount);
     }
-    // Минимальная стоимость игры: промокод (включая флеш-цену) не опускает
-    // игру ниже пола выручки. Пока минимум не задан — расчёт как раньше,
-    // байт в байт.
-    if ((0, reduced_price_1.getMinGameAmount)(game)) {
-        const budget = (0, get_players_price_1.getMaxGameDiscount)(game) - (slotId ? slotDiscountAmount : 0);
-        return Math.max(0, Math.min(amount, budget));
-    }
-    return amount;
+    // Пол защищает только стоимость самой игры. Выбранные допуслуги и товары
+    // можно дисконтировать полностью, даже если игра уже упёрлась в минимум.
+    const gameBudget = appliesToGame
+        ? Math.max(0, (0, get_players_price_1.getMaxGameDiscount)(game) - (slotId ? slotDiscountAmount : 0))
+        : 0;
+    return Math.max(0, Math.min(amount, gameBudget + nonGameBase));
 };
 exports.getPromocodeDiscount = getPromocodeDiscount;

package/dist/get-promocode-discount.spec.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const promocode_discount_target_enum_1 = require("@escapenavigator/types/dist/promocode/emun/promocode-discount-target.enum");
 const promocode_type_enum_1 = require("@escapenavigator/types/dist/promocode/emun/promocode-type.enum");
 const get_promocode_discount_1 = require("./get-promocode-discount");
 // Тариф: 2 игрока — 100.00, 4 игрока — 180.00, ребёнок — 20.00 (minor units).
@@ -90,3 +91,59 @@ describe('getPromocodeDiscount / FLASH_PRICE', () => {
         })).toBe(0);
     });
 });
+describe('getPromocodeDiscount / discount targets', () => {
+    const percent = (discountTargets) => (0, get_promocode_discount_1.getPromocodeDiscount)({
+        ...base,
+        total: 999_999,
+        promocodeType: promocode_type_enum_1.PromocodeTypeEnum.PERCENT_ALL_SUM,
+        promocodeDiscount: 1000,
+        discountTargets,
+        upsellingsTotal: 5000,
+        productsTotal: 3000,
+    });
+    it('считает процент только от выбранных частей и не использует общий total', () => {
+        expect(percent([promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.GAME])).toBe(1000);
+        expect(percent([promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.UPSELLINGS])).toBe(500);
+        expect(percent([promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.PRODUCTS])).toBe(300);
+        expect(percent([
+            promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.GAME,
+            promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.UPSELLINGS,
+            promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.PRODUCTS,
+        ])).toBe(1800);
+    });
+    it('вычитает скидку слота только из игровой части', () => {
+        expect((0, get_promocode_discount_1.getPromocodeDiscount)({
+            ...base,
+            slotDiscountAmount: 2000,
+            promocodeType: promocode_type_enum_1.PromocodeTypeEnum.PERCENT_ALL_SUM,
+            promocodeDiscount: 1000,
+            discountTargets: [
+                promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.GAME,
+                promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.UPSELLINGS,
+            ],
+            upsellingsTotal: 5000,
+        })).toBe(1300);
+    });
+    it('ограничивает фиксированную скидку суммой выбранных частей', () => {
+        expect((0, get_promocode_discount_1.getPromocodeDiscount)({
+            ...base,
+            promocodeType: promocode_type_enum_1.PromocodeTypeEnum.FIXED,
+            promocodeDiscount: 5000,
+            discountTargets: [promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.PRODUCTS],
+            productsTotal: 3000,
+        })).toBe(3000);
+    });
+    it('минимальная цена игры не запрещает скидку на допуслуги', () => {
+        expect((0, get_promocode_discount_1.getPromocodeDiscount)({
+            ...base,
+            minGameAmount: 10000,
+            promocodeType: promocode_type_enum_1.PromocodeTypeEnum.PERCENT_ALL_SUM,
+            promocodeDiscount: 5000,
+            discountTargets: [
+                promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.GAME,
+                promocode_discount_target_enum_1.PromocodeDiscountTargetEnum.UPSELLINGS,
+            ],
+            upsellingsTotal: 4000,
+        })).toBe(2000);
+    });
+});

package/dist/role-finance-permissions.d.ts

@@ -10,3 +10,7 @@ export declare const canAccessFinance: (role?: RoleFinancePermissions | null) =>
  * `financePaymentsOnly` оставляет только платежи. На владельца не действует.
  */
 export declare const canAccessFullFinance: (role?: RoleFinancePermissions | null) => boolean;
+/** Payroll management follows full finance access; payment-only roles cannot manage it. */
+export declare const canManagePayroll: (role?: RoleFinancePermissions | null, mode?: "user" | "admin") => boolean;
+/** Company-level self view can expose only the current employee's own payroll. */
+export declare const canViewOwnPayroll: (role?: RoleFinancePermissions | null, mode?: "user" | "admin", selfViewEnabled?: boolean | null) => boolean;

package/dist/role-finance-permissions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.canAccessFullFinance = exports.canAccessFinance = void 0;
+exports.canViewOwnPayroll = exports.canManagePayroll = exports.canAccessFullFinance = exports.canAccessFinance = void 0;
 /**
  * Вкладка платежей и сам раздел бухгалтерии.
  * Владелец (`totalAccess`) — как будто доступ включён.
@@ -13,3 +13,9 @@ exports.canAccessFinance = canAccessFinance;
  */
 const canAccessFullFinance = (role) => !!role?.totalAccess || (!!role?.accessToFinanceSection && !role?.financePaymentsOnly);
 exports.canAccessFullFinance = canAccessFullFinance;
+/** Payroll management follows full finance access; payment-only roles cannot manage it. */
+const canManagePayroll = (role, mode) => mode === 'admin' || (0, exports.canAccessFullFinance)(role);
+exports.canManagePayroll = canManagePayroll;
+/** Company-level self view can expose only the current employee's own payroll. */
+const canViewOwnPayroll = (role, mode, selfViewEnabled) => (0, exports.canManagePayroll)(role, mode) || Boolean(selfViewEnabled);
+exports.canViewOwnPayroll = canViewOwnPayroll;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@escapenavigator/utils",
-  "version": "2.1.27",
+  "version": "2.1.28",
   "publishConfig": {
     "access": "public"
   },
@@ -14,7 +14,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@escapenavigator/types": "^2.1.27",
+    "@escapenavigator/types": "^2.1.28",
     "axios": "^0.21.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.13.2",
@@ -29,5 +29,5 @@
     "ts-jest": "^29.1.1",
     "typescript": "^5.6"
   },
-  "gitHead": "1b97bef916770f64ebd799d00656db9bc845b9ec"
+  "gitHead": "924b64647909d9ba40d926f6e678cb809b795935"
 }