@floristcloud/api-lib 1.2.108 → 1.2.110

package/build/commands/client/get-client-calculate.query.js

@@ -2,13 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetClientCalculateContractQuery = void 0;
 const zod_1 = require("zod");
+const money_schema_1 = require("../../schemas/money.schema");
 const GetClientCalculateResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),
     data: zod_1.z.object({
-        transactionSum: zod_1.z.number(),
-        ordersSum: zod_1.z.number(),
-        writeOffSum: zod_1.z.number(),
-        calculation: zod_1.z.number(),
+        transactionSum: money_schema_1.MoneySchema,
+        ordersSum: money_schema_1.MoneySchema,
+        writeOffSum: money_schema_1.MoneySchema,
+        // Сальдо по клиенту: может быть отрицательным, поэтому знаковых ограничений нет.
+        calculation: money_schema_1.MoneySchema,
     }),
 });
 var GetClientCalculateContractQuery;

package/build/commands/consignment/execute-consignment-product-update.command.js

@@ -3,19 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecuteConsignmentProductUpdateContractCommand = void 0;
 const zod_1 = require("zod");
 const error_message_schema_1 = require("../../schemas/error-message.schema");
+const money_schema_1 = require("../../schemas/money.schema");
 const OptionUpdateSchema = zod_1.z.object({
     title: zod_1.z.string().nullable().optional(),
     optionMultiplicity: zod_1.z.number().nullable().optional(),
-    optionPrice: zod_1.z.number().nullable().optional(),
+    optionPrice: money_schema_1.MoneySchema.nullable().optional(),
 });
 const ConsignmentProductPositionUpdateSchema = zod_1.z.object({
     name: zod_1.z.string().nullable().optional(),
     multiplicity: zod_1.z.number().nullable().optional(),
     quantity: zod_1.z.number().nullable().optional(),
     balance: zod_1.z.number().nullable().optional(),
-    price: zod_1.z.number().nullable().optional(),
-    costPrice: zod_1.z.number().nullable().optional(),
-    invoicePrice: zod_1.z.number().nullable().optional(),
+    price: money_schema_1.MoneySchema.nullable().optional(),
+    costPrice: money_schema_1.MoneySchema.nullable().optional(),
+    invoicePrice: money_schema_1.MoneySchema.nullable().optional(),
     invoiceNumber: zod_1.z.string().nullable().optional(),
     multiplicityDescription: zod_1.z.string().nullable().optional(),
     vat: zod_1.z.number().nullable().optional(),

package/build/commands/integration/moysklad/execute-moysklad-import.command.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecuteMoyskladImportContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../../enum");
+const money_schema_1 = require("../../../schemas/money.schema");
 const ExecutableItemSchema = zod_1.z.object({
     externalSourceId: zod_1.z.string(),
     externalHref: zod_1.z.string(),
@@ -13,8 +14,8 @@ const ExecutableItemSchema = zod_1.z.object({
     color: zod_1.z.string().nullable(),
     country: zod_1.z.string().nullable(),
     grower: zod_1.z.string().nullable(),
-    price: zod_1.z.number(),
-    costPrice: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
+    costPrice: money_schema_1.MoneySchema,
     balance: zod_1.z.number(),
     vat: zod_1.z.number().nullable(),
     salesUnit: zod_1.z.nativeEnum(enum_1.SalesUnitEnum),

package/build/commands/integration/moysklad/preview-moysklad-products.query.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PreviewMoyskladProductsContractQuery = void 0;
 const zod_1 = require("zod");
+const money_schema_1 = require("../../../schemas/money.schema");
 const PreviewMoyskladProductsRequestSchema = zod_1.z.object({
     limit: zod_1.z.coerce.number().int().min(1).max(100).default(20),
 });
@@ -14,8 +15,8 @@ const MappedProductPreviewSchema = zod_1.z.object({
     color: zod_1.z.string().nullable(),
     country: zod_1.z.string().nullable(),
     grower: zod_1.z.string().nullable(),
-    price: zod_1.z.number(),
-    costPrice: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
+    costPrice: money_schema_1.MoneySchema,
     balance: zod_1.z.number(),
     categoryName: zod_1.z.string().nullable(),
 });

package/build/commands/integration/moysklad/scan-moysklad-import.query.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScanMoyskladImportContractQuery = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../../enum");
+const money_schema_1 = require("../../../schemas/money.schema");
 const ScannedItemSchema = zod_1.z.object({
     externalSourceId: zod_1.z.string(),
     externalHref: zod_1.z.string(),
@@ -15,8 +16,8 @@ const ScannedItemSchema = zod_1.z.object({
     color: zod_1.z.string().nullable(),
     country: zod_1.z.string().nullable(),
     grower: zod_1.z.string().nullable(),
-    price: zod_1.z.number(),
-    costPrice: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
+    costPrice: money_schema_1.MoneySchema,
     balance: zod_1.z.number(),
     categoryName: zod_1.z.string().nullable(),
     vat: zod_1.z.number().nullable(),

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

@@ -4,10 +4,11 @@ exports.CreateOrderContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const CreateOrderRequestSchema = zod_1.z.object({
     clientUUID: zod_1.z.uuid(),
     branchUUID: zod_1.z.uuid().nullable(),
-    deliveryCost: zod_1.z.number(),
+    deliveryCost: money_schema_1.MoneySchema,
     deliveryVat: zod_1.z.number().nullable(),
     type: zod_1.z.nativeEnum(enum_1.OrderTypeEnum),
     comment: zod_1.z.string().nullable(),

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

@@ -4,10 +4,11 @@ exports.UpdateOrderContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const UpdateOrderRequestSchema = zod_1.z.object({
     clientUUID: zod_1.z.uuid(),
     branchUUID: zod_1.z.uuid().nullable(),
-    deliveryCost: zod_1.z.coerce.number(),
+    deliveryCost: money_schema_1.MoneySchema,
     type: zod_1.z.nativeEnum(enum_1.OrderTypeEnum),
     comment: zod_1.z.string().nullable(),
     clientComment: zod_1.z.string().nullable(),
@@ -15,7 +16,7 @@ const UpdateOrderRequestSchema = zod_1.z.object({
     status: zod_1.z.nativeEnum(enum_1.OrderStatusEnum),
     isPaid: zod_1.z.coerce.boolean(),
     deliveryVat: zod_1.z.coerce.number().nullable(),
-    deliveryVatAmount: zod_1.z.coerce.number(),
+    deliveryVatAmount: money_schema_1.MoneySchema,
     completedAt: zod_1.z.coerce.date().nullable().optional(),
     paymentDueAt: zod_1.z.coerce.date().nullable().optional(),
 });

package/build/commands/order/webshop/get-order-sales-by-month.query.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetOrderSalesByMonthContractQuery = void 0;
 const zod_1 = require("zod");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const GetOrderSalesByMonthRequestSchema = zod_1.z.object({
     month: zod_1.z.coerce.number().int().min(1).max(12),
 });
 const GetOrderSalesByMonthResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),
-    data: zod_1.z.number(),
+    data: non_negative_money_schema_1.NonNegativeMoneySchema,
 });
 var GetOrderSalesByMonthContractQuery;
 (function (GetOrderSalesByMonthContractQuery) {

package/build/commands/order-product/create-order-product.command.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateOrderProductContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const CreateOrderProductRequestSchema = zod_1.z.object({
     quantity: zod_1.z.number(),
-    price: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
     comment: zod_1.z.string().nullable(),
     tag: zod_1.z.string().nullable(),
     isEditable: zod_1.z.coerce.boolean(),

package/build/commands/order-product/group/price-valuation-execute.command.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PriceValuationExecuteContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const PRICE_VALUATION_BATCH_LIMIT = 50;
 const PriceValuationExecuteItemSchema = zod_1.z.object({
     orderProductUUID: zod_1.z.string().uuid(),
-    price: zod_1.z.number().nonnegative(),
+    // Неотрицательность проверяем по знаку строки: минус — единственный признак отрицательной суммы.
+    price: non_negative_money_schema_1.NonNegativeMoneySchema,
 });
 const PriceValuationExecuteRequestSchema = zod_1.z.object({
     orderUUID: zod_1.z.string().uuid(),

package/build/commands/order-product/update-order-product.command.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateOrderProductContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const UpdateOrderProductRequestSchema = zod_1.z.object({
     productUUID: zod_1.z.uuid(),
     quantity: zod_1.z.number(),
-    price: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
     comment: zod_1.z.string().nullable(),
     tag: zod_1.z.string().nullable(),
     isEditable: zod_1.z.coerce.boolean(),

package/build/commands/payment-invoice/create-payment-invoice.command.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePaymentInvoiceContractCommand = void 0;
 const zod_1 = require("zod");
 const payment_invoice_schema_1 = require("../../schemas/payment-invoice/payment-invoice.schema");
+const positive_money_schema_1 = require("../../schemas/positive-money.schema");
 // Потолок числа заказов в счёте. Это защита от абсурдного запроса, а не бизнес-правило: счёт за месяц
 // клиенту с ежедневными поставками — это уже 30 строк, поэтому 10-20 отрезали бы живые сценарии.
 // Сто строк — это 3-4 страницы таблицы, документ такого размера собирается и читается нормально.
@@ -16,7 +17,8 @@ const CreatePaymentInvoiceRequestSchema = zod_1.z
     clientUUID: zod_1.z.uuid(),
     invoiceDate: zod_1.z.coerce.date(),
     orderUUIDs: zod_1.z.uuid().array().max(MAX_INVOICE_ORDER_COUNT).optional(),
-    amount: zod_1.z.coerce.number().positive().optional(),
+    // Строго положительная сумма: отсекаем минус по знаку строки и нулевые записи вида "0" / "0.00".
+    amount: positive_money_schema_1.PositiveMoneySchema.optional(),
 })
     .refine(value => { var _a; return Boolean((_a = value.orderUUIDs) === null || _a === void 0 ? void 0 : _a.length) || value.amount !== undefined; }, {
     message: 'Either orderUUIDs or amount must be provided',

package/build/commands/payment-invoice/pay-payment-invoice.command.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PayPaymentInvoiceContractCommand = void 0;
 const zod_1 = require("zod");
 const payment_invoice_schema_1 = require("../../schemas/payment-invoice/payment-invoice.schema");
+const positive_money_schema_1 = require("../../schemas/positive-money.schema");
 // Оплата по счёту. amount не передан — гасим остаток целиком; передан — частичная оплата.
 const PayPaymentInvoiceRequestSchema = zod_1.z.object({
     moneyAccountUUID: zod_1.z.uuid(),
-    amount: zod_1.z.coerce.number().positive().optional(),
+    // Строго положительная сумма: отсекаем минус по знаку строки и нулевые записи вида "0" / "0.00".
+    amount: positive_money_schema_1.PositiveMoneySchema.optional(),
     comment: zod_1.z.string().optional(),
     cashFlowItemUUID: zod_1.z.uuid().nullable().optional(),
     createdAt: zod_1.z.coerce.date().optional(),

package/build/commands/pre-order-collection-item/execute-pre-order-collection-item-update.command.js

@@ -3,17 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutePreOrderCollectionItemUpdateContractCommand = void 0;
 const zod_1 = require("zod");
 const error_message_schema_1 = require("../../schemas/error-message.schema");
+const money_schema_1 = require("../../schemas/money.schema");
 const OptionUpdateSchema = zod_1.z.object({
     title: zod_1.z.string().nullable().optional(),
     optionMultiplicity: zod_1.z.number().nullable().optional(),
-    optionPrice: zod_1.z.number().nullable().optional(),
+    optionPrice: money_schema_1.MoneySchema.nullable().optional(),
 });
 const PositionUpdateSchema = zod_1.z.object({
     name: zod_1.z.string().nullable().optional(),
     multiplicity: zod_1.z.number().nullable().optional(),
     quantity: zod_1.z.number().nullable().optional(),
     balance: zod_1.z.number().nullable().optional(),
-    price: zod_1.z.number().nullable().optional(),
+    price: money_schema_1.MoneySchema.nullable().optional(),
     advancedPrice: zod_1.z.string().nullable().optional(),
     grower: zod_1.z.string().nullable().optional(),
     size: zod_1.z.string().nullable().optional(),

package/build/commands/pre-order-collection-item/multiplicity-option/create-pre-order-collection-item-multiplicity-option.command.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreatePreOrderCollectionItemMultiplicityOptionContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const CreatePreOrderCollectionItemMultiplicityOptionRequestSchema = zod_1.z.object({
     title: zod_1.z.string().max(100).nullable().optional(),
     optionMultiplicity: zod_1.z.coerce.number().int().min(1),
-    optionPrice: zod_1.z.coerce.number().min(0).nullable().optional(),
+    optionPrice: non_negative_money_schema_1.NonNegativeMoneySchema.nullable().optional(),
     rank: zod_1.z.coerce.number().int().min(0).default(0).optional(),
 });
 const CreatePreOrderCollectionItemMultiplicityOptionResponseSchema = zod_1.z.object({

package/build/commands/pre-order-collection-item/multiplicity-option/update-pre-order-collection-item-multiplicity-option.command.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdatePreOrderCollectionItemMultiplicityOptionContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const UpdatePreOrderCollectionItemMultiplicityOptionRequestSchema = zod_1.z
     .object({
     title: zod_1.z.string().max(100).nullable(),
     optionMultiplicity: zod_1.z.coerce.number().int().min(1),
-    optionPrice: zod_1.z.coerce.number().min(0).nullable(),
+    optionPrice: non_negative_money_schema_1.NonNegativeMoneySchema.nullable(),
     rank: zod_1.z.coerce.number().int().min(0).default(0),
 })
     .partial();

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

@@ -4,14 +4,15 @@ exports.CreateProductContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const CreateProductRequestSchema = zod_1.z.object({
     name: zod_1.z.string(),
     consignmentUUID: zod_1.z.string(),
     categoryUUID: zod_1.z.string(),
     balance: zod_1.z.number(),
     quantity: zod_1.z.number(),
-    price: zod_1.z.number(),
-    costPrice: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
+    costPrice: money_schema_1.MoneySchema,
     multiplicity: zod_1.z.number(),
     isOpen: zod_1.z.coerce.boolean(),
     article: zod_1.z.string().nullable(),
@@ -21,7 +22,7 @@ const CreateProductRequestSchema = zod_1.z.object({
     size: zod_1.z.string().nullable(),
     size2: zod_1.z.string().nullable(),
     size3: zod_1.z.string().nullable(),
-    invoicePrice: zod_1.z.number().nullable(),
+    invoicePrice: money_schema_1.MoneySchema.nullable(),
     invoiceNumber: zod_1.z.string().nullable(),
     imageUUID: zod_1.z.string().nullable(),
     country: zod_1.z.string().nullable(),

package/build/commands/product/group/update-group-product-prices.command.js

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateGroupProductPricesContractCommand = void 0;
 const zod_1 = require("zod");
+const money_schema_1 = require("../../../schemas/money.schema");
 const UpdateGroupProductPricesRequestSchema = zod_1.z.object({
     data: zod_1.z
         .object({
         productUUID: zod_1.z.string(),
-        newCost: zod_1.z.coerce.number(),
-        newPrice: zod_1.z.coerce.number().optional(),
+        newCost: money_schema_1.MoneySchema,
+        newPrice: money_schema_1.MoneySchema.optional(),
     })
         .array(),
 });

package/build/commands/product/group/update-group-product-update-batch.command.js

@@ -4,21 +4,22 @@ exports.UpdateGroupProductUpdateBatchContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../../enum");
 const error_message_schema_1 = require("../../../schemas/error-message.schema");
+const money_schema_1 = require("../../../schemas/money.schema");
 const UpdateGroupProductUpdateBatchRequestSchema = zod_1.z.object({
     productUUIDList: zod_1.z.array(zod_1.z.string()),
     data: zod_1.z
         .object({
         name: zod_1.z.string(),
         categoryUUID: zod_1.z.string(),
-        price: zod_1.z.coerce.number(),
-        costPrice: zod_1.z.coerce.number(),
+        price: money_schema_1.MoneySchema,
+        costPrice: money_schema_1.MoneySchema,
         color: zod_1.z.string().nullable(),
         size: zod_1.z.string().nullable(),
         multiplicity: zod_1.z.coerce.number(),
         size2: zod_1.z.string().nullable(),
         grower: zod_1.z.string().nullable(),
         country: zod_1.z.string().nullable(),
-        invoicePrice: zod_1.z.coerce.number().nullable(),
+        invoicePrice: money_schema_1.MoneySchema.nullable(),
         invoiceNumber: zod_1.z.string().nullable(),
         imageUUID: zod_1.z.string().nullable(),
         multiplicityDescription: zod_1.z.string().nullable(),

package/build/commands/product/multiplicity-option/create-product-multiplicity-option.command.js

@@ -3,10 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateProductMultiplicityOptionContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const CreateProductMultiplicityOptionRequestSchema = zod_1.z.object({
     title: zod_1.z.string().max(100).nullable().optional(),
     optionMultiplicity: zod_1.z.coerce.number().int().min(1),
-    optionPrice: zod_1.z.coerce.number().min(0).nullable().optional(),
+    optionPrice: non_negative_money_schema_1.NonNegativeMoneySchema.nullable().optional(),
     rank: zod_1.z.coerce.number().int().min(0).default(0).optional(),
 });
 const CreateProductMultiplicityOptionResponseSchema = zod_1.z.object({

package/build/commands/product/multiplicity-option/update-product-multiplicity-option.command.js

@@ -3,11 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UpdateProductMultiplicityOptionContractCommand = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
+const non_negative_money_schema_1 = require("../../../schemas/non-negative-money.schema");
 const UpdateProductMultiplicityOptionRequestSchema = zod_1.z
     .object({
     title: zod_1.z.string().max(100).nullable(),
     optionMultiplicity: zod_1.z.coerce.number().int().min(1),
-    optionPrice: zod_1.z.coerce.number().min(0).nullable(),
+    optionPrice: non_negative_money_schema_1.NonNegativeMoneySchema.nullable(),
     rank: zod_1.z.coerce.number().int().min(0).default(0),
 })
     .partial();

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

@@ -4,14 +4,15 @@ exports.UpdateProductContractCommand = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const schemas_1 = require("../../schemas");
+const money_schema_1 = require("../../schemas/money.schema");
 const UpdateProductRequestSchema = zod_1.z.object({
     name: zod_1.z.string(),
     consignmentUUID: zod_1.z.string(),
     categoryUUID: zod_1.z.string(),
     balance: zod_1.z.number(),
     quantity: zod_1.z.number(),
-    price: zod_1.z.number(),
-    costPrice: zod_1.z.number(),
+    price: money_schema_1.MoneySchema,
+    costPrice: money_schema_1.MoneySchema,
     multiplicity: zod_1.z.number(),
     isOpen: zod_1.z.coerce.boolean(),
     article: zod_1.z.string().nullable(),
@@ -21,7 +22,7 @@ const UpdateProductRequestSchema = zod_1.z.object({
     size: zod_1.z.string().nullable(),
     size2: zod_1.z.string().nullable(),
     size3: zod_1.z.string().nullable(),
-    invoicePrice: zod_1.z.number().nullable(),
+    invoicePrice: money_schema_1.MoneySchema.nullable(),
     invoiceNumber: zod_1.z.string().nullable(),
     imageUUID: zod_1.z.string().nullable(),
     country: zod_1.z.string().nullable(),

package/build/commands/report/export-sales-by-client.query.js

@@ -3,11 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExportSalesByClientContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
+const report_order_filter_schema_1 = require("../../schemas/report/report-order-filter.schema");
 const ExportSalesByClientRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date(),
     endDate: zod_1.z.coerce.date(),
 })
+    // dateBasis / excludeClientUUID — те же, что у JSON-эндпоинтов отчётов по заказам.
+    .merge(report_order_filter_schema_1.ReportOrderFilterSchema)
     .refine(value => (0, date_helper_1.dateRangeCheck)(value.startDate, value.endDate), {
     message: 'validation.dateRange',
     path: ['endDate', 'startDate'],

package/build/commands/report/export-sales-by-position.query.js

@@ -4,12 +4,15 @@ exports.ExportSalesByPositionContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
 const sales_by_position_group_by_enum_1 = require("../../enum/sales-by-position-group-by.enum");
+const report_order_filter_schema_1 = require("../../schemas/report/report-order-filter.schema");
 const ExportSalesByPositionRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date(),
     endDate: zod_1.z.coerce.date(),
     groupBy: zod_1.z.nativeEnum(sales_by_position_group_by_enum_1.SalesByPositionGroupByEnum).default(sales_by_position_group_by_enum_1.SalesByPositionGroupByEnum.PRODUCT),
 })
+    // dateBasis / excludeClientUUID — те же, что у JSON-эндпоинтов отчётов по заказам.
+    .merge(report_order_filter_schema_1.ReportOrderFilterSchema)
     .refine(value => (0, date_helper_1.dateRangeCheck)(value.startDate, value.endDate), {
     message: 'validation.dateRange',
     path: ['endDate', 'startDate'],

package/build/commands/report/export-sales-revenue.query.js

@@ -4,12 +4,15 @@ exports.ExportSalesRevenueContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
 const report_period_type_enum_1 = require("../../enum/report-period-type.enum");
+const report_order_filter_schema_1 = require("../../schemas/report/report-order-filter.schema");
 const ExportSalesRevenueRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date().optional(),
     endDate: zod_1.z.coerce.date().optional(),
     periodType: zod_1.z.nativeEnum(report_period_type_enum_1.ReportPeriodTypeEnum).default(report_period_type_enum_1.ReportPeriodTypeEnum.DAY),
 })
+    // dateBasis / excludeClientUUID — те же, что у JSON-эндпоинтов отчётов по заказам.
+    .merge(report_order_filter_schema_1.ReportOrderFilterSchema)
     .refine(value => {
     const { startDate, endDate } = value;
     if (startDate && endDate) {

package/build/commands/report/get-cash-flow.query.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetCashFlowContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
+const money_schema_1 = require("../../schemas/money.schema");
 const GetCashFlowRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date(),
@@ -29,8 +30,8 @@ const CashFlowItemRowSchema = zod_1.z.object({
     // null — строка "Без статьи": платежи, которым статью ещё не проставили.
     cashFlowItemUUID: zod_1.z.string().nullable(),
     cashFlowItemName: zod_1.z.string().nullable(),
-    income: zod_1.z.number(),
-    expense: zod_1.z.number(),
+    income: money_schema_1.MoneySchema,
+    expense: money_schema_1.MoneySchema,
     transactionCount: zod_1.z.number(),
 });
 const CashFlowMonthRowSchema = CashFlowItemRowSchema.extend({
@@ -42,9 +43,11 @@ const GetCashFlowResponseSchema = zod_1.z.object({
         byItem: CashFlowItemRowSchema.array(),
         byMonth: CashFlowMonthRowSchema.array(),
         totals: zod_1.z.object({
-            income: zod_1.z.number(),
-            expense: zod_1.z.number(),
-            total: zod_1.z.number(),
+            income: money_schema_1.MoneySchema,
+            expense: money_schema_1.MoneySchema,
+            // Сальдо (`income - expense`) — знаковая величина, минус здесь легален,
+            // поэтому ограничения на знак нет и быть не должно.
+            total: money_schema_1.MoneySchema,
         }),
     }),
 });

package/build/commands/report/get-daily-orders-summary.query.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetDailyOrdersSummaryContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
+const money_schema_1 = require("../../schemas/money.schema");
 const GetDailyOrdersSummaryRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date(),
@@ -24,7 +25,7 @@ const UnitsByMeasureSchema = zod_1.z.object({
 const metricsShape = {
     ordersCreated: zod_1.z.number(),
     ordersCompleted: zod_1.z.number(),
-    totalSum: zod_1.z.number(),
+    totalSum: money_schema_1.MoneySchema,
     unitsByMeasure: UnitsByMeasureSchema,
 };
 const DailyOrdersSummaryTotalsSchema = zod_1.z.object(Object.assign({}, metricsShape));

package/build/commands/report/get-report-for-period.query.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GetReportForPeriodContractQuery = void 0;
 const zod_1 = require("zod");
 const date_helper_1 = require("../../helpers/date.helper");
+const money_schema_1 = require("../../schemas/money.schema");
 const GetReportForPeriodRequestSchema = zod_1.z
     .object({
     startDate: zod_1.z.coerce.date(),
@@ -23,17 +24,17 @@ const GetReportForPeriodResponseSchema = zod_1.z.object({
     data: zod_1.z.object({
         totalOrders: zod_1.z.number(),
         soldUnits: zod_1.z.number(),
-        totalSales: zod_1.z.number(),
-        totalCost: zod_1.z.number(),
+        totalSales: money_schema_1.MoneySchema,
+        totalCost: money_schema_1.MoneySchema,
         totalUnits: zod_1.z.number(),
-        totalWriteOff: zod_1.z.number(),
-        totalWriteOffCost: zod_1.z.number(),
+        totalWriteOff: zod_1.z.number(), // количество списанных единиц (SUM по quantity), не деньги
+        totalWriteOffCost: money_schema_1.MoneySchema,
         totalWriteOffByOrder: zod_1.z.number(),
-        totalWriteOffCostByOrder: zod_1.z.number(),
-        totalVatAmount: zod_1.z.number(),
-        totalDeliveryCost: zod_1.z.number(),
-        middlePrice: zod_1.z.number(),
-        grossProfit: zod_1.z.number(),
+        totalWriteOffCostByOrder: money_schema_1.MoneySchema,
+        totalVatAmount: money_schema_1.MoneySchema,
+        totalDeliveryCost: money_schema_1.MoneySchema,
+        middlePrice: money_schema_1.MoneySchema,
+        grossProfit: money_schema_1.MoneySchema,
         marginality: zod_1.z.number(),
     }),
 });

package/build/commands/report/get-report-group-by-client.query.js

@@ -4,6 +4,8 @@ exports.GetReportGroupByClientContactQuery = void 0;
 const zod_1 = require("zod");
 const enum_1 = require("../../enum");
 const date_helper_1 = require("../../helpers/date.helper");
+const money_schema_1 = require("../../schemas/money.schema");
+const report_order_filter_schema_1 = require("../../schemas/report/report-order-filter.schema");
 const GetReportGroupByClientRequestSchema = zod_1.z
     .object({
     // Даты приходят «сырым» днём — раскладку в полуинтервал [start, endExclusive) делает сервис
@@ -23,6 +25,9 @@ const GetReportGroupByClientRequestSchema = zod_1.z
     // Без значения — ограничения нет: панель по-прежнему получает все строки.
     limit: zod_1.z.coerce.number().int().positive().optional().describe('Keep only the top N rows; implies sorting by gross profit desc.'),
 })
+    // dateBasis / excludeClientUUID общие с sales/summary: обе цифры живут на одном экране и должны
+    // сужаться одинаково.
+    .merge(report_order_filter_schema_1.ReportOrderFilterSchema)
     .refine(value => {
     const { startDate, endDate } = value;
     if (startDate && endDate) {
@@ -41,16 +46,16 @@ const GetReportGroupByClientResponseSchema = zod_1.z.object({
             clientName: zod_1.z.string(),
             totalOrders: zod_1.z.number(),
             soldUnits: zod_1.z.number(),
-            totalSales: zod_1.z.number(),
-            totalSalesCost: zod_1.z.number(),
-            totalWriteOff: zod_1.z.number(),
-            totalWriteOffSales: zod_1.z.number(),
-            totalVatAmount: zod_1.z.number(),
-            totalDeliveryCost: zod_1.z.number(),
-            totalServiceAmount: zod_1.z.number(),
-            totalPayments: zod_1.z.number(),
-            middlePrice: zod_1.z.number(),
-            grossProfit: zod_1.z.number(),
+            totalSales: money_schema_1.MoneySchema,
+            totalSalesCost: money_schema_1.MoneySchema,
+            totalWriteOff: zod_1.z.number(), // количество списанных единиц (SUM по quantity), не деньги
+            totalWriteOffSales: money_schema_1.MoneySchema, // деньги: SUM(write_off.quantity * order_product.price)
+            totalVatAmount: money_schema_1.MoneySchema,
+            totalDeliveryCost: money_schema_1.MoneySchema,
+            totalServiceAmount: money_schema_1.MoneySchema,
+            totalPayments: money_schema_1.MoneySchema,
+            middlePrice: money_schema_1.MoneySchema,
+            grossProfit: money_schema_1.MoneySchema,
             marginality: zod_1.z.number(),
         })),
         // Аддитивно к прежней форме: число клиентов во ВСЁМ отчёте до усечения и применённый limit.