-
Notifications
You must be signed in to change notification settings - Fork 9.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Modularity improvements: * Moved all Grouped Product functionality to newly created module GroupedProduct * Moved Multishipping functionality to newly created module Multishipping * Extracted Product duplication behavior from Product model to Product\Copier model * Replaced event "catalog_model_product_duplicate" with composite Product\Copier model * Replaced event "catalog_product_prepare_save" with controller product initialization helper that can be customozed via plugins * Consolidated Authorize.Net functionality in single module Authorizenet * Eliminated dependency of Sales module on Shipping and Usa modules * Eliminated dependency of Shipping module on Customer module * Improved accuracy and quality of Module Dependency Test * Fixed bugs: * Fixed an issue when order was sent to PayPal in USD regardless of currency used during order creation * Fixed an issue with 404 error when clicking any button on a Recurring Billing Profile in the backend * Fixed an issue with synchronization with Google Shopping on product update caused by missed service property * Fixed ability to submit order in the backend when Authorize.Net Direct Post is used * Fixed an issue with notice that _attribute_set column is missing during Import/Export * Removed the deprecated service-calls and data source functionality * Request\Response workflow improvements: * Added Console\Response * Changed behavior of AppInterface to return ResponseInterface instead of sending it
- Loading branch information
1 parent
fa01f82
commit 8f72656
Showing
1,173 changed files
with
17,016 additions
and
12,853 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,7 @@ | |
| * needs please refer to http://www.magentocommerce.com for more information. | ||
| * | ||
| * @category Magento | ||
| * @package Magento_Paygate | ||
| * @package Magento_Authorizenet | ||
| * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) | ||
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
|
|
@@ -28,10 +28,10 @@ | |
| * Authorize Payment Controller | ||
| * | ||
| * @category Magento | ||
| * @package Magento_Paygate | ||
| * @package Magento_Authorizenet | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Paygate\Controller\Adminhtml\Paygate\Authorizenet; | ||
| namespace Magento\Authorizenet\Controller\Adminhtml\Authorizenet; | ||
|
|
||
| class Payment extends \Magento\Backend\App\Action | ||
| { | ||
|
|
@@ -63,7 +63,7 @@ public function cancelAction() | |
| $result['success'] = false; | ||
| try { | ||
| $paymentMethod = $this->_objectManager->get('Magento\Payment\Helper\Data') | ||
| ->getMethodInstance(\Magento\Paygate\Model\Authorizenet::METHOD_CODE); | ||
| ->getMethodInstance(\Magento\Authorizenet\Model\Authorizenet::METHOD_CODE); | ||
|
|
||
| if ($paymentMethod) { | ||
| $paymentMethod->setStore( | ||
|
|
@@ -75,7 +75,8 @@ public function cancelAction() | |
| } | ||
|
|
||
| $result['success'] = true; | ||
| $result['update_html'] = $this->_getPaymentMethodsHtml(); | ||
| $result['update_html'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data') | ||
| ->getPaymentMethodsHtml($this->_view); | ||
| } catch (\Magento\Core\Exception $e) { | ||
| $this->_objectManager->get('Magento\Logger')->logException($e); | ||
| $result['error_message'] = $e->getMessage(); | ||
|
|
@@ -87,23 +88,4 @@ public function cancelAction() | |
| $this->_sessionQuote->getQuote()->getPayment()->save(); | ||
| $this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)); | ||
| } | ||
|
|
||
| /** | ||
| * Get payment method step html | ||
| * | ||
| * @return string | ||
| */ | ||
| protected function _getPaymentMethodsHtml() | ||
| { | ||
| $layout = $this->_view->getLayout(); | ||
|
|
||
| $update = $layout->getUpdate(); | ||
| $update->load('checkout_onepage_paymentmethod'); | ||
|
|
||
| $layout->generateXml(); | ||
| $layout->generateElements(); | ||
|
|
||
| $output = $layout->getOutput(); | ||
| return $output; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,19 +19,12 @@ | |
| * needs please refer to http://www.magentocommerce.com for more information. | ||
| * | ||
| * @category Magento | ||
| * @package Magento_Paygate | ||
| * @package Magento_Authorizenet | ||
| * @copyright Copyright (c) 2014 X.commerce, Inc. (http://www.magentocommerce.com) | ||
| * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0) | ||
| */ | ||
|
|
||
| /** | ||
| * Authorize Payment Controller | ||
| * | ||
| * @category Magento | ||
| * @package Magento_Paygate | ||
| * @author Magento Core Team <[email protected]> | ||
| */ | ||
| namespace Magento\Paygate\Controller\Authorizenet; | ||
| namespace Magento\Authorizenet\Controller\Authorizenet; | ||
|
|
||
| class Payment extends \Magento\App\Action\Action | ||
| { | ||
|
|
@@ -63,14 +56,15 @@ public function cancelAction() | |
| $result['success'] = false; | ||
| try { | ||
| $paymentMethod = $this->_objectManager->get('Magento\Payment\Helper\Data') | ||
| ->getMethodInstance(\Magento\Paygate\Model\Authorizenet::METHOD_CODE); | ||
| ->getMethodInstance(\Magento\Authorizenet\Model\Authorizenet::METHOD_CODE); | ||
| if ($paymentMethod) { | ||
| $paymentMethod->cancelPartialAuthorization( | ||
| $this->_session->getQuote()->getPayment() | ||
| ); | ||
| } | ||
| $result['success'] = true; | ||
| $result['update_html'] = $this->_getPaymentMethodsHtml(); | ||
| $result['update_html'] = $this->_objectManager->get('Magento\Authorizenet\Helper\Data') | ||
| ->getPaymentMethodsHtml($this->_view); | ||
| } catch (\Magento\Core\Exception $e) { | ||
| $this->_objectManager->get('Magento\Logger')->logException($e); | ||
| $result['error_message'] = $e->getMessage(); | ||
|
|
@@ -82,20 +76,4 @@ public function cancelAction() | |
| $this->_session->getQuote()->getPayment()->save(); | ||
| $this->getResponse()->setBody($this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)); | ||
| } | ||
|
|
||
| /** | ||
| * Get payment method step html | ||
| * | ||
| * @return string | ||
| */ | ||
| protected function _getPaymentMethodsHtml() | ||
| { | ||
| $layout = $this->_view->getLayout(); | ||
| $update = $layout->getUpdate(); | ||
| $update->load('checkout_onepage_paymentmethod'); | ||
| $layout->generateXml(); | ||
| $layout->generateElements(); | ||
| $output = $layout->getOutput(); | ||
| return $output; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.