Skip to content

Commit abb25e7

Browse files
Merge remote-tracking branch '36976/no-author/backend' into Aug01-comprs
2 parents 0437d95 + fca5b46 commit abb25e7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+89
-150
lines changed

app/code/Magento/Backend/Block/Dashboard/AbstractDashboard.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Adminhtml dashboard tab abstract
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
abstract class AbstractDashboard extends \Magento\Backend\Block\Widget
1715
{
@@ -40,6 +38,8 @@ public function __construct(
4038
}
4139

4240
/**
41+
* Return a collection
42+
*
4343
* @return array|AbstractCollection|\Magento\Eav\Model\Entity\Collection\Abstract
4444
*/
4545
public function getCollection()
@@ -48,6 +48,8 @@ public function getCollection()
4848
}
4949

5050
/**
51+
* Return items count
52+
*
5153
* @return int
5254
*/
5355
public function getCount()
@@ -66,6 +68,8 @@ public function getDataHelper()
6668
}
6769

6870
/**
71+
* Prepare any data for display, if required
72+
*
6973
* @return $this
7074
*/
7175
protected function _prepareData()
@@ -74,6 +78,8 @@ protected function _prepareData()
7478
}
7579

7680
/**
81+
* Ensure data is prepared before layout
82+
*
7783
* @return $this
7884
*/
7985
protected function _prepareLayout()

app/code/Magento/Backend/Block/Dashboard/Bar.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
/**
1212
* Adminhtml dashboard bar block
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
class Bar extends \Magento\Backend\Block\Dashboard\AbstractDashboard
1715
{

app/code/Magento/Backend/Block/Dashboard/Diagrams.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
* Adminhtml dashboard diagram tabs
1010
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
1111
* @see dashboard.diagrams in adminhtml_dashboard_index.xml
12-
*
13-
* @author Magento Core Team <[email protected]>
1412
*/
1513
class Diagrams extends \Magento\Backend\Block\Widget\Tabs
1614
{

app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,27 @@
1111
* Adminhtml dashboard google chart block
1212
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
1313
* @see dashboard.chart.amounts and dashboard.chart.orders in adminhtml_dashboard_index.xml
14-
*
15-
* @author Magento Core Team <[email protected]>
1614
*/
1715
class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
1816
{
19-
const API_URL = 'https://image-charts.com/chart';
17+
public const API_URL = 'https://image-charts.com/chart';
2018

2119
/**
22-
* All series
23-
*
2420
* @var array
2521
*/
2622
protected $_allSeries = [];
2723

2824
/**
29-
* Axis labels
30-
*
3125
* @var array
3226
*/
3327
protected $_axisLabels = [];
3428

3529
/**
36-
* Axis maps
37-
*
3830
* @var array
3931
*/
4032
protected $_axisMaps = [];
4133

4234
/**
43-
* Data rows
44-
*
4535
* @var array
4636
*/
4737
protected $_dataRows = [];
@@ -78,6 +68,7 @@ class Graph extends \Magento\Backend\Block\Dashboard\AbstractDashboard
7868
* Google chart api data encoding
7969
*
8070
* @deprecated 101.0.2 since the Google Image Charts API not accessible from March 14, 2019
71+
* @see Nothing
8172
* @var string
8273
*/
8374
protected $_encoding = 'e';

app/code/Magento/Backend/Block/Dashboard/Grid.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* Adminhtml dashboard grid
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @api
1312
* @since 100.0.2
1413
*/

app/code/Magento/Backend/Block/Dashboard/Grids.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
* Adminhtml dashboard bottom tabs
1515
*
1616
* @api
17-
* @author Magento Core Team <[email protected]>
1817
* @since 100.0.2
1918
*/
2019
class Grids extends Tabs

app/code/Magento/Backend/Block/Dashboard/Sales.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
* Adminhtml dashboard sales statistics bar
1616
*
1717
* @api
18-
* @author Magento Core Team <[email protected]>
1918
* @since 100.0.2
2019
*/
2120
class Sales extends Bar

app/code/Magento/Backend/Block/Dashboard/Tab/Amounts.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
* Adminhtml dashboard order amounts diagram
1111
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
1212
* @see dashboard.chart.amounts in adminhtml_dashboard_index.xml
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
class Amounts extends \Magento\Backend\Block\Dashboard\Graph
1715
{

app/code/Magento/Backend/Block/Dashboard/Tab/Orders.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
* Adminhtml dashboard orders diagram
1111
* @deprecated dashboard graphs were migrated to dynamic chart.js solution
1212
* @see dashboard.chart.orders in adminhtml_dashboard_index.xml
13-
*
14-
* @author Magento Core Team <[email protected]>
1513
*/
1614
class Orders extends \Magento\Backend\Block\Dashboard\Graph
1715
{

app/code/Magento/Backend/Block/Dashboard/Tab/Products/Ordered.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
/**
99
* Adminhtml dashboard most ordered products grid
1010
*
11-
* @author Magento Core Team <[email protected]>
1211
* @SuppressWarnings(PHPMD.DepthOfInheritance)
1312
*/
1413
class Ordered extends \Magento\Backend\Block\Dashboard\Grid

0 commit comments

Comments
 (0)