forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implemented MAGETWO-11122: Configurable Grids (magento#471)
- converted Magento\Sales\Block\Adminhtml\Transactions\Grid and Magento\Sales\Block\Adminhtml\Order\View\Tab\Transactions to new layout xml config format
- Loading branch information
Showing
19 changed files
with
777 additions
and
238 deletions.
There are no files selected for viewing
58 changes: 58 additions & 0 deletions
58
app/code/Magento/Payment/Model/Resource/Grid/GroupsArray.php
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 |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
/** | ||
* Magento | ||
* | ||
* NOTICE OF LICENSE | ||
* | ||
* This source file is subject to the Open Software License (OSL 3.0) | ||
* that is bundled with this package in the file LICENSE.txt. | ||
* It is also available through the world-wide-web at this URL: | ||
* http://opensource.org/licenses/osl-3.0.php | ||
* If you did not receive a copy of the license and are unable to | ||
* obtain it through the world-wide-web, please send an email | ||
* to license@magentocommerce.com so we can send you a copy immediately. | ||
* | ||
* DISCLAIMER | ||
* | ||
* Do not edit or add to this file if you wish to upgrade Magento to newer | ||
* versions in the future. If you wish to customize Magento for your | ||
* needs please refer to http://www.magentocommerce.com for more information. | ||
* | ||
* @category Magento | ||
* @package Magento_Sales | ||
* @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) | ||
*/ | ||
|
||
namespace Magento\Payment\Model\Resource\Grid; | ||
|
||
/** | ||
* Sales transaction types option array | ||
*/ | ||
class GroupsArray implements \Magento\Core\Model\Option\ArrayInterface | ||
{ | ||
/** | ||
* Payment data | ||
* | ||
* @var \Magento\Payment\Helper\Data | ||
*/ | ||
protected $_paymentData; | ||
|
||
/** | ||
* @param \Magento\Payment\Helper\Data $paymentData | ||
*/ | ||
public function __construct(\Magento\Payment\Helper\Data $paymentData) | ||
{ | ||
$this->_paymentData = $paymentData; | ||
} | ||
|
||
/** | ||
* Return option array | ||
* | ||
* @return array | ||
*/ | ||
public function toOptionArray() | ||
{ | ||
return $this->_paymentData->getPaymentMethodList(true, true, true); | ||
} | ||
} |
58 changes: 58 additions & 0 deletions
58
app/code/Magento/Payment/Model/Resource/Grid/TypesArray.php
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 |
---|---|---|
@@ -0,0 +1,58 @@ | ||
<?php | ||
/** | ||
* Magento | ||
* | ||
* NOTICE OF LICENSE | ||
* | ||
* This source file is subject to the Open Software License (OSL 3.0) | ||
* that is bundled with this package in the file LICENSE.txt. | ||
* It is also available through the world-wide-web at this URL: | ||
* http://opensource.org/licenses/osl-3.0.php | ||
* If you did not receive a copy of the license and are unable to | ||
* obtain it through the world-wide-web, please send an email | ||
* to license@magentocommerce.com so we can send you a copy immediately. | ||
* | ||
* DISCLAIMER | ||
* | ||
* Do not edit or add to this file if you wish to upgrade Magento to newer | ||
* versions in the future. If you wish to customize Magento for your | ||
* needs please refer to http://www.magentocommerce.com for more information. | ||
* | ||
* @category Magento | ||
* @package Magento_Sales | ||
* @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) | ||
*/ | ||
|
||
namespace Magento\Payment\Model\Resource\Grid; | ||
|
||
/** | ||
* Sales transaction payment method types option array | ||
*/ | ||
class TypesArray implements \Magento\Core\Model\Option\ArrayInterface | ||
{ | ||
/** | ||
* Payment data | ||
* | ||
* @var \Magento\Payment\Helper\Data | ||
*/ | ||
protected $_paymentData; | ||
|
||
/** | ||
* @param \Magento\Payment\Helper\Data $paymentData | ||
*/ | ||
public function __construct(\Magento\Payment\Helper\Data $paymentData) | ||
{ | ||
$this->_paymentData = $paymentData; | ||
} | ||
|
||
/** | ||
* Return option array | ||
* | ||
* @return array | ||
*/ | ||
public function toOptionArray() | ||
{ | ||
return $this->_paymentData->getPaymentMethodList(true); | ||
} | ||
} |
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.