Skip to content

Commit 695d0c4

Browse files
committed
Merge remote-tracking branch '37015/no-author/sales-05' into commpr-10131-0608
2 parents 17ad968 + 81b0114 commit 695d0c4

File tree

28 files changed

+70
-141
lines changed

28 files changed

+70
-141
lines changed

app/code/Magento/Sales/Model/ResourceModel/Order/Tax.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Order;
77

88
/**
99
* Order Tax Model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Tax extends \Magento\Sales\Model\ResourceModel\EntityAbstract
1412
{

app/code/Magento/Sales/Model/ResourceModel/Order/Tax/Collection.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Order\Tax;
77

88
/**
99
* Order Tax Collection
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Collection extends \Magento\Sales\Model\ResourceModel\Collection\AbstractCollection
1412
{

app/code/Magento/Sales/Model/ResourceModel/Report.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel;
77

88
/**
99
* Sales report resource model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Report extends \Magento\Sales\Model\ResourceModel\EntityAbstract
1412
{
1513
/**
1614
* Resource initialization
1715
*
1816
* @return void
17+
* phpcs:disable Magento2.CodeAnalysis.EmptyBlock
1918
*/
2019
protected function _construct()
2120
{

app/code/Magento/Sales/Model/ResourceModel/Report/AbstractReport.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report;
77

88
/**
99
* Order report resource model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
abstract class AbstractReport extends \Magento\Reports\Model\ResourceModel\Report\AbstractReport
1412
{

app/code/Magento/Sales/Model/ResourceModel/Report/Collection/AbstractCollection.php

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report\Collection;
77

88
/**
99
* Report collection abstract model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class AbstractCollection extends \Magento\Reports\Model\ResourceModel\Report\Collection\AbstractCollection
1412
{
1513
/**
16-
* Order status
17-
*
1814
* @var string
1915
*/
2016
protected $_orderStatus = null;

app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report;
77

88
/**
99
* Invoice report resource model
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Invoiced extends AbstractReport
1412
{

app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Invoiced.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection;
77

88
/**
99
* Sales report invoiced collection
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Invoiced extends Order
1412
{

app/code/Magento/Sales/Model/ResourceModel/Report/Invoiced/Collection/Order.php

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report\Invoiced\Collection;
77

88
/**
99
* Sales report invoiced collection
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Order extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
1412
{
1513
/**
16-
* Period format
17-
*
1814
* @var string
1915
*/
2016
protected $_periodFormat;
@@ -84,6 +80,8 @@ protected function _getSelectedColumns()
8480
}
8581

8682
/**
83+
* Before load
84+
*
8785
* @return $this
8886
*/
8987
protected function _beforeLoad()

app/code/Magento/Sales/Model/ResourceModel/Report/Order/Collection.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report\Order;
77

88
/**
99
* Report order collection
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\AbstractCollection
1412
{
1513
/**
16-
* Period format
17-
*
1814
* @var string
1915
*/
2016
protected $_periodFormat;
@@ -27,8 +23,6 @@ class Collection extends \Magento\Sales\Model\ResourceModel\Report\Collection\Ab
2723
protected $_aggregationTable = 'sales_order_aggregated_created';
2824

2925
/**
30-
* Selected columns
31-
*
3226
* @var array
3327
*/
3428
protected $_selectedColumns = [];

app/code/Magento/Sales/Model/ResourceModel/Report/Order/Createdat.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2011 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model\ResourceModel\Report\Order;
77

88
/**
99
* Order entity resource model with aggregation by created at
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Createdat extends \Magento\Sales\Model\ResourceModel\Report\AbstractReport
1412
{

0 commit comments

Comments
 (0)