Skip to content

Commit

Permalink
Merge pull request #55 from Adyen/develop
Browse files Browse the repository at this point in the history
Merge 'develop' branch
  • Loading branch information
rikterbeek authored Jun 23, 2016
2 parents 3941d4b + 597a916 commit 6e7298e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions Block/Redirect/Validate3d.php
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,11 @@ public function __construct(
\Magento\Framework\View\Element\Template\Context $context,
array $data = [],
\Magento\Sales\Model\OrderFactory $orderFactory,
\Magento\Checkout\Model\Session $checkoutSession,
\Magento\Framework\App\RequestInterface $request
\Magento\Checkout\Model\Session $checkoutSession
) {
$this->_orderFactory = $orderFactory;
$this->_checkoutSession = $checkoutSession;
$this->_request = $request;
$this->_request = $context->getRequest();
parent::__construct($context, $data);
$this->_getOrder();
}
Expand Down Expand Up @@ -135,4 +134,4 @@ protected function _getRequest()
return $this->_request;
}

}
}
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "adyen/module-payment",
"description": "Official Magento2 Plugin to connect to Payment Service Provider Adyen.",
"type": "magento2-module",
"version": "1.4.2",
"version": "1.4.3",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion etc/module.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
-->
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">

<module name="Adyen_Payment" setup_version="1.4.2">
<module name="Adyen_Payment" setup_version="1.4.3">
<sequence>
<module name="Magento_Sales"/>
<module name="Magento_Quote"/>
Expand Down

0 comments on commit 6e7298e

Please sign in to comment.