#10558: Option to send currency in Google Adwords when using dynamic value

 - Fixes per failed tests

Author: ishakhsuvarov

app/code/Magento/GoogleAdwords/Observer/SetConversionValueObserver.php

@@ -61,11 +61,11 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         $conversionValue = 0;
         $conversionCurrency = false;
-        $orderHasSendCurrency = $this->_helper->hasSendCurrency();
+        $sendOrderCurrency = $this->_helper->hasSendCurrency();
         foreach ($this->_collection as $order) {
-            /** @var $order \Magento\Sales\Model\Order */
-            $conversionValue += $orderHasSendCurrency ? $order->getGrandTotal() : $order->getBaseGrandTotal();
-            $conversionCurrency = $orderHasSendCurrency ? $order->getOrderCurrencyCode() : false;
+            /** @var $order \Magento\Sales\Api\Data\OrderInterface */
+            $conversionValue += $sendOrderCurrency ? $order->getGrandTotal() : $order->getBaseGrandTotal();
+            $conversionCurrency = $sendOrderCurrency ? $order->getOrderCurrencyCode() : false;
         }
         $this->_registry->register(
             \Magento\GoogleAdwords\Helper\Data::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME,

app/code/Magento/GoogleAdwords/Test/Unit/Helper/DataTest.php

@@ -225,7 +225,6 @@ public function testGetConversionValueDynamic()
             $this->returnValue($returnValue)
         );
 
-
         $this->assertEquals($returnValue, $this->_helper->getConversionValue());
     }