Skip to content

Commit 90c0852

Browse files
author
Mike Weis
committed
Merge branch 'develop' into FearlessKiwis-MAGETWO-43549-fpt-prices-negative
2 parents 379b11d + 5de0d5d commit 90c0852

File tree

748 files changed

+22088
-21067
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

748 files changed

+22088
-21067
lines changed

‎app/code/Magento/AdminNotification/Model/Observer.php renamed to ‎app/code/Magento/AdminNotification/Observer/PredispathAdminActionControllerObserver.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,16 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
namespace Magento\AdminNotification\Model;
6+
namespace Magento\AdminNotification\Observer;
7+
8+
use Magento\Framework\Event\ObserverInterface;
79

810
/**
911
* AdminNotification observer
1012
*
1113
* @author Magento Core Team <core@magentocommerce.com>
1214
*/
13-
class Observer
15+
class PredispathAdminActionControllerObserver implements ObserverInterface
1416
{
1517
/**
1618
* @var \Magento\AdminNotification\Model\FeedFactory
@@ -41,7 +43,7 @@ public function __construct(
4143
* @return void
4244
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
4345
*/
44-
public function preDispatch(\Magento\Framework\Event\Observer $observer)
46+
public function execute(\Magento\Framework\Event\Observer $observer)
4547
{
4648
if ($this->_backendAuthSession->isLoggedIn()) {
4749
$feedModel = $this->_feedFactory->create();

‎app/code/Magento/AdminNotification/etc/adminhtml/events.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../lib/internal/Magento/Framework/Event/etc/events.xsd">
99
<event name="controller_action_predispatch">
10-
<observer name="adminnotification" instance="Magento\AdminNotification\Model\Observer" method="preDispatch" />
10+
<observer name="adminnotification" instance="Magento\AdminNotification\Observer\PredispathAdminActionControllerObserver" method="execute" />
1111
</event>
1212
</config>

‎app/code/Magento/Authorizenet/Model/Directpost/Observer.php

Lines changed: 0 additions & 150 deletions
This file was deleted.

‎app/code/Magento/Authorizenet/Observer/AddFieldsToResponseObserver.php

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Authorizenet\Observer;
7+
8+
use Magento\Framework\Event\ObserverInterface;
9+
use Magento\Sales\Model\Order;
10+
11+
class AddFieldsToResponseObserver implements ObserverInterface
12+
{
13+
/**
14+
*
15+
* @var \Magento\Framework\Registry
16+
*/
17+
protected $coreRegistry;
18+
19+
/**
20+
* @var \Magento\Authorizenet\Model\Directpost
21+
*/
22+
protected $payment;
23+
24+
/**
25+
* @var \Magento\Authorizenet\Model\Directpost\Session
26+
*/
27+
protected $session;
28+
29+
/**
30+
* @var \Magento\Store\Model\StoreManagerInterface
31+
*/
32+
protected $storeManager;
33+
34+
/**
35+
* @param \Magento\Framework\Registry $coreRegistry
36+
* @param \Magento\Authorizenet\Model\Directpost $payment
37+
* @param \Magento\Authorizenet\Model\Directpost\Session $session
38+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
39+
*/
40+
public function __construct(
41+
\Magento\Framework\Registry $coreRegistry,
42+
\Magento\Authorizenet\Model\Directpost $payment,
43+
\Magento\Authorizenet\Model\Directpost\Session $session,
44+
\Magento\Store\Model\StoreManagerInterface $storeManager
45+
) {
46+
$this->coreRegistry = $coreRegistry;
47+
$this->payment = $payment;
48+
$this->session = $session;
49+
$this->storeManager = $storeManager;
50+
}
51+
52+
/**
53+
* Save order into registry to use it in the overloaded controller.
54+
*
55+
* @param \Magento\Framework\Event\Observer $observer
56+
* @return $this
57+
*/
58+
public function execute(\Magento\Framework\Event\Observer $observer)
59+
{
60+
/* @var $order Order */
61+
$order = $this->coreRegistry->registry('directpost_order');
62+
63+
if (!$order || !$order->getId()) {
64+
return $this;
65+
}
66+
67+
$payment = $order->getPayment();
68+
69+
if (!$payment || $payment->getMethod() != $this->payment->getCode()) {
70+
return $this;
71+
}
72+
73+
$result = $observer->getData('result')->getData();
74+
75+
if (!empty($result['error'])) {
76+
return $this;
77+
}
78+
79+
// if success, then set order to session and add new fields
80+
$this->session->addCheckoutOrderIncrementId($order->getIncrementId());
81+
$this->session->setLastOrderIncrementId($order->getIncrementId());
82+
83+
$requestToAuthorizenet = $payment->getMethodInstance()
84+
->generateRequestFromOrder($order);
85+
$requestToAuthorizenet->setControllerActionName(
86+
$observer->getData('action')
87+
->getRequest()
88+
->getControllerName()
89+
);
90+
$requestToAuthorizenet->setIsSecure(
91+
(string)$this->storeManager->getStore()
92+
->isCurrentlySecure()
93+
);
94+
95+
$result[$this->payment->getCode()] = ['fields' => $requestToAuthorizenet->getData()];
96+
97+
$observer->getData('result')->setData($result);
98+
99+
return $this;
100+
}
101+
}

‎app/code/Magento/Authorizenet/Observer/SaveOrderAfterSubmitObserver.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Authorizenet\Observer;
7+
8+
use Magento\Framework\Event\ObserverInterface;
9+
use Magento\Sales\Model\Order;
10+
11+
class SaveOrderAfterSubmitObserver implements ObserverInterface
12+
{
13+
/**
14+
*
15+
* @var \Magento\Framework\Registry
16+
*/
17+
protected $coreRegistry;
18+
19+
/**
20+
* @param \Magento\Framework\Registry $coreRegistry
21+
*/
22+
public function __construct(
23+
\Magento\Framework\Registry $coreRegistry
24+
) {
25+
$this->coreRegistry = $coreRegistry;
26+
}
27+
28+
/**
29+
* Save order into registry to use it in the overloaded controller.
30+
*
31+
* @param \Magento\Framework\Event\Observer $observer
32+
* @return $this
33+
*/
34+
public function execute(\Magento\Framework\Event\Observer $observer)
35+
{
36+
/* @var $order Order */
37+
$order = $observer->getEvent()->getData('order');
38+
$this->coreRegistry->register('directpost_order', $order, true);
39+
40+
return $this;
41+
}
42+
}

‎app/code/Magento/Authorizenet/Observer/UpdateAllEditIncrementsObserver.php

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Authorizenet\Observer;
7+
8+
use Magento\Framework\Event\ObserverInterface;
9+
use Magento\Sales\Model\Order;
10+
11+
class UpdateAllEditIncrementsObserver implements ObserverInterface
12+
{
13+
/**
14+
*
15+
* @var \Magento\Authorizenet\Helper\Data
16+
*/
17+
protected $authorizenetData;
18+
19+
/**
20+
* @param \Magento\Authorizenet\Helper\Data $authorizenetData
21+
*/
22+
public function __construct(
23+
\Magento\Authorizenet\Helper\Data $authorizenetData
24+
) {
25+
$this->authorizenetData = $authorizenetData;
26+
}
27+
28+
/**
29+
* Save order into registry to use it in the overloaded controller.
30+
*
31+
* @param \Magento\Framework\Event\Observer $observer
32+
* @return $this
33+
*/
34+
public function execute(\Magento\Framework\Event\Observer $observer)
35+
{
36+
/* @var $order Order */
37+
$order = $observer->getEvent()->getData('order');
38+
$this->authorizenetData->updateOrderEditIncrements($order);
39+
40+
return $this;
41+
}
42+
}

0 commit comments

Comments
 (0)