Merge pull request #127 from buckaroo-it/feature/BP-658-pending-orders

BP-658 Magento 2 - orders with pending status after paid push

Author: vladislav-padalka-hys

Model/Push.php

@@ -1356,9 +1356,6 @@ protected function saveInvoice()
 
         $this->logging->addDebug(__METHOD__ . '|20|');
 
-        $this->order->setIsInProcess(true);
-        $this->order->save();
-
         $transactionKey = $this->getTransactionKey();
 
         if (strlen($transactionKey) <= 0) {
@@ -1373,6 +1370,9 @@ protected function saveInvoice()
 
             if (!empty($this->postData['brq_invoicenumber'])) {
                 if ($this->groupTransaction->isGroupTransaction($this->postData['brq_invoicenumber'])) {
+
+                    $this->logging->addDebug(__METHOD__ . '|27|');
+
                     $invoice->setGrandTotal($invoice->getGrandTotal() + $this->order->getBuckarooAlreadyPaid());
                     $invoice->setBaseGrandTotal($invoice->getBaseGrandTotal() + $this->order->getBaseBuckarooAlreadyPaid());
                     $invoice->setState(2);
@@ -1387,6 +1387,11 @@ protected function saveInvoice()
             }
         }
 
+        $this->logging->addDebug(__METHOD__ . '|35|');
+
+        $this->order->setIsInProcess(true);
+        $this->order->save();
+
         $this->dontSaveOrderUponSuccessPush = true;
 
         return true;