Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Adyen Magento2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Shared Libs
Adyen Magento2
Commits
bc985ffd
Commit
bc985ffd
authored
Jul 23, 2019
by
alessio
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PW-1459 Use different url for backend/frontend on getOrigin()
parent
483affba
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
1 deletion
+17
-1
Helper/Data.php
Helper/Data.php
+17
-1
No files found.
Helper/Data.php
View file @
bc985ffd
...
...
@@ -126,6 +126,12 @@ class Data extends AbstractHelper
*/
private
$config
;
/**
* @var \Magento\Backend\Helper\Data $helperBackend
*/
private
$helperBackend
;
/**
* Data constructor.
* @param \Magento\Framework\App\Helper\Context $context
...
...
@@ -145,6 +151,9 @@ class Data extends AbstractHelper
* @param \Magento\Framework\App\CacheInterface $cache
* @param \Adyen\Payment\Model\Billing\AgreementFactory $billingAgreementFactory
* @param \Adyen\Payment\Model\ResourceModel\Billing\Agreement $agreementResourceModel
* @param \Magento\Framework\Locale\ResolverInterface $localeResolver
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
* @param \Magento\Backend\Helper\Data $helperBackend
*/
public
function
__construct
(
\Magento\Framework\App\Helper\Context
$context
,
...
...
@@ -165,7 +174,8 @@ class Data extends AbstractHelper
\Adyen\Payment\Model\Billing\AgreementFactory
$billingAgreementFactory
,
\Adyen\Payment\Model\ResourceModel\Billing\Agreement
$agreementResourceModel
,
\Magento\Framework\Locale\ResolverInterface
$localeResolver
,
\Magento\Framework\App\Config\ScopeConfigInterface
$config
\Magento\Framework\App\Config\ScopeConfigInterface
$config
,
\Magento\Backend\Helper\Data
$helperBackend
)
{
parent
::
__construct
(
$context
);
$this
->
_encryptor
=
$encryptor
;
...
...
@@ -186,6 +196,7 @@ class Data extends AbstractHelper
$this
->
agreementResourceModel
=
$agreementResourceModel
;
$this
->
localeResolver
=
$localeResolver
;
$this
->
config
=
$config
;
$this
->
helperBackend
=
$helperBackend
;
}
/**
...
...
@@ -1477,7 +1488,12 @@ class Data extends AbstractHelper
* @return string
*/
public
function
getOrigin
()
{
$objectManager
=
\Magento\Framework\App\ObjectManager
::
getInstance
();
$state
=
$objectManager
->
get
(
'Magento\Framework\App\State'
);
$baseUrl
=
$this
->
storeManager
->
getStore
()
->
getBaseUrl
(
\Magento\Framework\UrlInterface
::
URL_TYPE_WEB
);
if
(
'adminhtml'
===
$state
->
getAreaCode
())
{
$baseUrl
=
$this
->
helperBackend
->
getHomePageUrl
();
}
$parsed
=
parse_url
(
$baseUrl
);
$origin
=
$parsed
[
'scheme'
]
.
"://"
.
$parsed
[
'host'
];
if
(
!
empty
(
$parsed
[
'port'
]))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment