@mercurjs/core 2.2.0-canary.37 → 2.2.0-canary.39
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/.medusa/server/src/api/admin/collections/validators.d.ts +2 -2
- package/.medusa/server/src/api/admin/commission-rates/validators.d.ts +8 -8
- package/.medusa/server/src/api/admin/offers/middlewares.js +3 -1
- package/.medusa/server/src/api/admin/offers/query-config.js +2 -1
- package/.medusa/server/src/api/admin/offers/validators.d.ts +56 -36
- package/.medusa/server/src/api/admin/offers/validators.js +8 -1
- package/.medusa/server/src/api/admin/order-groups/helpers.d.ts +2 -0
- package/.medusa/server/src/api/admin/order-groups/helpers.js +53 -0
- package/.medusa/server/src/api/admin/order-groups/middlewares.js +3 -3
- package/.medusa/server/src/api/admin/order-groups/route.js +4 -2
- package/.medusa/server/src/api/admin/order-groups/validators.d.ts +2 -5
- package/.medusa/server/src/api/admin/order-groups/validators.js +1 -2
- package/.medusa/server/src/api/admin/product-attributes/validators.d.ts +28 -28
- package/.medusa/server/src/api/admin/product-categories/validators.d.ts +4 -4
- package/.medusa/server/src/api/admin/products/[id]/route.js +2 -2
- package/.medusa/server/src/api/admin/products/validators.d.ts +53 -49
- package/.medusa/server/src/api/admin/products/validators.js +4 -2
- package/.medusa/server/src/api/admin/sellers/validators.d.ts +2 -2
- package/.medusa/server/src/api/store/offers/validators.d.ts +4 -4
- package/.medusa/server/src/api/utils/offers.d.ts +1 -0
- package/.medusa/server/src/api/utils/offers.js +50 -2
- package/.medusa/server/src/api/vendor/collections/validators.d.ts +2 -2
- package/.medusa/server/src/api/vendor/inventory-items/validators.d.ts +4 -4
- package/.medusa/server/src/api/vendor/middlewares.js +51 -53
- package/.medusa/server/src/api/vendor/offers/validators.d.ts +24 -24
- package/.medusa/server/src/api/vendor/orders/middlewares.js +1 -3
- package/.medusa/server/src/api/vendor/orders/validators.d.ts +0 -3
- package/.medusa/server/src/api/vendor/orders/validators.js +1 -7
- package/.medusa/server/src/api/vendor/price-lists/validators.d.ts +10 -10
- package/.medusa/server/src/api/vendor/product-attributes/validators.d.ts +16 -16
- package/.medusa/server/src/api/vendor/products/validators.d.ts +14 -14
- package/.medusa/server/src/api/vendor/sellers/validators.d.ts +2 -2
- package/.medusa/server/src/api/vendor/shipping-options/validators.d.ts +24 -24
- package/.medusa/server/src/links/product-attribute-category-link.d.ts +0 -9
- package/.medusa/server/src/links/product-attribute-category-link.js +5 -12
- package/.medusa/server/src/modules/offer/models/offer.d.ts +1 -0
- package/.medusa/server/src/modules/offer/models/offer.js +2 -1
- package/.medusa/server/src/modules/offer/service.d.ts +9 -0
- package/.medusa/server/src/modules/offer/service.js +100 -1
- package/.medusa/server/src/workflows/offer/steps/create-offers.d.ts +1 -0
- package/.medusa/server/src/workflows/offer/steps/update-offers.d.ts +1 -0
- package/.medusa/server/src/workflows/order-group/workflows/get-order-groups-list.d.ts +1 -0
- package/.medusa/server/src/workflows/order-group/workflows/get-order-groups-list.js +11 -2
- package/package.json +3 -3
- package/.medusa/server/src/api/admin/order-groups/apply-request-filter.d.ts +0 -2
- package/.medusa/server/src/api/admin/order-groups/apply-request-filter.js +0 -134
- package/.medusa/server/src/api/vendor/orders/apply-request-filter.d.ts +0 -2
- package/.medusa/server/src/api/vendor/orders/apply-request-filter.js +0 -109
- package/.medusa/server/src/api/vendor/payment-collections/[id]/mark-as-paid/route.d.ts +0 -3
- package/.medusa/server/src/api/vendor/payment-collections/[id]/mark-as-paid/route.js +0 -25
- package/.medusa/server/src/api/vendor/payment-collections/helpers.d.ts +0 -3
- package/.medusa/server/src/api/vendor/payment-collections/helpers.js +0 -30
- package/.medusa/server/src/api/vendor/payment-collections/middlewares.d.ts +0 -2
- package/.medusa/server/src/api/vendor/payment-collections/middlewares.js +0 -17
- package/.medusa/server/src/api/vendor/payment-collections/query-config.d.ts +0 -7
- package/.medusa/server/src/api/vendor/payment-collections/query-config.js +0 -26
- package/.medusa/server/src/api/vendor/payment-collections/validators.d.ts +0 -17
- package/.medusa/server/src/api/vendor/payment-collections/validators.js +0 -12
|
@@ -282,15 +282,15 @@ declare const CreateProductAttribute: z.ZodObject<{
|
|
|
282
282
|
}, "strip", z.ZodTypeAny, {
|
|
283
283
|
name: string;
|
|
284
284
|
metadata?: Record<string, unknown> | null | undefined;
|
|
285
|
+
rank?: number | undefined;
|
|
285
286
|
handle?: string | undefined;
|
|
286
287
|
is_active?: boolean | undefined;
|
|
287
|
-
rank?: number | undefined;
|
|
288
288
|
}, {
|
|
289
289
|
name: string;
|
|
290
290
|
metadata?: Record<string, unknown> | null | undefined;
|
|
291
|
+
rank?: number | undefined;
|
|
291
292
|
handle?: string | undefined;
|
|
292
293
|
is_active?: boolean | undefined;
|
|
293
|
-
rank?: number | undefined;
|
|
294
294
|
}>, "many">>;
|
|
295
295
|
metadata: z.ZodOptional<z.ZodNullable<z.ZodRecord<z.ZodString, z.ZodUnknown>>>;
|
|
296
296
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -299,17 +299,17 @@ declare const CreateProductAttribute: z.ZodObject<{
|
|
|
299
299
|
values?: {
|
|
300
300
|
name: string;
|
|
301
301
|
metadata?: Record<string, unknown> | null | undefined;
|
|
302
|
+
rank?: number | undefined;
|
|
302
303
|
handle?: string | undefined;
|
|
303
304
|
is_active?: boolean | undefined;
|
|
304
|
-
rank?: number | undefined;
|
|
305
305
|
}[] | undefined;
|
|
306
306
|
metadata?: Record<string, unknown> | null | undefined;
|
|
307
|
-
handle?: string | undefined;
|
|
308
|
-
description?: string | undefined;
|
|
309
|
-
is_active?: boolean | undefined;
|
|
310
307
|
rank?: number | undefined;
|
|
311
308
|
is_variant_axis?: boolean | undefined;
|
|
312
309
|
is_required?: boolean | undefined;
|
|
310
|
+
handle?: string | undefined;
|
|
311
|
+
description?: string | undefined;
|
|
312
|
+
is_active?: boolean | undefined;
|
|
313
313
|
is_filterable?: boolean | undefined;
|
|
314
314
|
category_ids?: string[] | undefined;
|
|
315
315
|
}, {
|
|
@@ -318,17 +318,17 @@ declare const CreateProductAttribute: z.ZodObject<{
|
|
|
318
318
|
values?: {
|
|
319
319
|
name: string;
|
|
320
320
|
metadata?: Record<string, unknown> | null | undefined;
|
|
321
|
+
rank?: number | undefined;
|
|
321
322
|
handle?: string | undefined;
|
|
322
323
|
is_active?: boolean | undefined;
|
|
323
|
-
rank?: number | undefined;
|
|
324
324
|
}[] | undefined;
|
|
325
325
|
metadata?: Record<string, unknown> | null | undefined;
|
|
326
|
-
handle?: string | undefined;
|
|
327
|
-
description?: string | undefined;
|
|
328
|
-
is_active?: boolean | undefined;
|
|
329
326
|
rank?: number | undefined;
|
|
330
327
|
is_variant_axis?: boolean | undefined;
|
|
331
328
|
is_required?: boolean | undefined;
|
|
329
|
+
handle?: string | undefined;
|
|
330
|
+
description?: string | undefined;
|
|
331
|
+
is_active?: boolean | undefined;
|
|
332
332
|
is_filterable?: boolean | undefined;
|
|
333
333
|
category_ids?: string[] | undefined;
|
|
334
334
|
}>;
|
|
@@ -350,24 +350,24 @@ declare const UpdateProductAttribute: z.ZodObject<{
|
|
|
350
350
|
metadata?: Record<string, unknown> | null | undefined;
|
|
351
351
|
type?: AttributeType | undefined;
|
|
352
352
|
name?: string | undefined;
|
|
353
|
-
handle?: string | undefined;
|
|
354
|
-
description?: string | undefined;
|
|
355
|
-
is_active?: boolean | undefined;
|
|
356
353
|
rank?: number | undefined;
|
|
357
354
|
is_variant_axis?: boolean | undefined;
|
|
358
355
|
is_required?: boolean | undefined;
|
|
356
|
+
handle?: string | undefined;
|
|
357
|
+
description?: string | undefined;
|
|
358
|
+
is_active?: boolean | undefined;
|
|
359
359
|
is_filterable?: boolean | undefined;
|
|
360
360
|
category_ids?: string[] | undefined;
|
|
361
361
|
}, {
|
|
362
362
|
metadata?: Record<string, unknown> | null | undefined;
|
|
363
363
|
type?: AttributeType | undefined;
|
|
364
364
|
name?: string | undefined;
|
|
365
|
-
handle?: string | undefined;
|
|
366
|
-
description?: string | undefined;
|
|
367
|
-
is_active?: boolean | undefined;
|
|
368
365
|
rank?: number | undefined;
|
|
369
366
|
is_variant_axis?: boolean | undefined;
|
|
370
367
|
is_required?: boolean | undefined;
|
|
368
|
+
handle?: string | undefined;
|
|
369
|
+
description?: string | undefined;
|
|
370
|
+
is_active?: boolean | undefined;
|
|
371
371
|
is_filterable?: boolean | undefined;
|
|
372
372
|
category_ids?: string[] | undefined;
|
|
373
373
|
}>;
|
|
@@ -425,15 +425,15 @@ declare const CreateProductAttributeValue: z.ZodObject<{
|
|
|
425
425
|
}, "strip", z.ZodTypeAny, {
|
|
426
426
|
name: string;
|
|
427
427
|
metadata?: Record<string, unknown> | null | undefined;
|
|
428
|
+
rank?: number | undefined;
|
|
428
429
|
handle?: string | undefined;
|
|
429
430
|
is_active?: boolean | undefined;
|
|
430
|
-
rank?: number | undefined;
|
|
431
431
|
}, {
|
|
432
432
|
name: string;
|
|
433
433
|
metadata?: Record<string, unknown> | null | undefined;
|
|
434
|
+
rank?: number | undefined;
|
|
434
435
|
handle?: string | undefined;
|
|
435
436
|
is_active?: boolean | undefined;
|
|
436
|
-
rank?: number | undefined;
|
|
437
437
|
}>;
|
|
438
438
|
export declare const AdminCreateProductAttributeValue: (additionalDataValidator?: z.ZodOptional<z.ZodNullable<z.ZodObject<any, any>>>) => z.ZodObject<any, any>;
|
|
439
439
|
export type AdminUpdateProductAttributeValueType = z.infer<typeof UpdateProductAttributeValue> & AdditionalData;
|
|
@@ -446,15 +446,15 @@ declare const UpdateProductAttributeValue: z.ZodObject<{
|
|
|
446
446
|
}, "strip", z.ZodTypeAny, {
|
|
447
447
|
metadata?: Record<string, unknown> | null | undefined;
|
|
448
448
|
name?: string | undefined;
|
|
449
|
+
rank?: number | undefined;
|
|
449
450
|
handle?: string | undefined;
|
|
450
451
|
is_active?: boolean | undefined;
|
|
451
|
-
rank?: number | undefined;
|
|
452
452
|
}, {
|
|
453
453
|
metadata?: Record<string, unknown> | null | undefined;
|
|
454
454
|
name?: string | undefined;
|
|
455
|
+
rank?: number | undefined;
|
|
455
456
|
handle?: string | undefined;
|
|
456
457
|
is_active?: boolean | undefined;
|
|
457
|
-
rank?: number | undefined;
|
|
458
458
|
}>;
|
|
459
459
|
export declare const AdminUpdateProductAttributeValue: (additionalDataValidator?: z.ZodOptional<z.ZodNullable<z.ZodObject<any, any>>>) => z.ZodObject<any, any>;
|
|
460
460
|
export type AdminUpsertProductAttributeValuesType = z.infer<typeof AdminUpsertProductAttributeValues>;
|
|
@@ -470,16 +470,16 @@ export declare const AdminUpsertProductAttributeValues: z.ZodObject<{
|
|
|
470
470
|
id: string;
|
|
471
471
|
metadata?: Record<string, unknown> | null | undefined;
|
|
472
472
|
name?: string | undefined;
|
|
473
|
+
rank?: number | undefined;
|
|
473
474
|
handle?: string | undefined;
|
|
474
475
|
is_active?: boolean | undefined;
|
|
475
|
-
rank?: number | undefined;
|
|
476
476
|
}, {
|
|
477
477
|
id: string;
|
|
478
478
|
metadata?: Record<string, unknown> | null | undefined;
|
|
479
479
|
name?: string | undefined;
|
|
480
|
+
rank?: number | undefined;
|
|
480
481
|
handle?: string | undefined;
|
|
481
482
|
is_active?: boolean | undefined;
|
|
482
|
-
rank?: number | undefined;
|
|
483
483
|
}>, z.ZodObject<{
|
|
484
484
|
name: z.ZodString;
|
|
485
485
|
handle: z.ZodOptional<z.ZodString>;
|
|
@@ -489,45 +489,45 @@ export declare const AdminUpsertProductAttributeValues: z.ZodObject<{
|
|
|
489
489
|
}, "strip", z.ZodTypeAny, {
|
|
490
490
|
name: string;
|
|
491
491
|
metadata?: Record<string, unknown> | null | undefined;
|
|
492
|
+
rank?: number | undefined;
|
|
492
493
|
handle?: string | undefined;
|
|
493
494
|
is_active?: boolean | undefined;
|
|
494
|
-
rank?: number | undefined;
|
|
495
495
|
}, {
|
|
496
496
|
name: string;
|
|
497
497
|
metadata?: Record<string, unknown> | null | undefined;
|
|
498
|
+
rank?: number | undefined;
|
|
498
499
|
handle?: string | undefined;
|
|
499
500
|
is_active?: boolean | undefined;
|
|
500
|
-
rank?: number | undefined;
|
|
501
501
|
}>]>, "many">;
|
|
502
502
|
}, "strip", z.ZodTypeAny, {
|
|
503
503
|
values: ({
|
|
504
504
|
id: string;
|
|
505
505
|
metadata?: Record<string, unknown> | null | undefined;
|
|
506
506
|
name?: string | undefined;
|
|
507
|
+
rank?: number | undefined;
|
|
507
508
|
handle?: string | undefined;
|
|
508
509
|
is_active?: boolean | undefined;
|
|
509
|
-
rank?: number | undefined;
|
|
510
510
|
} | {
|
|
511
511
|
name: string;
|
|
512
512
|
metadata?: Record<string, unknown> | null | undefined;
|
|
513
|
+
rank?: number | undefined;
|
|
513
514
|
handle?: string | undefined;
|
|
514
515
|
is_active?: boolean | undefined;
|
|
515
|
-
rank?: number | undefined;
|
|
516
516
|
})[];
|
|
517
517
|
}, {
|
|
518
518
|
values: ({
|
|
519
519
|
id: string;
|
|
520
520
|
metadata?: Record<string, unknown> | null | undefined;
|
|
521
521
|
name?: string | undefined;
|
|
522
|
+
rank?: number | undefined;
|
|
522
523
|
handle?: string | undefined;
|
|
523
524
|
is_active?: boolean | undefined;
|
|
524
|
-
rank?: number | undefined;
|
|
525
525
|
} | {
|
|
526
526
|
name: string;
|
|
527
527
|
metadata?: Record<string, unknown> | null | undefined;
|
|
528
|
+
rank?: number | undefined;
|
|
528
529
|
handle?: string | undefined;
|
|
529
530
|
is_active?: boolean | undefined;
|
|
530
|
-
rank?: number | undefined;
|
|
531
531
|
})[];
|
|
532
532
|
}>;
|
|
533
533
|
export {};
|
|
@@ -379,10 +379,10 @@ declare const CreateProductCategory: z.ZodObject<{
|
|
|
379
379
|
}, "strip", z.ZodTypeAny, {
|
|
380
380
|
name: string;
|
|
381
381
|
metadata?: Record<string, unknown> | null | undefined;
|
|
382
|
+
rank?: number | undefined;
|
|
382
383
|
handle?: string | undefined;
|
|
383
384
|
description?: string | undefined;
|
|
384
385
|
is_active?: boolean | undefined;
|
|
385
|
-
rank?: number | undefined;
|
|
386
386
|
media?: {
|
|
387
387
|
url: string;
|
|
388
388
|
rank?: number | undefined;
|
|
@@ -397,10 +397,10 @@ declare const CreateProductCategory: z.ZodObject<{
|
|
|
397
397
|
}, {
|
|
398
398
|
name: string;
|
|
399
399
|
metadata?: Record<string, unknown> | null | undefined;
|
|
400
|
+
rank?: number | undefined;
|
|
400
401
|
handle?: string | undefined;
|
|
401
402
|
description?: string | undefined;
|
|
402
403
|
is_active?: boolean | undefined;
|
|
403
|
-
rank?: number | undefined;
|
|
404
404
|
media?: {
|
|
405
405
|
url: string;
|
|
406
406
|
rank?: number | undefined;
|
|
@@ -446,10 +446,10 @@ declare const UpdateProductCategory: z.ZodObject<{
|
|
|
446
446
|
}, "strip", z.ZodTypeAny, {
|
|
447
447
|
metadata?: Record<string, unknown> | null | undefined;
|
|
448
448
|
name?: string | undefined;
|
|
449
|
+
rank?: number | undefined;
|
|
449
450
|
handle?: string | undefined;
|
|
450
451
|
description?: string | undefined;
|
|
451
452
|
is_active?: boolean | undefined;
|
|
452
|
-
rank?: number | undefined;
|
|
453
453
|
media?: {
|
|
454
454
|
url: string;
|
|
455
455
|
rank?: number | undefined;
|
|
@@ -464,10 +464,10 @@ declare const UpdateProductCategory: z.ZodObject<{
|
|
|
464
464
|
}, {
|
|
465
465
|
metadata?: Record<string, unknown> | null | undefined;
|
|
466
466
|
name?: string | undefined;
|
|
467
|
+
rank?: number | undefined;
|
|
467
468
|
handle?: string | undefined;
|
|
468
469
|
description?: string | undefined;
|
|
469
470
|
is_active?: boolean | undefined;
|
|
470
|
-
rank?: number | undefined;
|
|
471
471
|
media?: {
|
|
472
472
|
url: string;
|
|
473
473
|
rank?: number | undefined;
|
|
@@ -20,7 +20,7 @@ const GET = async (req, res) => {
|
|
|
20
20
|
}
|
|
21
21
|
await (0, utils_2.enrichProductAttributes)(req.scope, [product]);
|
|
22
22
|
if (withOffers) {
|
|
23
|
-
await (0, utils_2.wrapProductVariantsWithOffers)(req.scope, [product]);
|
|
23
|
+
await (0, utils_2.wrapProductVariantsWithOffers)(req.scope, [product], req.filterableFields?.seller_id);
|
|
24
24
|
}
|
|
25
25
|
res.json({ product });
|
|
26
26
|
};
|
|
@@ -58,4 +58,4 @@ const DELETE = async (req, res) => {
|
|
|
58
58
|
});
|
|
59
59
|
};
|
|
60
60
|
exports.DELETE = DELETE;
|
|
61
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
61
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi8uLi9zcmMvYXBpL2FkbWluL3Byb2R1Y3RzL1tpZF0vcm91dGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBSUEscURBR2tDO0FBS2xDLDREQUE0RjtBQUM1RiwwQ0FHdUI7QUFHaEIsTUFBTSxHQUFHLEdBQUcsS0FBSyxFQUN0QixHQUErQixFQUMvQixHQUFtRCxFQUNuRCxFQUFFO0lBQ0YsTUFBTSxLQUFLLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsaUNBQXlCLENBQUMsS0FBSyxDQUFDLENBQUE7SUFFaEUsTUFBTSxVQUFVLEdBQUcsR0FBRyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsS0FBSyxFQUFFLEVBQUUsQ0FDdkQsS0FBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxDQUNsQyxDQUFBO0lBQ0QsSUFBSSxVQUFVLEVBQUUsQ0FBQztRQUNmLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxHQUFHLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FDcEQsQ0FBQyxLQUFLLEVBQUUsRUFBRSxDQUFDLENBQUMsS0FBSyxDQUFDLFFBQVEsQ0FBQyxpQkFBaUIsQ0FBQyxDQUM5QyxDQUFBO0lBQ0gsQ0FBQztJQUVELE1BQU0sRUFDSixJQUFJLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FDaEIsR0FBRyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUM7UUFDcEIsTUFBTSxFQUFFLFNBQVM7UUFDakIsTUFBTSxFQUFFLEdBQUcsQ0FBQyxXQUFXLENBQUMsTUFBTTtRQUM5QixPQUFPLEVBQUUsRUFBRSxFQUFFLEVBQUUsR0FBRyxDQUFDLE1BQU0sQ0FBQyxFQUFFLEVBQUU7S0FDL0IsQ0FBQyxDQUFBO0lBRUYsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2IsTUFBTSxJQUFJLG1CQUFX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
|