Skip to content

Commit

Permalink
master: merge MAG-702
Browse files Browse the repository at this point in the history
  • Loading branch information
ebanolopes committed Nov 23, 2021
1 parent 70db1db commit 89cc34b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Helper/PurchaseHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -1000,7 +1000,7 @@ public function makeCheckoutPaymentDetailsFromQuote(Quote $quote, $methodData =

public function getCardholderFromQuote(Quote $quote)
{
try{
try {
$firstname = $quote->getBillingAddress()->getFirstname();
$lastname = $quote->getBillingAddress()->getLastname();
$cardholder = trim($firstname) . ' ' . trim($lastname);
Expand Down
14 changes: 9 additions & 5 deletions Plugin/Adyen/Payment/Controller/Process/Json.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function beforeExecute(AdyenJson $subject)
$isPreAuth = $this->purchaseHelper->getIsPreAuth($policyName, 'adyen_cc');
$notificationItems = json_decode(file_get_contents('php://input'), true);

if ($isPreAuth === false && empty($notificationItems) === true) {
if ($isPreAuth === false && empty($notificationItems) === true) {
return null;
}

Expand All @@ -98,7 +98,8 @@ public function beforeExecute(AdyenJson $subject)
isset($notificationItems['notificationItems'][0]['NotificationRequestItem']['success']) &&
isset($notificationItems['notificationItems'][0]['NotificationRequestItem']['reason'])
) {
$orderIncrement = $notificationItems['notificationItems'][0]['NotificationRequestItem']['merchantReference'];
$orderIncrement =
$notificationItems['notificationItems'][0]['NotificationRequestItem']['merchantReference'];
$isSuccess = $notificationItems['notificationItems'][0]['NotificationRequestItem']['success'];
$reason = $notificationItems['notificationItems'][0]['NotificationRequestItem']['reason'];

Expand Down Expand Up @@ -157,10 +158,13 @@ public function beforeExecute(AdyenJson $subject)

if (isset($notificationItems['notificationItems'][0]['NotificationRequestItem']['additionalData'])) {
$adyenData['cardLast4'] =
$notificationItems['notificationItems'][0]['NotificationRequestItem']['additionalData']['cardSummary'] ?? null;
$notificationItems['notificationItems'][0]
['NotificationRequestItem']['additionalData']['cardSummary'] ?? null;

if (isset($notificationItems['notificationItems'][0]['NotificationRequestItem']['additionalData']['expiryDate'])){
$expiryDate = $notificationItems['notificationItems'][0]['NotificationRequestItem']['additionalData']['expiryDate'];
if (isset($notificationItems['notificationItems']
[0]['NotificationRequestItem']['additionalData']['expiryDate'])) {
$expiryDate = $notificationItems['notificationItems'][0]
['NotificationRequestItem']['additionalData']['expiryDate'];
$expiryDateArray = explode('/', $expiryDate);
$adyenData['cardExpiryMonth'] = $expiryDateArray[0];
$adyenData['cardExpiryYear'] = $expiryDateArray[1];
Expand Down
2 changes: 1 addition & 1 deletion Plugin/Braintree/GeneralResponseValidator.php
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public function beforeValidate($subject, array $validationSubject)

$isPreAuth = $this->purchaseHelper->getIsPreAuth($policyName, 'braintree');

if ($isPreAuth === false) {
if ($isPreAuth === false) {
return null;
}

Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"name": "signifyd/module-connect",
"description": "Signifyd integration for Magento",
"require": {
"signifyd/signifyd-php": "3.1.1",
"signifyd/signifyd-php": "3.1.2",
"monolog/monolog": ">=1.16.0",
"php": ">=5.5.22"
},
"type": "magento2-module",
"version": "4.3.0",
"version": "4.3.2",
"autoload": {
"files": [
"registration.php"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
<module name="Signifyd_Connect" setup_version="4.3.0">
<module name="Signifyd_Connect" setup_version="4.3.2">
<sequence>
<module name="Magento_Sales" />
<module name="Magento_Payment" />
Expand Down

0 comments on commit 89cc34b

Please sign in to comment.