From 7ce8001906dc4bb4e7d1264b5e5620ab707a7618 Mon Sep 17 00:00:00 2001
From: --list <sebastian.m.nicolajsen@gmail.com>
Date: Thu, 17 Jun 2021 09:35:29 +0200
Subject: [PATCH] removed changes not to core

---
 .../src/services/manual-fulfillment.js        |  5 ---
 packages/medusa/src/services/claim.js         |  2 +-
 packages/medusa/src/services/draft-order.js   | 31 +++++++++++++++++++
 packages/medusa/src/services/order.js         |  4 +++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/packages/medusa-fulfillment-manual/src/services/manual-fulfillment.js b/packages/medusa-fulfillment-manual/src/services/manual-fulfillment.js
index f5e6817fa5..389dca5127 100644
--- a/packages/medusa-fulfillment-manual/src/services/manual-fulfillment.js
+++ b/packages/medusa-fulfillment-manual/src/services/manual-fulfillment.js
@@ -31,11 +31,6 @@ class ManualFulfillmentService extends FulfillmentService {
     throw Error("Manual Fulfillment service cannot calculatePrice")
   }
 
-  createReturn() {
-    // No data is being sent anywhere
-    return Promise.resolve({})
-  }
-
   createOrder() {
     // No data is being sent anywhere
     return Promise.resolve({})
diff --git a/packages/medusa/src/services/claim.js b/packages/medusa/src/services/claim.js
index 469ef9543c..d49d3558d6 100644
--- a/packages/medusa/src/services/claim.js
+++ b/packages/medusa/src/services/claim.js
@@ -135,7 +135,7 @@ class ClaimService extends BaseService {
         }
       }
 
-      if(no_notification !== undefined || no_notification !== null){
+      if(no_notification !== undefined){
         claim.no_notification = no_notification
         await claimRepo.save(claim)
       }
diff --git a/packages/medusa/src/services/draft-order.js b/packages/medusa/src/services/draft-order.js
index 41d83c9adb..94b59ca33f 100644
--- a/packages/medusa/src/services/draft-order.js
+++ b/packages/medusa/src/services/draft-order.js
@@ -10,6 +10,7 @@ import { Brackets } from "typeorm"
 class DraftOrderService extends BaseService {
   static Events = {
     CREATED: "draft_order.created",
+    UPDATED: "draft_order.updated",
   }
 
   constructor({
@@ -336,6 +337,36 @@ class DraftOrderService extends BaseService {
       await draftOrderRepo.save(draftOrder)
     })
   }
+  /**
+   * 
+   * @param {String} doId 
+   * @param {} data 
+   * @returns 
+   */
+  async update(doId, data){
+    return this.atomicPhase_(async manager => {
+      const doRepo = manager.getCustomRepository(this.draftOrderRepository_)
+      const draftOrder = await this.retrieve(doId)
+      let touched = false
+      
+      if(data.no_notification_order !== undefined){
+        touched = true
+        draftOrder.no_notification_order = data.no_notification_order
+      }
+
+      if(touched){
+        doRepo.save(draftOrder)
+
+        await this.eventBus_
+        .withTransaction(manager)
+        .emit(DraftOrderService.Events.UPDATED, {
+          id: draftOrder.id
+        })
+      }
+      
+      return draftOrder
+    })
+  }
 }
 
 export default DraftOrderService
diff --git a/packages/medusa/src/services/order.js b/packages/medusa/src/services/order.js
index b946de5848..90aca0542e 100644
--- a/packages/medusa/src/services/order.js
+++ b/packages/medusa/src/services/order.js
@@ -805,6 +805,10 @@ class OrderService extends BaseService {
         await this.updateBillingAddress_(order, update.billing_address)
       }
 
+      if("no_notification" in update){
+        order.no_notification = update.no_notification
+      }
+
       if ("items" in update) {
         for (const item of update.items) {
           await this.lineItemService_.withTransaction(manager).create({