Skip to content

Commit 8a9639e

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.2-develop
Accepted Public Pull Requests: - #23019: [Backport] [Shipping] Adjusting the Contact Us Xpath (by @eduard13) Fixed GitHub Issues: - #22822: [Shipping] The contact us link isn't showing on order tracking page (reported by @eduard13) has been fixed in #23019 by @eduard13 in 2.2-develop branch Related commits: 1. 857c305
2 parents 8bc34ee + aca8989 commit 8a9639e

File tree

1 file changed

+8
-2
lines changed
  • app/code/Magento/Shipping/Block/Tracking

1 file changed

+8
-2
lines changed

app/code/Magento/Shipping/Block/Tracking/Popup.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
use Magento\Framework\Stdlib\DateTime\DateTimeFormatterInterface;
1212

1313
/**
14+
* Tracking popup
15+
*
1416
* @api
1517
* @since 100.0.2
1618
*/
@@ -107,13 +109,15 @@ public function formatDeliveryTime($time, $date = null)
107109
*/
108110
public function getContactUsEnabled()
109111
{
110-
return (bool)$this->_scopeConfig->getValue(
111-
'contacts/contacts/enabled',
112+
return $this->_scopeConfig->isSetFlag(
113+
'contact/contact/enabled',
112114
\Magento\Store\Model\ScopeInterface::SCOPE_STORE
113115
);
114116
}
115117

116118
/**
119+
* Get support email
120+
*
117121
* @return string
118122
*/
119123
public function getStoreSupportEmail()
@@ -125,6 +129,8 @@ public function getStoreSupportEmail()
125129
}
126130

127131
/**
132+
* Get contact us url
133+
*
128134
* @return string
129135
*/
130136
public function getContactUs()

0 commit comments

Comments
 (0)