Skip to content

Commit c01d4de

Browse files
zakdmazakdma
committed
Merge branch 'MAGETWO-62680' into 2.0-pr7
2 parents a701421 + 41584ed commit c01d4de

File tree

15 files changed

+486
-42
lines changed

15 files changed

+486
-42
lines changed

‎app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_creditmemo_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Creditmemo::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Creditmemo/Order/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_creditmemo_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Creditmemo::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_invoice_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Invoice::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Invoice/Orders/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_invoice_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Invoice::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Shipment\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_shipment_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Shipment::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/Model/ResourceModel/Order/Shipment/Order/Grid/Collection.php‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?php
2+
/**
3+
* Copyright © 2016 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
namespace Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid;
8+
9+
use Magento\Framework\Data\Collection\Db\FetchStrategyInterface as FetchStrategy;
10+
use Magento\Framework\Data\Collection\EntityFactoryInterface as EntityFactory;
11+
use Magento\Framework\Event\ManagerInterface as EventManager;
12+
use Psr\Log\LoggerInterface as Logger;
13+
14+
class Collection extends \Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult
15+
{
16+
/**
17+
* Initialize dependencies.
18+
*
19+
* @param EntityFactory $entityFactory
20+
* @param Logger $logger
21+
* @param FetchStrategy $fetchStrategy
22+
* @param EventManager $eventManager
23+
* @param string $mainTable
24+
* @param string $resourceModel
25+
*/
26+
public function __construct(
27+
EntityFactory $entityFactory,
28+
Logger $logger,
29+
FetchStrategy $fetchStrategy,
30+
EventManager $eventManager,
31+
$mainTable = 'sales_shipment_grid',
32+
$resourceModel = \Magento\Sales\Model\ResourceModel\Order\Shipment::class
33+
) {
34+
parent::__construct($entityFactory, $logger, $fetchStrategy, $eventManager, $mainTable, $resourceModel);
35+
}
36+
}

‎app/code/Magento/Sales/etc/di.xml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -811,42 +811,6 @@
811811
<argument name="state" xsi:type="object">Magento\Framework\App\State\Proxy</argument>
812812
</arguments>
813813
</type>
814-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Invoice\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
815-
<arguments>
816-
<argument name="mainTable" xsi:type="string">sales_invoice_grid</argument>
817-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
818-
</arguments>
819-
</virtualType>
820-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Shipment\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
821-
<arguments>
822-
<argument name="mainTable" xsi:type="string">sales_shipment_grid</argument>
823-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Shipment</argument>
824-
</arguments>
825-
</virtualType>
826-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
827-
<arguments>
828-
<argument name="mainTable" xsi:type="string">sales_creditmemo_grid</argument>
829-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Creditmemo</argument>
830-
</arguments>
831-
</virtualType>
832-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Invoice\Orders\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
833-
<arguments>
834-
<argument name="mainTable" xsi:type="string">sales_invoice_grid</argument>
835-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Invoice</argument>
836-
</arguments>
837-
</virtualType>
838-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Shipment\Order\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
839-
<arguments>
840-
<argument name="mainTable" xsi:type="string">sales_shipment_grid</argument>
841-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Shipment</argument>
842-
</arguments>
843-
</virtualType>
844-
<virtualType name="Magento\Sales\Model\ResourceModel\Order\Creditmemo\Order\Grid\Collection" type="Magento\Framework\View\Element\UiComponent\DataProvider\SearchResult">
845-
<arguments>
846-
<argument name="mainTable" xsi:type="string">sales_creditmemo_grid</argument>
847-
<argument name="resourceModel" xsi:type="string">Magento\Sales\Model\ResourceModel\Order\Creditmemo</argument>
848-
</arguments>
849-
</virtualType>
850814
<virtualType name="orderMetadata" type="Magento\Sales\Model\ResourceModel\Metadata">
851815
<arguments>
852816
<argument name="resourceClassName" xsi:type="string">Magento\Sales\Model\ResourceModel\Order</argument>

‎dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/** @var $product \Magento\Catalog\Model\Product */
88
$product = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()
9-
->create('Magento\Catalog\Model\Product');
9+
->create(\Magento\Catalog\Model\Product::class);
1010
$product->isObjectNew(true);
1111
$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
1212
->setId(1)

‎dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_multiwebsite.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<?php
2+
/**
3+
* simple product assignet two websites fixture
4+
*
5+
* Copyright © 2016 Magento. All rights reserved.
6+
* See COPYING.txt for license details.
7+
*/
8+
require __DIR__ . '/../../../Magento/Store/_files/second_website_store.php';
9+
/** @var \Magento\Store\Model\Store $store */
10+
/** @var Magento\TestFramework\ObjectManager $objectManager */
11+
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
12+
13+
/** @var $product \Magento\Catalog\Model\Product */
14+
$product = $objectManager->create(\Magento\Catalog\Model\Product::class);
15+
$product->isObjectNew(true);
16+
$product->setTypeId(\Magento\Catalog\Model\Product\Type::TYPE_SIMPLE)
17+
->setAttributeSetId(4)
18+
->setWebsiteIds([1,2])
19+
->setName('Simple Product Two')
20+
->setSku('simple_two')
21+
->setPrice(10)
22+
->setWeight(2)
23+
->setStockData(
24+
[
25+
'use_config_manage_stock' => 1,
26+
'qty' => 100,
27+
'is_qty_decimal' => 0,
28+
'is_in_stock' => 1,
29+
]
30+
)
31+
->setCategoryIds([2])
32+
->setVisibility(\Magento\Catalog\Model\Product\Visibility::VISIBILITY_BOTH)
33+
->setStatus(\Magento\Catalog\Model\Product\Attribute\Source\Status::STATUS_ENABLED)
34+
->save();

‎dev/tests/integration/testsuite/Magento/Sales/_files/order.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,25 +14,25 @@
1414

1515
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
1616

17-
$billingAddress = $objectManager->create('Magento\Sales\Model\Order\Address', ['data' => $addressData]);
17+
$billingAddress = $objectManager->create(\Magento\Sales\Model\Order\Address::class, ['data' => $addressData]);
1818
$billingAddress->setAddressType('billing');
1919

2020
$shippingAddress = clone $billingAddress;
2121
$shippingAddress->setId(null)->setAddressType('shipping');
2222

23-
$payment = $objectManager->create('Magento\Sales\Model\Order\Payment');
23+
$payment = $objectManager->create(\Magento\Sales\Model\Order\Payment::class);
2424
$payment->setMethod('checkmo');
2525

2626
/** @var \Magento\Sales\Model\Order\Item $orderItem */
27-
$orderItem = $objectManager->create('Magento\Sales\Model\Order\Item');
27+
$orderItem = $objectManager->create(\Magento\Sales\Model\Order\Item::class);
2828
$orderItem->setProductId($product->getId())->setQtyOrdered(2);
2929
$orderItem->setBasePrice($product->getPrice());
3030
$orderItem->setPrice($product->getPrice());
3131
$orderItem->setRowTotal($product->getPrice());
3232
$orderItem->setProductType('simple');
3333

3434
/** @var \Magento\Sales\Model\Order $order */
35-
$order = $objectManager->create('Magento\Sales\Model\Order');
35+
$order = $objectManager->create(\Magento\Sales\Model\Order::class);
3636
$order->setIncrementId(
3737
'100000001'
3838
)->setState(
@@ -56,7 +56,7 @@
5656
)->setShippingAddress(
5757
$shippingAddress
5858
)->setStoreId(
59-
$objectManager->get('Magento\Store\Model\StoreManagerInterface')->getStore()->getId()
59+
$objectManager->get(\Magento\Store\Model\StoreManagerInterface::class)->getStore()->getId()
6060
)->addItem(
6161
$orderItem
6262
)->setPayment(

0 commit comments

Comments
 (0)