draft order func. complete

integration-tests/api/__tests__/admin/draft-order.js

@@ -50,8 +50,8 @@ describe("/admin/draft-orders", () => {
       await manager.query(`DELETE FROM "payment_provider"`);
       await manager.query(`DELETE FROM "payment_session"`);
       await manager.query(`UPDATE "payment" SET order_id=NULL`);
-      await manager.query(`DELETE FROM "order"`);
       await manager.query(`UPDATE "draft_order" SET order_id=NULL`);
+      await manager.query(`DELETE FROM "order"`);
       await manager.query(`DELETE FROM "draft_order"`);
       await manager.query(`DELETE FROM "cart"`);
       await manager.query(`DELETE FROM "payment"`);
@@ -256,8 +256,8 @@ describe("/admin/draft-orders", () => {
       await manager.query(`DELETE FROM "payment_provider"`);
       await manager.query(`DELETE FROM "payment_session"`);
       await manager.query(`UPDATE "payment" SET order_id=NULL`);
-      await manager.query(`DELETE FROM "order"`);
       await manager.query(`UPDATE "draft_order" SET order_id=NULL`);
+      await manager.query(`DELETE FROM "order"`);
       await manager.query(`DELETE FROM "draft_order"`);
       await manager.query(`DELETE FROM "cart"`);
       await manager.query(`DELETE FROM "payment"`);

integration-tests/api/src/services/test-not.js

@@ -0,0 +1,19 @@
+import { NotificationService } from "medusa-interfaces";
+
+class TestNotiService extends NotificationService {
+  static identifier = "test-not";
+
+  constructor() {
+    super();
+  }
+
+  async sendNotification() {
+    return Promise.resolve();
+  }
+
+  async reSendNotification() {
+    return Promise.resolve();
+  }
+}
+
+export default TestNotiService;

packages/medusa/src/migrations/1613634008478-payment_link_template.ts

@@ -1,14 +0,0 @@
-import {MigrationInterface, QueryRunner} from "typeorm";
-
-export class paymentLinkTemplate1613634008478 implements MigrationInterface {
-    name = 'paymentLinkTemplate1613634008478'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "store" ADD "payment_link_template" character varying`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "store" DROP COLUMN "payment_link_template"`);
-    }
-
-}

packages/medusa/src/services/draft-order.js

@@ -274,9 +274,9 @@ class DraftOrderService extends BaseService {
       delete where.display_id
 
       query.join = {
-        alias: "draftOrder",
+        alias: "draft_order",
         innerJoin: {
-          cart: "draftOrder.cart",
+          cart: "draft_order.cart",
         },
       }
 
@@ -287,7 +287,9 @@ class DraftOrderService extends BaseService {
           new Brackets(qb => {
             qb.where(`cart.email ILIKE :q`, {
               q: `%${q}%`,
-            }).orWhere(`display_id::varchar(255) ILIKE :dId`, { dId: `${q}` })
+            }).orWhere(`draft_order.display_id::varchar(255) ILIKE :dId`, {
+              dId: `${q}`,
+            })
           })
         )
       }