asyavee/medusa-store
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
olivermrbl
2023-01-19 18:26:34 +01:00
parent fcba705701 9c2169422d
commit 15bea8d49e
404 changed files with 8724 additions and 6167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
packages/medusa/src/api/routes/admin/orders/__tests__/get-order.js
View File

@@ -30,20 +30,24 @@ describe("GET /admin/orders", () => {
expect(OrderServiceMock.retrieveWithTotals).toHaveBeenCalledWith(
IdMap.getId("test-order"),
{
select: defaultAdminOrdersFields.filter((field) => {
return ![
"shipping_total",
"discount_total",
"tax_total",
"refunded_total",
"total",
"subtotal",
"refundable_amount",
"gift_card_total",
"gift_card_tax_total",
].includes(field)
}),
relations: [...defaultAdminOrdersRelations],
// TODO [MEDUSA_FF_SALES_CHANNELS]: Remove when sales channel flag is removed entirely
select: [...defaultAdminOrdersFields, "sales_channel_id"].filter(
(field) => {
return ![
"shipping_total",
"discount_total",
"tax_total",
"refunded_total",
"total",
"subtotal",
"refundable_amount",
"gift_card_total",
"gift_card_tax_total",
].includes(field)
}
),
// TODO [MEDUSA_FF_SALES_CHANNELS]: Remove when sales channel flag is removed entirely
relations: [...defaultAdminOrdersRelations, "sales_channel"],
}
)
})

18
packages/medusa/src/api/routes/admin/orders/index.ts
View File

@@ -1,11 +1,8 @@
import { Router } from "express"
import "reflect-metadata"
import { Order } from "../../../.."
import {
DeleteResponse,
FindParams,
PaginatedResponse,
} from "../../../../types/common"
import SalesChannelFeatureFlag from "../../../../loaders/feature-flags/sales-channels"
import { FindParams, PaginatedResponse } from "../../../../types/common"
import { FlagRouter } from "../../../../utils/flag-router"
import middlewares, {
transformBody,
@@ -22,6 +19,12 @@ export default (app, featureFlagRouter: FlagRouter) => {
app.use("/orders", route)
const relations = [...defaultAdminOrdersRelations]
const defaultFields = [...defaultAdminOrdersFields]
if (featureFlagRouter.isFeatureEnabled(SalesChannelFeatureFlag.key)) {
relations.push("sales_channel")
defaultFields.push("sales_channel_id")
}
/**
* List orders
@@ -43,7 +46,7 @@ export default (app, featureFlagRouter: FlagRouter) => {
"/:id",
transformQuery(FindParams, {
defaultRelations: relations,
defaultFields: defaultAdminOrdersFields.filter((field) => {
defaultFields: defaultFields.filter((field) => {
return ![
"shipping_total",
"discount_total",
@@ -333,7 +336,6 @@ export const defaultAdminOrdersRelations = [
"swaps.additional_items",
"swaps.fulfillments",
"swaps.fulfillments.tracking_links",
"sales_channel",
]
export const defaultAdminOrdersFields = [
@@ -345,7 +347,6 @@ export const defaultAdminOrdersFields = [
"cart_id",
"draft_order_id",
"customer_id",
"sales_channel_id",
"email",
"region_id",
"currency_code",
@@ -379,7 +380,6 @@ export const filterableAdminOrdersFields = [
"customer_id",
"email",
"region_id",
"sales_channel_id",
"currency_code",
"tax_rate",
"canceled_at",

15
packages/medusa/src/migrations/1673550502785-unique_pay_sess_cart_id.ts Normal file
View File

@@ -0,0 +1,15 @@
import { MigrationInterface, QueryRunner } from "typeorm";
export class uniquePaySessCartId1673550502785 implements MigrationInterface {
name = 'uniquePaySessCartId1673550502785'
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP INDEX "public"."UniqPaymentSessionCartIdProviderId"`);
await queryRunner.query(`CREATE UNIQUE INDEX "UniqPaymentSessionCartIdProviderId" ON "payment_session" ("cart_id", "provider_id") WHERE cart_id IS NOT NULL`);
}
public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`DROP INDEX "public"."UniqPaymentSessionCartIdProviderId"`);
await queryRunner.query(`CREATE UNIQUE INDEX "UniqPaymentSessionCartIdProviderId" ON "payment_session" ("cart_id", "provider_id") `);
}
}