@floristcloud/api-lib 1.2.27 → 1.2.29

package/build/commands/integration/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./telegram"), exports);
 __exportStar(require("./telegram-staff"), exports);
 __exportStar(require("./moysklad"), exports);
+__exportStar(require("./one-c"), exports);

package/build/commands/integration/one-c/connect-one-c.command.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ConnectOneCContractCommand = void 0;
+const zod_1 = require("zod");
+const ConnectOneCResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        username: zod_1.z.string(),
+        password: zod_1.z.string(),
+    }),
+});
+var ConnectOneCContractCommand;
+(function (ConnectOneCContractCommand) {
+    ConnectOneCContractCommand.ResponseSchema = ConnectOneCResponseSchema;
+})(ConnectOneCContractCommand || (exports.ConnectOneCContractCommand = ConnectOneCContractCommand = {}));

package/build/commands/integration/one-c/disconnect-one-c.command.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DisconnectOneCContractCommand = void 0;
+const zod_1 = require("zod");
+const DisconnectOneCResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        success: zod_1.z.literal(true),
+    }),
+});
+var DisconnectOneCContractCommand;
+(function (DisconnectOneCContractCommand) {
+    DisconnectOneCContractCommand.ResponseSchema = DisconnectOneCResponseSchema;
+})(DisconnectOneCContractCommand || (exports.DisconnectOneCContractCommand = DisconnectOneCContractCommand = {}));

package/build/commands/integration/one-c/get-one-c-status.query.js

@@ -0,0 +1,18 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GetOneCStatusContractQuery = void 0;
+const zod_1 = require("zod");
+const GetOneCStatusResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        isConnected: zod_1.z.boolean(),
+        isEnabled: zod_1.z.boolean(),
+        username: zod_1.z.string().nullable(),
+        lastCheckauthAt: zod_1.z.string().datetime().nullable(),
+        lastSyncAt: zod_1.z.string().datetime().nullable(),
+    }),
+});
+var GetOneCStatusContractQuery;
+(function (GetOneCStatusContractQuery) {
+    GetOneCStatusContractQuery.ResponseSchema = GetOneCStatusResponseSchema;
+})(GetOneCStatusContractQuery || (exports.GetOneCStatusContractQuery = GetOneCStatusContractQuery = {}));

package/build/commands/integration/one-c/index.js

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./connect-one-c.command"), exports);
+__exportStar(require("./rotate-one-c-password.command"), exports);
+__exportStar(require("./disconnect-one-c.command"), exports);
+__exportStar(require("./get-one-c-status.query"), exports);

package/build/commands/integration/one-c/rotate-one-c-password.command.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RotateOneCPasswordContractCommand = void 0;
+const zod_1 = require("zod");
+const RotateOneCPasswordResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        username: zod_1.z.string(),
+        password: zod_1.z.string(),
+    }),
+});
+var RotateOneCPasswordContractCommand;
+(function (RotateOneCPasswordContractCommand) {
+    RotateOneCPasswordContractCommand.ResponseSchema = RotateOneCPasswordResponseSchema;
+})(RotateOneCPasswordContractCommand || (exports.RotateOneCPasswordContractCommand = RotateOneCPasswordContractCommand = {}));

package/build/commands/order/group/merge-orders.command.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MergeOrdersContractCommand = exports.MergeOrdersGroupAnalysisResponseSchema = void 0;
+exports.MergeOrdersExecuteContractCommand = exports.MergeOrdersContractCommand = exports.MergeOrdersGroupAnalysisResponseSchema = void 0;
 const zod_1 = require("zod");
 const schemas_1 = require("../../../schemas");
 const MergeOrdersRequestSchema = zod_1.z.object({
@@ -24,3 +24,28 @@ var MergeOrdersContractCommand;
     MergeOrdersContractCommand.RequestSchema = MergeOrdersRequestSchema;
     MergeOrdersContractCommand.ResponseSchema = MergeOrdersAnalyzeResponseSchema;
 })(MergeOrdersContractCommand || (exports.MergeOrdersContractCommand = MergeOrdersContractCommand = {}));
+// Группы, не прошедшие merge, перечисляются в `failedGroups` с per-group причиной — UI рендерит
+// «Заказы клиента X не объединены: <message>».
+const MergeOrdersExecuteFailedGroupSchema = zod_1.z.object({
+    clientUUID: zod_1.z.string(),
+    branchUUID: zod_1.z.string().nullable(),
+    targetOrderUUID: zod_1.z.string().nullable(),
+    sourceOrdersUUIDs: zod_1.z.array(zod_1.z.string()),
+    errorCode: zod_1.z.string(),
+    errorMessage: zod_1.z.string(),
+});
+const MergeOrdersExecuteResponseSchema = zod_1.z.object({
+    message: zod_1.z.string().optional(),
+    data: zod_1.z.object({
+        success: zod_1.z.boolean(),
+        successCount: zod_1.z.number().int().nonnegative(),
+        totalCount: zod_1.z.number().int().nonnegative(),
+        failedGroups: zod_1.z.array(MergeOrdersExecuteFailedGroupSchema),
+    }),
+});
+var MergeOrdersExecuteContractCommand;
+(function (MergeOrdersExecuteContractCommand) {
+    MergeOrdersExecuteContractCommand.RequestSchema = MergeOrdersRequestSchema;
+    MergeOrdersExecuteContractCommand.ResponseSchema = MergeOrdersExecuteResponseSchema;
+    MergeOrdersExecuteContractCommand.FailedGroupSchema = MergeOrdersExecuteFailedGroupSchema;
+})(MergeOrdersExecuteContractCommand || (exports.MergeOrdersExecuteContractCommand = MergeOrdersExecuteContractCommand = {}));

package/build/commands/order/group/split-group-order.command.js

@@ -6,12 +6,20 @@ const schemas_1 = require("../../../schemas");
 const SplitGroupOrderRequestSchema = zod_1.z.object({
     orderUUIDList: zod_1.z.array(zod_1.z.string()),
 });
+// Источники, которые не удалось разделить, попадают в `failures` с per-source причиной.
+const SplitGroupOrderFailureSchema = zod_1.z.object({
+    sourceOrderUUID: zod_1.z.string(),
+    errorCode: zod_1.z.string(),
+    errorMessage: zod_1.z.string(),
+});
 const SplitGroupOrderResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),
     data: schemas_1.OrderSchema.array(),
+    failures: zod_1.z.array(SplitGroupOrderFailureSchema).optional(),
 });
 var SplitGroupOrderContractCommand;
 (function (SplitGroupOrderContractCommand) {
     SplitGroupOrderContractCommand.RequestSchema = SplitGroupOrderRequestSchema;
     SplitGroupOrderContractCommand.ResponseSchema = SplitGroupOrderResponseSchema;
+    SplitGroupOrderContractCommand.FailureSchema = SplitGroupOrderFailureSchema;
 })(SplitGroupOrderContractCommand || (exports.SplitGroupOrderContractCommand = SplitGroupOrderContractCommand = {}));

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

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UpdateGroupOrderProductOrderContractCommand = void 0;
+exports.UpdateGroupOrderProductOrderContractCommand = exports.BULK_MOVE_ORDER_PRODUCT_LIMIT = void 0;
 const zod_1 = require("zod");
+exports.BULK_MOVE_ORDER_PRODUCT_LIMIT = 200;
 const UpdateGroupOrderProductOrderRequestSchema = zod_1.z.object({
-    orderProductUUIDList: zod_1.z.array(zod_1.z.object({
+    orderProductUUIDList: zod_1.z
+        .array(zod_1.z.object({
         uuid: zod_1.z.string(),
-        quantity: zod_1.z.coerce.number(),
-    })),
+        quantity: zod_1.z.coerce.number().int().positive(),
+    }))
+        .min(1)
+        .max(exports.BULK_MOVE_ORDER_PRODUCT_LIMIT),
     newOrderUUID: zod_1.z.uuid(),
     isDelete: zod_1.z.coerce.boolean().optional().default(true),
     isComment: zod_1.z.coerce.boolean().optional().default(true),

package/build/constant/error.js

@@ -430,6 +430,16 @@ exports.ERRORS = {
         message: 'Another bulk operation on this order is in progress, retry later',
         httpCode: 409,
     },
+    ORDER_PRODUCT_HAS_WRITE_OFF: {
+        code: 'OP019',
+        message: 'Cannot move order-product: it has a write-off attached',
+        httpCode: 400,
+    },
+    ORDER_MOVE_BULK_OPERATION_IN_PROGRESS: {
+        code: 'OP020',
+        message: 'Another bulk-move operation on this pair of orders is in progress, retry later',
+        httpCode: 409,
+    },
     //TRANSACTION
     TRANSACTION_NOT_CREATED: { code: 'TR001', message: 'Failed to transaction product', httpCode: 500 },
     TRANSACTION_FETCH_FAILED: { code: 'TR002', message: 'Error when retrieving a transaction', httpCode: 500 },
@@ -1048,4 +1058,10 @@ exports.ERRORS = {
         message: 'MoySklad integration is disabled for this company',
         httpCode: 409,
     },
+    // 1C COMMERCEML INTEGRATION
+    ONE_C_NOT_CONNECTED: { code: 'OC001', message: '1C integration is not connected for this company', httpCode: 404 },
+    ONE_C_CONNECT_FAILED: { code: 'OC002', message: 'Failed to connect 1C integration', httpCode: 500 },
+    ONE_C_INVALID_CREDENTIALS: { code: 'OC003', message: '1C credentials are invalid', httpCode: 401 },
+    ONE_C_INTEGRATION_DISABLED: { code: 'OC004', message: '1C integration is disabled for this company', httpCode: 409 },
+    ONE_C_SESSION_INVALID: { code: 'OC005', message: '1C session is missing or expired', httpCode: 401 },
 };

package/build/enum/action-log-type.enum.js

@@ -9,6 +9,8 @@ var ActionLogTypeEnum;
     ActionLogTypeEnum["DELETE_ORDER"] = "DELETE_ORDER";
     ActionLogTypeEnum["DELETE_ORDER_ITEM"] = "DELETE_ORDER_ITEM";
     ActionLogTypeEnum["UPDATE_ORDER_ITEM"] = "UPDATE_ORDER_ITEM";
+    ActionLogTypeEnum["MOVE_ORDER_ITEM"] = "MOVE_ORDER_ITEM";
+    ActionLogTypeEnum["MERGE_ORDER"] = "MERGE_ORDER";
     ActionLogTypeEnum["ADD_PAYMENT"] = "ADD_PAYMENT";
     ActionLogTypeEnum["DELETE_PAYMENT"] = "DELETE_PAYMENT";
     ActionLogTypeEnum["CREATE_PREORDER"] = "CREATE_PREORDER";

package/build/enum/index.js

@@ -23,6 +23,7 @@ __exportStar(require("./order-type.enum"), exports);
 __exportStar(require("./order-status.enum"), exports);
 __exportStar(require("./order-restricted-status-list"), exports);
 __exportStar(require("./order-balance-status-list"), exports);
+__exportStar(require("./order-merge-allowed-status-list"), exports);
 __exportStar(require("./transaction-type.enum"), exports);
 __exportStar(require("./consignment-import-schema-relation-entity-property.enum"), exports);
 __exportStar(require("./consignment-import-errors.enum"), exports);

package/build/enum/integration-provider.enum.js

@@ -4,4 +4,5 @@ exports.IntegrationProviderEnum = void 0;
 var IntegrationProviderEnum;
 (function (IntegrationProviderEnum) {
     IntegrationProviderEnum["MOYSKLAD"] = "MOYSKLAD";
+    IntegrationProviderEnum["ONE_C"] = "ONE_C";
 })(IntegrationProviderEnum || (exports.IntegrationProviderEnum = IntegrationProviderEnum = {}));

package/build/enum/order-merge-allowed-status-list.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OrderMergeAllowedStatusList = void 0;
+const order_status_enum_1 = require("./order-status.enum");
+exports.OrderMergeAllowedStatusList = [
+    order_status_enum_1.OrderStatusEnum.NEW,
+    order_status_enum_1.OrderStatusEnum.UNDER_REVIEW,
+    order_status_enum_1.OrderStatusEnum.ACCEPTED,
+    order_status_enum_1.OrderStatusEnum.IMPORTED,
+    order_status_enum_1.OrderStatusEnum.TEMPLATE,
+];

package/build/schemas/consignment/consignment.schema.js

@@ -15,7 +15,6 @@ exports.ConsignmentSchema = zod_1.z.object({
     isInStock: zod_1.z.boolean(),
     status: zod_1.z.nativeEnum(enum_1.ConsignmentStatusEnum),
     url: zod_1.z.string().nullable(),
-    isWithSync: zod_1.z.boolean(),
     createdAt: zod_1.z.date(),
     updatedAt: zod_1.z.date(),
     deletedAt: zod_1.z.date().nullable(),

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

@@ -13,7 +13,6 @@ exports.OrderSchema = zod_1.z.object({
     clientUUID: zod_1.z.uuid(),
     branchUUID: zod_1.z.uuid().nullable(),
     creatorUserUUID: zod_1.z.uuid(),
-    isSync: zod_1.z.boolean(),
     totalCost: zod_1.z.number(),
     subtotal: zod_1.z.number(),
     deliveryCost: zod_1.z.number(),

package/build/schemas/product/product.schema.js

@@ -11,7 +11,6 @@ const discount_rules_schema_1 = require("../discount-rules/discount-rules.schema
 const __1 = require("../..");
 exports.ProductSchema = zod_1.z.object({
     uuid: zod_1.z.uuid(),
-    dataSyncId: zod_1.z.string().nullable(),
     consignmentUUID: zod_1.z.uuid(),
     categoryUUID: zod_1.z.uuid().nullable(),
     name: zod_1.z.string(),

package/commands/integration/index.ts

@@ -1,4 +1,4 @@
 export * from './telegram';
 export * from './telegram-staff';
 export * from './moysklad';
-
+export * from './one-c';

package/commands/integration/one-c/connect-one-c.command.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+const ConnectOneCResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        username: z.string(),
+        password: z.string(),
+    }),
+});
+
+export namespace ConnectOneCContractCommand {
+    export const ResponseSchema = ConnectOneCResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/integration/one-c/disconnect-one-c.command.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+
+const DisconnectOneCResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        success: z.literal(true),
+    }),
+});
+
+export namespace DisconnectOneCContractCommand {
+    export const ResponseSchema = DisconnectOneCResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/integration/one-c/get-one-c-status.query.ts

@@ -0,0 +1,17 @@
+import { z } from 'zod';
+
+const GetOneCStatusResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        isConnected: z.boolean(),
+        isEnabled: z.boolean(),
+        username: z.string().nullable(),
+        lastCheckauthAt: z.string().datetime().nullable(),
+        lastSyncAt: z.string().datetime().nullable(),
+    }),
+});
+
+export namespace GetOneCStatusContractQuery {
+    export const ResponseSchema = GetOneCStatusResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/integration/one-c/index.ts

@@ -0,0 +1,4 @@
+export * from './connect-one-c.command';
+export * from './rotate-one-c-password.command';
+export * from './disconnect-one-c.command';
+export * from './get-one-c-status.query';

package/commands/integration/one-c/rotate-one-c-password.command.ts

@@ -0,0 +1,14 @@
+import { z } from 'zod';
+
+const RotateOneCPasswordResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        username: z.string(),
+        password: z.string(),
+    }),
+});
+
+export namespace RotateOneCPasswordContractCommand {
+    export const ResponseSchema = RotateOneCPasswordResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+}

package/commands/order/group/merge-orders.command.ts

@@ -27,3 +27,35 @@ export namespace MergeOrdersContractCommand {
     export const ResponseSchema = MergeOrdersAnalyzeResponseSchema;
     export type Response = z.infer<typeof ResponseSchema>;
 }
+
+// Группы, не прошедшие merge, перечисляются в `failedGroups` с per-group причиной — UI рендерит
+// «Заказы клиента X не объединены: <message>».
+const MergeOrdersExecuteFailedGroupSchema = z.object({
+    clientUUID: z.string(),
+    branchUUID: z.string().nullable(),
+    targetOrderUUID: z.string().nullable(),
+    sourceOrdersUUIDs: z.array(z.string()),
+    errorCode: z.string(),
+    errorMessage: z.string(),
+});
+
+const MergeOrdersExecuteResponseSchema = z.object({
+    message: z.string().optional(),
+    data: z.object({
+        success: z.boolean(),
+        successCount: z.number().int().nonnegative(),
+        totalCount: z.number().int().nonnegative(),
+        failedGroups: z.array(MergeOrdersExecuteFailedGroupSchema),
+    }),
+});
+
+export namespace MergeOrdersExecuteContractCommand {
+    export const RequestSchema = MergeOrdersRequestSchema;
+    export type Request = z.infer<typeof RequestSchema>;
+
+    export const ResponseSchema = MergeOrdersExecuteResponseSchema;
+    export type Response = z.infer<typeof ResponseSchema>;
+
+    export const FailedGroupSchema = MergeOrdersExecuteFailedGroupSchema;
+    export type FailedGroup = z.infer<typeof FailedGroupSchema>;
+}

package/commands/order/group/split-group-order.command.ts

@@ -5,9 +5,17 @@ const SplitGroupOrderRequestSchema = z.object({
     orderUUIDList: z.array(z.string()),
 });
 
+// Источники, которые не удалось разделить, попадают в `failures` с per-source причиной.
+const SplitGroupOrderFailureSchema = z.object({
+    sourceOrderUUID: z.string(),
+    errorCode: z.string(),
+    errorMessage: z.string(),
+});
+
 const SplitGroupOrderResponseSchema = z.object({
     message: z.string().optional(),
     data: OrderSchema.array(),
+    failures: z.array(SplitGroupOrderFailureSchema).optional(),
 });
 
 export namespace SplitGroupOrderContractCommand {
@@ -16,4 +24,7 @@ export namespace SplitGroupOrderContractCommand {
 
     export const ResponseSchema = SplitGroupOrderResponseSchema;
     export type Response = z.infer<typeof ResponseSchema>;
+
+    export const FailureSchema = SplitGroupOrderFailureSchema;
+    export type Failure = z.infer<typeof FailureSchema>;
 }

package/commands/order-product/group/update-group-order-product-order.command.ts

@@ -1,12 +1,17 @@
 import { z } from 'zod';
 
+export const BULK_MOVE_ORDER_PRODUCT_LIMIT = 200;
+
 const UpdateGroupOrderProductOrderRequestSchema = z.object({
-    orderProductUUIDList: z.array(
-        z.object({
-            uuid: z.string(),
-            quantity: z.coerce.number(),
-        }),
-    ),
+    orderProductUUIDList: z
+        .array(
+            z.object({
+                uuid: z.string(),
+                quantity: z.coerce.number().int().positive(),
+            }),
+        )
+        .min(1)
+        .max(BULK_MOVE_ORDER_PRODUCT_LIMIT),
     newOrderUUID: z.uuid(),
     isDelete: z.coerce.boolean().optional().default(true),
     isComment: z.coerce.boolean().optional().default(true),

package/constant/error.ts

@@ -446,6 +446,16 @@ export const ERRORS = {
         message: 'Another bulk operation on this order is in progress, retry later',
         httpCode: 409,
     },
+    ORDER_PRODUCT_HAS_WRITE_OFF: {
+        code: 'OP019',
+        message: 'Cannot move order-product: it has a write-off attached',
+        httpCode: 400,
+    },
+    ORDER_MOVE_BULK_OPERATION_IN_PROGRESS: {
+        code: 'OP020',
+        message: 'Another bulk-move operation on this pair of orders is in progress, retry later',
+        httpCode: 409,
+    },
 
     //TRANSACTION
     TRANSACTION_NOT_CREATED: { code: 'TR001', message: 'Failed to transaction product', httpCode: 500 },
@@ -1108,4 +1118,11 @@ export const ERRORS = {
         message: 'MoySklad integration is disabled for this company',
         httpCode: 409,
     },
+
+    // 1C COMMERCEML INTEGRATION
+    ONE_C_NOT_CONNECTED: { code: 'OC001', message: '1C integration is not connected for this company', httpCode: 404 },
+    ONE_C_CONNECT_FAILED: { code: 'OC002', message: 'Failed to connect 1C integration', httpCode: 500 },
+    ONE_C_INVALID_CREDENTIALS: { code: 'OC003', message: '1C credentials are invalid', httpCode: 401 },
+    ONE_C_INTEGRATION_DISABLED: { code: 'OC004', message: '1C integration is disabled for this company', httpCode: 409 },
+    ONE_C_SESSION_INVALID: { code: 'OC005', message: '1C session is missing or expired', httpCode: 401 },
 } as const;

package/enum/action-log-type.enum.ts

@@ -5,6 +5,8 @@ export enum ActionLogTypeEnum {
     DELETE_ORDER = 'DELETE_ORDER',
     DELETE_ORDER_ITEM = 'DELETE_ORDER_ITEM',
     UPDATE_ORDER_ITEM = 'UPDATE_ORDER_ITEM',
+    MOVE_ORDER_ITEM = 'MOVE_ORDER_ITEM',
+    MERGE_ORDER = 'MERGE_ORDER',
     ADD_PAYMENT = 'ADD_PAYMENT',
     DELETE_PAYMENT = 'DELETE_PAYMENT',
     CREATE_PREORDER = 'CREATE_PREORDER',

package/enum/index.ts

@@ -7,6 +7,7 @@ export * from './order-type.enum';
 export * from './order-status.enum';
 export * from './order-restricted-status-list';
 export * from './order-balance-status-list';
+export * from './order-merge-allowed-status-list';
 export * from './transaction-type.enum';
 export * from './consignment-import-schema-relation-entity-property.enum';
 export * from './consignment-import-errors.enum';

package/enum/integration-provider.enum.ts

@@ -1,3 +1,4 @@
 export enum IntegrationProviderEnum {
     MOYSKLAD = 'MOYSKLAD',
+    ONE_C = 'ONE_C',
 }

package/enum/order-merge-allowed-status-list.ts

@@ -0,0 +1,9 @@
+import { OrderStatusEnum } from './order-status.enum';
+
+export const OrderMergeAllowedStatusList: OrderStatusEnum[] = [
+    OrderStatusEnum.NEW,
+    OrderStatusEnum.UNDER_REVIEW,
+    OrderStatusEnum.ACCEPTED,
+    OrderStatusEnum.IMPORTED,
+    OrderStatusEnum.TEMPLATE,
+];

package/package.json

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

package/schemas/consignment/consignment.schema.ts

@@ -13,7 +13,6 @@ export const ConsignmentSchema = z.object({
     isInStock: z.boolean(),
     status: z.nativeEnum(ConsignmentStatusEnum),
     url: z.string().nullable(),
-    isWithSync: z.boolean(),
     createdAt: z.date(),
     updatedAt: z.date(),
     deletedAt: z.date().nullable(),

package/schemas/order/order.schema.ts

@@ -12,7 +12,6 @@ export const OrderSchema = z.object({
     branchUUID: z.uuid().nullable(),
     creatorUserUUID: z.uuid(),
 
-    isSync: z.boolean(),
     totalCost: z.number(),
     subtotal: z.number(),
     deliveryCost: z.number(),

package/schemas/product/product.schema.ts

@@ -9,7 +9,6 @@ import { ProductMultiplicityOptionSchema } from '../..';
 
 export const ProductSchema = z.object({
     uuid: z.uuid(),
-    dataSyncId: z.string().nullable(),
     consignmentUUID: z.uuid(),
     categoryUUID: z.uuid().nullable(),
     name: z.string(),