Skip to content

Commit 2ccbe92

Browse files
author
Robert He
committed
Merge branch 'FearlessKiwis-MAGETWO-26034-tax-notification-link' of https://github.corp.ebay.com/magento-fearless-kiwis/magento2ce into develop
2 parents 0f7b395 + 1e3293d commit 2ccbe92

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

app/code/Magento/Tax/Model/Config.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -787,12 +787,11 @@ public function isWrongDiscountSettingsIgnored($store = null)
787787
* Return the notification info url
788788
*
789789
* @param null|string|bool|int|Store $store
790-
* @return bool
791-
* @SuppressWarnings(PHPMD.BooleanGetMethodName)
790+
* @return string
792791
*/
793792
public function getInfoUrl($store = null)
794793
{
795-
return (bool)$this->_scopeConfig->getValue(
794+
return (string)$this->_scopeConfig->getValue(
796795
self::XML_PATH_TAX_NOTIFICATION_INFO_URL,
797796
\Magento\Store\Model\ScopeInterface::SCOPE_STORE,
798797
$store

app/code/Magento/Tax/Test/Unit/Model/ConfigTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,8 @@ public function dataProviderScopeConfigMethods()
363363
[
364364
'getInfoUrl',
365365
Config::XML_PATH_TAX_NOTIFICATION_INFO_URL,
366-
true,
367-
true
366+
'http:\\kiwis.rule.com',
367+
'http:\\kiwis.rule.com'
368368
]
369369
];
370370
}

app/code/Magento/Tax/etc/config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<zero_tax>0</zero_tax>
5252
</sales_display>
5353
<notification>
54-
<url>http://www.magentocommerce.com/knowledge-base/entry/magento-ce-18-ee-113-tax-calc</url>
54+
<info_url>http://docs.magento.com/m2/ce/user_guide/tax/warning-messages.html</info_url>
5555
</notification>
5656
</tax>
5757
</default>

0 commit comments

Comments
 (0)