-
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.
Merge pull request #496 from magento-api/for-pr
[API] Bug Fixes
- Loading branch information
Showing
24 changed files
with
313 additions
and
71 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
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Customer/Model/ResourceModel/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Customer\Model\ResourceModel\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'customer_grid_flat', | ||
| $resourceModel = '\Magento\Customer\Model\ResourceModel\Customer' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
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
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
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'sales_creditmemo_grid', | ||
| $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'sales_creditmemo_grid', | ||
| $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Creditmemo' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'sales_invoice_grid', | ||
| $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'sales_invoice_grid', | ||
| $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Invoice' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
36 changes: 36 additions & 0 deletions
36
app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.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,36 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © 2016 Magento. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| namespace Magento\Sales\Model\ResourceModel\Order\Shipment\Grid; | ||
|
|
||
| use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy; | ||
| use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory; | ||
| use Magento\Framework\Event\ManagerInterface as EventManager; | ||
| use Psr\Log\LoggerInterface as Logger; | ||
|
|
||
| class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult | ||
| { | ||
| /** | ||
| * Initialize dependencies. | ||
| * | ||
| * @param EntityFactory $entityFactory | ||
| * @param Logger $logger | ||
| * @param FetchStrategy $fetchStrategy | ||
| * @param EventManager $eventManager | ||
| * @param string $mainTable | ||
| * @param string $resourceModel | ||
| */ | ||
| public function __construct( | ||
| EntityFactory $entityFactory, | ||
| Logger $logger, | ||
| FetchStrategy $fetchStrategy, | ||
| EventManager $eventManager, | ||
| $mainTable = 'sales_shipment_grid', | ||
| $resourceModel = '\Magento\Sales\Model\ResourceModel\Order\Shipment' | ||
| ) { | ||
| parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel); | ||
| } | ||
| } |
Oops, something went wrong.