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
5ea387ef
Commit
5ea387ef
authored
Nov 29, 2018
by
Rik ter Beek
Committed by
GitHub
Nov 29, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #350 from Adyen/release-2-4-0-fix
Resolve PR comments
parents
9e58f0a0
c8275459
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
6 deletions
+3
-6
Gateway/Http/Client/TransactionPosCloudSync.php
Gateway/Http/Client/TransactionPosCloudSync.php
+3
-3
Model/AdyenInitiateTerminalApi.php
Model/AdyenInitiateTerminalApi.php
+0
-3
No files found.
Gateway/Http/Client/TransactionPosCloudSync.php
View file @
5ea387ef
...
...
@@ -60,10 +60,10 @@ class TransactionPosCloudSync implements ClientInterface
$this
->
adyenLogger
=
$adyenLogger
;
$this
->
storeId
=
$storeManager
->
getStore
()
->
getId
();
$apiKey
=
$this
->
adyenHelper
->
getPosApiKey
(
$this
->
storeId
);
// initialize client
$client
=
$this
->
adyenHelper
->
initializeAdyenClient
(
$this
->
storeId
);
$apiKey
=
$this
->
adyenHelper
->
getPosApiKey
(
$this
->
storeId
);
$client
->
setXApiKey
(
$apiKey
);
$client
=
$this
->
adyenHelper
->
initializeAdyenClient
(
$this
->
storeId
,
$apiKey
);
//Set configurable option in M2
$posTimeout
=
$this
->
adyenHelper
->
getAdyenPosCloudConfigData
(
'pos_timeout'
,
$this
->
storeId
);
...
...
Model/AdyenInitiateTerminalApi.php
View file @
5ea387ef
...
...
@@ -85,9 +85,6 @@ class AdyenInitiateTerminalApi implements AdyenInitiateTerminalApiInterface
$client
->
setTimeout
(
$posTimeout
);
}
// assign magento log
$client
->
setLogger
(
$adyenLogger
);
$this
->
client
=
$client
;
}
...
...
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