@floristcloud/api-lib 1.2.166 → 1.2.168

package/build/commands/category/create-category.command.js

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateCategoryContractCommand = void 0;
-const zod_1 = require("zod");
-const schemas_1 = require("../../schemas");
 const category_create_schema_1 = require("../../schemas/category/category-create.schema");
-const CreateCategoryRequestSchema = category_create_schema_1.CategoryCreateSchema;
-const CreateCategoryResponseSchema = zod_1.z.object({
-    message: zod_1.z.string().optional(),
-    data: schemas_1.CategorySchema,
-});
+const create_category_response_schema_1 = require("../../schemas/category/create-category-response.schema");
 var CreateCategoryContractCommand;
 (function (CreateCategoryContractCommand) {
-    CreateCategoryContractCommand.RequestSchema = CreateCategoryRequestSchema;
-    CreateCategoryContractCommand.ResponseSchema = CreateCategoryResponseSchema;
+    CreateCategoryContractCommand.RequestSchema = category_create_schema_1.CategoryCreateSchema;
+    CreateCategoryContractCommand.ResponseSchema = create_category_response_schema_1.CreateCategoryResponseSchema;
 })(CreateCategoryContractCommand || (exports.CreateCategoryContractCommand = CreateCategoryContractCommand = {}));

package/build/commands/category/get-category-by-uuid.query.js

@@ -1,17 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetCategoryByUUIDhContractQuery = void 0;
-const zod_1 = require("zod");
-const category_schema_1 = require("../../schemas/category/category.schema");
-const GetCategoryByUUIDRequestSchema = zod_1.z.object({
-    uuid: zod_1.z.uuid(),
-});
-const GetCategoryByUUIDResponseSchema = zod_1.z.object({
-    message: zod_1.z.string().optional(),
-    data: category_schema_1.CategoryExtendedSchema,
-});
+const get_category_by_uuid_request_schema_1 = require("../../schemas/category/get-category-by-uuid-request.schema");
+const get_category_by_uuid_response_schema_1 = require("../../schemas/category/get-category-by-uuid-response.schema");
 var GetCategoryByUUIDhContractQuery;
 (function (GetCategoryByUUIDhContractQuery) {
-    GetCategoryByUUIDhContractQuery.RequestSchema = GetCategoryByUUIDRequestSchema;
-    GetCategoryByUUIDhContractQuery.ResponseSchema = GetCategoryByUUIDResponseSchema;
+    GetCategoryByUUIDhContractQuery.RequestSchema = get_category_by_uuid_request_schema_1.GetCategoryByUUIDRequestSchema;
+    GetCategoryByUUIDhContractQuery.ResponseSchema = get_category_by_uuid_response_schema_1.GetCategoryByUUIDResponseSchema;
 })(GetCategoryByUUIDhContractQuery || (exports.GetCategoryByUUIDhContractQuery = GetCategoryByUUIDhContractQuery = {}));

package/build/commands/category/get-category-list.query.js

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetCategoryListContractQuery = void 0;
-const zod_1 = require("zod");
 const category_list_filter_schema_1 = require("../../schemas/category/category-list-filter.schema");
-const category_list_schema_1 = require("../../schemas/category/category-list.schema");
-const GetCategoryListRequestSchema = category_list_filter_schema_1.CategoryListFilterSchema;
-const GetCategoryResponseSchema = zod_1.z.object({
-    message: zod_1.z.string().optional(),
-    data: category_list_schema_1.CategoryListSchema,
-});
+const get_category_list_response_schema_1 = require("../../schemas/category/get-category-list-response.schema");
 var GetCategoryListContractQuery;
 (function (GetCategoryListContractQuery) {
-    GetCategoryListContractQuery.RequestSchema = GetCategoryListRequestSchema;
-    GetCategoryListContractQuery.ResponseSchema = GetCategoryResponseSchema;
+    GetCategoryListContractQuery.RequestSchema = category_list_filter_schema_1.CategoryListFilterSchema;
+    GetCategoryListContractQuery.ResponseSchema = get_category_list_response_schema_1.GetCategoryListResponseSchema;
 })(GetCategoryListContractQuery || (exports.GetCategoryListContractQuery = GetCategoryListContractQuery = {}));

package/build/commands/category/update-category-command.js

@@ -1,16 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateCategoryContractCommand = void 0;
-const zod_1 = require("zod");
-const schemas_1 = require("../../schemas");
 const category_update_schema_1 = require("../../schemas/category/category-update.schema");
-const UpdateCategoryRequestSchema = category_update_schema_1.CategoryUpdateSchema;
-const UpdateCategoryResponseSchema = zod_1.z.object({
-    message: zod_1.z.string().optional(),
-    data: schemas_1.CategorySchema.nullable(),
-});
+const update_category_response_schema_1 = require("../../schemas/category/update-category-response.schema");
 var UpdateCategoryContractCommand;
 (function (UpdateCategoryContractCommand) {
-    UpdateCategoryContractCommand.RequestSchema = UpdateCategoryRequestSchema;
-    UpdateCategoryContractCommand.ResponseSchema = UpdateCategoryResponseSchema;
+    UpdateCategoryContractCommand.RequestSchema = category_update_schema_1.CategoryUpdateSchema;
+    UpdateCategoryContractCommand.ResponseSchema = update_category_response_schema_1.UpdateCategoryResponseSchema;
 })(UpdateCategoryContractCommand || (exports.UpdateCategoryContractCommand = UpdateCategoryContractCommand = {}));

package/build/commands/integration/ozexport/get-ozexport-catalog-filters.query.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOzexportCatalogFiltersContractQuery = void 0;
+const get_ozexport_catalog_filters_request_schema_1 = require("../../../schemas/integration/ozexport/get-ozexport-catalog-filters-request.schema");
+const get_ozexport_catalog_filters_response_schema_1 = require("../../../schemas/integration/ozexport/get-ozexport-catalog-filters-response.schema");
+var GetOzexportCatalogFiltersContractQuery;
+(function (GetOzexportCatalogFiltersContractQuery) {
+    GetOzexportCatalogFiltersContractQuery.RequestSchema = get_ozexport_catalog_filters_request_schema_1.GetOzexportCatalogFiltersRequestSchema;
+    GetOzexportCatalogFiltersContractQuery.ResponseSchema = get_ozexport_catalog_filters_response_schema_1.GetOzexportCatalogFiltersResponseSchema;
+})(GetOzexportCatalogFiltersContractQuery || (exports.GetOzexportCatalogFiltersContractQuery = GetOzexportCatalogFiltersContractQuery = {}));

package/build/commands/integration/ozexport/index.js

@@ -17,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./connect-ozexport.command"), exports);
 __exportStar(require("./disconnect-ozexport.command"), exports);
 __exportStar(require("./get-ozexport-catalog.query"), exports);
+__exportStar(require("./get-ozexport-catalog-filters.query"), exports);
 __exportStar(require("./get-ozexport-status.query"), exports);
 __exportStar(require("./select-ozexport-unit.command"), exports);
 __exportStar(require("./get-ozexport-catalog-offers.query"), exports);

package/build/constant/discount-rules-pricing-type-list.constant.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DISCOUNT_RULES_PRICING_TYPE_LIST = void 0;
+const discount_rules_type_enum_1 = require("../enum/discount-rules-type.enum");
+/**
+ * Правила ценообразования: задают цену клиента целиком, а не уменьшают её.
+ *
+ * Цена от себестоимости или от прайса плюс наценка. Если у клиента есть такое правило, скидки к нему не
+ * применяются, и больше одного действующего правила ценообразования на клиента быть не может.
+ */
+exports.DISCOUNT_RULES_PRICING_TYPE_LIST = [
+    discount_rules_type_enum_1.DiscountRulesTypeEnum.COST_PLUS_MARKUP,
+    discount_rules_type_enum_1.DiscountRulesTypeEnum.PRICE_PLUS_MARKUP,
+];

package/build/constant/error.js

@@ -1363,6 +1363,17 @@ exports.ERRORS = {
         message: 'Too many products for a single consignment discount operation',
         httpCode: 400,
     },
+    DISCOUNT_RULES_PRICING_RULE_CONFLICT: {
+        code: 'DR007',
+        message: 'A client can have only one active pricing rule',
+        httpCode: 409,
+    },
+    // Не дождались транзакционной блокировки правил ценообразования компании (lock_timeout).
+    DISCOUNT_RULES_PRICING_RULE_LOCK_BUSY: {
+        code: 'DR008',
+        message: 'Pricing rules of this company are being changed right now, try again',
+        httpCode: 409,
+    },
     DISCOUNT_RULES_NOT_FOUND: { code: 'DR010', message: 'Discount-rules not found', httpCode: 404 },
     // ACTION LOG
     ACTION_LOG_NOT_CREATED: { code: 'ALG001', message: 'Failed to create action-log', httpCode: 500 },

package/build/constant/index.js

@@ -31,3 +31,4 @@ __exportStar(require("./product-image-merge.constant"), exports);
 __exportStar(require("./client-group-actions.constant"), exports);
 __exportStar(require("./standing-order-positions.constant"), exports);
 __exportStar(require("./order-external-number.constant"), exports);
+__exportStar(require("./discount-rules-pricing-type-list.constant"), exports);

package/build/enum/discount-rules-mode-type.enum.js

@@ -8,10 +8,8 @@ var DiscountRulesModeTypeEnum;
     /**
      * Готовая цена, а не величина скидки.
      *
-     * Значение вычисляемое: его выставляет правило `COST_PLUS_MARKUP`, посчитав цену от
-     * себестоимости товара. Задать его снаружи нельзя — схема ввода правила
-     * (`discountRulesModeSchema`) знает только FIXED и PERCENT, а схема выдачи
-     * (`discountPriceOutcomeSchema`) — все три.
+     * Больше не отдаётся: правило `COST_PLUS_MARKUP` стало правилом ценообразования и задаёт цену
+     * клиента, а не вариант скидки. Значение оставлено, чтобы не ломать клиентов, которые его разбирают.
      */
     DiscountRulesModeTypeEnum["TARGET_PRICE"] = "TARGET_PRICE";
 })(DiscountRulesModeTypeEnum || (exports.DiscountRulesModeTypeEnum = DiscountRulesModeTypeEnum = {}));

package/build/enum/discount-rules-type.enum.js

@@ -9,4 +9,5 @@ var DiscountRulesTypeEnum;
     DiscountRulesTypeEnum["ITEM_DISCOUNT"] = "ITEM_DISCOUNT";
     DiscountRulesTypeEnum["DISCOUNT_PROHIBITED"] = "DISCOUNT_PROHIBITED";
     DiscountRulesTypeEnum["COST_PLUS_MARKUP"] = "COST_PLUS_MARKUP";
+    DiscountRulesTypeEnum["PRICE_PLUS_MARKUP"] = "PRICE_PLUS_MARKUP";
 })(DiscountRulesTypeEnum || (exports.DiscountRulesTypeEnum = DiscountRulesTypeEnum = {}));

package/build/schemas/category/category-create.schema.js

@@ -2,13 +2,17 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryCreateSchema = void 0;
 const zod_1 = require("zod");
+const category_pieces_per_box_overrides_schema_1 = require("./category-pieces-per-box-overrides.schema");
 const localized_name_schema_1 = require("../i18n/localized-name.schema");
+const INT4_MAX = 2147483647;
 // Поля новой категории. Название на дополнительных языках необязательно: без переводов
 // категория живёт на каноническом имени.
 exports.CategoryCreateSchema = zod_1.z.object({
     name: zod_1.z.string(),
     nameTranslations: localized_name_schema_1.LocalizedNameSchema.nullish(),
     multiplicity: zod_1.z.number(),
+    basePiecesPerBox: zod_1.z.number().int().positive().max(INT4_MAX).nullable().optional(),
+    piecesPerBoxByLength: category_pieces_per_box_overrides_schema_1.CategoryPiecesPerBoxOverridesSchema.optional(),
     isSizeSeparate: zod_1.z.coerce.boolean(),
     typeUUID: zod_1.z.string(),
     isSaveCategoryName: zod_1.z.coerce.boolean(),

package/build/schemas/category/category-extended-with-box-settings.schema.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryExtendedWithBoxSettingsSchema = void 0;
+const type_schema_1 = require("../type/type.schema");
+const category_with_box_settings_schema_1 = require("./category-with-box-settings.schema");
+exports.CategoryExtendedWithBoxSettingsSchema = category_with_box_settings_schema_1.CategoryWithBoxSettingsSchema.extend({
+    type: type_schema_1.TypeSchema.nullable(),
+});

package/build/schemas/category/category-extended.schema.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryExtendedSchema = void 0;
+const category_schema_1 = require("./category.schema");
+const type_schema_1 = require("../type/type.schema");
+exports.CategoryExtendedSchema = category_schema_1.CategorySchema.extend({
+    type: type_schema_1.TypeSchema.nullable(),
+});

package/build/schemas/category/category-list.schema.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryListSchema = void 0;
 const zod_1 = require("zod");
-const category_schema_1 = require("./category.schema");
+const category_extended_with_box_settings_schema_1 = require("./category-extended-with-box-settings.schema");
 // Страница справочника категорий вместе с общим числом строк по фильтру.
 exports.CategoryListSchema = zod_1.z.object({
-    categoryList: category_schema_1.CategoryExtendedSchema.array(),
+    categoryList: category_extended_with_box_settings_schema_1.CategoryExtendedWithBoxSettingsSchema.array(),
     total: zod_1.z.number(),
 });

package/build/schemas/category/category-pieces-per-box-by-length.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryPiecesPerBoxByLengthSchema = void 0;
+const zod_1 = require("zod");
+const INT4_MAX = 2147483647;
+exports.CategoryPiecesPerBoxByLengthSchema = zod_1.z.object({
+    lengthCm: zod_1.z.number().int().positive().max(INT4_MAX),
+    pieces: zod_1.z.number().int().positive().max(INT4_MAX),
+});

package/build/schemas/category/category-pieces-per-box-overrides.schema.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryPiecesPerBoxOverridesSchema = void 0;
+const zod_1 = require("zod");
+const category_pieces_per_box_by_length_schema_1 = require("./category-pieces-per-box-by-length.schema");
+exports.CategoryPiecesPerBoxOverridesSchema = zod_1.z
+    .array(category_pieces_per_box_by_length_schema_1.CategoryPiecesPerBoxByLengthSchema)
+    .refine(values => new Set(values.map(value => value.lengthCm)).size === values.length, { message: 'Each length must occur only once' });

package/build/schemas/category/category-update.schema.js

@@ -2,8 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CategoryUpdateSchema = void 0;
 const zod_1 = require("zod");
+const category_pieces_per_box_overrides_schema_1 = require("./category-pieces-per-box-overrides.schema");
 const enum_1 = require("../../enum");
 const localized_name_schema_1 = require("../i18n/localized-name.schema");
+const INT4_MAX = 2147483647;
 // Поля редактируемой категории. Переводы отсутствуют в теле — остаются прежними;
 // `null` и пустой объект их очищают.
 exports.CategoryUpdateSchema = zod_1.z.object({
@@ -11,6 +13,8 @@ exports.CategoryUpdateSchema = zod_1.z.object({
     nameTranslations: localized_name_schema_1.LocalizedNameSchema.nullish(),
     typeUUID: zod_1.z.string(),
     multiplicity: zod_1.z.number(),
+    basePiecesPerBox: zod_1.z.number().int().positive().max(INT4_MAX).nullable().optional(),
+    piecesPerBoxByLength: category_pieces_per_box_overrides_schema_1.CategoryPiecesPerBoxOverridesSchema.optional(),
     isSizeSeparate: zod_1.z.coerce.boolean(),
     isSaveCategoryName: zod_1.z.coerce.boolean(),
     status: zod_1.z.nativeEnum(enum_1.CategoryStatusEnum),

package/build/schemas/category/category-with-box-settings.schema.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CategoryWithBoxSettingsSchema = void 0;
+const zod_1 = require("zod");
+const category_schema_1 = require("./category.schema");
+const category_pieces_per_box_overrides_schema_1 = require("./category-pieces-per-box-overrides.schema");
+const INT4_MAX = 2147483647;
+exports.CategoryWithBoxSettingsSchema = category_schema_1.CategorySchema.extend({
+    basePiecesPerBox: zod_1.z.number().int().positive().max(INT4_MAX).nullable(),
+    piecesPerBoxByLength: category_pieces_per_box_overrides_schema_1.CategoryPiecesPerBoxOverridesSchema,
+});

package/build/schemas/category/category.schema.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CategoryExtendedSchema = exports.CategorySchema = void 0;
+exports.CategorySchema = void 0;
 const zod_1 = require("zod");
 const category_status_enum_1 = require("../../enum/category-status.enum");
 const localized_name_schema_1 = require("../i18n/localized-name.schema");
-const type_schema_1 = require("../type/type.schema");
 exports.CategorySchema = zod_1.z.object({
     uuid: zod_1.z.uuid(),
     // Канон, по нему сходятся импорт, отчёты и выгрузки.
@@ -19,6 +18,3 @@ exports.CategorySchema = zod_1.z.object({
     updatedAt: zod_1.z.date(),
     deletedAt: zod_1.z.date().nullable(),
 });
-exports.CategoryExtendedSchema = exports.CategorySchema.extend({
-    type: type_schema_1.TypeSchema.nullable(),
-});

package/build/schemas/category/create-category-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CreateCategoryResponseSchema = void 0;
+const zod_1 = require("zod");
+const category_with_box_settings_schema_1 = require("./category-with-box-settings.schema");
+exports.CreateCategoryResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: category_with_box_settings_schema_1.CategoryWithBoxSettingsSchema,
+});

package/build/schemas/category/get-category-by-uuid-request.schema.js

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

package/build/schemas/category/get-category-by-uuid-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetCategoryByUUIDResponseSchema = void 0;
+const zod_1 = require("zod");
+const category_extended_with_box_settings_schema_1 = require("./category-extended-with-box-settings.schema");
+exports.GetCategoryByUUIDResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: category_extended_with_box_settings_schema_1.CategoryExtendedWithBoxSettingsSchema,
+});

package/build/schemas/category/get-category-list-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetCategoryListResponseSchema = void 0;
+const zod_1 = require("zod");
+const category_list_schema_1 = require("./category-list.schema");
+exports.GetCategoryListResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: category_list_schema_1.CategoryListSchema,
+});

package/build/schemas/category/index.js

@@ -21,3 +21,13 @@ __exportStar(require("./category-list-filter.schema"), exports);
 __exportStar(require("./category-list.schema"), exports);
 __exportStar(require("./category.schema"), exports);
 __exportStar(require("./category-name.schema"), exports);
+__exportStar(require("./category-pieces-per-box-by-length.schema"), exports);
+__exportStar(require("./category-pieces-per-box-overrides.schema"), exports);
+__exportStar(require("./category-extended.schema"), exports);
+__exportStar(require("./create-category-response.schema"), exports);
+__exportStar(require("./update-category-response.schema"), exports);
+__exportStar(require("./get-category-by-uuid-request.schema"), exports);
+__exportStar(require("./get-category-by-uuid-response.schema"), exports);
+__exportStar(require("./get-category-list-response.schema"), exports);
+__exportStar(require("./category-with-box-settings.schema"), exports);
+__exportStar(require("./category-extended-with-box-settings.schema"), exports);

package/build/schemas/category/update-category-response.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UpdateCategoryResponseSchema = void 0;
+const zod_1 = require("zod");
+const category_with_box_settings_schema_1 = require("./category-with-box-settings.schema");
+exports.UpdateCategoryResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: category_with_box_settings_schema_1.CategoryWithBoxSettingsSchema.nullable(),
+});

package/build/schemas/discount-rules/discount-rules.schema.js

@@ -22,10 +22,9 @@ exports.discountRulesModeSchema = zod_1.z.discriminatedUnion('typeDiscount', [di
 /**
  * Итог применения правила к товару — то, что уезжает клиенту в `discountDataList`.
  *
- * От схемы ввода отличается ровно одной веткой: TARGET_PRICE несёт уже посчитанную цену, а не
- * величину скидки. Так работает правило от себестоимости: считать цену на клиенте нечем — там нет
- * ни себестоимости, ни права её видеть. Ветка живёт только в выдаче: задать TARGET_PRICE при
- * создании правила нельзя, `discountRulesModeSchema` его не принимает.
+ * Ветка TARGET_PRICE больше не отдаётся: правило от себестоимости стало правилом ценообразования и
+ * задаёт цену клиента (`price`, `clientPrice`), а не вариант скидки. Ветка оставлена, чтобы не ломать
+ * клиентов, которые её разбирают.
  */
 exports.discountPriceOutcomeSchema = zod_1.z.discriminatedUnion('typeDiscount', [
     discountPercentModeSchema,
@@ -61,18 +60,29 @@ const DiscountRulesQuantityBasedDataSchema = zod_1.z
 const DiscountRulesItemDiscountDataSchema = exports.discountRulesModeSchema;
 const DiscountRulesDiscountProhibitedDataSchema = zod_1.z.object({}).default({});
 /**
- * Наценка к себестоимости: цена клиента = себестоимость + наценка.
+ * Наценка правила ценообразования: процент или сумма на единицу.
  *
- * Три отличия от режима скидки, и все намеренные:
- * — только вверх, знака у величины нет: продажу ниже себестоимости правилом не задают;
- * — ноль допустим (`markupValue: 0` — продаём по себестоимости), поэтому FIXED берёт
- *   `NonNegativeMoneySchema`, а не `PositiveMoneySchema`;
+ * Отличия от режима скидки намеренные:
+ * — только вверх, знака у величины нет;
+ * — ноль допустим (цена ровно равна источнику), поэтому FIXED берёт `NonNegativeMoneySchema`;
  * — у процента нет верхней границы: наценка в 150 % законна, в отличие от скидки в 150 %.
  */
+const pricingMarkupPercentSchema = zod_1.z.object({ typeMarkup: zod_1.z.literal(enum_1.DiscountRulesModeTypeEnum.PERCENT), markupValue: zod_1.z.number().min(0) });
+const pricingMarkupFixedSchema = zod_1.z.object({ typeMarkup: zod_1.z.literal(enum_1.DiscountRulesModeTypeEnum.FIXED), markupValue: non_negative_money_schema_1.NonNegativeMoneySchema });
+/**
+ * Потолок «не выше прайса» есть только у цены от себестоимости: цена от прайса с наценкой выше
+ * прайса по определению. Поле необязательное, и отсутствие значит разное: при создании — потолка
+ * нет, при правке — оставить как было. Так старая панель, которая флага не знает, не снимает потолок
+ * у правил, которым его проставила миграция.
+ */
+const costPlusCapShape = { isCappedByPrice: zod_1.z.boolean().optional() };
+/** Цена клиента = себестоимость + наценка. */
 const DiscountRulesCostPlusMarkupDataSchema = zod_1.z.discriminatedUnion('typeMarkup', [
-    zod_1.z.object({ typeMarkup: zod_1.z.literal(enum_1.DiscountRulesModeTypeEnum.PERCENT), markupValue: zod_1.z.number().min(0) }),
-    zod_1.z.object({ typeMarkup: zod_1.z.literal(enum_1.DiscountRulesModeTypeEnum.FIXED), markupValue: non_negative_money_schema_1.NonNegativeMoneySchema }),
+    pricingMarkupPercentSchema.extend(costPlusCapShape),
+    pricingMarkupFixedSchema.extend(costPlusCapShape),
 ]);
+/** Цена клиента = цена позиции (фасовки, если она выбрана) + наценка. */
+const DiscountRulesPricePlusMarkupDataSchema = zod_1.z.discriminatedUnion('typeMarkup', [pricingMarkupPercentSchema, pricingMarkupFixedSchema]);
 exports.DiscountRulesTypeSchema = zod_1.z.discriminatedUnion('type', [
     zod_1.z.object({
         type: zod_1.z.literal(enum_1.DiscountRulesTypeEnum.PERSONAL_DISCOUNT),
@@ -98,6 +108,10 @@ exports.DiscountRulesTypeSchema = zod_1.z.discriminatedUnion('type', [
         type: zod_1.z.literal(enum_1.DiscountRulesTypeEnum.COST_PLUS_MARKUP),
         data: DiscountRulesCostPlusMarkupDataSchema,
     }),
+    zod_1.z.object({
+        type: zod_1.z.literal(enum_1.DiscountRulesTypeEnum.PRICE_PLUS_MARKUP),
+        data: DiscountRulesPricePlusMarkupDataSchema,
+    }),
 ]);
 exports.DiscountRulesBaseSchema = zod_1.z.object({
     uuid: zod_1.z.string(),

package/build/schemas/discount-rules/product-discount-price-data.schema.js

@@ -5,9 +5,18 @@ const zod_1 = require("zod");
 const money_schema_1 = require("../money.schema");
 const product_discount_price_item_schema_1 = require("./product-discount-price-item.schema");
 const product_discount_price_multiplicity_option_schema_1 = require("./product-discount-price-multiplicity-option.schema");
+/**
+ * Две базы рядом, и это намеренно. `price` / `optionPrice` — прайс, одинаковый для всех.
+ * `clientPrice` / `clientOptionPrice` — цена этого клиента до скидок: у клиента с правилом
+ * ценообразования (от себестоимости или от прайса с наценкой) это цена по правилу, у остальных — тот
+ * же прайс. Скидки считаются от прайса и только у клиентов без правила ценообразования: у клиента с
+ * таким правилом скидок нет, списки вариантов пусты. Цену позиции без скидки берите из `clientPrice`,
+ * а не из `price`: иначе цена по правилу потеряется.
+ */
 exports.ProductDiscountPriceDataSchema = zod_1.z.object({
     productUUID: zod_1.z.string(),
     price: money_schema_1.MoneySchema,
+    clientPrice: money_schema_1.MoneySchema,
     priceWithBestDiscount: money_schema_1.MoneySchema.nullable(),
     multiplicityOptions: product_discount_price_multiplicity_option_schema_1.ProductDiscountPriceMultiplicityOptionSchema.array(),
     /**

package/build/schemas/discount-rules/product-discount-price-multiplicity-option.schema.js

@@ -7,6 +7,8 @@ const product_discount_price_item_schema_1 = require("./product-discount-price-i
 exports.ProductDiscountPriceMultiplicityOptionSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     optionPrice: money_schema_1.MoneySchema.nullable(),
+    /** `null` ровно тогда, когда `null` у `optionPrice`: своей цены у фасовки нет, база — `clientPrice`. */
+    clientOptionPrice: money_schema_1.MoneySchema.nullable(),
     optionPriceWithDiscount: money_schema_1.MoneySchema.nullable(),
     isDiscountApplicable: zod_1.z.boolean(),
     /**

package/build/schemas/integration/ozexport/get-ozexport-catalog-filters-request.schema.js

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

package/build/schemas/integration/ozexport/get-ozexport-catalog-filters-response-data.schema.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOzexportCatalogFiltersResponseDataSchema = void 0;
+const zod_1 = require("zod");
+const ozexport_catalog_category_schema_1 = require("./ozexport-catalog-category.schema");
+exports.GetOzexportCatalogFiltersResponseDataSchema = zod_1.z.object({
+    categories: zod_1.z.array(ozexport_catalog_category_schema_1.OzexportCatalogCategorySchema),
+    lengths: zod_1.z.array(zod_1.z.number().int().positive()),
+});

package/build/schemas/integration/ozexport/get-ozexport-catalog-filters-response.schema.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOzexportCatalogFiltersResponseSchema = void 0;
+const zod_1 = require("zod");
+const get_ozexport_catalog_filters_response_data_schema_1 = require("./get-ozexport-catalog-filters-response-data.schema");
+exports.GetOzexportCatalogFiltersResponseSchema = zod_1.z.object({
+    data: get_ozexport_catalog_filters_response_data_schema_1.GetOzexportCatalogFiltersResponseDataSchema,
+});

package/build/schemas/integration/ozexport/get-ozexport-catalog-offers-request.schema.js

@@ -8,6 +8,8 @@ exports.GetOzexportCatalogOffersRequestSchema = get_ozexport_catalog_request_sch
     count: true,
     search: true,
     color: true,
+    categoryTemplateUUID: true,
+    lengthCm: true,
     stockType: true,
     status: true,
 }).extend({ templateUUID: zod_1.z.string().uuid() });

package/build/schemas/integration/ozexport/get-ozexport-catalog-request.schema.js

@@ -6,6 +6,7 @@ const supplier_catalog_nomenclature_filter_enum_1 = require("../../../enum/suppl
 const supplier_offer_status_enum_1 = require("../../../enum/supplier-offer-status.enum");
 const OZEXPORT_CATALOG_SEARCH_MAX_LENGTH = 100;
 const OZEXPORT_CATALOG_FILTER_MAX_LENGTH = 100;
+const OZEXPORT_CATALOG_LENGTH_CM_MAX = 2147483647;
 // qs отдаёт одиночное значение строкой (`status=AVAILABLE`), а повторённое — массивом.
 const toArray = (value) => (typeof value === 'string' ? [value] : value);
 // Дальше этой страницы не листаем: OFFSET до 1 млн строк сортов — заведомо больше каталога поставщика.
@@ -15,6 +16,8 @@ const OZEXPORT_CATALOG_PAGE_SIZE_DEFAULT = 20;
 exports.GetOzexportCatalogRequestSchema = zod_1.z.object({
     search: zod_1.z.string().trim().max(OZEXPORT_CATALOG_SEARCH_MAX_LENGTH).optional(),
     color: zod_1.z.string().trim().max(OZEXPORT_CATALOG_FILTER_MAX_LENGTH).optional(),
+    categoryTemplateUUID: zod_1.z.string().uuid().optional(),
+    lengthCm: zod_1.z.coerce.number().int().positive().max(OZEXPORT_CATALOG_LENGTH_CM_MAX).optional(),
     stockType: zod_1.z.string().trim().max(OZEXPORT_CATALOG_FILTER_MAX_LENGTH).optional(),
     inNomenclature: zod_1.z.nativeEnum(supplier_catalog_nomenclature_filter_enum_1.SupplierCatalogNomenclatureFilterEnum).optional().default(supplier_catalog_nomenclature_filter_enum_1.SupplierCatalogNomenclatureFilterEnum.ALL),
     // Без фильтра сервер отдаёт живые предложения (AVAILABLE, NO_PRICE и OUT_OF_STOCK); NOT_FOUND запрашивается явно.

package/build/schemas/integration/ozexport/index.js

@@ -18,6 +18,10 @@ __exportStar(require("./connect-ozexport-request.schema"), exports);
 __exportStar(require("./disconnect-ozexport-response-true.schema"), exports);
 __exportStar(require("./disconnect-ozexport-response.schema"), exports);
 __exportStar(require("./get-ozexport-catalog-request.schema"), exports);
+__exportStar(require("./get-ozexport-catalog-filters-request.schema"), exports);
+__exportStar(require("./get-ozexport-catalog-filters-response.schema"), exports);
+__exportStar(require("./get-ozexport-catalog-filters-response-data.schema"), exports);
+__exportStar(require("./ozexport-catalog-category.schema"), exports);
 __exportStar(require("./get-ozexport-catalog-response-data.schema"), exports);
 __exportStar(require("./get-ozexport-catalog-response.schema"), exports);
 __exportStar(require("./ozexport-account-unit.schema"), exports);

package/build/schemas/integration/ozexport/ozexport-catalog-category.schema.js

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

package/build/schemas/order-product/price-correction-analyze-item.schema.js

@@ -34,6 +34,12 @@ exports.PriceCorrectionAnalyzeItemSchema = zod_1.z.object({
     // Разницы могут быть отрицательными — цена корректируется в обе стороны, поэтому без ограничения знака.
     priceDifferenceWithoutDiscount: money_schema_1.MoneySchema,
     priceDifferenceWithDiscount: money_schema_1.MoneySchema,
+    /**
+     * У клиента действует правило ценообразования (от себестоимости или от прайса с наценкой).
+     * Его цена — `newPriceWithDiscount`; «без скидок» для него означает прайс, то есть снятие наценки.
+     * Сотруднику стоит показать это до применения.
+     */
+    hasPricingRule: zod_1.z.boolean(),
     isSkipped: zod_1.z.boolean(),
     skipReason: error_message_schema_1.ErrorMessageSchema.optional(),
 });

package/build/schemas/pre-order-collection-item/index.js

@@ -68,6 +68,7 @@ __exportStar(require("./supplier-add-execute-skipped-item.schema"), exports);
 __exportStar(require("./supplier-add-items-limit.constant"), exports);
 __exportStar(require("./supplier-add-offer-key.schema"), exports);
 __exportStar(require("./supplier-add-sale-price.schema"), exports);
+__exportStar(require("./supplier-add-cost-price.schema"), exports);
 __exportStar(require("./supplier-sync-analyze-item.schema"), exports);
 __exportStar(require("./supplier-sync-analyze-request.schema"), exports);
 __exportStar(require("./supplier-sync-analyze-response-data.schema"), exports);

package/build/schemas/pre-order-collection-item/pre-order-collection-item-extended-for-admin.schema.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreOrderCollectionItemExtendedForAdminSchema = void 0;
 const pre_order_collection_item_extended_schema_1 = require("./pre-order-collection-item-extended.schema");
 const pre_order_collection_item_supplier_admin_shape_1 = require("./pre-order-collection-item-supplier-admin.shape");
-exports.PreOrderCollectionItemExtendedForAdminSchema = pre_order_collection_item_extended_schema_1.PreOrderCollectionItemExtendedSchema.extend(pre_order_collection_item_supplier_admin_shape_1.PreOrderCollectionItemSupplierAdminShape);
+const supplier_add_cost_price_schema_1 = require("./supplier-add-cost-price.schema");
+exports.PreOrderCollectionItemExtendedForAdminSchema = pre_order_collection_item_extended_schema_1.PreOrderCollectionItemExtendedSchema.extend(Object.assign(Object.assign({}, pre_order_collection_item_supplier_admin_shape_1.PreOrderCollectionItemSupplierAdminShape), { costPrice: supplier_add_cost_price_schema_1.SupplierAddCostPriceSchema.nullable() }));

package/build/schemas/pre-order-collection-item/pre-order-collection-item-extended-with-clients-pre-order-product.schema.js

@@ -4,6 +4,8 @@ exports.PreOrderCollectionItemExtendedWithClientsPreOrderProductSchema = void 0;
 const zod_1 = require("zod");
 const pre_order_collection_item_client_pre_order_product_schema_1 = require("./pre-order-collection-item-client-pre-order-product.schema");
 const pre_order_collection_item_extended_schema_1 = require("./pre-order-collection-item-extended.schema");
+const supplier_add_cost_price_schema_1 = require("./supplier-add-cost-price.schema");
 exports.PreOrderCollectionItemExtendedWithClientsPreOrderProductSchema = pre_order_collection_item_extended_schema_1.PreOrderCollectionItemExtendedSchema.extend({
+    costPrice: supplier_add_cost_price_schema_1.SupplierAddCostPriceSchema.nullable(),
     clientsWithPreOrderProduct: zod_1.z.array(pre_order_collection_item_client_pre_order_product_schema_1.PreOrderCollectionItemClientPreOrderProductSchema),
 });

package/build/schemas/pre-order-collection-item/pre-order-collection-item-for-admin.schema.js

@@ -3,4 +3,5 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreOrderCollectionItemForAdminSchema = void 0;
 const pre_order_collection_item_supplier_admin_shape_1 = require("./pre-order-collection-item-supplier-admin.shape");
 const pre_order_collection_item_base_schema_1 = require("./pre-order-collection-item-base.schema");
-exports.PreOrderCollectionItemForAdminSchema = pre_order_collection_item_base_schema_1.PreOrderCollectionItemSchema.extend(pre_order_collection_item_supplier_admin_shape_1.PreOrderCollectionItemSupplierAdminShape);
+const supplier_add_cost_price_schema_1 = require("./supplier-add-cost-price.schema");
+exports.PreOrderCollectionItemForAdminSchema = pre_order_collection_item_base_schema_1.PreOrderCollectionItemSchema.extend(Object.assign(Object.assign({}, pre_order_collection_item_supplier_admin_shape_1.PreOrderCollectionItemSupplierAdminShape), { costPrice: supplier_add_cost_price_schema_1.SupplierAddCostPriceSchema.nullable() }));

package/build/schemas/pre-order-collection-item/supplier-add-analyze-item.schema.js

@@ -15,6 +15,8 @@ exports.SupplierAddAnalyzeItemSchema = zod_1.z.object({
     productImageUUID: zod_1.z.string().nullable(),
     willImportCard: zod_1.z.boolean(),
     categoryName: zod_1.z.string().nullable(),
+    categoryMultiplicity: zod_1.z.number().nullable(),
+    piecesPerBox: zod_1.z.number().int().positive().nullable(),
     offer: supplier_add_analyze_offer_schema_1.SupplierAddAnalyzeOfferSchema.nullable(),
     existingItemUUID: zod_1.z.string().nullable(),
     isSkipped: zod_1.z.boolean(),

package/build/schemas/pre-order-collection-item/supplier-add-analyze-request.schema.js

@@ -13,4 +13,5 @@ exports.SupplierAddAnalyzeRequestSchema = zod_1.z.object({
         .min(1)
         .max(supplier_add_items_limit_constant_1.SUPPLIER_ADD_ITEMS_LIMIT)
         .refine(has_unique_supplier_add_keys_helper_1.hasUniqueSupplierAddKeys, { message: 'validation.supplierAdd.duplicateKeys' }),
+    allowDuplicates: zod_1.z.boolean().optional().default(false),
 });