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
bc1ed8e4
Commit
bc1ed8e4
authored
Jan 08, 2019
by
attilak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixes based on code review
parent
ae4a6d04
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
16 deletions
+20
-16
Gateway/Response/CheckoutPaymentsDetailsHandler.php
Gateway/Response/CheckoutPaymentsDetailsHandler.php
+1
-2
Gateway/Response/PaymentPosCloudHandler.php
Gateway/Response/PaymentPosCloudHandler.php
+1
-2
Gateway/Validator/CheckoutResponseValidator.php
Gateway/Validator/CheckoutResponseValidator.php
+9
-9
Helper/Data.php
Helper/Data.php
+9
-3
No files found.
Gateway/Response/CheckoutPaymentsDetailsHandler.php
View file @
bc1ed8e4
...
...
@@ -65,8 +65,7 @@ class CheckoutPaymentsDetailsHandler implements HandlerInterface
$payment
->
setTransactionId
(
$response
[
'pspReference'
]);
}
if
(
!
empty
(
$response
[
'additionalData'
])
&&
!
empty
(
$response
[
'additionalData'
][
'recurring.recurringDetailReference'
])
if
(
!
empty
(
$response
[
'additionalData'
][
'recurring.recurringDetailReference'
])
)
{
$order
=
$payment
->
getOrder
();
...
...
Gateway/Response/PaymentPosCloudHandler.php
View file @
bc1ed8e4
...
...
@@ -74,8 +74,7 @@ class PaymentPosCloudHandler implements HandlerInterface
// do not send order confirmation mail
$payment
->
getOrder
()
->
setCanSendNewEmailFlag
(
false
);
if
(
!
empty
(
$paymentResponse
[
'Response'
])
&&
!
empty
(
$paymentResponse
[
'Response'
][
'AdditionalResponse'
])
if
(
!
empty
(
$paymentResponse
[
'Response'
][
'AdditionalResponse'
])
)
{
$pairs
=
explode
(
'&'
,
$paymentResponse
[
'Response'
][
'AdditionalResponse'
]);
...
...
Gateway/Validator/CheckoutResponseValidator.php
View file @
bc1ed8e4
...
...
@@ -61,7 +61,7 @@ class CheckoutResponseValidator extends AbstractValidator
$errorMessages
=
[];
// validate result
if
(
$response
&&
isset
(
$response
[
'resultCode'
]))
{
if
(
isset
(
$response
[
'resultCode'
]))
{
switch
(
$response
[
'resultCode'
])
{
case
"Authorised"
:
$payment
->
setAdditionalInformation
(
'pspReference'
,
$response
[
'pspReference'
]);
...
...
@@ -97,15 +97,15 @@ class CheckoutResponseValidator extends AbstractValidator
case
"RedirectShopper"
:
$payment
->
setAdditionalInformation
(
'3dActive'
,
true
);
if
(
!
empty
(
$
paReq
=
$
response
[
'redirect'
][
'data'
][
'PaReq'
])
&&
!
empty
(
$
md
=
$
response
[
'redirect'
][
'data'
][
'MD'
])
&&
!
empty
(
$
issuerUrl
=
$
response
[
'redirect'
][
'url'
])
&&
!
empty
(
$
paymentData
=
$
response
[
'paymentData'
])
if
(
!
empty
(
$response
[
'redirect'
][
'data'
][
'PaReq'
])
&&
!
empty
(
$response
[
'redirect'
][
'data'
][
'MD'
])
&&
!
empty
(
$response
[
'redirect'
][
'url'
])
&&
!
empty
(
$response
[
'paymentData'
])
)
{
$payment
->
setAdditionalInformation
(
'issuerUrl'
,
$
issuerUrl
);
$payment
->
setAdditionalInformation
(
'paRequest'
,
$
paReq
);
$payment
->
setAdditionalInformation
(
'md'
,
$
md
);
$payment
->
setAdditionalInformation
(
'paymentData'
,
$
paymentData
);
$payment
->
setAdditionalInformation
(
'issuerUrl'
,
$
response
[
'redirect'
][
'url'
]
);
$payment
->
setAdditionalInformation
(
'paRequest'
,
$
response
[
'redirect'
][
'data'
][
'PaReq'
]
);
$payment
->
setAdditionalInformation
(
'md'
,
$
response
[
'redirect'
][
'data'
][
'MD'
]
);
$payment
->
setAdditionalInformation
(
'paymentData'
,
$
response
[
'paymentData'
]
);
}
else
{
$isValid
=
false
;
$errorMsg
=
__
(
'3D secure is not valid.'
);
...
...
Helper/Data.php
View file @
bc1ed8e4
...
...
@@ -1383,10 +1383,12 @@ class Data extends AbstractHelper
$client
=
$this
->
initializeAdyenClient
(
$storeId
);
$service
=
$this
->
createAdyenCheckoutUtilityService
(
$client
);
$respone
=
$service
->
originKeys
(
$params
);
$respon
s
e
=
$service
->
originKeys
(
$params
);
if
(
empty
(
$originKey
=
$respone
[
'originKeys'
][
$url
]))
{
$originKey
=
""
;
$originKey
=
""
;
if
(
!
empty
(
$response
[
'originKeys'
][
$url
]))
{
$originKey
=
$response
[
'originKeys'
][
$url
];
}
return
$originKey
;
...
...
@@ -1428,6 +1430,10 @@ class Data extends AbstractHelper
return
self
::
CHECKOUT_COMPONENT_JS_LIVE
;
}
/**
* @param $order
* @param $additionalData
*/
public
function
createAdyenBillingAgreement
(
$order
,
$additionalData
)
{
if
(
!
empty
(
$additionalData
[
'recurring.recurringDetailReference'
]))
{
...
...
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