@floristcloud/api-lib 1.2.98 → 1.2.100

package/build/commands/pre-order/group/group-create-orders-from-pre-orders.command.js

@@ -9,6 +9,24 @@ const GroupCreateOrdersFromPreOrdersRequestSchema = zod_1.z.object({
     matchingConfig: schemas_1.MatchingConfigSchema.optional().nullable(),
     isProportionalAllocation: zod_1.z.coerce.boolean().optional(),
     orderProductTag: zod_1.z.string().nullable().optional(),
+    /**
+     * The conversion the user confirmed in the preview. Without it the server re-runs the analysis
+     * and converts whatever it finds at that moment; with it the analysis is skipped and exactly
+     * these allocations are created. Carries product choice and quantity only — prices always stay
+     * server-side (product price + discount rules).
+     */
+    plan: zod_1.z
+        .object({
+        preOrderUUID: zod_1.z.uuid(),
+        lines: zod_1.z
+            .object({
+            preOrderProductUUID: zod_1.z.uuid(),
+            allocations: zod_1.z.object({ productUUID: zod_1.z.uuid(), quantity: zod_1.z.number().int().positive() }).array(),
+        })
+            .array(),
+    })
+        .array()
+        .optional(),
 });
 const GroupCreateOrdersFromPreOrdersResponseSchema = zod_1.z.object({
     message: zod_1.z.string().optional(),

package/build/constant/error-i18n-key.js

@@ -42,6 +42,15 @@ exports.ErrorI18nKey = {
     preOrderConvertProductNotFound: 'preOrderConvert.productNotFound',
     preOrderConvertNotDistributed: 'preOrderConvert.notDistributed',
     preOrderConvertAlreadyExists: 'preOrderConvert.alreadyExists',
+    // Pre-order → order conversion plan validation
+    preOrderPlanMismatch: 'preOrderPlan.mismatch',
+    preOrderPlanDuplicatePreOrder: 'preOrderPlan.duplicatePreOrder',
+    preOrderPlanDuplicateItem: 'preOrderPlan.duplicateItem',
+    preOrderPlanDuplicateProduct: 'preOrderPlan.duplicateProduct',
+    preOrderPlanItemNotInPreOrder: 'preOrderPlan.itemNotInPreOrder',
+    preOrderPlanProductNotAvailable: 'preOrderPlan.productNotAvailable',
+    preOrderPlanQuantityMultiplicity: 'preOrderPlan.quantityMultiplicity',
+    preOrderPlanQuantityExceedsItem: 'preOrderPlan.quantityExceedsItem',
     // Category determination (import)
     categoryNotDetermined: 'category.notDetermined',
     // Standing-order import

package/build/constant/error.js

@@ -750,6 +750,36 @@ exports.ERRORS = {
     PRE_ORDER_MERGE_HAS_EMPTY: { code: 'PO021', message: 'Some pre-orders are empty and will be deleted', httpCode: 400 },
     PRE_ORDER_MERGE_TAGS_CONCATENATE: { code: 'PO022', message: 'Pre-orders have different tags', httpCode: 400 },
     PRE_ORDER_MERGE_COMMENTS_CONCATENATE: { code: 'PO023', message: 'Pre-orders have different comments', httpCode: 400 },
+    PRE_ORDER_PLAN_MISMATCH: {
+        code: 'PO038',
+        message: 'Conversion plan must cover exactly the requested pre-orders',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_DUPLICATE_ENTRY: {
+        code: 'PO039',
+        message: 'Conversion plan contains duplicate entries',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_ITEM_NOT_IN_PRE_ORDER: {
+        code: 'PO040',
+        message: 'Planned item does not belong to its pre-order',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_PRODUCT_NOT_AVAILABLE: {
+        code: 'PO041',
+        message: 'Planned product does not belong to the selected consignments',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_QUANTITY_MULTIPLICITY: {
+        code: 'PO042',
+        message: 'Planned quantity does not respect product multiplicity',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_QUANTITY_EXCEEDS_ITEM: {
+        code: 'PO043',
+        message: 'Planned quantity exceeds the pre-order item quantity',
+        httpCode: 400,
+    },
     STANDING_ORDER_CLIENT_NAME_REQUIRED: {
         code: 'SO001',
         message: 'Standing order client name is required',
@@ -1286,6 +1316,11 @@ exports.ERRORS = {
         message: 'MoySklad sync lock is held by another job for this company; will retry shortly',
         httpCode: 409,
     },
+    MOYSKLAD_ORDER_CREATE_LOCK_BUSY: {
+        code: 'MS022',
+        message: 'Another order is being created in MoySklad for this account; will retry shortly',
+        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 },

package/commands/pre-order/group/group-create-orders-from-pre-orders.command.ts

@@ -7,6 +7,24 @@ const GroupCreateOrdersFromPreOrdersRequestSchema = z.object({
     matchingConfig: MatchingConfigSchema.optional().nullable(),
     isProportionalAllocation: z.coerce.boolean().optional(),
     orderProductTag: z.string().nullable().optional(),
+    /**
+     * The conversion the user confirmed in the preview. Without it the server re-runs the analysis
+     * and converts whatever it finds at that moment; with it the analysis is skipped and exactly
+     * these allocations are created. Carries product choice and quantity only — prices always stay
+     * server-side (product price + discount rules).
+     */
+    plan: z
+        .object({
+            preOrderUUID: z.uuid(),
+            lines: z
+                .object({
+                    preOrderProductUUID: z.uuid(),
+                    allocations: z.object({ productUUID: z.uuid(), quantity: z.number().int().positive() }).array(),
+                })
+                .array(),
+        })
+        .array()
+        .optional(),
 });
 
 const GroupCreateOrdersFromPreOrdersResponseSchema = z.object({

package/constant/error-i18n-key.ts

@@ -42,6 +42,16 @@ export const ErrorI18nKey = {
     preOrderConvertNotDistributed: 'preOrderConvert.notDistributed',
     preOrderConvertAlreadyExists: 'preOrderConvert.alreadyExists',
 
+    // Pre-order → order conversion plan validation
+    preOrderPlanMismatch: 'preOrderPlan.mismatch',
+    preOrderPlanDuplicatePreOrder: 'preOrderPlan.duplicatePreOrder',
+    preOrderPlanDuplicateItem: 'preOrderPlan.duplicateItem',
+    preOrderPlanDuplicateProduct: 'preOrderPlan.duplicateProduct',
+    preOrderPlanItemNotInPreOrder: 'preOrderPlan.itemNotInPreOrder',
+    preOrderPlanProductNotAvailable: 'preOrderPlan.productNotAvailable',
+    preOrderPlanQuantityMultiplicity: 'preOrderPlan.quantityMultiplicity',
+    preOrderPlanQuantityExceedsItem: 'preOrderPlan.quantityExceedsItem',
+
     // Category determination (import)
     categoryNotDetermined: 'category.notDetermined',
 

package/constant/error.ts

@@ -785,6 +785,36 @@ export const ERRORS = {
     PRE_ORDER_MERGE_HAS_EMPTY: { code: 'PO021', message: 'Some pre-orders are empty and will be deleted', httpCode: 400 },
     PRE_ORDER_MERGE_TAGS_CONCATENATE: { code: 'PO022', message: 'Pre-orders have different tags', httpCode: 400 },
     PRE_ORDER_MERGE_COMMENTS_CONCATENATE: { code: 'PO023', message: 'Pre-orders have different comments', httpCode: 400 },
+    PRE_ORDER_PLAN_MISMATCH: {
+        code: 'PO038',
+        message: 'Conversion plan must cover exactly the requested pre-orders',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_DUPLICATE_ENTRY: {
+        code: 'PO039',
+        message: 'Conversion plan contains duplicate entries',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_ITEM_NOT_IN_PRE_ORDER: {
+        code: 'PO040',
+        message: 'Planned item does not belong to its pre-order',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_PRODUCT_NOT_AVAILABLE: {
+        code: 'PO041',
+        message: 'Planned product does not belong to the selected consignments',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_QUANTITY_MULTIPLICITY: {
+        code: 'PO042',
+        message: 'Planned quantity does not respect product multiplicity',
+        httpCode: 400,
+    },
+    PRE_ORDER_PLAN_QUANTITY_EXCEEDS_ITEM: {
+        code: 'PO043',
+        message: 'Planned quantity exceeds the pre-order item quantity',
+        httpCode: 400,
+    },
     STANDING_ORDER_CLIENT_NAME_REQUIRED: {
         code: 'SO001',
         message: 'Standing order client name is required',
@@ -1352,6 +1382,11 @@ export const ERRORS = {
         message: 'MoySklad sync lock is held by another job for this company; will retry shortly',
         httpCode: 409,
     },
+    MOYSKLAD_ORDER_CREATE_LOCK_BUSY: {
+        code: 'MS022',
+        message: 'Another order is being created in MoySklad for this account; will retry shortly',
+        httpCode: 409,
+    },
 
     // 1C COMMERCEML INTEGRATION
     ONE_C_NOT_CONNECTED: { code: 'OC001', message: '1C integration is not connected for this company', httpCode: 404 },

package/package.json

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