@deepintel-ltd/farmpro-contracts 1.11.4 → 1.11.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/routes/admin.routes.d.ts +334 -618
- package/dist/routes/admin.routes.d.ts.map +1 -1
- package/dist/routes/admin.routes.js +26 -36
- package/dist/routes/commodity-deals.routes.d.ts +490 -0
- package/dist/routes/commodity-deals.routes.d.ts.map +1 -1
- package/dist/schemas/admin.schemas.d.ts +45 -6
- package/dist/schemas/admin.schemas.d.ts.map +1 -1
- package/dist/schemas/admin.schemas.js +15 -5
- package/dist/schemas/commodity-deals.schemas.d.ts +284 -0
- package/dist/schemas/commodity-deals.schemas.d.ts.map +1 -1
- package/dist/schemas/commodity-deals.schemas.js +18 -0
- package/package.json +1 -1
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
export declare const commodityDealStatusSchema: z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>;
|
|
3
|
+
export declare const companyFeeModeSchema: z.ZodEnum<["percent_of_invoice", "per_kg"]>;
|
|
3
4
|
export declare const dealParticipantShareSchema: z.ZodObject<{
|
|
4
5
|
id: z.ZodOptional<z.ZodString>;
|
|
5
6
|
userId: z.ZodString;
|
|
@@ -35,8 +36,14 @@ export declare const commodityDealComputedSchema: z.ZodObject<{
|
|
|
35
36
|
staffCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
36
37
|
companyNet: z.ZodNullable<z.ZodNumber>;
|
|
37
38
|
netAfterStaff: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
39
|
+
/** @deprecated Use companyFeeAmount; retained as total company keep for KPIs */
|
|
38
40
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
41
|
+
/** Total company keep (= fee + capital return) */
|
|
39
42
|
companyCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
43
|
+
companyFeeAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
44
|
+
companyCapitalReturn: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
45
|
+
companyOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
46
|
+
investorOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
40
47
|
investorPool: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
41
48
|
isRealized: z.ZodBoolean;
|
|
42
49
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -52,6 +59,10 @@ export declare const commodityDealComputedSchema: z.ZodObject<{
|
|
|
52
59
|
staffCommissionAmount?: number | null | undefined;
|
|
53
60
|
netAfterStaff?: number | null | undefined;
|
|
54
61
|
companyCommissionAmount?: number | null | undefined;
|
|
62
|
+
companyFeeAmount?: number | null | undefined;
|
|
63
|
+
companyCapitalReturn?: number | null | undefined;
|
|
64
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
65
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
55
66
|
investorPool?: number | null | undefined;
|
|
56
67
|
}, {
|
|
57
68
|
totalCost: number;
|
|
@@ -66,6 +77,10 @@ export declare const commodityDealComputedSchema: z.ZodObject<{
|
|
|
66
77
|
staffCommissionAmount?: number | null | undefined;
|
|
67
78
|
netAfterStaff?: number | null | undefined;
|
|
68
79
|
companyCommissionAmount?: number | null | undefined;
|
|
80
|
+
companyFeeAmount?: number | null | undefined;
|
|
81
|
+
companyCapitalReturn?: number | null | undefined;
|
|
82
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
83
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
69
84
|
investorPool?: number | null | undefined;
|
|
70
85
|
}>;
|
|
71
86
|
export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
@@ -82,7 +97,12 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
82
97
|
currency: z.ZodDefault<z.ZodString>;
|
|
83
98
|
status: z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>;
|
|
84
99
|
notes: z.ZodNullable<z.ZodString>;
|
|
100
|
+
dealCapital: z.ZodNullable<z.ZodNumber>;
|
|
101
|
+
companyFeeMode: z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
102
|
+
companyFeeValue: z.ZodNullable<z.ZodNumber>;
|
|
103
|
+
/** @deprecated Prefer companyFeeMode/companyFeeValue */
|
|
85
104
|
companyCommissionRate: z.ZodNullable<z.ZodNumber>;
|
|
105
|
+
totalWeightKg: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
86
106
|
participants: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
87
107
|
id: z.ZodOptional<z.ZodString>;
|
|
88
108
|
userId: z.ZodString;
|
|
@@ -118,8 +138,14 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
118
138
|
staffCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
119
139
|
companyNet: z.ZodNullable<z.ZodNumber>;
|
|
120
140
|
netAfterStaff: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
141
|
+
/** @deprecated Use companyFeeAmount; retained as total company keep for KPIs */
|
|
121
142
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
143
|
+
/** Total company keep (= fee + capital return) */
|
|
122
144
|
companyCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
145
|
+
companyFeeAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
146
|
+
companyCapitalReturn: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
147
|
+
companyOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
148
|
+
investorOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
123
149
|
investorPool: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
124
150
|
isRealized: z.ZodBoolean;
|
|
125
151
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -135,6 +161,10 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
135
161
|
staffCommissionAmount?: number | null | undefined;
|
|
136
162
|
netAfterStaff?: number | null | undefined;
|
|
137
163
|
companyCommissionAmount?: number | null | undefined;
|
|
164
|
+
companyFeeAmount?: number | null | undefined;
|
|
165
|
+
companyCapitalReturn?: number | null | undefined;
|
|
166
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
167
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
138
168
|
investorPool?: number | null | undefined;
|
|
139
169
|
}, {
|
|
140
170
|
totalCost: number;
|
|
@@ -149,6 +179,10 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
149
179
|
staffCommissionAmount?: number | null | undefined;
|
|
150
180
|
netAfterStaff?: number | null | undefined;
|
|
151
181
|
companyCommissionAmount?: number | null | undefined;
|
|
182
|
+
companyFeeAmount?: number | null | undefined;
|
|
183
|
+
companyCapitalReturn?: number | null | undefined;
|
|
184
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
185
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
152
186
|
investorPool?: number | null | undefined;
|
|
153
187
|
}>;
|
|
154
188
|
} & {
|
|
@@ -171,6 +205,9 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
171
205
|
waybillId: string;
|
|
172
206
|
invoiceId: string | null;
|
|
173
207
|
handlerUserId: string | null;
|
|
208
|
+
dealCapital: number | null;
|
|
209
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
210
|
+
companyFeeValue: number | null;
|
|
174
211
|
computed: {
|
|
175
212
|
totalCost: number;
|
|
176
213
|
saleAmount: number | null;
|
|
@@ -184,8 +221,13 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
184
221
|
staffCommissionAmount?: number | null | undefined;
|
|
185
222
|
netAfterStaff?: number | null | undefined;
|
|
186
223
|
companyCommissionAmount?: number | null | undefined;
|
|
224
|
+
companyFeeAmount?: number | null | undefined;
|
|
225
|
+
companyCapitalReturn?: number | null | undefined;
|
|
226
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
227
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
187
228
|
investorPool?: number | null | undefined;
|
|
188
229
|
};
|
|
230
|
+
totalWeightKg?: number | null | undefined;
|
|
189
231
|
participants?: {
|
|
190
232
|
userId: string;
|
|
191
233
|
capitalContributed: number;
|
|
@@ -211,6 +253,9 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
211
253
|
waybillId: string;
|
|
212
254
|
invoiceId: string | null;
|
|
213
255
|
handlerUserId: string | null;
|
|
256
|
+
dealCapital: number | null;
|
|
257
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
258
|
+
companyFeeValue: number | null;
|
|
214
259
|
computed: {
|
|
215
260
|
totalCost: number;
|
|
216
261
|
saleAmount: number | null;
|
|
@@ -224,9 +269,14 @@ export declare const commodityDealAttributesSchema: z.ZodObject<{
|
|
|
224
269
|
staffCommissionAmount?: number | null | undefined;
|
|
225
270
|
netAfterStaff?: number | null | undefined;
|
|
226
271
|
companyCommissionAmount?: number | null | undefined;
|
|
272
|
+
companyFeeAmount?: number | null | undefined;
|
|
273
|
+
companyCapitalReturn?: number | null | undefined;
|
|
274
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
275
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
227
276
|
investorPool?: number | null | undefined;
|
|
228
277
|
};
|
|
229
278
|
currency?: string | undefined;
|
|
279
|
+
totalWeightKg?: number | null | undefined;
|
|
230
280
|
participants?: {
|
|
231
281
|
userId: string;
|
|
232
282
|
capitalContributed: number;
|
|
@@ -246,6 +296,9 @@ export declare const createCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
246
296
|
status: z.ZodOptional<z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>>;
|
|
247
297
|
notes: z.ZodOptional<z.ZodString>;
|
|
248
298
|
handlerUserId: z.ZodOptional<z.ZodString>;
|
|
299
|
+
dealCapital: z.ZodOptional<z.ZodNumber>;
|
|
300
|
+
companyFeeMode: z.ZodOptional<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
301
|
+
companyFeeValue: z.ZodOptional<z.ZodNumber>;
|
|
249
302
|
companyCommissionRate: z.ZodOptional<z.ZodNumber>;
|
|
250
303
|
}, "strip", z.ZodTypeAny, {
|
|
251
304
|
currency: string;
|
|
@@ -257,6 +310,9 @@ export declare const createCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
257
310
|
notes?: string | undefined;
|
|
258
311
|
companyCommissionRate?: number | undefined;
|
|
259
312
|
handlerUserId?: string | undefined;
|
|
313
|
+
dealCapital?: number | undefined;
|
|
314
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
315
|
+
companyFeeValue?: number | undefined;
|
|
260
316
|
}, {
|
|
261
317
|
purchaseCost: number;
|
|
262
318
|
waybillId: string;
|
|
@@ -267,6 +323,9 @@ export declare const createCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
267
323
|
companyCommissionRate?: number | undefined;
|
|
268
324
|
miscellaneousCost?: number | undefined;
|
|
269
325
|
handlerUserId?: string | undefined;
|
|
326
|
+
dealCapital?: number | undefined;
|
|
327
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
328
|
+
companyFeeValue?: number | undefined;
|
|
270
329
|
}>;
|
|
271
330
|
export declare const updateCommodityDealAttributesSchema: z.ZodObject<{
|
|
272
331
|
purchaseCost: z.ZodOptional<z.ZodNumber>;
|
|
@@ -277,6 +336,9 @@ export declare const updateCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
277
336
|
notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
|
|
278
337
|
invoiceId: z.ZodOptional<z.ZodString>;
|
|
279
338
|
handlerUserId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
|
|
339
|
+
dealCapital: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
340
|
+
companyFeeMode: z.ZodOptional<z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>>;
|
|
341
|
+
companyFeeValue: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
280
342
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
281
343
|
}, "strip", z.ZodTypeAny, {
|
|
282
344
|
status?: "cancelled" | "paid" | "draft" | "in_transit" | "invoiced" | undefined;
|
|
@@ -288,6 +350,9 @@ export declare const updateCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
288
350
|
miscellaneousCost?: number | undefined;
|
|
289
351
|
invoiceId?: string | undefined;
|
|
290
352
|
handlerUserId?: string | null | undefined;
|
|
353
|
+
dealCapital?: number | null | undefined;
|
|
354
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
355
|
+
companyFeeValue?: number | null | undefined;
|
|
291
356
|
}, {
|
|
292
357
|
status?: "cancelled" | "paid" | "draft" | "in_transit" | "invoiced" | undefined;
|
|
293
358
|
currency?: string | undefined;
|
|
@@ -298,6 +363,9 @@ export declare const updateCommodityDealAttributesSchema: z.ZodObject<{
|
|
|
298
363
|
miscellaneousCost?: number | undefined;
|
|
299
364
|
invoiceId?: string | undefined;
|
|
300
365
|
handlerUserId?: string | null | undefined;
|
|
366
|
+
dealCapital?: number | null | undefined;
|
|
367
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
368
|
+
companyFeeValue?: number | null | undefined;
|
|
301
369
|
}>;
|
|
302
370
|
export declare const createCommodityDealSchema: z.ZodObject<{
|
|
303
371
|
type: z.ZodLiteral<"commodity-deals">;
|
|
@@ -310,6 +378,9 @@ export declare const createCommodityDealSchema: z.ZodObject<{
|
|
|
310
378
|
status: z.ZodOptional<z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>>;
|
|
311
379
|
notes: z.ZodOptional<z.ZodString>;
|
|
312
380
|
handlerUserId: z.ZodOptional<z.ZodString>;
|
|
381
|
+
dealCapital: z.ZodOptional<z.ZodNumber>;
|
|
382
|
+
companyFeeMode: z.ZodOptional<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
383
|
+
companyFeeValue: z.ZodOptional<z.ZodNumber>;
|
|
313
384
|
companyCommissionRate: z.ZodOptional<z.ZodNumber>;
|
|
314
385
|
}, "strip", z.ZodTypeAny, {
|
|
315
386
|
currency: string;
|
|
@@ -321,6 +392,9 @@ export declare const createCommodityDealSchema: z.ZodObject<{
|
|
|
321
392
|
notes?: string | undefined;
|
|
322
393
|
companyCommissionRate?: number | undefined;
|
|
323
394
|
handlerUserId?: string | undefined;
|
|
395
|
+
dealCapital?: number | undefined;
|
|
396
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
397
|
+
companyFeeValue?: number | undefined;
|
|
324
398
|
}, {
|
|
325
399
|
purchaseCost: number;
|
|
326
400
|
waybillId: string;
|
|
@@ -331,6 +405,9 @@ export declare const createCommodityDealSchema: z.ZodObject<{
|
|
|
331
405
|
companyCommissionRate?: number | undefined;
|
|
332
406
|
miscellaneousCost?: number | undefined;
|
|
333
407
|
handlerUserId?: string | undefined;
|
|
408
|
+
dealCapital?: number | undefined;
|
|
409
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
410
|
+
companyFeeValue?: number | undefined;
|
|
334
411
|
}>;
|
|
335
412
|
}, "strip", z.ZodTypeAny, {
|
|
336
413
|
type: "commodity-deals";
|
|
@@ -344,6 +421,9 @@ export declare const createCommodityDealSchema: z.ZodObject<{
|
|
|
344
421
|
notes?: string | undefined;
|
|
345
422
|
companyCommissionRate?: number | undefined;
|
|
346
423
|
handlerUserId?: string | undefined;
|
|
424
|
+
dealCapital?: number | undefined;
|
|
425
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
426
|
+
companyFeeValue?: number | undefined;
|
|
347
427
|
};
|
|
348
428
|
}, {
|
|
349
429
|
type: "commodity-deals";
|
|
@@ -357,6 +437,9 @@ export declare const createCommodityDealSchema: z.ZodObject<{
|
|
|
357
437
|
companyCommissionRate?: number | undefined;
|
|
358
438
|
miscellaneousCost?: number | undefined;
|
|
359
439
|
handlerUserId?: string | undefined;
|
|
440
|
+
dealCapital?: number | undefined;
|
|
441
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | undefined;
|
|
442
|
+
companyFeeValue?: number | undefined;
|
|
360
443
|
};
|
|
361
444
|
}>;
|
|
362
445
|
export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
@@ -371,6 +454,9 @@ export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
|
371
454
|
notes: z.ZodOptional<z.ZodNullable<z.ZodString>>;
|
|
372
455
|
invoiceId: z.ZodOptional<z.ZodString>;
|
|
373
456
|
handlerUserId: z.ZodOptional<z.ZodNullable<z.ZodString>>;
|
|
457
|
+
dealCapital: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
458
|
+
companyFeeMode: z.ZodOptional<z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>>;
|
|
459
|
+
companyFeeValue: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
374
460
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
375
461
|
}, "strip", z.ZodTypeAny, {
|
|
376
462
|
status?: "cancelled" | "paid" | "draft" | "in_transit" | "invoiced" | undefined;
|
|
@@ -382,6 +468,9 @@ export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
|
382
468
|
miscellaneousCost?: number | undefined;
|
|
383
469
|
invoiceId?: string | undefined;
|
|
384
470
|
handlerUserId?: string | null | undefined;
|
|
471
|
+
dealCapital?: number | null | undefined;
|
|
472
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
473
|
+
companyFeeValue?: number | null | undefined;
|
|
385
474
|
}, {
|
|
386
475
|
status?: "cancelled" | "paid" | "draft" | "in_transit" | "invoiced" | undefined;
|
|
387
476
|
currency?: string | undefined;
|
|
@@ -392,6 +481,9 @@ export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
|
392
481
|
miscellaneousCost?: number | undefined;
|
|
393
482
|
invoiceId?: string | undefined;
|
|
394
483
|
handlerUserId?: string | null | undefined;
|
|
484
|
+
dealCapital?: number | null | undefined;
|
|
485
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
486
|
+
companyFeeValue?: number | null | undefined;
|
|
395
487
|
}>;
|
|
396
488
|
}, "strip", z.ZodTypeAny, {
|
|
397
489
|
type: "commodity-deals";
|
|
@@ -405,6 +497,9 @@ export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
|
405
497
|
miscellaneousCost?: number | undefined;
|
|
406
498
|
invoiceId?: string | undefined;
|
|
407
499
|
handlerUserId?: string | null | undefined;
|
|
500
|
+
dealCapital?: number | null | undefined;
|
|
501
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
502
|
+
companyFeeValue?: number | null | undefined;
|
|
408
503
|
};
|
|
409
504
|
id?: string | undefined;
|
|
410
505
|
}, {
|
|
@@ -419,6 +514,9 @@ export declare const updateCommodityDealSchema: z.ZodObject<{
|
|
|
419
514
|
miscellaneousCost?: number | undefined;
|
|
420
515
|
invoiceId?: string | undefined;
|
|
421
516
|
handlerUserId?: string | null | undefined;
|
|
517
|
+
dealCapital?: number | null | undefined;
|
|
518
|
+
companyFeeMode?: "percent_of_invoice" | "per_kg" | null | undefined;
|
|
519
|
+
companyFeeValue?: number | null | undefined;
|
|
422
520
|
};
|
|
423
521
|
id?: string | undefined;
|
|
424
522
|
}>;
|
|
@@ -504,7 +602,12 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
504
602
|
currency: z.ZodDefault<z.ZodString>;
|
|
505
603
|
status: z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>;
|
|
506
604
|
notes: z.ZodNullable<z.ZodString>;
|
|
605
|
+
dealCapital: z.ZodNullable<z.ZodNumber>;
|
|
606
|
+
companyFeeMode: z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
607
|
+
companyFeeValue: z.ZodNullable<z.ZodNumber>;
|
|
608
|
+
/** @deprecated Prefer companyFeeMode/companyFeeValue */
|
|
507
609
|
companyCommissionRate: z.ZodNullable<z.ZodNumber>;
|
|
610
|
+
totalWeightKg: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
508
611
|
participants: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
509
612
|
id: z.ZodOptional<z.ZodString>;
|
|
510
613
|
userId: z.ZodString;
|
|
@@ -540,8 +643,14 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
540
643
|
staffCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
541
644
|
companyNet: z.ZodNullable<z.ZodNumber>;
|
|
542
645
|
netAfterStaff: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
646
|
+
/** @deprecated Use companyFeeAmount; retained as total company keep for KPIs */
|
|
543
647
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
648
|
+
/** Total company keep (= fee + capital return) */
|
|
544
649
|
companyCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
650
|
+
companyFeeAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
651
|
+
companyCapitalReturn: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
652
|
+
companyOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
653
|
+
investorOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
545
654
|
investorPool: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
546
655
|
isRealized: z.ZodBoolean;
|
|
547
656
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -557,6 +666,10 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
557
666
|
staffCommissionAmount?: number | null | undefined;
|
|
558
667
|
netAfterStaff?: number | null | undefined;
|
|
559
668
|
companyCommissionAmount?: number | null | undefined;
|
|
669
|
+
companyFeeAmount?: number | null | undefined;
|
|
670
|
+
companyCapitalReturn?: number | null | undefined;
|
|
671
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
672
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
560
673
|
investorPool?: number | null | undefined;
|
|
561
674
|
}, {
|
|
562
675
|
totalCost: number;
|
|
@@ -571,6 +684,10 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
571
684
|
staffCommissionAmount?: number | null | undefined;
|
|
572
685
|
netAfterStaff?: number | null | undefined;
|
|
573
686
|
companyCommissionAmount?: number | null | undefined;
|
|
687
|
+
companyFeeAmount?: number | null | undefined;
|
|
688
|
+
companyCapitalReturn?: number | null | undefined;
|
|
689
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
690
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
574
691
|
investorPool?: number | null | undefined;
|
|
575
692
|
}>;
|
|
576
693
|
} & {
|
|
@@ -593,6 +710,9 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
593
710
|
waybillId: string;
|
|
594
711
|
invoiceId: string | null;
|
|
595
712
|
handlerUserId: string | null;
|
|
713
|
+
dealCapital: number | null;
|
|
714
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
715
|
+
companyFeeValue: number | null;
|
|
596
716
|
computed: {
|
|
597
717
|
totalCost: number;
|
|
598
718
|
saleAmount: number | null;
|
|
@@ -606,8 +726,13 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
606
726
|
staffCommissionAmount?: number | null | undefined;
|
|
607
727
|
netAfterStaff?: number | null | undefined;
|
|
608
728
|
companyCommissionAmount?: number | null | undefined;
|
|
729
|
+
companyFeeAmount?: number | null | undefined;
|
|
730
|
+
companyCapitalReturn?: number | null | undefined;
|
|
731
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
732
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
609
733
|
investorPool?: number | null | undefined;
|
|
610
734
|
};
|
|
735
|
+
totalWeightKg?: number | null | undefined;
|
|
611
736
|
participants?: {
|
|
612
737
|
userId: string;
|
|
613
738
|
capitalContributed: number;
|
|
@@ -633,6 +758,9 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
633
758
|
waybillId: string;
|
|
634
759
|
invoiceId: string | null;
|
|
635
760
|
handlerUserId: string | null;
|
|
761
|
+
dealCapital: number | null;
|
|
762
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
763
|
+
companyFeeValue: number | null;
|
|
636
764
|
computed: {
|
|
637
765
|
totalCost: number;
|
|
638
766
|
saleAmount: number | null;
|
|
@@ -646,9 +774,14 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
646
774
|
staffCommissionAmount?: number | null | undefined;
|
|
647
775
|
netAfterStaff?: number | null | undefined;
|
|
648
776
|
companyCommissionAmount?: number | null | undefined;
|
|
777
|
+
companyFeeAmount?: number | null | undefined;
|
|
778
|
+
companyCapitalReturn?: number | null | undefined;
|
|
779
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
780
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
649
781
|
investorPool?: number | null | undefined;
|
|
650
782
|
};
|
|
651
783
|
currency?: string | undefined;
|
|
784
|
+
totalWeightKg?: number | null | undefined;
|
|
652
785
|
participants?: {
|
|
653
786
|
userId: string;
|
|
654
787
|
capitalContributed: number;
|
|
@@ -682,6 +815,9 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
682
815
|
waybillId: string;
|
|
683
816
|
invoiceId: string | null;
|
|
684
817
|
handlerUserId: string | null;
|
|
818
|
+
dealCapital: number | null;
|
|
819
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
820
|
+
companyFeeValue: number | null;
|
|
685
821
|
computed: {
|
|
686
822
|
totalCost: number;
|
|
687
823
|
saleAmount: number | null;
|
|
@@ -695,8 +831,13 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
695
831
|
staffCommissionAmount?: number | null | undefined;
|
|
696
832
|
netAfterStaff?: number | null | undefined;
|
|
697
833
|
companyCommissionAmount?: number | null | undefined;
|
|
834
|
+
companyFeeAmount?: number | null | undefined;
|
|
835
|
+
companyCapitalReturn?: number | null | undefined;
|
|
836
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
837
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
698
838
|
investorPool?: number | null | undefined;
|
|
699
839
|
};
|
|
840
|
+
totalWeightKg?: number | null | undefined;
|
|
700
841
|
participants?: {
|
|
701
842
|
userId: string;
|
|
702
843
|
capitalContributed: number;
|
|
@@ -729,6 +870,9 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
729
870
|
waybillId: string;
|
|
730
871
|
invoiceId: string | null;
|
|
731
872
|
handlerUserId: string | null;
|
|
873
|
+
dealCapital: number | null;
|
|
874
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
875
|
+
companyFeeValue: number | null;
|
|
732
876
|
computed: {
|
|
733
877
|
totalCost: number;
|
|
734
878
|
saleAmount: number | null;
|
|
@@ -742,9 +886,14 @@ export declare const commodityDealResourceSchema: z.ZodObject<{
|
|
|
742
886
|
staffCommissionAmount?: number | null | undefined;
|
|
743
887
|
netAfterStaff?: number | null | undefined;
|
|
744
888
|
companyCommissionAmount?: number | null | undefined;
|
|
889
|
+
companyFeeAmount?: number | null | undefined;
|
|
890
|
+
companyCapitalReturn?: number | null | undefined;
|
|
891
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
892
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
745
893
|
investorPool?: number | null | undefined;
|
|
746
894
|
};
|
|
747
895
|
currency?: string | undefined;
|
|
896
|
+
totalWeightKg?: number | null | undefined;
|
|
748
897
|
participants?: {
|
|
749
898
|
userId: string;
|
|
750
899
|
capitalContributed: number;
|
|
@@ -777,7 +926,12 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
777
926
|
currency: z.ZodDefault<z.ZodString>;
|
|
778
927
|
status: z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>;
|
|
779
928
|
notes: z.ZodNullable<z.ZodString>;
|
|
929
|
+
dealCapital: z.ZodNullable<z.ZodNumber>;
|
|
930
|
+
companyFeeMode: z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
931
|
+
companyFeeValue: z.ZodNullable<z.ZodNumber>;
|
|
932
|
+
/** @deprecated Prefer companyFeeMode/companyFeeValue */
|
|
780
933
|
companyCommissionRate: z.ZodNullable<z.ZodNumber>;
|
|
934
|
+
totalWeightKg: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
781
935
|
participants: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
782
936
|
id: z.ZodOptional<z.ZodString>;
|
|
783
937
|
userId: z.ZodString;
|
|
@@ -813,8 +967,14 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
813
967
|
staffCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
814
968
|
companyNet: z.ZodNullable<z.ZodNumber>;
|
|
815
969
|
netAfterStaff: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
970
|
+
/** @deprecated Use companyFeeAmount; retained as total company keep for KPIs */
|
|
816
971
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
972
|
+
/** Total company keep (= fee + capital return) */
|
|
817
973
|
companyCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
974
|
+
companyFeeAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
975
|
+
companyCapitalReturn: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
976
|
+
companyOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
977
|
+
investorOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
818
978
|
investorPool: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
819
979
|
isRealized: z.ZodBoolean;
|
|
820
980
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -830,6 +990,10 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
830
990
|
staffCommissionAmount?: number | null | undefined;
|
|
831
991
|
netAfterStaff?: number | null | undefined;
|
|
832
992
|
companyCommissionAmount?: number | null | undefined;
|
|
993
|
+
companyFeeAmount?: number | null | undefined;
|
|
994
|
+
companyCapitalReturn?: number | null | undefined;
|
|
995
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
996
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
833
997
|
investorPool?: number | null | undefined;
|
|
834
998
|
}, {
|
|
835
999
|
totalCost: number;
|
|
@@ -844,6 +1008,10 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
844
1008
|
staffCommissionAmount?: number | null | undefined;
|
|
845
1009
|
netAfterStaff?: number | null | undefined;
|
|
846
1010
|
companyCommissionAmount?: number | null | undefined;
|
|
1011
|
+
companyFeeAmount?: number | null | undefined;
|
|
1012
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1013
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1014
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
847
1015
|
investorPool?: number | null | undefined;
|
|
848
1016
|
}>;
|
|
849
1017
|
} & {
|
|
@@ -866,6 +1034,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
866
1034
|
waybillId: string;
|
|
867
1035
|
invoiceId: string | null;
|
|
868
1036
|
handlerUserId: string | null;
|
|
1037
|
+
dealCapital: number | null;
|
|
1038
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1039
|
+
companyFeeValue: number | null;
|
|
869
1040
|
computed: {
|
|
870
1041
|
totalCost: number;
|
|
871
1042
|
saleAmount: number | null;
|
|
@@ -879,8 +1050,13 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
879
1050
|
staffCommissionAmount?: number | null | undefined;
|
|
880
1051
|
netAfterStaff?: number | null | undefined;
|
|
881
1052
|
companyCommissionAmount?: number | null | undefined;
|
|
1053
|
+
companyFeeAmount?: number | null | undefined;
|
|
1054
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1055
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1056
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
882
1057
|
investorPool?: number | null | undefined;
|
|
883
1058
|
};
|
|
1059
|
+
totalWeightKg?: number | null | undefined;
|
|
884
1060
|
participants?: {
|
|
885
1061
|
userId: string;
|
|
886
1062
|
capitalContributed: number;
|
|
@@ -906,6 +1082,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
906
1082
|
waybillId: string;
|
|
907
1083
|
invoiceId: string | null;
|
|
908
1084
|
handlerUserId: string | null;
|
|
1085
|
+
dealCapital: number | null;
|
|
1086
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1087
|
+
companyFeeValue: number | null;
|
|
909
1088
|
computed: {
|
|
910
1089
|
totalCost: number;
|
|
911
1090
|
saleAmount: number | null;
|
|
@@ -919,9 +1098,14 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
919
1098
|
staffCommissionAmount?: number | null | undefined;
|
|
920
1099
|
netAfterStaff?: number | null | undefined;
|
|
921
1100
|
companyCommissionAmount?: number | null | undefined;
|
|
1101
|
+
companyFeeAmount?: number | null | undefined;
|
|
1102
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1103
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1104
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
922
1105
|
investorPool?: number | null | undefined;
|
|
923
1106
|
};
|
|
924
1107
|
currency?: string | undefined;
|
|
1108
|
+
totalWeightKg?: number | null | undefined;
|
|
925
1109
|
participants?: {
|
|
926
1110
|
userId: string;
|
|
927
1111
|
capitalContributed: number;
|
|
@@ -955,6 +1139,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
955
1139
|
waybillId: string;
|
|
956
1140
|
invoiceId: string | null;
|
|
957
1141
|
handlerUserId: string | null;
|
|
1142
|
+
dealCapital: number | null;
|
|
1143
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1144
|
+
companyFeeValue: number | null;
|
|
958
1145
|
computed: {
|
|
959
1146
|
totalCost: number;
|
|
960
1147
|
saleAmount: number | null;
|
|
@@ -968,8 +1155,13 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
968
1155
|
staffCommissionAmount?: number | null | undefined;
|
|
969
1156
|
netAfterStaff?: number | null | undefined;
|
|
970
1157
|
companyCommissionAmount?: number | null | undefined;
|
|
1158
|
+
companyFeeAmount?: number | null | undefined;
|
|
1159
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1160
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1161
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
971
1162
|
investorPool?: number | null | undefined;
|
|
972
1163
|
};
|
|
1164
|
+
totalWeightKg?: number | null | undefined;
|
|
973
1165
|
participants?: {
|
|
974
1166
|
userId: string;
|
|
975
1167
|
capitalContributed: number;
|
|
@@ -1002,6 +1194,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1002
1194
|
waybillId: string;
|
|
1003
1195
|
invoiceId: string | null;
|
|
1004
1196
|
handlerUserId: string | null;
|
|
1197
|
+
dealCapital: number | null;
|
|
1198
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1199
|
+
companyFeeValue: number | null;
|
|
1005
1200
|
computed: {
|
|
1006
1201
|
totalCost: number;
|
|
1007
1202
|
saleAmount: number | null;
|
|
@@ -1015,9 +1210,14 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1015
1210
|
staffCommissionAmount?: number | null | undefined;
|
|
1016
1211
|
netAfterStaff?: number | null | undefined;
|
|
1017
1212
|
companyCommissionAmount?: number | null | undefined;
|
|
1213
|
+
companyFeeAmount?: number | null | undefined;
|
|
1214
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1215
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1216
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1018
1217
|
investorPool?: number | null | undefined;
|
|
1019
1218
|
};
|
|
1020
1219
|
currency?: string | undefined;
|
|
1220
|
+
totalWeightKg?: number | null | undefined;
|
|
1021
1221
|
participants?: {
|
|
1022
1222
|
userId: string;
|
|
1023
1223
|
capitalContributed: number;
|
|
@@ -1077,6 +1277,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1077
1277
|
waybillId: string;
|
|
1078
1278
|
invoiceId: string | null;
|
|
1079
1279
|
handlerUserId: string | null;
|
|
1280
|
+
dealCapital: number | null;
|
|
1281
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1282
|
+
companyFeeValue: number | null;
|
|
1080
1283
|
computed: {
|
|
1081
1284
|
totalCost: number;
|
|
1082
1285
|
saleAmount: number | null;
|
|
@@ -1090,8 +1293,13 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1090
1293
|
staffCommissionAmount?: number | null | undefined;
|
|
1091
1294
|
netAfterStaff?: number | null | undefined;
|
|
1092
1295
|
companyCommissionAmount?: number | null | undefined;
|
|
1296
|
+
companyFeeAmount?: number | null | undefined;
|
|
1297
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1298
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1299
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1093
1300
|
investorPool?: number | null | undefined;
|
|
1094
1301
|
};
|
|
1302
|
+
totalWeightKg?: number | null | undefined;
|
|
1095
1303
|
participants?: {
|
|
1096
1304
|
userId: string;
|
|
1097
1305
|
capitalContributed: number;
|
|
@@ -1136,6 +1344,9 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1136
1344
|
waybillId: string;
|
|
1137
1345
|
invoiceId: string | null;
|
|
1138
1346
|
handlerUserId: string | null;
|
|
1347
|
+
dealCapital: number | null;
|
|
1348
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1349
|
+
companyFeeValue: number | null;
|
|
1139
1350
|
computed: {
|
|
1140
1351
|
totalCost: number;
|
|
1141
1352
|
saleAmount: number | null;
|
|
@@ -1149,9 +1360,14 @@ export declare const commodityDealResponseSchema: z.ZodObject<{
|
|
|
1149
1360
|
staffCommissionAmount?: number | null | undefined;
|
|
1150
1361
|
netAfterStaff?: number | null | undefined;
|
|
1151
1362
|
companyCommissionAmount?: number | null | undefined;
|
|
1363
|
+
companyFeeAmount?: number | null | undefined;
|
|
1364
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1365
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1366
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1152
1367
|
investorPool?: number | null | undefined;
|
|
1153
1368
|
};
|
|
1154
1369
|
currency?: string | undefined;
|
|
1370
|
+
totalWeightKg?: number | null | undefined;
|
|
1155
1371
|
participants?: {
|
|
1156
1372
|
userId: string;
|
|
1157
1373
|
capitalContributed: number;
|
|
@@ -1195,7 +1411,12 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1195
1411
|
currency: z.ZodDefault<z.ZodString>;
|
|
1196
1412
|
status: z.ZodEnum<["draft", "in_transit", "invoiced", "paid", "cancelled"]>;
|
|
1197
1413
|
notes: z.ZodNullable<z.ZodString>;
|
|
1414
|
+
dealCapital: z.ZodNullable<z.ZodNumber>;
|
|
1415
|
+
companyFeeMode: z.ZodNullable<z.ZodEnum<["percent_of_invoice", "per_kg"]>>;
|
|
1416
|
+
companyFeeValue: z.ZodNullable<z.ZodNumber>;
|
|
1417
|
+
/** @deprecated Prefer companyFeeMode/companyFeeValue */
|
|
1198
1418
|
companyCommissionRate: z.ZodNullable<z.ZodNumber>;
|
|
1419
|
+
totalWeightKg: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1199
1420
|
participants: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
1200
1421
|
id: z.ZodOptional<z.ZodString>;
|
|
1201
1422
|
userId: z.ZodString;
|
|
@@ -1231,8 +1452,14 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1231
1452
|
staffCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1232
1453
|
companyNet: z.ZodNullable<z.ZodNumber>;
|
|
1233
1454
|
netAfterStaff: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1455
|
+
/** @deprecated Use companyFeeAmount; retained as total company keep for KPIs */
|
|
1234
1456
|
companyCommissionRate: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1457
|
+
/** Total company keep (= fee + capital return) */
|
|
1235
1458
|
companyCommissionAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1459
|
+
companyFeeAmount: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1460
|
+
companyCapitalReturn: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1461
|
+
companyOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1462
|
+
investorOwnershipPercent: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1236
1463
|
investorPool: z.ZodOptional<z.ZodNullable<z.ZodNumber>>;
|
|
1237
1464
|
isRealized: z.ZodBoolean;
|
|
1238
1465
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -1248,6 +1475,10 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1248
1475
|
staffCommissionAmount?: number | null | undefined;
|
|
1249
1476
|
netAfterStaff?: number | null | undefined;
|
|
1250
1477
|
companyCommissionAmount?: number | null | undefined;
|
|
1478
|
+
companyFeeAmount?: number | null | undefined;
|
|
1479
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1480
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1481
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1251
1482
|
investorPool?: number | null | undefined;
|
|
1252
1483
|
}, {
|
|
1253
1484
|
totalCost: number;
|
|
@@ -1262,6 +1493,10 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1262
1493
|
staffCommissionAmount?: number | null | undefined;
|
|
1263
1494
|
netAfterStaff?: number | null | undefined;
|
|
1264
1495
|
companyCommissionAmount?: number | null | undefined;
|
|
1496
|
+
companyFeeAmount?: number | null | undefined;
|
|
1497
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1498
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1499
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1265
1500
|
investorPool?: number | null | undefined;
|
|
1266
1501
|
}>;
|
|
1267
1502
|
} & {
|
|
@@ -1284,6 +1519,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1284
1519
|
waybillId: string;
|
|
1285
1520
|
invoiceId: string | null;
|
|
1286
1521
|
handlerUserId: string | null;
|
|
1522
|
+
dealCapital: number | null;
|
|
1523
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1524
|
+
companyFeeValue: number | null;
|
|
1287
1525
|
computed: {
|
|
1288
1526
|
totalCost: number;
|
|
1289
1527
|
saleAmount: number | null;
|
|
@@ -1297,8 +1535,13 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1297
1535
|
staffCommissionAmount?: number | null | undefined;
|
|
1298
1536
|
netAfterStaff?: number | null | undefined;
|
|
1299
1537
|
companyCommissionAmount?: number | null | undefined;
|
|
1538
|
+
companyFeeAmount?: number | null | undefined;
|
|
1539
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1540
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1541
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1300
1542
|
investorPool?: number | null | undefined;
|
|
1301
1543
|
};
|
|
1544
|
+
totalWeightKg?: number | null | undefined;
|
|
1302
1545
|
participants?: {
|
|
1303
1546
|
userId: string;
|
|
1304
1547
|
capitalContributed: number;
|
|
@@ -1324,6 +1567,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1324
1567
|
waybillId: string;
|
|
1325
1568
|
invoiceId: string | null;
|
|
1326
1569
|
handlerUserId: string | null;
|
|
1570
|
+
dealCapital: number | null;
|
|
1571
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1572
|
+
companyFeeValue: number | null;
|
|
1327
1573
|
computed: {
|
|
1328
1574
|
totalCost: number;
|
|
1329
1575
|
saleAmount: number | null;
|
|
@@ -1337,9 +1583,14 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1337
1583
|
staffCommissionAmount?: number | null | undefined;
|
|
1338
1584
|
netAfterStaff?: number | null | undefined;
|
|
1339
1585
|
companyCommissionAmount?: number | null | undefined;
|
|
1586
|
+
companyFeeAmount?: number | null | undefined;
|
|
1587
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1588
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1589
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1340
1590
|
investorPool?: number | null | undefined;
|
|
1341
1591
|
};
|
|
1342
1592
|
currency?: string | undefined;
|
|
1593
|
+
totalWeightKg?: number | null | undefined;
|
|
1343
1594
|
participants?: {
|
|
1344
1595
|
userId: string;
|
|
1345
1596
|
capitalContributed: number;
|
|
@@ -1373,6 +1624,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1373
1624
|
waybillId: string;
|
|
1374
1625
|
invoiceId: string | null;
|
|
1375
1626
|
handlerUserId: string | null;
|
|
1627
|
+
dealCapital: number | null;
|
|
1628
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1629
|
+
companyFeeValue: number | null;
|
|
1376
1630
|
computed: {
|
|
1377
1631
|
totalCost: number;
|
|
1378
1632
|
saleAmount: number | null;
|
|
@@ -1386,8 +1640,13 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1386
1640
|
staffCommissionAmount?: number | null | undefined;
|
|
1387
1641
|
netAfterStaff?: number | null | undefined;
|
|
1388
1642
|
companyCommissionAmount?: number | null | undefined;
|
|
1643
|
+
companyFeeAmount?: number | null | undefined;
|
|
1644
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1645
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1646
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1389
1647
|
investorPool?: number | null | undefined;
|
|
1390
1648
|
};
|
|
1649
|
+
totalWeightKg?: number | null | undefined;
|
|
1391
1650
|
participants?: {
|
|
1392
1651
|
userId: string;
|
|
1393
1652
|
capitalContributed: number;
|
|
@@ -1420,6 +1679,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1420
1679
|
waybillId: string;
|
|
1421
1680
|
invoiceId: string | null;
|
|
1422
1681
|
handlerUserId: string | null;
|
|
1682
|
+
dealCapital: number | null;
|
|
1683
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1684
|
+
companyFeeValue: number | null;
|
|
1423
1685
|
computed: {
|
|
1424
1686
|
totalCost: number;
|
|
1425
1687
|
saleAmount: number | null;
|
|
@@ -1433,9 +1695,14 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1433
1695
|
staffCommissionAmount?: number | null | undefined;
|
|
1434
1696
|
netAfterStaff?: number | null | undefined;
|
|
1435
1697
|
companyCommissionAmount?: number | null | undefined;
|
|
1698
|
+
companyFeeAmount?: number | null | undefined;
|
|
1699
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1700
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1701
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1436
1702
|
investorPool?: number | null | undefined;
|
|
1437
1703
|
};
|
|
1438
1704
|
currency?: string | undefined;
|
|
1705
|
+
totalWeightKg?: number | null | undefined;
|
|
1439
1706
|
participants?: {
|
|
1440
1707
|
userId: string;
|
|
1441
1708
|
capitalContributed: number;
|
|
@@ -1495,6 +1762,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1495
1762
|
waybillId: string;
|
|
1496
1763
|
invoiceId: string | null;
|
|
1497
1764
|
handlerUserId: string | null;
|
|
1765
|
+
dealCapital: number | null;
|
|
1766
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1767
|
+
companyFeeValue: number | null;
|
|
1498
1768
|
computed: {
|
|
1499
1769
|
totalCost: number;
|
|
1500
1770
|
saleAmount: number | null;
|
|
@@ -1508,8 +1778,13 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1508
1778
|
staffCommissionAmount?: number | null | undefined;
|
|
1509
1779
|
netAfterStaff?: number | null | undefined;
|
|
1510
1780
|
companyCommissionAmount?: number | null | undefined;
|
|
1781
|
+
companyFeeAmount?: number | null | undefined;
|
|
1782
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1783
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1784
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1511
1785
|
investorPool?: number | null | undefined;
|
|
1512
1786
|
};
|
|
1787
|
+
totalWeightKg?: number | null | undefined;
|
|
1513
1788
|
participants?: {
|
|
1514
1789
|
userId: string;
|
|
1515
1790
|
capitalContributed: number;
|
|
@@ -1554,6 +1829,9 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1554
1829
|
waybillId: string;
|
|
1555
1830
|
invoiceId: string | null;
|
|
1556
1831
|
handlerUserId: string | null;
|
|
1832
|
+
dealCapital: number | null;
|
|
1833
|
+
companyFeeMode: "percent_of_invoice" | "per_kg" | null;
|
|
1834
|
+
companyFeeValue: number | null;
|
|
1557
1835
|
computed: {
|
|
1558
1836
|
totalCost: number;
|
|
1559
1837
|
saleAmount: number | null;
|
|
@@ -1567,9 +1845,14 @@ export declare const commodityDealListResponseSchema: z.ZodObject<{
|
|
|
1567
1845
|
staffCommissionAmount?: number | null | undefined;
|
|
1568
1846
|
netAfterStaff?: number | null | undefined;
|
|
1569
1847
|
companyCommissionAmount?: number | null | undefined;
|
|
1848
|
+
companyFeeAmount?: number | null | undefined;
|
|
1849
|
+
companyCapitalReturn?: number | null | undefined;
|
|
1850
|
+
companyOwnershipPercent?: number | null | undefined;
|
|
1851
|
+
investorOwnershipPercent?: number | null | undefined;
|
|
1570
1852
|
investorPool?: number | null | undefined;
|
|
1571
1853
|
};
|
|
1572
1854
|
currency?: string | undefined;
|
|
1855
|
+
totalWeightKg?: number | null | undefined;
|
|
1573
1856
|
participants?: {
|
|
1574
1857
|
userId: string;
|
|
1575
1858
|
capitalContributed: number;
|
|
@@ -1787,6 +2070,7 @@ export declare const myEarningsResponseSchema: z.ZodObject<{
|
|
|
1787
2070
|
};
|
|
1788
2071
|
};
|
|
1789
2072
|
}>;
|
|
2073
|
+
export type CompanyFeeMode = z.infer<typeof companyFeeModeSchema>;
|
|
1790
2074
|
export type CommodityDealStatus = z.infer<typeof commodityDealStatusSchema>;
|
|
1791
2075
|
export type CommodityDealComputed = z.infer<typeof commodityDealComputedSchema>;
|
|
1792
2076
|
export type CreateCommodityDealAttributes = z.infer<typeof createCommodityDealAttributesSchema>;
|