@floristcloud/api-lib 1.2.176 → 1.2.179

package/schemas/pre-order/pre-order-conversion-created.schema.ts

@@ -0,0 +1,9 @@
+import { PreOrderConversionSummarySchema } from './pre-order-conversion-summary.schema';
+import { z } from 'zod';
+import { PreOrderConversionOrderSchema } from './pre-order-conversion-order.schema';
+
+export const PreOrderConversionCreatedSchema = z.object({
+    preOrderUUID: z.uuid(),
+    conversionSummary: PreOrderConversionSummarySchema.nullable().optional(),
+    orders: PreOrderConversionOrderSchema.array(),
+});

package/schemas/pre-order/pre-order-conversion-current-order.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { OrderStatusEnum } from '../../enum/order-status.enum';
+export const PreOrderConversionCurrentOrderSchema = z.object({
+    uuid: z.uuid(),
+    number: z.number().int(),
+    status: z.enum(OrderStatusEnum).nullable(),
+    exists: z.boolean(),
+});

package/schemas/pre-order/pre-order-conversion-difference.schema.ts

@@ -0,0 +1,10 @@
+import { PreOrderConversionDifferenceFieldEnum } from '../../enum/pre-order-conversion-difference-field.enum';
+import { z } from 'zod';
+
+export const PreOrderConversionDifferenceSchema = z.object({
+    field: z.enum(PreOrderConversionDifferenceFieldEnum),
+    requestedLabel: z.string().nullable().optional(),
+    selectedLabel: z.string().nullable().optional(),
+    requested: z.string(),
+    selected: z.string().nullable(),
+});

package/schemas/pre-order/pre-order-conversion-error.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+
+export const PreOrderConversionErrorSchema = z.object({
+    preOrderUUID: z.uuid(),
+    code: z.string(),
+    message: z.string(),
+});

package/schemas/pre-order/pre-order-conversion-failed-error.schema.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+export const PreOrderConversionFailedErrorSchema = z.object({
+    code: z.string(),
+    message: z.string(),
+});

package/schemas/pre-order/pre-order-conversion-failed.schema.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { PreOrderConversionFailedErrorSchema } from './pre-order-conversion-failed-error.schema';
+
+export const PreOrderConversionFailedSchema = z.object({ preOrderUUID: z.uuid(), error: PreOrderConversionFailedErrorSchema });

package/schemas/pre-order/pre-order-conversion-mapping.schema.ts

@@ -0,0 +1,12 @@
+import { PreOrderConversionRemainderSchema } from './pre-order-conversion-remainder.schema';
+import { z } from 'zod';
+import { PreOrderProductExtendedSchema } from '../pre-order-product/pre-order-product.schema';
+import { PreOrderConversionMatchSchema } from './pre-order-conversion-match.schema';
+
+export const PreOrderConversionMappingSchema = z.object({
+    item: PreOrderProductExtendedSchema,
+    matches: z.array(PreOrderConversionMatchSchema),
+    warnings: z.array(z.string()),
+    remainder: PreOrderConversionRemainderSchema.array().optional(),
+    remainingQuantity: z.number(),
+});

package/schemas/pre-order/pre-order-conversion-match-description.schema.ts

@@ -0,0 +1,7 @@
+import { PreOrderConversionAllocationSchema } from './pre-order-conversion-allocation.schema';
+
+export const PreOrderConversionMatchDescriptionSchema = PreOrderConversionAllocationSchema.pick({
+    kind: true,
+    differences: true,
+    warnings: true,
+});

package/schemas/pre-order/pre-order-conversion-match.schema.ts

@@ -0,0 +1,11 @@
+import { PreOrderConversionMatchDescriptionSchema } from './pre-order-conversion-match-description.schema';
+import { z } from 'zod';
+import { ProductExtendedForAdminSchema } from '../product/product-extended-for-admin.schema';
+
+export const PreOrderConversionMatchSchema = z.object({
+    product: ProductExtendedForAdminSchema,
+    quantity: z.number(),
+    description: PreOrderConversionMatchDescriptionSchema.optional(),
+    price: z.string().optional(),
+    remainingBalance: z.number(),
+});

package/schemas/pre-order/pre-order-conversion-order.schema.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod';
+import { OrderSchema } from '../order/order.schema';
+
+export const PreOrderConversionOrderSchema = OrderSchema.extend({ warnings: z.string().array() });

package/schemas/pre-order/pre-order-conversion-plan-allocation.schema.ts

@@ -0,0 +1,3 @@
+import { z } from 'zod';
+
+export const PreOrderConversionPlanAllocationSchema = z.object({ productUUID: z.uuid(), quantity: z.number().int().positive() });

package/schemas/pre-order/pre-order-conversion-plan-entry.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { PreOrderConversionPlanLineSchema } from './pre-order-conversion-plan-line.schema';
+
+export const PreOrderConversionPlanEntrySchema = z.object({
+    preOrderUUID: z.uuid(),
+    version: z.string().min(1),
+    lines: PreOrderConversionPlanLineSchema.array(),
+});

package/schemas/pre-order/pre-order-conversion-plan-line.schema.ts

@@ -0,0 +1,7 @@
+import { z } from 'zod';
+import { PreOrderConversionPlanAllocationSchema } from './pre-order-conversion-plan-allocation.schema';
+
+export const PreOrderConversionPlanLineSchema = z.object({
+    preOrderProductUUID: z.uuid(),
+    allocations: PreOrderConversionPlanAllocationSchema.array(),
+});

package/schemas/pre-order/pre-order-conversion-preview-plan-entry.schema.ts

@@ -0,0 +1,3 @@
+import { PreOrderConversionPlanEntrySchema } from './pre-order-conversion-plan-entry.schema';
+
+export const PreOrderConversionPreviewPlanEntrySchema = PreOrderConversionPlanEntrySchema.omit({ version: true });

package/schemas/pre-order/pre-order-conversion-remainder.schema.ts

@@ -0,0 +1,7 @@
+import { PreOrderConversionRemainderReasonEnum } from '../../enum/pre-order-conversion-remainder-reason.enum';
+import { z } from 'zod';
+
+export const PreOrderConversionRemainderSchema = z.object({
+    reason: z.enum(PreOrderConversionRemainderReasonEnum),
+    quantity: z.number().int().nonnegative(),
+});

package/schemas/pre-order/pre-order-conversion-skipped.schema.ts

@@ -0,0 +1,4 @@
+import { PreOrderConversionSkipReasonEnum } from '../../enum/pre-order-conversion-skip-reason.enum';
+import { z } from 'zod';
+
+export const PreOrderConversionSkippedSchema = z.object({ preOrderUUID: z.uuid(), reason: z.enum(PreOrderConversionSkipReasonEnum) });

package/schemas/pre-order/pre-order-conversion-summary-line.schema.ts

@@ -0,0 +1,18 @@
+import { z } from 'zod';
+import { MoneySchema } from '../money.schema';
+import { PreOrderConversionAttributesSchema } from './pre-order-conversion-attributes.schema';
+import { PreOrderConversionRemainderSchema } from './pre-order-conversion-remainder.schema';
+import { PreOrderConversionAllocationSchema } from './pre-order-conversion-allocation.schema';
+
+export const PreOrderConversionSummaryLineSchema = z.object({
+    preOrderProductUUID: z.uuid(),
+    requested: PreOrderConversionAttributesSchema,
+    comment: z.string().nullable(),
+    stopPrice: MoneySchema.nullable(),
+    isReplaceable: z.boolean(),
+    requestedQuantity: z.number().int().nonnegative(),
+    allocatedQuantity: z.number().int().nonnegative(),
+    closedQuantity: z.number().int().nonnegative(),
+    remainder: PreOrderConversionRemainderSchema.array(),
+    allocations: PreOrderConversionAllocationSchema.array(),
+});

package/schemas/pre-order/pre-order-conversion-summary.schema.ts

@@ -0,0 +1,12 @@
+import { z } from 'zod';
+import { PreOrderStatusEnum } from '../../enum/pre-order-status.enum';
+import { PreOrderConversionSummaryLineSchema } from './pre-order-conversion-summary-line.schema';
+
+export const PreOrderConversionSummarySchema = z.object({
+    version: z.literal(1),
+    convertedAt: z.iso.datetime(),
+    creatorUserUUID: z.uuid(),
+    // Статус до оформления — в него предзаказ вернётся при откате. В ранних снимках поля нет.
+    previousStatus: z.enum(PreOrderStatusEnum).optional(),
+    lines: PreOrderConversionSummaryLineSchema.array(),
+});

package/schemas/pre-order/pre-order-for-client.schema.ts

@@ -1,7 +1,11 @@
+import { PreOrderFulfillmentSchema } from './pre-order-fulfillment.schema';
 import { z } from 'zod';
 import { PreOrderStatusEnum } from '../../enum';
 
 export const PreOrderForClientSchema = z.object({
+    fulfillment: z.record(z.uuid(), PreOrderFulfillmentSchema).nullable().optional(),
+    orderNumbers: z.number().int().array().optional(),
+    hasUnavailableOrders: z.boolean().optional(),
     uuid: z.string(),
     clientUUID: z.string(),
     branchUUID: z.string().nullable(),

package/schemas/pre-order/pre-order-fulfillment-stop-price.schema.ts

@@ -0,0 +1,3 @@
+import { z } from 'zod';
+import { MoneySchema } from '../money.schema';
+export const PreOrderFulfillmentStopPriceSchema = z.object({ limit: MoneySchema, prices: MoneySchema.array(), currency: z.string() });

package/schemas/pre-order/pre-order-fulfillment-substitute.schema.ts

@@ -0,0 +1,2 @@
+import { z } from 'zod';
+export const PreOrderFulfillmentSubstituteSchema = z.object({ name: z.string(), quantity: z.number().int().positive() });

package/schemas/pre-order/pre-order-fulfillment.schema.ts

@@ -0,0 +1,13 @@
+import { z } from 'zod';
+import { PreOrderFulfillmentStatusEnum } from '../../enum/pre-order-fulfillment-status.enum';
+import { PreOrderConversionAttributesSchema } from './pre-order-conversion-attributes.schema';
+import { PreOrderFulfillmentSubstituteSchema } from './pre-order-fulfillment-substitute.schema';
+import { PreOrderFulfillmentStopPriceSchema } from './pre-order-fulfillment-stop-price.schema';
+export const PreOrderFulfillmentSchema = z.object({
+    status: z.enum(PreOrderFulfillmentStatusEnum),
+    allocated: z.number().int().nonnegative(),
+    requested: z.number().int().nonnegative(),
+    requestedAttributes: PreOrderConversionAttributesSchema.nullable(),
+    substitutes: PreOrderFulfillmentSubstituteSchema.array(),
+    stopPrice: PreOrderFulfillmentStopPriceSchema.nullable(),
+});

package/schemas/pre-order/pre-order.schema.ts

@@ -1,3 +1,6 @@
+import { PreOrderConversionCurrentOrderSchema } from './pre-order-conversion-current-order.schema';
+import { PreOrderConversionChangeSchema } from './pre-order-conversion-change.schema';
+import { PreOrderConversionSummarySchema } from './pre-order-conversion-summary.schema';
 import { z } from 'zod';
 import { PreOrderStatusEnum } from '../../enum/pre-order-status.enum';
 import { ClientSchema } from '../client/client-base.schema';
@@ -6,6 +9,9 @@ import { PreOrderCollectionSchema } from '../pre-order-collection/pre-order-coll
 import { MoneySchema } from '../money.schema';
 
 export const PreOrderSchema = z.object({
+    conversionOrders: PreOrderConversionCurrentOrderSchema.array().optional(),
+    conversionChanges: PreOrderConversionChangeSchema.array().optional(),
+    conversionSummary: PreOrderConversionSummarySchema.nullable().optional(),
     uuid: z.string(),
     clientUUID: z.string(),
     branchUUID: z.string().nullable(),
@@ -57,7 +63,14 @@ export const UpdatablePreOrderStatusSchema = z.enum([
     PreOrderStatusEnum.COMPLETED,
 ]);
 
-export const UpdatePreOrderSchema = PreOrderSchema.omit({ uuid: true, preOrderNum: true, createdAt: true })
+export const UpdatePreOrderSchema = PreOrderSchema.omit({
+    uuid: true,
+    preOrderNum: true,
+    createdAt: true,
+    conversionOrders: true,
+    conversionSummary: true,
+    conversionChanges: true,
+})
     .partial()
     .extend({ status: UpdatablePreOrderStatusSchema.optional() });
 

package/schemas/pre-order/revert-pre-order-conversion-order.schema.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+
+export const RevertPreOrderConversionOrderSchema = z.object({
+    uuid: z.uuid(),
+    number: z.number().int(),
+});

package/schemas/pre-order/revert-pre-order-conversion-response.schema.ts

@@ -0,0 +1,6 @@
+import { z } from 'zod';
+import { RevertPreOrderConversionResultSchema } from './revert-pre-order-conversion-result.schema';
+
+export const RevertPreOrderConversionResponseSchema = z.object({
+    data: RevertPreOrderConversionResultSchema,
+});

package/schemas/pre-order/revert-pre-order-conversion-result.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { PreOrderStatusEnum } from '../../enum/pre-order-status.enum';
+import { RevertPreOrderConversionOrderSchema } from './revert-pre-order-conversion-order.schema';
+
+export const RevertPreOrderConversionResultSchema = z.object({
+    status: z.enum(PreOrderStatusEnum),
+    deletedOrders: RevertPreOrderConversionOrderSchema.array(),
+});

package/schemas/pre-order/update-pre-order-webshop-response.schema.ts

@@ -0,0 +1,3 @@
+import { z } from 'zod';
+import { PreOrderForClientSchema } from './pre-order-for-client.schema';
+export const UpdatePreOrderWebshopResponseSchema = z.object({ message: z.string().optional(), data: PreOrderForClientSchema });

package/schemas/settings/city-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const CityDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.CITY),
+    value: z.string().trim().min(1),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/default-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const DefaultDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.DEFAULT),
+    value: z.null(),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/delivery-pricing-rule.schema.ts

@@ -0,0 +1,10 @@
+import { z } from 'zod';
+import { CityDeliveryPricingRuleSchema } from './city-delivery-pricing-rule.schema';
+import { DefaultDeliveryPricingRuleSchema } from './default-delivery-pricing-rule.schema';
+import { GroupDeliveryPricingRuleSchema } from './group-delivery-pricing-rule.schema';
+
+export const DeliveryPricingRuleSchema = z.discriminatedUnion('scope', [
+    DefaultDeliveryPricingRuleSchema,
+    CityDeliveryPricingRuleSchema,
+    GroupDeliveryPricingRuleSchema,
+]);

package/schemas/settings/delivery-pricing-rules.schema.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+import { validateUniqueDeliveryPricingRules } from '../../helpers/validate-unique-delivery-pricing-rules.helper';
+import { DeliveryPricingRuleSchema } from './delivery-pricing-rule.schema';
+
+export const DeliveryPricingRulesSchema = z.array(DeliveryPricingRuleSchema).superRefine(validateUniqueDeliveryPricingRules);

package/schemas/settings/delivery-pricing-tier.schema.ts

@@ -0,0 +1,8 @@
+import { z } from 'zod';
+import { NonNegativeMoneySchema } from '../non-negative-money.schema';
+
+// JSON tiers follow the same decimal-string precision as monetary database columns.
+export const DeliveryPricingTierSchema = z.object({
+    minSubtotal: NonNegativeMoneySchema,
+    cost: NonNegativeMoneySchema,
+});

package/schemas/settings/delivery-pricing-tiers.schema.ts

@@ -0,0 +1,5 @@
+import { z } from 'zod';
+import { validateUniqueDeliveryPricingThresholds } from '../../helpers/validate-unique-delivery-pricing-thresholds.helper';
+import { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
+
+export const DeliveryPricingTiersSchema = z.array(DeliveryPricingTierSchema).superRefine(validateUniqueDeliveryPricingThresholds);

package/schemas/settings/group-delivery-pricing-rule.schema.ts

@@ -0,0 +1,9 @@
+import { z } from 'zod';
+import { DeliveryPricingRuleScopeEnum } from '../../enum/delivery-pricing-rule-scope.enum';
+import { DeliveryPricingTiersSchema } from './delivery-pricing-tiers.schema';
+
+export const GroupDeliveryPricingRuleSchema = z.object({
+    scope: z.literal(DeliveryPricingRuleScopeEnum.GROUP),
+    value: z.string().trim().min(1),
+    tiers: DeliveryPricingTiersSchema,
+});

package/schemas/settings/settings.schema.ts

@@ -19,7 +19,14 @@ import { DISABLE_ORDERS_MESSAGE_MAX_LENGTH } from '../../constant/settings.const
 import { ValidationI18nKey } from '../../constant/validation-i18n-key';
 import { WebshopMainDisplayModeEnum } from '../../enum/webshop-main-display-mode.enum';
 import { MenuItemsUrlEnum } from '../../enum/menu-items-url.enum';
-import { NonNegativeMoneySchema } from '../non-negative-money.schema';
+import { DeliveryPricingInTransitModeEnum } from '../../enum/delivery-pricing-in-transit-mode.enum';
+import { DeliveryPricingRulesSchema } from './delivery-pricing-rules.schema';
+import { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
+
+// Preserve existing direct imports and contracts package exports.
+export { DeliveryPricingRuleSchema } from './delivery-pricing-rule.schema';
+export { DeliveryPricingRulesSchema } from './delivery-pricing-rules.schema';
+export { DeliveryPricingTierSchema } from './delivery-pricing-tier.schema';
 
 export const SettingsWorkingHoursSchema = z.object({
     uuid: z.string(),
@@ -82,14 +89,6 @@ export const ContactPhoneListSchema = z.array(ContactPhoneSchema).max(CONTACT_PH
 // только валидация.
 export const DisableOrdersMessageSchema = z.string().max(DISABLE_ORDERS_MESSAGE_MAX_LENGTH);
 
-// Обе величины — деньги: `minSubtotal` сравнивается с суммой заказа, `cost` попадает в
-// `order.delivery_cost`. Живут они внутри JSON-колонки, куда ALTER TABLE не достаёт, поэтому
-// точность здесь держит не тип колонки, а формат значения — та же десятичная строка, что и на проводе.
-export const DeliveryPricingTierSchema = z.object({
-    minSubtotal: NonNegativeMoneySchema,
-    cost: NonNegativeMoneySchema,
-});
-
 export const SettingsSchema = z.object({
     uuid: z.string(),
     language: z.nativeEnum(LanguageEnum),
@@ -176,6 +175,8 @@ export const SettingsSchema = z.object({
 });
 
 export const SettingsForAdminSchema = SettingsSchema.extend({
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum),
     // post terminal settings
     vatTag: z.string().nullable(),
     taxMode: z.string().nullable(),
@@ -273,7 +274,8 @@ export const CreateSettingsSchema = z.object({
     chatNoManagerMode: z.nativeEnum(ChatNoManagerModeEnum).default(ChatNoManagerModeEnum.ANY_MANAGER),
     importantMessage: ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: z.coerce.boolean().optional(),
-    deliveryPricingTiers: z.array(DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum).optional(),
 });
 
 export const UpdateSettingsRequestSchema = z.object({
@@ -355,7 +357,8 @@ export const UpdateSettingsRequestSchema = z.object({
     chatNoManagerMode: z.nativeEnum(ChatNoManagerModeEnum).default(ChatNoManagerModeEnum.ANY_MANAGER).optional(),
     importantMessage: ImportantMessageSchema.nullable().optional(),
     deliveryPricingEnabled: z.coerce.boolean().optional(),
-    deliveryPricingTiers: z.array(DeliveryPricingTierSchema).nullable().optional(),
+    deliveryPricingRules: DeliveryPricingRulesSchema.nullable().optional(),
+    deliveryPricingInTransitMode: z.nativeEnum(DeliveryPricingInTransitModeEnum).optional(),
     employeeClientScopeEnabled: z.coerce.boolean().optional(),
     // post terminal settings
     vatTag: z.string().nullable().optional(),