MAGETWO-44268: Shipping & Handling is not updated during creating order from admin

Author: Oleksandr Karpenko

app/code/Magento/Quote/Model/Quote/Address/Total/Shipping.php

@@ -169,9 +169,10 @@ public function collect(
                     );
                     $total->setTotalAmount($this->getCode(), $amountPrice);
                     $total->setBaseTotalAmount($this->getCode(), $rate->getPrice());
-                    $total->setShippingAmount($address->getShippingAmount());
                     $shippingDescription = $rate->getCarrierTitle() . ' - ' . $rate->getMethodTitle();
                     $address->setShippingDescription(trim($shippingDescription, ' -'));
+                    $total->setShippingAmount($rate->getPrice());
+                    $total->setShippingDescription($address->getShippingDescription());
                     break;
                 }
             }
@@ -185,6 +186,7 @@ public function collect(
      * @param \Magento\Quote\Model\Quote $quote
      * @param \Magento\Quote\Model\Quote\Address\Total $total
      * @return array
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function fetch(\Magento\Quote\Model\Quote $quote, \Magento\Quote\Model\Quote\Address\Total $total)
     {

app/code/Magento/Quote/Model/Quote/TotalsCollector.php

@@ -145,6 +145,7 @@ public function collect(\Magento\Quote\Model\Quote $quote)
 
             $total->setShippingAmount($addressTotal->getShippingAmount());
             $total->setBaseShippingAmount($addressTotal->getBaseShippingAmount());
+            $total->setShippingDescription($addressTotal->getShippingDescription());
 
             $total->setSubtotal((float)$total->getSubtotal() + $addressTotal->getSubtotal());
             $total->setBaseSubtotal((float)$total->getBaseSubtotal() + $addressTotal->getBaseSubtotal());

app/code/Magento/Quote/Test/Unit/Model/Quote/Address/Total/ShippingTest.php

@@ -72,6 +72,7 @@ protected function setUp()
                 'setShippingAmount',
                 'setBaseTotalAmount',
                 'setTotalAmount',
+                'setShippingDescription',
             ],
             [],
             '',
@@ -94,8 +95,8 @@ protected function setUp()
                 'setItemQty',
                 'collectShippingRates',
                 'getAllShippingRates',
-                'getShippingAmount',
                 'setShippingDescription',
+                'getShippingDescription',
                 'getFreeShipping',
             ],
             [],
@@ -229,9 +230,6 @@ public function testCollect()
             ->method('convert')
             ->with(5, $this->store)
             ->willReturn(5);
-        $this->address->expects($this->once())
-            ->method('getShippingAmount')
-            ->willReturn(5);
         $this->total->expects($this->once())
             ->method('setShippingAmount')
             ->with(5);
@@ -244,6 +242,12 @@ public function testCollect()
         $this->address->expects($this->once())
             ->method('setShippingDescription')
             ->with('Carrier title - Method title');
+        $this->address->expects($this->once())
+            ->method('getShippingDescription')
+            ->willReturn('Carrier title - Method title');
+        $this->total->expects($this->once())
+            ->method('setShippingDescription')
+            ->with('Carrier title - Method title');
 
         $this->shippingModel->collect($this->quote, $this->shippingAssignment, $this->total);
     }