Merge branch 'MAGETWO-71371' into MPI-PR

Author: YevSent

app/code/Magento/Sales/Model/Order/Invoice.php

@@ -362,9 +362,18 @@ public function pay()
 
         $this->setState(self::STATE_PAID);
 
-        $this->getOrder()->getPayment()->pay($this);
-        $this->getOrder()->setTotalPaid($this->getOrder()->getTotalPaid() + $this->getGrandTotal());
-        $this->getOrder()->setBaseTotalPaid($this->getOrder()->getBaseTotalPaid() + $this->getBaseGrandTotal());
+        $order = $this->getOrder();
+        $order->getPayment()->pay($this);
+        $totalPaid = $this->getGrandTotal();
+        $baseTotalPaid = $this->getBaseGrandTotal();
+        $invoiceList = $order->getInvoiceCollection();
+        // calculate all totals
+        if (count($invoiceList->getItems()) > 1) {
+            $totalPaid += $order->getTotalPaid();
+            $baseTotalPaid += $order->getBaseTotalPaid();
+        }
+        $order->setTotalPaid($totalPaid);
+        $order->setBaseTotalPaid($baseTotalPaid);
         $this->_eventManager->dispatch('sales_order_invoice_pay', [$this->_eventObject => $this]);
         return $this;
     }

app/code/Magento/Sales/Model/Order/Payment.php

@@ -198,6 +198,7 @@ protected function _construct()
     public function setOrder(Order $order)
     {
         $this->_order = $order;
+
         return $this;
     }
 
@@ -225,6 +226,7 @@ public function getOrder()
     public function setTransactionId($transactionId)
     {
         $this->setData('transaction_id', $transactionId);
+
         return $this;
     }
 
@@ -247,6 +249,7 @@ public function getTransactionId()
     public function setIsTransactionClosed($isClosed)
     {
         $this->setData('is_transaction_closed', (bool)$isClosed);
+
         return $this;
     }
 
@@ -293,6 +296,7 @@ public function canCapture()
                 return false;
             }
         }
+
         return true;
     }
 
@@ -499,15 +503,16 @@ public function registerAuthorizationNotification($amount)
      */
     public function pay($invoice)
     {
-        $this->_updateTotals(
-            [
-                'amount_paid' => $invoice->getGrandTotal(),
-                'base_amount_paid' => $invoice->getBaseGrandTotal(),
-                'shipping_captured' => $invoice->getShippingAmount(),
-                'base_shipping_captured' => $invoice->getBaseShippingAmount(),
-            ]
+        $totals = $this->collectTotalAmounts(
+            $this->getOrder(),
+            ['grand_total', 'base_grand_total', 'shipping_amount', 'base_shipping_amount']
         );
+        $this->setAmountPaid($totals['grand_total']);
+        $this->setBaseAmountPaid($totals['base_grand_total']);
+        $this->setShippingCaptured($totals['shipping_amount']);
+        $this->setBaseShippingCaptured($totals['base_shipping_amount']);
         $this->_eventManager->dispatch('sales_order_payment_pay', ['payment' => $this, 'invoice' => $invoice]);
+
         return $this;
     }
 
@@ -550,6 +555,7 @@ protected function _invoice()
         }
 
         $this->getOrder()->addRelatedObject($invoice);
+
         return $invoice;
     }
 
@@ -567,6 +573,7 @@ public function canVoid()
                 $this->_canVoidLookup = (bool)$authTransaction && !(int)$authTransaction->getIsClosed();
             }
         }
+
         return $this->_canVoidLookup;
     }
 
@@ -581,6 +588,7 @@ public function void(\Magento\Framework\DataObject $document)
     {
         $this->_void(true);
         $this->_eventManager->dispatch('sales_order_payment_void', ['payment' => $this, 'invoice' => $document]);
+
         return $this;
     }
 
@@ -596,6 +604,7 @@ public function registerVoidNotification($amount = null)
         if (!$this->hasMessage()) {
             $this->setMessage(__('Registered a Void notification.'));
         }
+
         return $this->_void(false, $amount);
     }
 
@@ -608,6 +617,7 @@ public function registerVoidNotification($amount = null)
     public function setCreditmemo(Creditmemo $creditmemo)
     {
         $this->setData('creditmemo', $creditmemo);
+
         return $this;
     }
 
@@ -724,6 +734,7 @@ public function refund($creditmemo)
             'sales_order_payment_refund',
             ['payment' => $this, 'creditmemo' => $creditmemo]
         );
+
         return $this;
     }
 
@@ -778,6 +789,7 @@ public function registerRefundNotification($amount)
                 ),
                 false
             );
+
             return $this;
         }
 
@@ -807,6 +819,7 @@ public function registerRefundNotification($amount)
         );
         $message = $this->_appendTransactionToMessage($transaction, $message);
         $this->setOrderStateProcessing($message);
+
         return $this;
     }
 
@@ -830,6 +843,7 @@ public function cancelCreditmemo($creditmemo)
             'sales_order_payment_cancel_creditmemo',
             ['payment' => $this, 'creditmemo' => $creditmemo]
         );
+
         return $this;
     }
 
@@ -904,6 +918,7 @@ public function accept()
             );
             $this->setOrderStatePaymentReview($message, $transactionId);
         }
+
         return $this;
     }
 
@@ -944,6 +959,7 @@ public function deny($isOnline = true)
             );
             $this->setOrderStatePaymentReview($message, $transactionId);
         }
+
         return $this;
     }
 
@@ -998,7 +1014,8 @@ protected function updateBaseAmountPaidOnlineTotal($invoice)
     {
         if ($invoice instanceof Invoice) {
             $invoice->pay();
-            $this->_updateTotals(['base_amount_paid_online' => $invoice->getBaseGrandTotal()]);
+            $totals = $this->collectTotalAmounts($this->getOrder(), ['base_grand_total']);
+            $this->setBaseAmountPaidOnline($totals['base_grand_total']);
             $this->getOrder()->addRelatedObject($invoice);
         }
     }
@@ -1147,6 +1164,7 @@ protected function _void($isOnline, $amount = null, $gatewayCallback = 'void')
         $message = $this->_appendTransactionToMessage($transaction, $message);
         $this->setOrderStateProcessing($message);
         $order->setDataChanges(true);
+
         return $this;
     }
 
@@ -1168,6 +1186,7 @@ public function addTransaction($type, $salesDocument = null, $failSafe = false)
         if ($salesDocument) {
             $builder->setSalesDocument($salesDocument);
         }
+
         return $builder->build($type);
     }
 
@@ -1202,6 +1221,7 @@ public function importTransactionInfo(Transaction $transactionTo)
                 $data
             );
         }
+
         return $this;
     }
 
@@ -1235,6 +1255,7 @@ protected function _appendTransactionToMessage($transaction, $message)
             $txnId = is_object($transaction) ? $transaction->getHtmlTxnId() : $transaction;
             $message .= ' ' . __('Transaction ID: "%1"', $txnId);
         }
+
         return $message;
     }
 
@@ -1260,9 +1281,11 @@ public function prependMessage($messagePrependTo)
             ) {
                 $comment = $preparedMessage->getComment() . ' ' . $messagePrependTo;
                 $preparedMessage->setComment($comment);
+
                 return $comment;
             }
         }
+
         return $messagePrependTo;
     }
 
@@ -1276,6 +1299,7 @@ public function prependMessage($messagePrependTo)
     public function formatAmount($amount, $asFloat = false)
     {
         $amount = $this->priceCurrency->round($amount);
+
         return !$asFloat ? (string)$amount : $amount;
     }
 
@@ -1311,6 +1335,7 @@ public function getAuthorizationTransaction()
     public function isCaptureFinal($amountToCapture)
     {
         $total = $this->getOrder()->getBaseTotalDue();
+
         return $this->formatAmount($total, true) == $this->formatAmount($amountToCapture, true);
     }
 
@@ -1354,6 +1379,7 @@ public function getTransactionAdditionalInfo()
     public function resetTransactionAdditionalInfo()
     {
         $this->transactionAdditionalInfo = [];
+
         return $this;
     }
 
@@ -1410,6 +1436,7 @@ protected function _getInvoiceForTransactionId($transactionId)
         foreach ($this->getOrder()->getInvoiceCollection() as $invoice) {
             if ($invoice->getTransactionId() == $transactionId) {
                 $invoice->load($invoice->getId());
+
                 // to make sure all data will properly load (maybe not required)
                 return $invoice;
             }
@@ -1420,9 +1447,11 @@ protected function _getInvoiceForTransactionId($transactionId)
                 )
             ) {
                 $invoice->setTransactionId($transactionId);
+
                 return $invoice;
             }
         }
+
         return false;
     }
 
@@ -1436,7 +1465,7 @@ private function getOrderStateResolver()
             $this->orderStateResolver = ObjectManager::getInstance()->get(OrderStateResolverInterface::class);
         }
 
-        return$this->orderStateResolver;
+        return $this->orderStateResolver;
     }
 
     //@codeCoverageIgnoreStart
@@ -2413,6 +2442,7 @@ public function setExtensionAttributes(\Magento\Sales\Api\Data\OrderPaymentExten
     public function setIsTransactionPending($flag)
     {
         $this->setData('is_transaction_pending', (bool)$flag);
+
         return $this;
     }
 
@@ -2436,6 +2466,7 @@ public function getIsTransactionPending()
     public function setIsFraudDetected($flag)
     {
         $this->setData('is_fraud_detected', (bool)$flag);
+
         return $this;
     }
 
@@ -2459,6 +2490,7 @@ public function getIsFraudDetected()
     public function setShouldCloseParentTransaction($flag)
     {
         $this->setData('should_close_parent_transaction', (bool)$flag);
+
         return $this;
     }
 
@@ -2493,4 +2525,26 @@ private function setTransactionIdsForRefund(Transaction $transaction)
     }
 
     //@codeCoverageIgnoreEnd
+
+    /**
+     * Collects order invoices totals by provided keys.
+     * Returns result as {key: amount}.
+     *
+     * @param Order $order
+     * @param array $keys
+     * @return array
+     */
+    private function collectTotalAmounts(Order $order, array $keys)
+    {
+        $result = array_fill_keys($keys, 0.00);
+        $invoiceCollection = $order->getInvoiceCollection();
+        /** @var Invoice $invoice */
+        foreach ($invoiceCollection as $invoice) {
+            foreach ($keys as $key) {
+                $result[$key] += $invoice->getData($key);
+            }
+        }
+
+        return $result;
+    }
 }