Merge branch 'MAGETWO-44191' of github.corp.magento.com:magento-firedrakes/magento2ce into MAGETWO-44191

Author: Michael Logvin

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Totals.php

@@ -83,6 +83,8 @@ protected function _construct()
      */
     public function getTotals()
     {
+        $this->getQuote()->setTotalsCollectedFlag(false);
+        $this->getQuote()->collectTotals();
         if ($this->getQuote()->isVirtual()) {
             $totals = $this->getQuote()->getBillingAddress()->getTotals();
         } else {

app/code/Magento/Sales/Test/Unit/Block/Order/Create/TotalsTest.php

@@ -87,6 +87,8 @@ protected function setUp()
     public function testGetTotals($isVirtual)
     {
         $expected = 'expected';
+        $this->quoteMock->expects($this->at(0))->method('setTotalsCollectedFlag')->with(false);
+        $this->quoteMock->expects($this->at(1))->method('collectTotals');
         $this->quoteMock->expects($this->once())->method('isVirtual')->willreturn($isVirtual);
         if ($isVirtual) {
             $this->billingAddressMock->expects($this->once())->method('getTotals')->willReturn($expected);