Merge remote-tracking branch 'origin/MAGETWO-52829' into MPI-BUGFIXES

viktym · viktym · commit b6a41525fd2f · 2016-05-17T14:51:39.000+03:00
diff --git a/app/code/Magento/Sales/Block/Order/Totals.php b/app/code/Magento/Sales/Block/Order/Totals.php
@@ -164,7 +164,7 @@ protected function _initTotals()
             $this->_totals['base_grandtotal'] = new \Magento\Framework\DataObject(
                 [
                     'code' => 'base_grandtotal',
-                    'value' => $this->getOrder()->formatPrice($source->getGrandTotal()),
+                    'value' => $this->getOrder()->formatBasePrice($source->getBaseGrandTotal()),
                     'label' => __('Grand Total to be Charged'),
                     'is_formated' => true,
                 ]

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@ protected function _initTotals()`
`164`	`164`	`$this->_totals['base_grandtotal'] = new \Magento\Framework\DataObject(`
`165`	`165`	`[`
`166`	`166`	`'code' => 'base_grandtotal',`
`167`		`- 'value' => $this->getOrder()->formatPrice($source->getGrandTotal()),`
	`167`	`+ 'value' => $this->getOrder()->formatBasePrice($source->getBaseGrandTotal()),`
`168`	`168`	`'label' => __('Grand Total to be Charged'),`
`169`	`169`	`'is_formated' => true,`
`170`	`170`	`]`