Merge remote-tracking branch 'origin/MAGETWO-67681' into 2.1-develop-pr35

Author: DianaRusin

app/code/Magento/Sales/Model/Service/CreditmemoService.php

@@ -163,12 +163,6 @@ public function refund(
         $connection = $this->getResource()->getConnection('sales');
         $connection->beginTransaction();
         try {
-            $order = $this->getRefundAdapter()->refund(
-                $creditmemo,
-                $creditmemo->getOrder(),
-                !$offlineRequested
-            );
-            $this->getOrderRepository()->save($order);
             $invoice = $creditmemo->getInvoice();
             if ($invoice && !$offlineRequested) {
                 $invoice->setIsUsedForRefund(true);
@@ -178,6 +172,12 @@ public function refund(
                 $creditmemo->setInvoiceId($invoice->getId());
                 $this->getInvoiceRepository()->save($creditmemo->getInvoice());
             }
+            $order = $this->getRefundAdapter()->refund(
+                $creditmemo,
+                $creditmemo->getOrder(),
+                !$offlineRequested
+            );
+            $this->getOrderRepository()->save($order);
             $this->creditmemoRepository->save($creditmemo);
             $connection->commit();
         } catch (\Exception $e) {