changes in response to unit and static tests

Author: DominicWatts

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

@@ -277,7 +277,8 @@ public function getConversionValue()
      *
      * @return boolean
      */
-    public function getSendCurrency() {
+    public function hasSendCurrency()
+    {
         return $this->scopeConfig->isSetFlag(
             self::XML_PATH_SEND_CURRENCY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE
@@ -291,9 +292,9 @@ public function getSendCurrency() {
      */
     public function getConversionValueCurrency()
     {
-        if ($this->getSendCurrency()) {
+        if ($this->hasSendCurrency()) {
             return (string) $this->_registry->registry(self::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME);
-        } 
+        }
         return false;
     }
 }

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

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

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

@@ -171,7 +171,8 @@ public function dataProviderForTestStoreConfig()
             ['getConversionColor', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_COLOR, 'ffffff'],
             ['getConversionLabel', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_LABEL, 'Label'],
             ['getConversionValueType', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_VALUE_TYPE, '1'],
-            ['getConversionValueConstant', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_VALUE, '0']
+            ['getConversionValueConstant', \Magento\GoogleAdwords\Helper\Data::XML_PATH_CONVERSION_VALUE, '0'],
+            ['hasSendCurrency', \Magento\GoogleAdwords\Helper\Data::XML_PATH_SEND_CURRENCY, '1']
         ];
     }
 

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

@@ -122,9 +122,10 @@ public function testSetConversionValueWhenAdwordsActiveWithOrdersIds()
     {
         $ordersIds = [1, 2, 3];
         $conversionValue = 0;
-        $conversionValueCurrency = 'USD';
+        $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->_eventMock->expects($this->once())->method('getOrderIds')->will($this->returnValue($ordersIds));
         $this->_eventObserverMock->expects(
             $this->once()
@@ -158,7 +159,7 @@ public function testSetConversionValueWhenAdwordsActiveWithOrdersIds()
             'register'
         )->with(
             \Magento\GoogleAdwords\Helper\Data::CONVERSION_VALUE_CURRENCY_REGISTRY_NAME,
-            $conversionValueCurrency
+            $conversionCurrency
         );
 
         $this->assertSame($this->_model, $this->_model->execute($this->_eventObserverMock));

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()->getSendCurrency() && $block->getHelper()->getConversionValueCurrency()): ?>
+    <?php if($block->getHelper()->hasSendCurrency() && $block->getHelper()->getConversionValueCurrency()): ?>
     var google_conversion_currency = "<?= /* @escapeNotVerified */ $block->getHelper()->getConversionValueCurrency() ?>";
     <?php endif; ?>
     /* ]]> */