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
16ce9c74
Commit
16ce9c74
authored
Mar 31, 2020
by
attilak
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add error message into response in Transactions
Log these errors in the validators
parent
55617992
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
36 additions
and
11 deletions
+36
-11
Gateway/Http/Client/TransactionAuthorization.php
Gateway/Http/Client/TransactionAuthorization.php
+1
-0
Gateway/Http/Client/TransactionCancel.php
Gateway/Http/Client/TransactionCancel.php
+1
-1
Gateway/Http/Client/TransactionCapture.php
Gateway/Http/Client/TransactionCapture.php
+2
-3
Gateway/Http/Client/TransactionRefund.php
Gateway/Http/Client/TransactionRefund.php
+1
-1
Gateway/Validator/CancelResponseValidator.php
Gateway/Validator/CancelResponseValidator.php
+6
-1
Gateway/Validator/CaptureResponseValidator.php
Gateway/Validator/CaptureResponseValidator.php
+6
-1
Gateway/Validator/CheckoutResponseValidator.php
Gateway/Validator/CheckoutResponseValidator.php
+6
-1
Gateway/Validator/GeneralResponseValidator.php
Gateway/Validator/GeneralResponseValidator.php
+7
-2
Gateway/Validator/RefundResponseValidator.php
Gateway/Validator/RefundResponseValidator.php
+6
-1
No files found.
Gateway/Http/Client/TransactionAuthorization.php
View file @
16ce9c74
...
...
@@ -82,6 +82,7 @@ class TransactionAuthorization implements ClientInterface
}
catch
(
\Adyen\AdyenException
$e
)
{
$response
[
'error'
]
=
$e
->
getMessage
();
}
return
$response
;
}
}
Gateway/Http/Client/TransactionCancel.php
View file @
16ce9c74
...
...
@@ -60,7 +60,7 @@ class TransactionCancel implements ClientInterface
try
{
$response
=
$service
->
cancel
(
$request
);
}
catch
(
\Adyen\AdyenException
$e
)
{
$response
=
null
;
$response
[
'error'
]
=
$e
->
getMessage
()
;
}
return
$response
;
}
...
...
Gateway/Http/Client/TransactionCapture.php
View file @
16ce9c74
...
...
@@ -60,10 +60,9 @@ class TransactionCapture implements ClientInterface
try
{
$response
=
$service
->
capture
(
$request
);
}
catch
(
\Adyen\AdyenException
$e
)
{
$this
->
_adyenLogger
->
error
(
$e
);
// add this for now not in the lib yet
$response
=
null
;
$response
[
'error'
]
=
$e
->
getMessage
();
}
return
$response
;
}
}
Gateway/Http/Client/TransactionRefund.php
View file @
16ce9c74
...
...
@@ -63,7 +63,7 @@ class TransactionRefund implements ClientInterface
try
{
$responses
[]
=
$service
->
refund
(
$request
);
}
catch
(
\Adyen\AdyenException
$e
)
{
$responses
[]
=
null
;
$responses
[]
=
array
(
'error'
=>
$e
->
getMessage
())
;
}
}
return
$responses
;
...
...
Gateway/Validator/CancelResponseValidator.php
View file @
16ce9c74
...
...
@@ -61,9 +61,14 @@ class CancelResponseValidator extends AbstractValidator
// The available response codes that the API can return in case of successfull cancellation
$expectedResponses
=
[
'[cancelOrRefund-received]'
,
'[cancel-received]'
];
if
(
!
in_array
(
$response
[
'response'
],
$expectedResponses
))
{
if
(
empty
(
$response
[
'response'
])
||
!
in_array
(
$response
[
'response'
],
$expectedResponses
))
{
$errorMsg
=
__
(
'Error with cancellation'
);
$this
->
adyenLogger
->
error
(
$errorMsg
);
if
(
!
empty
(
$response
[
'error'
]))
{
$this
->
adyenLogger
->
error
(
$response
[
'error'
]);
}
$errorMessages
[]
=
$errorMsg
;
}
...
...
Gateway/Validator/CaptureResponseValidator.php
View file @
16ce9c74
...
...
@@ -58,9 +58,14 @@ class CaptureResponseValidator extends AbstractValidator
$isValid
=
true
;
$errorMessages
=
[];
if
(
$response
[
'response'
]
!=
'[capture-received]'
)
{
if
(
empty
(
$response
[
'response'
])
||
$response
[
'response'
]
!=
'[capture-received]'
)
{
$errorMsg
=
__
(
'Error with capture'
);
$this
->
adyenLogger
->
error
(
$errorMsg
);
if
(
!
empty
(
$response
[
'error'
]))
{
$this
->
adyenLogger
->
error
(
$response
[
'error'
]);
}
$errorMessages
[]
=
$errorMsg
;
}
...
...
Gateway/Validator/CheckoutResponseValidator.php
View file @
16ce9c74
...
...
@@ -67,7 +67,7 @@ class CheckoutResponseValidator extends AbstractValidator
$isValid
=
true
;
$errorMessages
=
[];
// validate result
if
(
isset
(
$response
[
'resultCode'
]))
{
if
(
!
empty
(
$response
[
'resultCode'
]))
{
switch
(
$response
[
'resultCode'
])
{
case
"IdentifyShopper"
:
$payment
->
setAdditionalInformation
(
'threeDSType'
,
$response
[
'resultCode'
]);
...
...
@@ -193,6 +193,11 @@ class CheckoutResponseValidator extends AbstractValidator
}
}
else
{
$errorMsg
=
__
(
'Error with payment method please select different payment method.'
);
if
(
!
empty
(
$response
[
'error'
]))
{
$this
->
adyenLogger
->
error
(
$response
[
'error'
]);
}
throw
new
\Magento\Framework\Exception\LocalizedException
(
__
(
$errorMsg
));
}
...
...
Gateway/Validator/GeneralResponseValidator.php
View file @
16ce9c74
...
...
@@ -68,7 +68,7 @@ class GeneralResponseValidator extends AbstractValidator
$errorMessages
=
[];
// validate result
if
(
$response
&&
isset
(
$response
[
'resultCode'
]))
{
if
(
!
empty
(
$response
[
'resultCode'
]))
{
switch
(
$response
[
'resultCode'
])
{
case
"Authorised"
:
$payment
->
setAdditionalInformation
(
'pspReference'
,
$response
[
'pspReference'
]);
...
...
@@ -139,9 +139,14 @@ class GeneralResponseValidator extends AbstractValidator
}
}
else
{
$errorMsg
=
__
(
'Error with payment method please select different payment method.'
);
if
(
!
empty
(
$response
[
'error'
]))
{
$this
->
adyenLogger
->
error
(
$response
[
'error'
]);
}
throw
new
\Magento\Framework\Exception\LocalizedException
(
__
(
$errorMsg
));
}
return
$this
->
createResult
(
$isValid
,
$errorMessages
);
}
}
Gateway/Validator/RefundResponseValidator.php
View file @
16ce9c74
...
...
@@ -59,9 +59,14 @@ class RefundResponseValidator extends AbstractValidator
$errorMessages
=
[];
foreach
(
$responses
as
$response
)
{
if
(
$response
[
'response'
]
!=
'[refund-received]'
)
{
if
(
empty
(
$response
[
'response'
])
||
$response
[
'response'
]
!=
'[refund-received]'
)
{
$errorMsg
=
__
(
'Error with refund'
);
$this
->
adyenLogger
->
error
(
$errorMsg
);
if
(
!
empty
(
$response
[
'error'
]))
{
$this
->
adyenLogger
->
error
(
$response
[
'error'
]);
}
$errorMessages
[]
=
$errorMsg
;
}
}
...
...
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