review requested changes

Author: DominicWatts

app/code/Magento/GoogleAdwords/Helper/Data.php

@@ -64,6 +64,9 @@ class Data extends \Magento\Framework\App\Helper\AbstractHelper
 
     const XML_PATH_CONVERSION_VALUE = 'google/adwords/conversion_value';
 
+    /**
+     * Google Adwords send order conversion value currency when using dynamic value
+     */
     const XML_PATH_SEND_CURRENCY = 'google/adwords/send_currency';
 
     /**#@-*/
@@ -277,7 +280,7 @@ public function getConversionValue()
      *
      * @return boolean
      */
-    public function hasSendCurrency()
+    public function hasSendConversionValueCurrency()
     {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_SEND_CURRENCY,
@@ -288,11 +291,11 @@ public function hasSendCurrency()
     /**
      * Get Google AdWords conversion value currency
      *
-     * @return float
+     * @return string|false
      */
     public function getConversionValueCurrency()
     {
-        if ($this->hasSendCurrency()) {
+        if ($this->hasSendConversionValueCurrency()) {
             return (string) $this->_registry->registry(self::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME);
         }
         return false;

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

@@ -61,7 +61,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
 
         $conversionValue = 0;
         $conversionCurrency = false;
-        $sendOrderCurrency = $this->_helper->hasSendCurrency();
+        $sendOrderCurrency = $this->_helper->hasSendConversionValueCurrency();
         foreach ($this->_collection as $order) {
             /** @var $order \Magento\Sales\Api\Data\OrderInterface */
             $conversionValue += $sendOrderCurrency ? $order->getGrandTotal() : $order->getBaseGrandTotal();

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

@@ -196,11 +196,11 @@ public function testGetStoreConfigValue($method, $xmlPath, $returnValue)
         $this->assertEquals($returnValue, $this->_helper->{$method}());
     }
 
-    public function testHasSendCurrency()
+    public function testHasSendConversionValueCurrency()
     {
         $this->_scopeConfigMock->expects($this->once())->method('isSetFlag')->willReturn(true);
 
-        $this->assertTrue($this->_helper->hasSendCurrency());
+        $this->assertTrue($this->_helper->hasSendConversionValueCurrency());
     }
 
     public function testGetConversionValueDynamic()

app/code/Magento/GoogleAdwords/Test/Unit/Observer/SetConversionValueObserverTest.php

@@ -127,7 +127,7 @@ public function testSetConversionValueWhenAdwordsActiveWithOrdersIds()
         $conversionCurrency = 'USD';
         $this->_helperMock->expects($this->once())->method('isGoogleAdwordsActive')->will($this->returnValue(true));
         $this->_helperMock->expects($this->once())->method('isDynamicConversionValue')->will($this->returnValue(true));
-        $this->_helperMock->expects($this->once())->method('hasSendCurrency')->will($this->returnValue(true));
+        $this->_helperMock->expects($this->once())->method('hasSendConversionValueCurrency')->will($this->returnValue(true));
         $this->_eventMock->expects($this->once())->method('getOrderIds')->will($this->returnValue($ordersIds));
         $this->_eventObserverMock->expects(
             $this->once()

app/code/Magento/GoogleAdwords/view/frontend/templates/code.phtml

@@ -18,7 +18,7 @@
     var google_conversion_color = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionColor() ?>";
     var google_conversion_label = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionLabel() ?>";
     var google_conversion_value = <?= /* @escapeNotVerified */ $block->getHelper()->getConversionValue() ?>;
-    <?php if($block->getHelper()->hasSendCurrency() && $block->getHelper()->getConversionValueCurrency()): ?>
+    <?php if($block->getHelper()->hasSendConversionValueCurrency() && $block->getHelper()->getConversionValueCurrency()): ?>
     var google_conversion_currency = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionValueCurrency() ?>";
     <?php endif; ?>
     /* ]]> */