@floristcloud/api-lib 1.2.103 → 1.2.104

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

@@ -3,10 +3,24 @@ 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 CreatePaymentInvoiceRequestSchema = zod_1.z.object({
+// Потолок числа заказов в счёте. Это защита от абсурдного запроса, а не бизнес-правило: счёт за месяц
+// клиенту с ежедневными поставками — это уже 30 строк, поэтому 10-20 отрезали бы живые сценарии.
+// Сто строк — это 3-4 страницы таблицы, документ такого размера собирается и читается нормально.
+const MAX_INVOICE_ORDER_COUNT = 100;
+// Счёт выставляется одним из двух способов:
+//  - по заказам: orderUUIDs непустой, итог считается на бэке как сумма totalCost этих заказов,
+//    а amount — необязательная правка итога (например скидка по счёту), она уходит отдельной строкой;
+//  - вручную: orderUUIDs пуст, тогда amount обязателен и становится единственной строкой счёта.
+const CreatePaymentInvoiceRequestSchema = zod_1.z
+    .object({
     clientUUID: zod_1.z.uuid(),
     invoiceDate: zod_1.z.coerce.date(),
-    amount: zod_1.z.coerce.number().positive(),
+    orderUUIDs: zod_1.z.uuid().array().max(MAX_INVOICE_ORDER_COUNT).optional(),
+    amount: zod_1.z.coerce.number().positive().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',
+    path: ['amount'],
 });
 const CreatePaymentInvoiceResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),

package/build/commands/payment-invoice/index.js

@@ -18,3 +18,4 @@ __exportStar(require("./create-payment-invoice.command"), exports);
 __exportStar(require("./get-payment-invoice-list.query"), exports);
 __exportStar(require("./get-payment-invoice.query"), exports);
 __exportStar(require("./delete-payment-invoice.command"), exports);
+__exportStar(require("./pay-payment-invoice.command"), exports);

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

@@ -0,0 +1,22 @@
+"use strict";
+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");
+// Оплата по счёту. amount не передан — гасим остаток целиком; передан — частичная оплата.
+const PayPaymentInvoiceRequestSchema = zod_1.z.object({
+    moneyAccountUUID: zod_1.z.uuid(),
+    amount: zod_1.z.coerce.number().positive().optional(),
+    comment: zod_1.z.string().optional(),
+    cashFlowItemUUID: zod_1.z.uuid().nullable().optional(),
+    createdAt: zod_1.z.coerce.date().optional(),
+});
+const PayPaymentInvoiceResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: payment_invoice_schema_1.PaymentInvoiceSchema,
+});
+var PayPaymentInvoiceContractCommand;
+(function (PayPaymentInvoiceContractCommand) {
+    PayPaymentInvoiceContractCommand.RequestSchema = PayPaymentInvoiceRequestSchema;
+    PayPaymentInvoiceContractCommand.ResponseSchema = PayPaymentInvoiceResponseSchema;
+})(PayPaymentInvoiceContractCommand || (exports.PayPaymentInvoiceContractCommand = PayPaymentInvoiceContractCommand = {}));

package/build/constant/error.js

@@ -379,6 +379,11 @@ exports.ERRORS = {
     ORDER_MODIFY_NOT_ALLOWED: { code: 'O018', message: 'Modifying the order is not allowed', httpCode: 500 },
     ORDER_SPLIT_ERROR: { code: 'O015', message: 'Error splitting orders', httpCode: 500 },
     ORDER_PAYMENT_NOT_EMPTY: { code: 'O016', message: 'Order not deleted, the order contains payments', httpCode: 400 },
+    ORDER_IN_PAYMENT_INVOICE: {
+        code: 'O039',
+        message: 'Order not deleted, the order is included in a payment invoice',
+        httpCode: 409,
+    },
     ORDER_SPLIT_NOT_COMPLETELY_ERROR: { code: 'O019', message: 'Error splitting orders, not all orders were split', httpCode: 500 },
     ORDER_TOTAL_COST_NEGATIVE: { code: 'O020', message: 'Order total cost is negative', httpCode: 400 },
     ORDER_SUBTOTAL_NEGATIVE: { code: 'O021', message: 'Order subtotal is negative', httpCode: 400 },
@@ -1107,6 +1112,29 @@ exports.ERRORS = {
     PAYMENT_INVOICE_NOT_FOUND: { code: 'PINV003', message: 'Payment invoice not found', httpCode: 404 },
     PAYMENT_INVOICE_FETCH_FAILED: { code: 'PINV004', message: 'Failed to fetch payment invoices', httpCode: 500 },
     PAYMENT_INVOICE_DELETE_FAILED: { code: 'PINV005', message: 'Failed to delete payment invoice', httpCode: 500 },
+    PAYMENT_INVOICE_ORDERS_NOT_FOUND: {
+        code: 'PINV006',
+        message: 'Some of the requested orders were not found for this client',
+        httpCode: 404,
+    },
+    PAYMENT_INVOICE_ORDER_ALREADY_INVOICED: {
+        code: 'PINV007',
+        message: 'Some of the requested orders are already included in another invoice',
+        httpCode: 409,
+    },
+    PAYMENT_INVOICE_AMOUNT_INVALID: { code: 'PINV008', message: 'Payment invoice amount must be positive', httpCode: 400 },
+    PAYMENT_INVOICE_ALREADY_PAID: { code: 'PINV009', message: 'Payment invoice is already fully paid', httpCode: 409 },
+    PAYMENT_INVOICE_PAYMENT_EXCEEDS_REMAINING: {
+        code: 'PINV010',
+        message: 'Payment amount exceeds the remaining amount of the invoice',
+        httpCode: 400,
+    },
+    PAYMENT_INVOICE_PAYMENT_FAILED: { code: 'PINV011', message: 'Failed to register payment for the invoice', httpCode: 500 },
+    PAYMENT_INVOICE_HAS_PAYMENTS: {
+        code: 'PINV012',
+        message: 'Payment invoice has registered payments and cannot be deleted',
+        httpCode: 409,
+    },
     // AUTH GATEWAY
     AUTH_GATEWAY_VOICE_FAILED: { code: 'AG001', message: 'Failed to send code via voice call', httpCode: 500 },
     AUTH_GATEWAY_TELEGRAM_FAILED: { code: 'AG002', message: 'Failed to send code via Telegram', httpCode: 500 },

package/build/enum/index.js

@@ -110,3 +110,4 @@ __exportStar(require("./consignment-transfer-direction.enum"), exports);
 __exportStar(require("./legal-identifier-field.enum"), exports);
 __exportStar(require("./permission-key.enum"), exports);
 __exportStar(require("./cash-flow-item-status.enum"), exports);
+__exportStar(require("./payment-invoice-status.enum"), exports);

package/build/enum/payment-invoice-status.enum.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PaymentInvoiceStatusEnum = void 0;
+// Статус счёта — производный: считается из суммы живых платежей, привязанных к счёту.
+// В БД не хранится, поэтому не имеет пары в Prisma-энамах и не нуждается в prisma-enum-bridge.
+var PaymentInvoiceStatusEnum;
+(function (PaymentInvoiceStatusEnum) {
+    PaymentInvoiceStatusEnum["ISSUED"] = "ISSUED";
+    PaymentInvoiceStatusEnum["PARTIALLY_PAID"] = "PARTIALLY_PAID";
+    PaymentInvoiceStatusEnum["PAID"] = "PAID";
+})(PaymentInvoiceStatusEnum || (exports.PaymentInvoiceStatusEnum = PaymentInvoiceStatusEnum = {}));

package/build/schemas/order/order.schema.js

@@ -32,15 +32,20 @@ exports.OrderSchema = zod_1.z.object({
     totalProductNumber: zod_1.z.number(),
     invoiceSendAt: zod_1.z.date().nullable(),
     deliveryRouteUUID: zod_1.z.uuid().nullable(),
+    // Счёт на оплату, в который включён заказ. Сам счёт (номер, файл, статус оплаты) читается
+    // отдельным запросом GET /payment-invoice/:uuid — здесь только ссылка, чтобы не утяжелять список заказов.
+    paymentInvoiceUUID: zod_1.z.uuid().nullable(),
     completedAt: zod_1.z.date().nullable(),
     paymentDueAt: zod_1.z.date().nullable(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
     deletedAt: zod_1.z.date().nullable(),
 });
+// Витрина клиента не показывает внутреннюю кухню счетов, поэтому ссылка на счёт сюда не попадает.
 exports.OrderForClientSchema = exports.OrderSchema.omit({
     comment: true,
     tag: true,
+    paymentInvoiceUUID: true,
 });
 exports.OrderExtendedSchema = exports.OrderSchema.extend({
     client: client_1.ClientSchema,

package/build/schemas/payment-invoice/payment-invoice.schema.js

@@ -2,13 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PaymentInvoiceSchema = void 0;
 const zod_1 = require("zod");
+const payment_invoice_status_enum_1 = require("../../enum/payment-invoice-status.enum");
+// Строка счёта. Для счёта, собранного из заказов, каждая строка — снимок заказа на момент
+// выставления: заказ потом может измениться, а выставленный счёт обязан остаться прежним.
+const PaymentInvoiceItemSchema = zod_1.z.object({
+    orderUUID: zod_1.z.string().nullable(),
+    orderId: zod_1.z.number().nullable(),
+    orderDate: zod_1.z.coerce.date().nullable(),
+    description: zod_1.z.string(),
+    amount: zod_1.z.coerce.number(),
+});
 exports.PaymentInvoiceSchema = zod_1.z.object({
     uuid: zod_1.z.string(),
     number: zod_1.z.string(),
     invoiceDate: zod_1.z.coerce.date(),
     amount: zod_1.z.coerce.number(),
+    paidAmount: zod_1.z.coerce.number(),
+    remainingAmount: zod_1.z.coerce.number(),
+    status: zod_1.z.nativeEnum(payment_invoice_status_enum_1.PaymentInvoiceStatusEnum),
     clientUUID: zod_1.z.string(),
     clientName: zod_1.z.string(),
+    contractNumber: zod_1.z.string().nullable(),
+    contractDate: zod_1.z.coerce.date().nullable(),
+    items: PaymentInvoiceItemSchema.array(),
     fileUrl: zod_1.z.string().nullable(),
     createdAt: zod_1.z.coerce.date(),
 });

package/commands/payment-invoice/create-payment-invoice.command.ts

@@ -1,11 +1,26 @@
 import { z } from 'zod';
 import { PaymentInvoiceSchema } from '../../schemas/payment-invoice/payment-invoice.schema';
 
-const CreatePaymentInvoiceRequestSchema = z.object({
-    clientUUID: z.uuid(),
-    invoiceDate: z.coerce.date(),
-    amount: z.coerce.number().positive(),
-});
+// Потолок числа заказов в счёте. Это защита от абсурдного запроса, а не бизнес-правило: счёт за месяц
+// клиенту с ежедневными поставками — это уже 30 строк, поэтому 10-20 отрезали бы живые сценарии.
+// Сто строк — это 3-4 страницы таблицы, документ такого размера собирается и читается нормально.
+const MAX_INVOICE_ORDER_COUNT = 100;
+
+// Счёт выставляется одним из двух способов:
+//  - по заказам: orderUUIDs непустой, итог считается на бэке как сумма totalCost этих заказов,
+//    а amount — необязательная правка итога (например скидка по счёту), она уходит отдельной строкой;
+//  - вручную: orderUUIDs пуст, тогда amount обязателен и становится единственной строкой счёта.
+const CreatePaymentInvoiceRequestSchema = z
+    .object({
+        clientUUID: z.uuid(),
+        invoiceDate: z.coerce.date(),
+        orderUUIDs: z.uuid().array().max(MAX_INVOICE_ORDER_COUNT).optional(),
+        amount: z.coerce.number().positive().optional(),
+    })
+    .refine(value => Boolean(value.orderUUIDs?.length) || value.amount !== undefined, {
+        message: 'Either orderUUIDs or amount must be provided',
+        path: ['amount'],
+    });
 
 const CreatePaymentInvoiceResponseSchema = z.object({
     message: z.string().optional(),

package/commands/payment-invoice/index.ts

@@ -2,3 +2,4 @@ export * from './create-payment-invoice.command';
 export * from './get-payment-invoice-list.query';
 export * from './get-payment-invoice.query';
 export * from './delete-payment-invoice.command';
+export * from './pay-payment-invoice.command';

package/commands/payment-invoice/pay-payment-invoice.command.ts

@@ -0,0 +1,24 @@
+import { z } from 'zod';
+import { PaymentInvoiceSchema } from '../../schemas/payment-invoice/payment-invoice.schema';
+
+// Оплата по счёту. amount не передан — гасим остаток целиком; передан — частичная оплата.
+const PayPaymentInvoiceRequestSchema = z.object({
+    moneyAccountUUID: z.uuid(),
+    amount: z.coerce.number().positive().optional(),
+    comment: z.string().optional(),
+    cashFlowItemUUID: z.uuid().nullable().optional(),
+    createdAt: z.coerce.date().optional(),
+});
+
+const PayPaymentInvoiceResponseSchema = z.object({
+    message: z.string().optional(),
+    data: PaymentInvoiceSchema,
+});
+
+export namespace PayPaymentInvoiceContractCommand {
+    export const RequestSchema = PayPaymentInvoiceRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = PayPaymentInvoiceResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/constant/error.ts

@@ -393,6 +393,11 @@ export const ERRORS = {
     ORDER_MODIFY_NOT_ALLOWED: { code: 'O018', message: 'Modifying the order is not allowed', httpCode: 500 },
     ORDER_SPLIT_ERROR: { code: 'O015', message: 'Error splitting orders', httpCode: 500 },
     ORDER_PAYMENT_NOT_EMPTY: { code: 'O016', message: 'Order not deleted, the order contains payments', httpCode: 400 },
+    ORDER_IN_PAYMENT_INVOICE: {
+        code: 'O039',
+        message: 'Order not deleted, the order is included in a payment invoice',
+        httpCode: 409,
+    },
     ORDER_SPLIT_NOT_COMPLETELY_ERROR: { code: 'O019', message: 'Error splitting orders, not all orders were split', httpCode: 500 },
     ORDER_TOTAL_COST_NEGATIVE: { code: 'O020', message: 'Order total cost is negative', httpCode: 400 },
     ORDER_SUBTOTAL_NEGATIVE: { code: 'O021', message: 'Order subtotal is negative', httpCode: 400 },
@@ -1155,6 +1160,29 @@ export const ERRORS = {
     PAYMENT_INVOICE_NOT_FOUND: { code: 'PINV003', message: 'Payment invoice not found', httpCode: 404 },
     PAYMENT_INVOICE_FETCH_FAILED: { code: 'PINV004', message: 'Failed to fetch payment invoices', httpCode: 500 },
     PAYMENT_INVOICE_DELETE_FAILED: { code: 'PINV005', message: 'Failed to delete payment invoice', httpCode: 500 },
+    PAYMENT_INVOICE_ORDERS_NOT_FOUND: {
+        code: 'PINV006',
+        message: 'Some of the requested orders were not found for this client',
+        httpCode: 404,
+    },
+    PAYMENT_INVOICE_ORDER_ALREADY_INVOICED: {
+        code: 'PINV007',
+        message: 'Some of the requested orders are already included in another invoice',
+        httpCode: 409,
+    },
+    PAYMENT_INVOICE_AMOUNT_INVALID: { code: 'PINV008', message: 'Payment invoice amount must be positive', httpCode: 400 },
+    PAYMENT_INVOICE_ALREADY_PAID: { code: 'PINV009', message: 'Payment invoice is already fully paid', httpCode: 409 },
+    PAYMENT_INVOICE_PAYMENT_EXCEEDS_REMAINING: {
+        code: 'PINV010',
+        message: 'Payment amount exceeds the remaining amount of the invoice',
+        httpCode: 400,
+    },
+    PAYMENT_INVOICE_PAYMENT_FAILED: { code: 'PINV011', message: 'Failed to register payment for the invoice', httpCode: 500 },
+    PAYMENT_INVOICE_HAS_PAYMENTS: {
+        code: 'PINV012',
+        message: 'Payment invoice has registered payments and cannot be deleted',
+        httpCode: 409,
+    },
 
     // AUTH GATEWAY
     AUTH_GATEWAY_VOICE_FAILED: { code: 'AG001', message: 'Failed to send code via voice call', httpCode: 500 },

package/enum/index.ts

@@ -94,3 +94,4 @@ export * from './consignment-transfer-direction.enum';
 export * from './legal-identifier-field.enum';
 export * from './permission-key.enum';
 export * from './cash-flow-item-status.enum';
+export * from './payment-invoice-status.enum';

package/enum/payment-invoice-status.enum.ts

@@ -0,0 +1,7 @@
+// Статус счёта — производный: считается из суммы живых платежей, привязанных к счёту.
+// В БД не хранится, поэтому не имеет пары в Prisma-энамах и не нуждается в prisma-enum-bridge.
+export enum PaymentInvoiceStatusEnum {
+    ISSUED = 'ISSUED',
+    PARTIALLY_PAID = 'PARTIALLY_PAID',
+    PAID = 'PAID',
+}

package/package.json

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

package/schemas/order/order.schema.ts

@@ -34,6 +34,9 @@ export const OrderSchema = z.object({
     totalProductNumber: z.number(),
     invoiceSendAt: z.date().nullable(),
     deliveryRouteUUID: z.uuid().nullable(),
+    // Счёт на оплату, в который включён заказ. Сам счёт (номер, файл, статус оплаты) читается
+    // отдельным запросом GET /payment-invoice/:uuid — здесь только ссылка, чтобы не утяжелять список заказов.
+    paymentInvoiceUUID: z.uuid().nullable(),
 
     completedAt: z.date().nullable(),
     paymentDueAt: z.date().nullable(),
@@ -43,9 +46,11 @@ export const OrderSchema = z.object({
     deletedAt: z.date().nullable(),
 });
 
+// Витрина клиента не показывает внутреннюю кухню счетов, поэтому ссылка на счёт сюда не попадает.
 export const OrderForClientSchema = OrderSchema.omit({
     comment: true,
     tag: true,
+    paymentInvoiceUUID: true,
 });
 
 export const OrderExtendedSchema = OrderSchema.extend({

package/schemas/payment-invoice/payment-invoice.schema.ts

@@ -1,12 +1,29 @@
 import { z } from 'zod';
+import { PaymentInvoiceStatusEnum } from '../../enum/payment-invoice-status.enum';
+
+// Строка счёта. Для счёта, собранного из заказов, каждая строка — снимок заказа на момент
+// выставления: заказ потом может измениться, а выставленный счёт обязан остаться прежним.
+const PaymentInvoiceItemSchema = z.object({
+    orderUUID: z.string().nullable(),
+    orderId: z.number().nullable(),
+    orderDate: z.coerce.date().nullable(),
+    description: z.string(),
+    amount: z.coerce.number(),
+});
 
 export const PaymentInvoiceSchema = z.object({
     uuid: z.string(),
     number: z.string(),
     invoiceDate: z.coerce.date(),
     amount: z.coerce.number(),
+    paidAmount: z.coerce.number(),
+    remainingAmount: z.coerce.number(),
+    status: z.nativeEnum(PaymentInvoiceStatusEnum),
     clientUUID: z.string(),
     clientName: z.string(),
+    contractNumber: z.string().nullable(),
+    contractDate: z.coerce.date().nullable(),
+    items: PaymentInvoiceItemSchema.array(),
     fileUrl: z.string().nullable(),
     createdAt: z.coerce.date(),
 });