Skip to content

A
Adyen Magento2

We will be off on April 7th (Monday) for public holiday in our country

Commit bbdd6889 authored by rikterbeek's avatar rikterbeek
Browse files
Options

added support for refund and capture, added loggers so it is possible to log... 

added support for refund and capture, added loggers so it is possible to log to different files(not fully working yet)
parent 63c2a12c
Hide whitespace changes
Inline Side-by-side
Showing with 420 additions and 54 deletions
Controller/Process/Json.php
View file @ bbdd6889
......@@ -46,18 +46,26 @@ class Json extends \Magento\Framework\App\Action\Action
*/
protected $_adyenHelper;
/**
* @var \Adyen\Payment\Logger\AdyenLogger
*/
protected $_adyenLogger;
/**
* @param \Magento\Framework\App\Action\Context $context
* @param \Adyen\Payment\Helper\Data $adyenHelper
* @param \Adyen\Payment\Logger\AdyenLogger $adyenLogger
*/
public function __construct(
\Magento\Framework\App\Action\Context $context,
\Adyen\Payment\Helper\Data $adyenHelper
\Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Logger\AdyenLogger $adyenLogger
) {
parent::__construct($context);
$this->_objectManager = $context->getObjectManager();
$this->_resultFactory = $context->getResultFactory();
$this->_adyenHelper = $adyenHelper;
$this->_adyenLogger = $adyenLogger;
}
/**
......@@ -67,6 +75,10 @@ class Json extends \Magento\Framework\App\Action\Action
{
try {
$notificationItems = json_decode(file_get_contents('php://input'), true);
// log the notification
$this->_adyenLogger->info("The content of the notification is: " . print_r($notificationItems,1));
$notificationMode = isset($notificationItems['live']) ? $notificationItems['live'] : "";
if($notificationMode != "" && $this->_validateNotificationMode($notificationMode))
......@@ -79,6 +91,9 @@ class Json extends \Magento\Framework\App\Action\Action
return;
}
}
$this->_adyenLogger->info("The result is accepted");
$this->getResponse()
->clearHeader('Content-Type')
->setHeader('Content-Type', 'text/html')
......
Controller/Process/Result.php
View file @ bbdd6889
......@@ -85,7 +85,11 @@ class Result extends \Magento\Framework\App\Action\Action
public function execute()
{
$response = $this->getRequest()->getParams();
$this->_adyenLogger->info(print_r($response, true));
$this->_adyenLogger->notification(print_r($response, true));
// testing
$this->_adyenLogger->notification("WAAR KOMT DEZE REGEL 1");
$this->_adyenLogger->notificationtest("WAAR KOMT DEZE REGEL 2");
$result = $this->validateResponse($response);
......
Logger/AdyenLogger.php
View file @ bbdd6889
......@@ -27,6 +27,29 @@ use Monolog\Logger;
class AdyenLogger extends Logger
{
/**
* Adds a log record at the INFO level.
*
* This method allows for compatibility with common interfaces.
*
* @param string $message The log message
* @param array $context The log context
* @return Boolean Whether the record has been processed
*/
public function notification($message, array $context = array())
{
return $this->addRecord(static::INFO, $message, $context);
}
public function notificationtest($message, array $context = array())
{
return $this->addRecord(static::DEBUG, $message, $context);
}
/**
* Adds a log record.
*
......@@ -40,4 +63,18 @@ class AdyenLogger extends Logger
$context['is_exception'] = $message instanceof \Exception;
return parent::addRecord($level, $message, $context);
}
/**
* Adds a log record at the INFO level.
*
* This method allows for compatibility with common interfaces.
*
* @param string $message The log message
* @param array $context The log context
* @return Boolean Whether the record has been processed
*/
public function addNotificationLog($message, array $context = array())
{
return $this->addRecord(static::INFO, $message, $context);
}
}
\ No newline at end of file
Logger/Handler/AdyenBase.php 0 → 100644
View file @ bbdd6889
<?php
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
namespace Adyen\Payment\Logger\Handler;
use Magento\Framework\Filesystem\DriverInterface;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
use Monolog\Logger;
class AdyenBase extends StreamHandler
{
/**
* @var string
*/
protected $fileName;
/**
* @var int
*/
protected $loggerType = Logger::DEBUG;
/**
* @var DriverInterface
*/
protected $filesystem;
/**
* @param DriverInterface $filesystem
* @param string $filePath
*/
public function __construct(
DriverInterface $filesystem,
$filePath = null
) {
$this->filesystem = $filesystem;
parent::__construct(
$filePath ? $filePath . $this->fileName : BP . $this->fileName,
$this->loggerType
);
$this->setFormatter(new LineFormatter(null, null, true));
}
/**
* @{inheritDoc}
*
* @param $record array
* @return void
*/
public function write(array $record)
{
$logDir = $this->filesystem->getParentDirectory($this->url);
if (!$this->filesystem->isDirectory($logDir)) {
$this->filesystem->createDirectory($logDir, 0777);
}
parent::write($record);
}
/**
* overwrite core it needs to be the exact level otherwise use different handler
*
* {@inheritdoc}
*/
// public function isHandling(array $record)
// {
// return $record['level'] == $this->level;
// }
}
Logger/Handler/AdyenDebug.php
View file @ bbdd6889
......@@ -23,12 +23,10 @@
namespace Adyen\Payment\Logger\Handler;
use Magento\Framework\Filesystem\DriverInterface;
use Monolog\Formatter\LineFormatter;
use Monolog\Handler\StreamHandler;
use Adyen\Payment\Logger\AdyenLogger;
use Monolog\Logger;
class AdyenDebug extends StreamHandler
class AdyenDebug extends AdyenBase
{
/**
* @var string
......@@ -40,40 +38,7 @@ class AdyenDebug extends StreamHandler
*/
protected $loggerType = Logger::DEBUG;
/**
* @var DriverInterface
*/
protected $filesystem;
protected $level = Logger::DEBUG;
/**
* @param DriverInterface $filesystem
* @param string $filePath
*/
public function __construct(
DriverInterface $filesystem,
$filePath = null
) {
$this->filesystem = $filesystem;
parent::__construct(
$filePath ? $filePath . $this->fileName : BP . $this->fileName,
$this->loggerType
);
$this->setFormatter(new LineFormatter(null, null, true));
}
/**
* @{inheritDoc}
*
* @param $record array
* @return void
*/
public function write(array $record)
{
$logDir = $this->filesystem->getParentDirectory($this->url);
if (!$this->filesystem->isDirectory($logDir)) {
$this->filesystem->createDirectory($logDir, 0777);
}
parent::write($record);
}
}
Logger/Handler/AdyenNotification.php 0 → 100644
View file @ bbdd6889
<?php
/**
* ######
* ######
* ############ ####( ###### #####. ###### ############ ############
* ############# #####( ###### #####. ###### ############# #############
* ###### #####( ###### #####. ###### ##### ###### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ##### ######
* ###### ###### #####( ###### #####. ###### ##### ##### ######
* ############# ############# ############# ############# ##### ######
* ############ ############ ############# ############ ##### ######
* ######
* #############
* ############
*
* Adyen Payment module (https://www.adyen.com/)
*
* Copyright (c) 2015 Adyen BV (https://www.adyen.com/)
* See LICENSE.txt for license details.
*
* Author: Adyen <magento@adyen.com>
*/
namespace Adyen\Payment\Logger\Handler;
use Monolog\Logger;
use Adyen\Payment\Logger\AdyenLogger;
class AdyenNotification extends AdyenBase
{
/**
* @var string
*/
protected $fileName = '/var/log/adyen/notification.log';
/**
* @var int
*/
protected $loggerType = Logger::INFO;
protected $level = Logger::INFO;
}
Model/Api/PaymentRequest.php
View file @ bbdd6889
......@@ -72,7 +72,6 @@ class PaymentRequest extends DataObject
\Magento\Framework\Encryption\EncryptorInterface $encryptor,
\Adyen\Payment\Helper\Data $adyenHelper,
\Adyen\Payment\Logger\AdyenLogger $adyenLogger,
\Adyen\Client $client,
array $data = []
) {
$this->_scopeConfig = $scopeConfig;
......@@ -85,6 +84,7 @@ class PaymentRequest extends DataObject
$webserviceUsername = $this->_adyenHelper->getWsUsername();
$webservicePassword = $this->_adyenHelper->getWsPassword();
$client = new \Adyen\Client();
$client->setApplicationName("Magento 2 plugin");
$client->setUsername($webserviceUsername);
$client->setPassword($webservicePassword);
......@@ -218,12 +218,124 @@ class PaymentRequest extends DataObject
$service = new \Adyen\Service\Payment($this->_client);
$result = $service->authorise3D($request);
} catch(Exception $e) {
print_r($e);
throw new \Magento\Framework\Exception\LocalizedException(__('3D secure failed'));
}
return $result;
}
/**
* Capture payment on Adyen
*
* @param \Magento\Payment\Model\InfoInterface $payment
* @param $amount
* @return mixed
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
$pspReference = $this->_getPspReference($payment);
$merchantAccount = $this->_adyenHelper->getAdyenAbstractConfigData("merchant_account");
$currency = $payment->getOrder()->getBaseCurrencyCode();
$modificationAmount = array('currency' => $currency, 'value' => $amount);
$request = array(
"merchantAccount" => $merchantAccount,
"modificationAmount" => $modificationAmount,
"reference" => $payment->getOrder()->getIncrementId(),
"originalReference" => $pspReference
);
// call lib
$service = new \Adyen\Service\Modification($this->_client);
$result = $service->capture($request);
if($result['response'] != '[capture-received]') {
// something went wrong
throw new \Magento\Framework\Exception\LocalizedException(__('The capture action failed'));
}
return $result;
}
/**
* Cancel or Refund payment on Adyen
*
* @param \Magento\Payment\Model\InfoInterface $payment
* @return mixed
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function cancelOrRefund(\Magento\Payment\Model\InfoInterface $payment)
{
$pspReference = $this->_getPspReference($payment);
$merchantAccount = $this->_adyenHelper->getAdyenAbstractConfigData("merchant_account");
$request = array(
"merchantAccount" => $merchantAccount,
"reference" => $payment->getOrder()->getIncrementId(),
"originalReference" => $pspReference
);
// call lib
$service = new \Adyen\Service\Modification($this->_client);
$result = $service->cancelOrRefund($request);
if($result['response'] != '[cancelOrRefund-received]') {
// something went wrong
throw new \Magento\Framework\Exception\LocalizedException(__('The refund action failed'));
}
return $result;
}
/**
* (partial)Refund payment on Adyen
*
* @param \Magento\Payment\Model\InfoInterface $payment
* @param $amount
* @return mixed
* @throws \Magento\Framework\Exception\LocalizedException
*/
public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
$pspReference = $this->_getPspReference($payment);
$merchantAccount = $this->_adyenHelper->getAdyenAbstractConfigData("merchant_account");
$currency = $payment->getOrder()->getBaseCurrencyCode();
$modificationAmount = array('currency' => $currency, 'value' => $amount);
$request = array(
"merchantAccount" => $merchantAccount,
"modificationAmount" => $modificationAmount,
"reference" => $payment->getOrder()->getIncrementId(),
"originalReference" => $pspReference
);
// call lib
$service = new \Adyen\Service\Modification($this->_client);
$result = $service->refund($request);
if($result['response'] != '[refund-received]') {
// something went wrong
throw new \Magento\Framework\Exception\LocalizedException(__('The refund action failed'));
}
return $result;
}
/**
* Retrieve pspReference from payment object
*
* @param \Magento\Payment\Model\InfoInterface $payment
*/
protected function _getPspReference(\Magento\Payment\Model\InfoInterface $payment)
{
return $payment->getAdyenPspReference();
}
/**
* Decrypt password
*
......
Model/Cron.php
View file @ bbdd6889
......@@ -180,11 +180,15 @@ class Cron
$this->_addStatusHistoryComment();
$previousAdyenEventCode = $this->_order->getData('adyen_notification_event_code');
// set pspReference on payment object
$this->_order->getPayment()->setAdditionalInformation('pspReference', $this->_pspReference);
$this->_order->getPayment()->setAdyenPspReference($this->_pspReference);
$_paymentCode = $this->_paymentMethodCode();
// set pspReference on payment object only on authorisation and handled_externally(c_cash)
if ($this->_eventCode == Notification::AUTHORISATION
|| $this->_eventCode == Notification::HANDLED_EXTERNALLY)
{
$this->_order->getPayment()->setAdditionalInformation('pspReference', $this->_pspReference);
$this->_order->getPayment()->setAdyenPspReference($this->_pspReference);
}
// check if success is true of false
if (strcmp($this->_success, 'false') == 0 || strcmp($this->_success, '0') == 0) {
......@@ -628,7 +632,6 @@ class Cron
if (strcmp($this->_order->getState(), \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW) == 0) {
$this->_order->setState(\Magento\Sales\Model\Order::STATE_NEW);
}
//capture mode
if (!$this->_isAutoCapture()) {
$this->_order->addStatusHistoryComment(__('Capture Mode set to Manual'));
......@@ -788,7 +791,7 @@ class Cron
// set transaction id so you can do a online refund from credit memo
$invoice->setTransactionId(1);
$autoCapture = $this->_isAutoCapture($this->_order);
$autoCapture = $this->_isAutoCapture();
$createPendingInvoice = (bool) $this->_getConfigData('create_pending_invoice', 'adyen_abstract', $this->_order->getStoreId());
if((!$autoCapture) && ($createPendingInvoice)) {
......@@ -945,10 +948,6 @@ class Cron
*/
protected function _getConfigData($field, $paymentMethodCode = 'adyen_cc', $storeId)
{
// replace for now settings should moved from adyen_cc to adyen_abstract
if($paymentMethodCode == 'adyen_abstract') {
$paymentMethodCode = "adyen_cc";
}
$path = 'payment/' . $paymentMethodCode . '/' . $field;
return $this->_scopeConfig->getValue($path, \Magento\Store\Model\ScopeInterface::SCOPE_STORE, $storeId);
}
......
Model/Method/Cc.php
View file @ bbdd6889
......@@ -301,4 +301,44 @@ class Cc extends \Magento\Payment\Model\Method\Cc
return $this->_urlBuilder->getUrl('adyen/process/validate3d/');
}
/**
* Capture on Adyen
*
* @param \Magento\Payment\Model\InfoInterface $payment
* @param float $amount
*/
public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
parent::capture($payment, $amount);
$this->_paymentRequest->capture($payment, $amount);
return $this;
}
/**
* Refund specified amount for payment
*
* @param \Magento\Framework\DataObject|InfoInterface $payment
* @param float $amount
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @api
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
parent::refund($payment, $amount);
$order = $payment->getOrder();
// if amount is a full refund send a refund/cancelled request so if it is not captured yet it will cancel the order
$grandTotal = $order->getGrandTotal();
if($grandTotal == $amount) {
$this->_paymentRequest->cancelOrRefund($payment);
} else {
$this->_paymentRequest->refund($payment, $amount);
}
return $this;
}
}
\ No newline at end of file
Model/Method/Hpp.php
View file @ bbdd6889
......@@ -59,6 +59,14 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
protected $_isGateway = true;
protected $_canAuthorize = true;
protected $_isInitializeNeeded = true;
protected $_canRefund = true;
protected $_canRefundInvoicePartial = true;
/**
* @var \Adyen\Payment\Model\Api\PaymentRequest
*/
protected $_paymentRequest;
/**
* @var \Adyen\Payment\Helper\Data
......@@ -87,6 +95,7 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
protected $_adyenLogger;
/**
* @param \Adyen\Payment\Model\Api\PaymentRequest $paymentRequest
* @param \Magento\Framework\UrlInterface $urlBuilder
* @param \Adyen\Payment\Helper\Data $adyenHelper
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
......@@ -105,6 +114,7 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
*/
public function __construct(
\Adyen\Payment\Model\Api\PaymentRequest $paymentRequest,
\Magento\Framework\UrlInterface $urlBuilder,
\Adyen\Payment\Helper\Data $adyenHelper,
\Magento\Store\Model\StoreManagerInterface $storeManager,
......@@ -133,6 +143,7 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
$resourceCollection,
$data
);
$this->_paymentRequest = $paymentRequest;
$this->_urlBuilder = $urlBuilder;
$this->_adyenHelper = $adyenHelper;
$this->storeManager = $storeManager;
......@@ -345,5 +356,47 @@ class Hpp extends \Magento\Payment\Model\Method\AbstractMethod implements Gatewa
return $this->getConfigData('payment_selection_on_adyen');
}
/**
* Capture on Adyen
*
* @param \Magento\Payment\Model\InfoInterface $payment
* @param float $amount
*/
public function capture(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
parent::capture($payment, $amount);
$this->_paymentRequest->capture($payment, $amount);
return $this;
}
/**
* Refund specified amount for payment
*
* @param \Magento\Framework\DataObject|InfoInterface $payment
* @param float $amount
* @return $this
* @throws \Magento\Framework\Exception\LocalizedException
* @api
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
*/
public function refund(\Magento\Payment\Model\InfoInterface $payment, $amount)
{
parent::refund($payment, $amount);
// get pspReference
$pspReference = $payment->getAdyenPspReference();
$order = $payment->getOrder();
// if amount is a full refund send a refund/cancelled request so if it is not captured yet it will cancel the order
$grandTotal = $order->getGrandTotal();
if($grandTotal == $amount) {
$this->_paymentRequest->cancelOrRefund($payment);
} else {
$this->_paymentRequest->refund($payment, $amount);
}
return $this;
}
}
\ No newline at end of file
etc/crontab.xml
View file @ bbdd6889
......@@ -25,7 +25,7 @@
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Cron:etc/crontab.xsd">
<group id="index">
<job name="adyen_payment_process_notification" instance="Adyen\Payment\Model\Cron" method="processNotification">
<schedule>* * * * *</schedule>
<schedule>*/1 * * * *</schedule>
</job>
</group>
</config>
\ No newline at end of file
etc/di.xml
View file @ bbdd6889
......@@ -29,11 +29,17 @@
<argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
</arguments>
</type>
<type name="Adyen\Payment\Logger\Handler\AdyenNotification">
<arguments>
<argument name="filesystem" xsi:type="object">Magento\Framework\Filesystem\Driver\File</argument>
</arguments>
</type>
<type name="Adyen\Payment\Logger\AdyenLogger">
<arguments>
<argument name="name" xsi:type="string">AdyenLoggerTest</argument>
<argument name="handlers" xsi:type="array">
<item name="adyenDebug" xsi:type="object">Adyen\Payment\Logger\Handler\AdyenDebug</item>
<item name="adyenNotification" xsi:type="object">Adyen\Payment\Logger\Handler\AdyenNotification</item>
</argument>
</arguments>
</type>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment