Skip to content

Commit 0d74b8f

Browse files
del10131del10131
committed
Merge remote-tracking branch '37009/no-author/reports' into commpr-10131-0608
2 parents 695d0c4 + 7f1902f commit 0d74b8f

File tree

34 files changed

+123
-142
lines changed

34 files changed

+123
-142
lines changed

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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\Reports\Block\Adminhtml\Sales;
77

88
/**
99
* Adminhtml refunded report page content block
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
@@ -22,7 +21,7 @@ class Refunded extends \Magento\Backend\Block\Widget\Grid\Container
2221
protected $_template = 'Magento_Reports::report/grid/container.phtml';
2322

2423
/**
25-
* {@inheritdoc}
24+
* @inheritdoc
2625
*/
2726
protected function _construct()
2827
{

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Refunded/Grid.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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

77
namespace Magento\Reports\Block\Adminhtml\Sales\Refunded;
88

99
/**
1010
* Adminhtml refunded report grid block
1111
*
12-
* @author Magento Core Team <[email protected]>
1312
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1413
*/
1514
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Sales.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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\Reports\Block\Adminhtml\Sales;
77

88
/**
99
* Adminhtml sales report page content block
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Sales extends \Magento\Backend\Block\Widget\Grid\Container
@@ -22,7 +21,7 @@ class Sales extends \Magento\Backend\Block\Widget\Grid\Container
2221
protected $_template = 'Magento_Reports::report/grid/container.phtml';
2322

2423
/**
25-
* {@inheritdoc}
24+
* @inheritdoc
2625
*/
2726
protected function _construct()
2827
{

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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\Reports\Block\Adminhtml\Sales;
77

88
/**
99
* Adminhtml shipping report page content block
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
@@ -22,7 +21,7 @@ class Shipping extends \Magento\Backend\Block\Widget\Grid\Container
2221
protected $_template = 'Magento_Reports::report/grid/container.phtml';
2322

2423
/**
25-
* {@inheritdoc}
24+
* @inheritdoc
2625
*/
2726
protected function _construct()
2827
{

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Shipping/Grid.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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

77
namespace Magento\Reports\Block\Adminhtml\Sales\Shipping;
88

99
/**
1010
* Adminhtml shipping report grid block
1111
*
12-
* @author Magento Core Team <[email protected]>
1312
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1413
*/
1514
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Tax.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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\Reports\Block\Adminhtml\Sales;
77

88
/**
99
* Adminhtml tax report page content block
1010
*
1111
* @api
12-
* @author Magento Core Team <[email protected]>
1312
* @since 100.0.2
1413
*/
1514
class Tax extends \Magento\Backend\Block\Widget\Grid\Container
@@ -22,7 +21,7 @@ class Tax extends \Magento\Backend\Block\Widget\Grid\Container
2221
protected $_template = 'Magento_Reports::report/grid/container.phtml';
2322

2423
/**
25-
* {@inheritdoc}
24+
* @inheritdoc
2625
*/
2726
protected function _construct()
2827
{

‎app/code/Magento/Reports/Block/Adminhtml/Sales/Tax/Grid.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
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

77
namespace Magento\Reports\Block\Adminhtml\Sales\Tax;
88

99
/**
1010
* Adminhtml tax report grid block
1111
*
12-
* @author Magento Core Team <[email protected]>
1312
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1413
*/
1514
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\AbstractGrid

‎app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
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\Reports\Block\Adminhtml\Shopcart;
77

88
/**
99
* Adminhtml abandoned shopping cart report page content block
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Abandoned extends \Magento\Backend\Block\Widget\Grid\Container
1412
{
1513
/**
14+
* Initialize
15+
*
1616
* @return void
1717
*/
1818
protected function _construct()

‎app/code/Magento/Reports/Block/Adminhtml/Shopcart/Abandoned/Grid.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
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\Reports\Block\Adminhtml\Shopcart\Abandoned;
77

@@ -14,7 +14,6 @@
1414
*
1515
* @method \Magento\Reports\Model\ResourceModel\Quote\Collection getCollection()
1616
*
17-
* @author Magento Core Team <[email protected]>
1817
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1918
*/
2019
class Grid extends \Magento\Reports\Block\Adminhtml\Grid\Shopcart

‎app/code/Magento/Reports/Block/Adminhtml/Shopcart/Customer.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
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\Reports\Block\Adminhtml\Shopcart;
77

88
/**
99
* Adminhtml Shopping cart customers report page content block
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class Customer extends \Magento\Backend\Block\Widget\Grid\Container
1412
{
1513
/**
14+
* Initialize
15+
*
1616
* @return void
1717
*/
1818
protected function _construct()

0 commit comments

Comments
 (0)