@floristcloud/api-lib 1.2.177 → 1.2.179

package/build/commands/order/get-order-delivery-pricing.query.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOrderDeliveryPricingContractQuery = void 0;
+const get_order_delivery_pricing_request_schema_1 = require("../../schemas/order/get-order-delivery-pricing-request.schema");
+const get_order_delivery_pricing_response_schema_1 = require("../../schemas/order/get-order-delivery-pricing-response.schema");
+var GetOrderDeliveryPricingContractQuery;
+(function (GetOrderDeliveryPricingContractQuery) {
+    GetOrderDeliveryPricingContractQuery.RequestSchema = get_order_delivery_pricing_request_schema_1.GetOrderDeliveryPricingRequestSchema;
+    GetOrderDeliveryPricingContractQuery.ResponseSchema = get_order_delivery_pricing_response_schema_1.GetOrderDeliveryPricingResponseSchema;
+})(GetOrderDeliveryPricingContractQuery || (exports.GetOrderDeliveryPricingContractQuery = GetOrderDeliveryPricingContractQuery = {}));

package/build/commands/order/index.js

@@ -41,3 +41,4 @@ __exportStar(require("./webshop/create-cart.command"), exports);
 __exportStar(require("./webshop/get-order-list-for-client.query"), exports);
 __exportStar(require("./webshop/update-cart.command"), exports);
 __exportStar(require("./webshop/get-order-sales-by-month.query"), exports);
+__exportStar(require("./get-order-delivery-pricing.query"), exports);

package/build/enum/delivery-pricing-in-transit-mode.enum.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingInTransitModeEnum = void 0;
+var DeliveryPricingInTransitModeEnum;
+(function (DeliveryPricingInTransitModeEnum) {
+    DeliveryPricingInTransitModeEnum["FREE"] = "FREE";
+    DeliveryPricingInTransitModeEnum["SAME_RULES"] = "SAME_RULES";
+})(DeliveryPricingInTransitModeEnum || (exports.DeliveryPricingInTransitModeEnum = DeliveryPricingInTransitModeEnum = {}));

package/build/enum/delivery-pricing-rule-scope.enum.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingRuleScopeEnum = void 0;
+var DeliveryPricingRuleScopeEnum;
+(function (DeliveryPricingRuleScopeEnum) {
+    DeliveryPricingRuleScopeEnum["DEFAULT"] = "DEFAULT";
+    DeliveryPricingRuleScopeEnum["CITY"] = "CITY";
+    DeliveryPricingRuleScopeEnum["GROUP"] = "GROUP";
+})(DeliveryPricingRuleScopeEnum || (exports.DeliveryPricingRuleScopeEnum = DeliveryPricingRuleScopeEnum = {}));

package/build/enum/index.js

@@ -174,3 +174,5 @@ __exportStar(require("./pre-order-conversion-remainder-reason.enum"), exports);
 __exportStar(require("./pre-order-conversion-difference-field.enum"), exports);
 __exportStar(require("./pre-order-conversion-skip-reason.enum"), exports);
 __exportStar(require("./pre-order-fulfillment-status.enum"), exports);
+__exportStar(require("./delivery-pricing-rule-scope.enum"), exports);
+__exportStar(require("./delivery-pricing-in-transit-mode.enum"), exports);

package/build/helpers/canonical-money-key.helper.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.canonicalMoneyKey = void 0;
+/** Input has already passed MoneySchema. Compare decimal strings without floating point arithmetic. */
+const canonicalMoneyKey = (value) => {
+    const [integer, fraction = ''] = value.split('.');
+    return `${integer.replace(/^0+(?=\d)/, '')}.${(fraction + '00').slice(0, 2)}`;
+};
+exports.canonicalMoneyKey = canonicalMoneyKey;

package/build/helpers/normalize-delivery-pricing-value.helper.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeDeliveryPricingValue = void 0;
+const normalizeDeliveryPricingValue = (value) => value.trim().toLowerCase();
+exports.normalizeDeliveryPricingValue = normalizeDeliveryPricingValue;

package/build/helpers/validate-unique-delivery-pricing-rules.helper.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateUniqueDeliveryPricingRules = validateUniqueDeliveryPricingRules;
+const normalize_delivery_pricing_value_helper_1 = require("./normalize-delivery-pricing-value.helper");
+function validateUniqueDeliveryPricingRules(rules, ctx) {
+    const seen = new Set();
+    rules.forEach((rule, index) => {
+        var _a;
+        const value = (0, normalize_delivery_pricing_value_helper_1.normalizeDeliveryPricingValue)((_a = rule.value) !== null && _a !== void 0 ? _a : '');
+        const key = `${rule.scope}:${value}`;
+        if (seen.has(key)) {
+            ctx.addIssue({ code: 'custom', path: [index, 'value'], message: 'Duplicate delivery pricing rule' });
+        }
+        seen.add(key);
+    });
+}

package/build/helpers/validate-unique-delivery-pricing-thresholds.helper.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateUniqueDeliveryPricingThresholds = validateUniqueDeliveryPricingThresholds;
+const canonical_money_key_helper_1 = require("./canonical-money-key.helper");
+function validateUniqueDeliveryPricingThresholds(tiers, ctx) {
+    const thresholds = new Set();
+    tiers.forEach((tier, index) => {
+        const key = (0, canonical_money_key_helper_1.canonicalMoneyKey)(tier.minSubtotal);
+        if (thresholds.has(key)) {
+            ctx.addIssue({ code: 'custom', path: [index, 'minSubtotal'], message: 'Duplicate delivery pricing threshold' });
+        }
+        thresholds.add(key);
+    });
+}

package/build/schemas/index.js

@@ -123,6 +123,10 @@ __exportStar(require("./report/user-activity-summary-row.schema"), exports);
 __exportStar(require("./report/user-activity-timeline-row.schema"), exports);
 __exportStar(require("./service/service.schema"), exports);
 __exportStar(require("./settings/settings.schema"), exports);
+__exportStar(require("./settings/city-delivery-pricing-rule.schema"), exports);
+__exportStar(require("./settings/default-delivery-pricing-rule.schema"), exports);
+__exportStar(require("./settings/group-delivery-pricing-rule.schema"), exports);
+__exportStar(require("./settings/delivery-pricing-tiers.schema"), exports);
 __exportStar(require("./transaction"), exports);
 __exportStar(require("./transaction/transaction-list.schema"), exports);
 __exportStar(require("./transaction/transaction.schema"), exports);

package/build/schemas/order/delivery-pricing.schema.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingSchema = void 0;
+const zod_1 = require("zod");
+const money_schema_1 = require("../money.schema");
+const delivery_pricing_tier_schema_1 = require("../settings/delivery-pricing-tier.schema");
+const delivery_pricing_in_transit_mode_enum_1 = require("../../enum/delivery-pricing-in-transit-mode.enum");
+exports.DeliveryPricingSchema = zod_1.z.object({
+    cost: money_schema_1.MoneySchema,
+    inStockSubtotal: money_schema_1.MoneySchema,
+    tiers: zod_1.z.array(delivery_pricing_tier_schema_1.DeliveryPricingTierSchema),
+    inTransitMode: zod_1.z.nativeEnum(delivery_pricing_in_transit_mode_enum_1.DeliveryPricingInTransitModeEnum),
+});

package/build/schemas/order/get-order-delivery-pricing-request.schema.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOrderDeliveryPricingRequestSchema = void 0;
+const zod_1 = require("zod");
+exports.GetOrderDeliveryPricingRequestSchema = zod_1.z.object({ orderUUID: zod_1.z.string().uuid() });

package/build/schemas/order/get-order-delivery-pricing-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOrderDeliveryPricingResponseSchema = void 0;
+const zod_1 = require("zod");
+const delivery_pricing_schema_1 = require("./delivery-pricing.schema");
+exports.GetOrderDeliveryPricingResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: delivery_pricing_schema_1.DeliveryPricingSchema.nullable(),
+});

package/build/schemas/order/index.js

@@ -28,3 +28,6 @@ __exportStar(require("./order.schema"), exports);
 __exportStar(require("./update-cart-delivery-request.schema"), exports);
 __exportStar(require("./update-cart-request.schema"), exports);
 __exportStar(require("./update-cart-response.schema"), exports);
+__exportStar(require("./delivery-pricing.schema"), exports);
+__exportStar(require("./get-order-delivery-pricing-request.schema"), exports);
+__exportStar(require("./get-order-delivery-pricing-response.schema"), exports);

package/build/schemas/order/order-extended-for-client.schema.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderExtendedForClientSchema = void 0;
+const delivery_pricing_schema_1 = require("./delivery-pricing.schema");
 const zod_1 = require("zod");
 const order_for_client_schema_1 = require("./order-for-client.schema");
 const client_for_client_schema_1 = require("../client/client-for-client.schema");
@@ -13,7 +14,8 @@ exports.OrderExtendedForClientSchema = order_for_client_schema_1.OrderForClientS
     delivery: order_delivery_schema_1.OrderDeliverySchema.nullable(),
     writeOffSum: money_schema_1.MoneySchema,
     consignmentDeliveryDates: zod_1.z.union([zod_1.z.date(), zod_1.z.literal('in-stock')]).array(),
-    // Server-computed delivery cost for the current subtotal when the tier rule is on (null when off).
-    // Convenience preview for the cart page; the storefront still recomputes locally on the delivery/pickup toggle.
+    // Server quote for the current cart; transit products do not contribute to the stock threshold.
+    deliveryPricing: delivery_pricing_schema_1.DeliveryPricingSchema.nullable(),
+    /** @deprecated One-release compatibility alias for deliveryPricing.cost. */
     deliveryCostPreview: money_schema_1.MoneySchema.nullable(),
 });

package/build/schemas/settings/city-delivery-pricing-rule.schema.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CityDeliveryPricingRuleSchema = void 0;
+const zod_1 = require("zod");
+const delivery_pricing_rule_scope_enum_1 = require("../../enum/delivery-pricing-rule-scope.enum");
+const delivery_pricing_tiers_schema_1 = require("./delivery-pricing-tiers.schema");
+exports.CityDeliveryPricingRuleSchema = zod_1.z.object({
+    scope: zod_1.z.literal(delivery_pricing_rule_scope_enum_1.DeliveryPricingRuleScopeEnum.CITY),
+    value: zod_1.z.string().trim().min(1),
+    tiers: delivery_pricing_tiers_schema_1.DeliveryPricingTiersSchema,
+});

package/build/schemas/settings/default-delivery-pricing-rule.schema.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DefaultDeliveryPricingRuleSchema = void 0;
+const zod_1 = require("zod");
+const delivery_pricing_rule_scope_enum_1 = require("../../enum/delivery-pricing-rule-scope.enum");
+const delivery_pricing_tiers_schema_1 = require("./delivery-pricing-tiers.schema");
+exports.DefaultDeliveryPricingRuleSchema = zod_1.z.object({
+    scope: zod_1.z.literal(delivery_pricing_rule_scope_enum_1.DeliveryPricingRuleScopeEnum.DEFAULT),
+    value: zod_1.z.null(),
+    tiers: delivery_pricing_tiers_schema_1.DeliveryPricingTiersSchema,
+});

package/build/schemas/settings/delivery-pricing-rule.schema.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingRuleSchema = void 0;
+const zod_1 = require("zod");
+const city_delivery_pricing_rule_schema_1 = require("./city-delivery-pricing-rule.schema");
+const default_delivery_pricing_rule_schema_1 = require("./default-delivery-pricing-rule.schema");
+const group_delivery_pricing_rule_schema_1 = require("./group-delivery-pricing-rule.schema");
+exports.DeliveryPricingRuleSchema = zod_1.z.discriminatedUnion('scope', [
+    default_delivery_pricing_rule_schema_1.DefaultDeliveryPricingRuleSchema,
+    city_delivery_pricing_rule_schema_1.CityDeliveryPricingRuleSchema,
+    group_delivery_pricing_rule_schema_1.GroupDeliveryPricingRuleSchema,
+]);

package/build/schemas/settings/delivery-pricing-rules.schema.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingRulesSchema = void 0;
+const zod_1 = require("zod");
+const validate_unique_delivery_pricing_rules_helper_1 = require("../../helpers/validate-unique-delivery-pricing-rules.helper");
+const delivery_pricing_rule_schema_1 = require("./delivery-pricing-rule.schema");
+exports.DeliveryPricingRulesSchema = zod_1.z.array(delivery_pricing_rule_schema_1.DeliveryPricingRuleSchema).superRefine(validate_unique_delivery_pricing_rules_helper_1.validateUniqueDeliveryPricingRules);

package/build/schemas/settings/delivery-pricing-tier.schema.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingTierSchema = void 0;
+const zod_1 = require("zod");
+const non_negative_money_schema_1 = require("../non-negative-money.schema");
+// JSON tiers follow the same decimal-string precision as monetary database columns.
+exports.DeliveryPricingTierSchema = zod_1.z.object({
+    minSubtotal: non_negative_money_schema_1.NonNegativeMoneySchema,
+    cost: non_negative_money_schema_1.NonNegativeMoneySchema,
+});

package/build/schemas/settings/delivery-pricing-tiers.schema.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeliveryPricingTiersSchema = void 0;
+const zod_1 = require("zod");
+const validate_unique_delivery_pricing_thresholds_helper_1 = require("../../helpers/validate-unique-delivery-pricing-thresholds.helper");
+const delivery_pricing_tier_schema_1 = require("./delivery-pricing-tier.schema");
+exports.DeliveryPricingTiersSchema = zod_1.z.array(delivery_pricing_tier_schema_1.DeliveryPricingTierSchema).superRefine(validate_unique_delivery_pricing_thresholds_helper_1.validateUniqueDeliveryPricingThresholds);

package/build/schemas/settings/group-delivery-pricing-rule.schema.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GroupDeliveryPricingRuleSchema = void 0;
+const zod_1 = require("zod");
+const delivery_pricing_rule_scope_enum_1 = require("../../enum/delivery-pricing-rule-scope.enum");
+const delivery_pricing_tiers_schema_1 = require("./delivery-pricing-tiers.schema");
+exports.GroupDeliveryPricingRuleSchema = zod_1.z.object({
+    scope: zod_1.z.literal(delivery_pricing_rule_scope_enum_1.DeliveryPricingRuleScopeEnum.GROUP),
+    value: zod_1.z.string().trim().min(1),
+    tiers: delivery_pricing_tiers_schema_1.DeliveryPricingTiersSchema,
+});

package/build/schemas/settings/settings.schema.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpdateSettingsRequestSchema = exports.CreateSettingsSchema = exports.SettingsForAdminSchema = exports.SettingsSchema = exports.DeliveryPricingTierSchema = exports.DisableOrdersMessageSchema = exports.ContactPhoneListSchema = exports.ContactPhoneSchema = exports.ContactMessengerLinkSchema = exports.ImportantMessageSchema = exports.SettingsWorkingHoursSchema = void 0;
+exports.UpdateSettingsRequestSchema = exports.CreateSettingsSchema = exports.SettingsForAdminSchema = exports.SettingsSchema = exports.DisableOrdersMessageSchema = exports.ContactPhoneListSchema = exports.ContactPhoneSchema = exports.ContactMessengerLinkSchema = exports.ImportantMessageSchema = exports.SettingsWorkingHoursSchema = exports.DeliveryPricingTierSchema = exports.DeliveryPricingRulesSchema = exports.DeliveryPricingRuleSchema = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const contact_phone_constant_1 = require("../../constant/contact-phone.constant");
@@ -8,7 +8,16 @@ const settings_constant_1 = require("../../constant/settings.constant");
 const validation_i18n_key_1 = require("../../constant/validation-i18n-key");
 const webshop_main_display_mode_enum_1 = require("../../enum/webshop-main-display-mode.enum");
 const menu_items_url_enum_1 = require("../../enum/menu-items-url.enum");
-const non_negative_money_schema_1 = require("../non-negative-money.schema");
+const delivery_pricing_in_transit_mode_enum_1 = require("../../enum/delivery-pricing-in-transit-mode.enum");
+const delivery_pricing_rules_schema_1 = require("./delivery-pricing-rules.schema");
+const delivery_pricing_tier_schema_1 = require("./delivery-pricing-tier.schema");
+// Preserve existing direct imports and contracts package exports.
+var delivery_pricing_rule_schema_1 = require("./delivery-pricing-rule.schema");
+Object.defineProperty(exports, "DeliveryPricingRuleSchema", { enumerable: true, get: function () { return delivery_pricing_rule_schema_1.DeliveryPricingRuleSchema; } });
+var delivery_pricing_rules_schema_2 = require("./delivery-pricing-rules.schema");
+Object.defineProperty(exports, "DeliveryPricingRulesSchema", { enumerable: true, get: function () { return delivery_pricing_rules_schema_2.DeliveryPricingRulesSchema; } });
+var delivery_pricing_tier_schema_2 = require("./delivery-pricing-tier.schema");
+Object.defineProperty(exports, "DeliveryPricingTierSchema", { enumerable: true, get: function () { return delivery_pricing_tier_schema_2.DeliveryPricingTierSchema; } });
 exports.SettingsWorkingHoursSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     settingsUUID: zod_1.z.string(),
@@ -62,13 +71,6 @@ exports.ContactPhoneListSchema = zod_1.z.array(exports.ContactPhoneSchema).max(c
 // Один потолок на все три схемы настроек: колонка `disable_orders_message` — TEXT, длину держит
 // только валидация.
 exports.DisableOrdersMessageSchema = zod_1.z.string().max(settings_constant_1.DISABLE_ORDERS_MESSAGE_MAX_LENGTH);
-// Обе величины — деньги: `minSubtotal` сравнивается с суммой заказа, `cost` попадает в
-// `order.delivery_cost`. Живут они внутри JSON-колонки, куда ALTER TABLE не достаёт, поэтому
-// точность здесь держит не тип колонки, а формат значения — та же десятичная строка, что и на проводе.
-exports.DeliveryPricingTierSchema = zod_1.z.object({
-    minSubtotal: non_negative_money_schema_1.NonNegativeMoneySchema,
-    cost: non_negative_money_schema_1.NonNegativeMoneySchema,
-});
 exports.SettingsSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     language: zod_1.z.nativeEnum(enum_1.LanguageEnum),
@@ -149,11 +151,13 @@ exports.SettingsSchema = zod_1.z.object({
     isBalanceVisible: zod_1.z.boolean(),
     importantMessage: exports.ImportantMessageSchema.nullable(),
     deliveryPricingEnabled: zod_1.z.boolean(),
-    deliveryPricingTiers: zod_1.z.array(exports.DeliveryPricingTierSchema).nullable(),
+    deliveryPricingTiers: zod_1.z.array(delivery_pricing_tier_schema_1.DeliveryPricingTierSchema).nullable(),
     employeeClientScopeEnabled: zod_1.z.boolean(),
     telegramStaffBotName: zod_1.z.string().nullable().optional(),
 });
 exports.SettingsForAdminSchema = exports.SettingsSchema.extend({
+    deliveryPricingRules: delivery_pricing_rules_schema_1.DeliveryPricingRulesSchema.nullable(),
+    deliveryPricingInTransitMode: zod_1.z.nativeEnum(delivery_pricing_in_transit_mode_enum_1.DeliveryPricingInTransitModeEnum),
     // post terminal settings
     vatTag: zod_1.z.string().nullable(),
     taxMode: zod_1.z.string().nullable(),
@@ -248,7 +252,8 @@ exports.CreateSettingsSchema = zod_1.z.object({
     chatNoManagerMode: zod_1.z.nativeEnum(enum_1.ChatNoManagerModeEnum).default(enum_1.ChatNoManagerModeEnum.ANY_MANAGER),
     importantMessage: exports.ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: zod_1.z.coerce.boolean().optional(),
-    deliveryPricingTiers: zod_1.z.array(exports.DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: delivery_pricing_rules_schema_1.DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: zod_1.z.nativeEnum(delivery_pricing_in_transit_mode_enum_1.DeliveryPricingInTransitModeEnum).optional(),
 });
 exports.UpdateSettingsRequestSchema = zod_1.z.object({
     language: zod_1.z.nativeEnum(enum_1.LanguageEnum),
@@ -327,7 +332,8 @@ exports.UpdateSettingsRequestSchema = zod_1.z.object({
     chatNoManagerMode: zod_1.z.nativeEnum(enum_1.ChatNoManagerModeEnum).default(enum_1.ChatNoManagerModeEnum.ANY_MANAGER).optional(),
     importantMessage: exports.ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: zod_1.z.coerce.boolean().optional(),
-    deliveryPricingTiers: zod_1.z.array(exports.DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: delivery_pricing_rules_schema_1.DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: zod_1.z.nativeEnum(delivery_pricing_in_transit_mode_enum_1.DeliveryPricingInTransitModeEnum).optional(),
     employeeClientScopeEnabled: zod_1.z.coerce.boolean().optional(),
     // post terminal settings
     vatTag: zod_1.z.string().nullable().optional(),

package/commands/order/get-order-delivery-pricing.query.ts

@@ -0,0 +1,10 @@
+import type { z } from 'zod';
+import { GetOrderDeliveryPricingRequestSchema } from '../../schemas/order/get-order-delivery-pricing-request.schema';
+import { GetOrderDeliveryPricingResponseSchema } from '../../schemas/order/get-order-delivery-pricing-response.schema';
+
+export namespace GetOrderDeliveryPricingContractQuery {
+    export const RequestSchema = GetOrderDeliveryPricingRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+    export const ResponseSchema = GetOrderDeliveryPricingResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/order/index.ts

@@ -25,3 +25,5 @@ export * from './webshop/create-cart.command';
 export * from './webshop/get-order-list-for-client.query';
 export * from './webshop/update-cart.command';
 export * from './webshop/get-order-sales-by-month.query';
+
+export * from './get-order-delivery-pricing.query';

package/enum/delivery-pricing-in-transit-mode.enum.ts

@@ -0,0 +1,4 @@
+export enum DeliveryPricingInTransitModeEnum {
+    FREE = 'FREE',
+    SAME_RULES = 'SAME_RULES',
+}

package/enum/delivery-pricing-rule-scope.enum.ts

@@ -0,0 +1,5 @@
+export enum DeliveryPricingRuleScopeEnum {
+    DEFAULT = 'DEFAULT',
+    CITY = 'CITY',
+    GROUP = 'GROUP',
+}

package/enum/index.ts

@@ -159,3 +159,6 @@ export * from './pre-order-conversion-difference-field.enum';
 export * from './pre-order-conversion-skip-reason.enum';
 
 export * from './pre-order-fulfillment-status.enum';
+
+export * from './delivery-pricing-rule-scope.enum';
+export * from './delivery-pricing-in-transit-mode.enum';

package/helpers/canonical-money-key.helper.ts

@@ -0,0 +1,5 @@
+/** Input has already passed MoneySchema. Compare decimal strings without floating point arithmetic. */
+export const canonicalMoneyKey = (value: string): string => {
+    const [integer, fraction = ''] = value.split('.');
+    return `${integer.replace(/^0+(?=\d)/, '')}.${(fraction + '00').slice(0, 2)}`;
+};

package/helpers/normalize-delivery-pricing-value.helper.ts

@@ -0,0 +1 @@
+export const normalizeDeliveryPricingValue = (value: string): string => value.trim().toLowerCase();

package/helpers/validate-unique-delivery-pricing-rules.helper.ts

@@ -0,0 +1,18 @@
+import type { RefinementCtx } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../enum/delivery-pricing-rule-scope.enum';
+import { normalizeDeliveryPricingValue } from './normalize-delivery-pricing-value.helper';
+
+export function validateUniqueDeliveryPricingRules(
+    rules: { scope: DeliveryPricingRuleScopeEnum; value: string | null }[],
+    ctx: RefinementCtx,
+): void {
+    const seen = new Set<string>();
+    rules.forEach((rule, index) => {
+        const value = normalizeDeliveryPricingValue(rule.value ?? '');
+        const key = `${rule.scope}:${value}`;
+        if (seen.has(key)) {
+            ctx.addIssue({ code: 'custom', path: [index, 'value'], message: 'Duplicate delivery pricing rule' });
+        }
+        seen.add(key);
+    });
+}

package/helpers/validate-unique-delivery-pricing-thresholds.helper.ts

@@ -0,0 +1,13 @@
+import type { RefinementCtx } from 'zod';
+import { canonicalMoneyKey } from './canonical-money-key.helper';
+
+export function validateUniqueDeliveryPricingThresholds(tiers: { minSubtotal: string }[], ctx: RefinementCtx): void {
+    const thresholds = new Set<string>();
+    tiers.forEach((tier, index) => {
+        const key = canonicalMoneyKey(tier.minSubtotal);
+        if (thresholds.has(key)) {
+            ctx.addIssue({ code: 'custom', path: [index, 'minSubtotal'], message: 'Duplicate delivery pricing threshold' });
+        }
+        thresholds.add(key);
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@floristcloud/api-lib",
-    "version": "1.2.177",
+    "version": "1.2.179",
     "description": "",
     "main": "./build/index.js",
     "scripts": {

package/schemas/index.ts

@@ -107,6 +107,10 @@ export * from './report/user-activity-summary-row.schema';
 export * from './report/user-activity-timeline-row.schema';
 export * from './service/service.schema';
 export * from './settings/settings.schema';
+export * from './settings/city-delivery-pricing-rule.schema';
+export * from './settings/default-delivery-pricing-rule.schema';
+export * from './settings/group-delivery-pricing-rule.schema';
+export * from './settings/delivery-pricing-tiers.schema';
 export * from './transaction';
 export * from './transaction/transaction-list.schema';
 export * from './transaction/transaction.schema';

package/schemas/order/delivery-pricing.schema.ts

@@ -0,0 +1,11 @@
+import { z } from 'zod';
+import { MoneySchema } from '../money.schema';
+import { DeliveryPricingTierSchema } from '../settings/delivery-pricing-tier.schema';
+import { DeliveryPricingInTransitModeEnum } from '../../enum/delivery-pricing-in-transit-mode.enum';
+
+export const DeliveryPricingSchema = z.object({
+    cost: MoneySchema,
+    inStockSubtotal: MoneySchema,
+    tiers: z.array(DeliveryPricingTierSchema),
+    inTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum),
+});

package/schemas/order/get-order-delivery-pricing-request.schema.ts

@@ -0,0 +1,3 @@
+import { z } from 'zod';
+
+export const GetOrderDeliveryPricingRequestSchema = z.object({ orderUUID: z.string().uuid() });

package/schemas/order/get-order-delivery-pricing-response.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { DeliveryPricingSchema } from './delivery-pricing.schema';
+
+export const GetOrderDeliveryPricingResponseSchema = z.object({
+    message: z.string().optional(),
+    data: DeliveryPricingSchema.nullable(),
+});

package/schemas/order/index.ts

@@ -12,3 +12,7 @@ export * from './order.schema';
 export * from './update-cart-delivery-request.schema';
 export * from './update-cart-request.schema';
 export * from './update-cart-response.schema';
+
+export * from './delivery-pricing.schema';
+export * from './get-order-delivery-pricing-request.schema';
+export * from './get-order-delivery-pricing-response.schema';

package/schemas/order/order-extended-for-client.schema.ts

@@ -1,3 +1,4 @@
+import { DeliveryPricingSchema } from './delivery-pricing.schema';
 import { z } from 'zod';
 import { OrderForClientSchema } from './order-for-client.schema';
 import { ClientForClientSchema } from '../client/client-for-client.schema';
@@ -11,7 +12,8 @@ export const OrderExtendedForClientSchema = OrderForClientSchema.extend({
     delivery: OrderDeliverySchema.nullable(),
     writeOffSum: MoneySchema,
     consignmentDeliveryDates: z.union([z.date(), z.literal('in-stock')]).array(),
-    // Server-computed delivery cost for the current subtotal when the tier rule is on (null when off).
-    // Convenience preview for the cart page; the storefront still recomputes locally on the delivery/pickup toggle.
+    // Server quote for the current cart; transit products do not contribute to the stock threshold.
+    deliveryPricing: DeliveryPricingSchema.nullable(),
+    /** @deprecated One-release compatibility alias for deliveryPricing.cost. */
     deliveryCostPreview: MoneySchema.nullable(),
 });

package/schemas/settings/city-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const CityDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.CITY),
+    value: z.string().trim().min(1),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/default-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const DefaultDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.DEFAULT),
+    value: z.null(),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/delivery-pricing-rule.schema.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { CityDeliveryPricingRuleSchema } from './city-delivery-pricing-rule.schema';
+import { DefaultDeliveryPricingRuleSchema } from './default-delivery-pricing-rule.schema';
+import { GroupDeliveryPricingRuleSchema } from './group-delivery-pricing-rule.schema';
+
+export const DeliveryPricingRuleSchema = z.discriminatedUnion('scope', [
+    DefaultDeliveryPricingRuleSchema,
+    CityDeliveryPricingRuleSchema,
+    GroupDeliveryPricingRuleSchema,
+]);

package/schemas/settings/delivery-pricing-rules.schema.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+import { validateUniqueDeliveryPricingRules } from '../../helpers/validate-unique-delivery-pricing-rules.helper';
+import { DeliveryPricingRuleSchema } from './delivery-pricing-rule.schema';
+
+export const DeliveryPricingRulesSchema = z.array(DeliveryPricingRuleSchema).superRefine(validateUniqueDeliveryPricingRules);

package/schemas/settings/delivery-pricing-tier.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { NonNegativeMoneySchema } from '../non-negative-money.schema';
+
+// JSON tiers follow the same decimal-string precision as monetary database columns.
+export const DeliveryPricingTierSchema = z.object({
+    minSubtotal: NonNegativeMoneySchema,
+    cost: NonNegativeMoneySchema,
+});

package/schemas/settings/delivery-pricing-tiers.schema.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+import { validateUniqueDeliveryPricingThresholds } from '../../helpers/validate-unique-delivery-pricing-thresholds.helper';
+import { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
+
+export const DeliveryPricingTiersSchema = z.array(DeliveryPricingTierSchema).superRefine(validateUniqueDeliveryPricingThresholds);

package/schemas/settings/group-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const GroupDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.GROUP),
+    value: z.string().trim().min(1),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/settings.schema.ts

@@ -19,7 +19,14 @@ import { DISABLE_ORDERS_MESSAGE_MAX_LENGTH } from '../../constant/settings.const
 import { ValidationI18nKey } from '../../constant/validation-i18n-key';
 import { WebshopMainDisplayModeEnum } from '../../enum/webshop-main-display-mode.enum';
 import { MenuItemsUrlEnum } from '../../enum/menu-items-url.enum';
-import { NonNegativeMoneySchema } from '../non-negative-money.schema';
+import { DeliveryPricingInTransitModeEnum } from '../../enum/delivery-pricing-in-transit-mode.enum';
+import { DeliveryPricingRulesSchema } from './delivery-pricing-rules.schema';
+import { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
+
+// Preserve existing direct imports and contracts package exports.
+export { DeliveryPricingRuleSchema } from './delivery-pricing-rule.schema';
+export { DeliveryPricingRulesSchema } from './delivery-pricing-rules.schema';
+export { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
 
 export const SettingsWorkingHoursSchema = z.object({
     uuid: z.string(),
@@ -82,14 +89,6 @@ export const ContactPhoneListSchema = z.array(ContactPhoneSchema).max(CONTACT_PH
 // только валидация.
 export const DisableOrdersMessageSchema = z.string().max(DISABLE_ORDERS_MESSAGE_MAX_LENGTH);
 
-// Обе величины — деньги: `minSubtotal` сравнивается с суммой заказа, `cost` попадает в
-// `order.delivery_cost`. Живут они внутри JSON-колонки, куда ALTER TABLE не достаёт, поэтому
-// точность здесь держит не тип колонки, а формат значения — та же десятичная строка, что и на проводе.
-export const DeliveryPricingTierSchema = z.object({
-    minSubtotal: NonNegativeMoneySchema,
-    cost: NonNegativeMoneySchema,
-});
-
 export const SettingsSchema = z.object({
     uuid: z.string(),
     language: z.nativeEnum(LanguageEnum),
@@ -176,6 +175,8 @@ export const SettingsSchema = z.object({
 });
 
 export const SettingsForAdminSchema = SettingsSchema.extend({
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum),
     // post terminal settings
     vatTag: z.string().nullable(),
     taxMode: z.string().nullable(),
@@ -273,7 +274,8 @@ export const CreateSettingsSchema = z.object({
     chatNoManagerMode: z.nativeEnum(ChatNoManagerModeEnum).default(ChatNoManagerModeEnum.ANY_MANAGER),
     importantMessage: ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: z.coerce.boolean().optional(),
-    deliveryPricingTiers: z.array(DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum).optional(),
 });
 
 export const UpdateSettingsRequestSchema = z.object({
@@ -355,7 +357,8 @@ export const UpdateSettingsRequestSchema = z.object({
     chatNoManagerMode: z.nativeEnum(ChatNoManagerModeEnum).default(ChatNoManagerModeEnum.ANY_MANAGER).optional(),
     importantMessage: ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: z.coerce.boolean().optional(),
-    deliveryPricingTiers: z.array(DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum).optional(),
     employeeClientScopeEnabled: z.coerce.boolean().optional(),
     // post terminal settings
     vatTag: z.string().nullable().optional(),