├── .gitignore
├── app
    ├── code
    │   └── community
    │   │   └── Onilab
    │   │       └── GoogleCharts
    │   │           ├── Helper
    │   │               └── Data.php
    │   │           ├── Block
    │   │               └── Adminhtml
    │   │               │   └── Dashboard
    │   │               │       ├── Tab
    │   │               │           ├── Amounts.php
    │   │               │           └── Orders.php
    │   │               │       └── Graph.php
    │   │           └── etc
    │   │               └── config.xml
    ├── etc
    │   └── modules
    │   │   └── Onilab_GoogleCharts.xml
    └── design
    │   └── adminhtml
    │       └── default
    │           └── default
    │               ├── layout
    │                   └── onilab
    │                   │   └── google_charts.xml
    │               └── template
    │                   └── onilab
    │                       └── google_charts
    │                           ├── scripts.phtml
    │                           └── dashboard
    │                               └── graph.phtml
├── composer.json
├── modman
└── README.md


/.gitignore:
--------------------------------------------------------------------------------
1 | .idea


--------------------------------------------------------------------------------
/app/code/community/Onilab/GoogleCharts/Helper/Data.php:
--------------------------------------------------------------------------------
1 | <?php
2 | 
3 | class Onilab_GoogleCharts_Helper_Data extends Mage_Core_Helper_Abstract
4 | {
5 | }


--------------------------------------------------------------------------------
/composer.json:
--------------------------------------------------------------------------------
1 | {
2 | 	"name": "onilab/google_charts",
3 | 	"type": "magento-module",
4 | 	"require": {
5 | 		"magento-hackathon/magento-composer-installer": "*"
6 | 	}
7 | }


--------------------------------------------------------------------------------
/modman:
--------------------------------------------------------------------------------
1 | app/code/community/Onilab/
2 | 
3 | app/design/adminhtml/default/default/layout/onilab/
4 | app/design/adminhtml/default/default/template/onilab/
5 | 
6 | app/etc/modules/Onilab_GoogleCharts.xml


--------------------------------------------------------------------------------
/app/etc/modules/Onilab_GoogleCharts.xml:
--------------------------------------------------------------------------------
1 | <config>
2 |     <modules>
3 |         <Onilab_GoogleCharts>
4 |             <active>true</active>
5 |             <codePool>community</codePool>
6 |         </Onilab_GoogleCharts>
7 |     </modules>
8 | </config>
9 | 


--------------------------------------------------------------------------------
/app/design/adminhtml/default/default/layout/onilab/google_charts.xml:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0"?>
 2 | <layout>
 3 |     <adminhtml_dashboard_index>
 4 |         <reference name="before_body_end">
 5 |             <block type="core/text" name="google_charts_external_js">
 6 |                 <action method="addText">
 7 |                     <text>
 8 |                         <![CDATA[<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>]]>
 9 |                     </text>
10 |                 </action>
11 |             </block>
12 |             <block type="core/template" template="onilab/google_charts/scripts.phtml"/>
13 |         </reference>
14 |     </adminhtml_dashboard_index>
15 | </layout>


--------------------------------------------------------------------------------
/README.md:
--------------------------------------------------------------------------------
 1 | Magento 2.x support:
 2 | =====================
 3 | 
 4 | The repo for Magento 2 version of our module is available in the new repository of the module : [https://github.com/onilab/magento-2-google-api-chart-fix/](https://github.com/onilab/magento-2-google-api-chart-fix/).
 5 | 
 6 | About this module:
 7 | ===================
 8 | 
 9 | https://onilab.com/blog/chart-broken-in-magento-1-2-admin-dashboard-reasons-hotfix/
10 | 
11 | Installation:
12 | ===============
13 | 
14 | 1. Copy files to your Magento root path
15 | 2. Clear all caches
16 | 3. Go to the dashboard
17 | 4. Enjoy
18 | 
19 | 
20 | What Magento version is supported?
21 | -----------------------------------
22 | 
23 | The module has been successfully deployed and tested against the following Magento versions:
24 | * Magento EE 1.14
25 | * Magento CE 1.9
26 | 
27 | 
28 | Bugs / RFC
29 | ----------
30 | 
31 | Don't hesitate to:
32 | 
33 | * Submit a bug, RFC, idea of new feature
34 | * Submit a merge request
35 | 
36 | 


--------------------------------------------------------------------------------
/app/code/community/Onilab/GoogleCharts/Block/Adminhtml/Dashboard/Tab/Amounts.php:
--------------------------------------------------------------------------------
 1 | <?php
 2 | 
 3 | class Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Tab_Amounts extends Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Graph
 4 | {
 5 |     /**
 6 |      * Initialize object
 7 |      *
 8 |      * @return void
 9 |      */
10 |     public function __construct()
11 |     {
12 |         $this->setHtmlId('amounts');
13 |         parent::__construct();
14 |     }
15 | 
16 |     /**
17 |      * Prepare chart data
18 |      *
19 |      * @return void
20 |      */
21 |     protected function _prepareData()
22 |     {
23 |         $this->setDataHelperName('adminhtml/dashboard_order');
24 |         $this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
25 |         $this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
26 |         $this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
27 | 
28 |         $this->setDataRows('revenue');
29 |         $this->_axisMaps = array(
30 |             'x' => 'range',
31 |             'y' => 'revenue'
32 |         );
33 | 
34 |         parent::_prepareData();
35 |     }
36 | 
37 |     public function getTitle()
38 |     {
39 |         return $this->__('Amounts');
40 |     }
41 | }


--------------------------------------------------------------------------------
/app/code/community/Onilab/GoogleCharts/Block/Adminhtml/Dashboard/Tab/Orders.php:
--------------------------------------------------------------------------------
 1 | <?php
 2 | 
 3 | class Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Tab_Orders extends Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Graph
 4 | {
 5 |     /**
 6 |      * Initialize object
 7 |      *
 8 |      * @return void
 9 |      */
10 |     public function __construct()
11 |     {
12 |         $this->setHtmlId('orders');
13 |         parent::__construct();
14 |     }
15 | 
16 |     /**
17 |      * Prepare chart data
18 |      *
19 |      * @return void
20 |      */
21 |     protected function _prepareData()
22 |     {
23 |         $this->setDataHelperName('adminhtml/dashboard_order');
24 |         $this->getDataHelper()->setParam('store', $this->getRequest()->getParam('store'));
25 |         $this->getDataHelper()->setParam('website', $this->getRequest()->getParam('website'));
26 |         $this->getDataHelper()->setParam('group', $this->getRequest()->getParam('group'));
27 | 
28 |         $this->setDataRows('quantity');
29 |         $this->_axisMaps = array(
30 |             'x' => 'range',
31 |             'y' => 'quantity'
32 |         );
33 | 
34 |         parent::_prepareData();
35 |     }
36 | 
37 |     public function getTitle()
38 |     {
39 |         return $this->__('Orders');
40 |     }
41 | }


--------------------------------------------------------------------------------
/app/code/community/Onilab/GoogleCharts/etc/config.xml:
--------------------------------------------------------------------------------
 1 | <?xml version="1.0"?>
 2 | <config>
 3 |     <modules>
 4 |         <Onilab_GoogleCharts>
 5 |             <version>0.0.3</version>
 6 |         </Onilab_GoogleCharts>
 7 |     </modules>
 8 |     <global>
 9 |         <helpers>
10 |             <onilab_googlecharts>
11 |                 <class>Onilab_GoogleCharts_Helper</class>
12 |             </onilab_googlecharts>
13 |         </helpers>
14 |         <blocks>
15 |             <adminhtml>
16 |                 <rewrite>
17 |                     <dashboard_graph>Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Graph</dashboard_graph>
18 |                     <dashboard_tab_orders>Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Tab_Orders</dashboard_tab_orders>
19 |                     <dashboard_tab_amounts>Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Tab_Amounts</dashboard_tab_amounts>
20 |                 </rewrite>
21 |             </adminhtml>
22 |             <onilab_googlecharts>
23 |                 <class>Onilab_GoogleCharts_Block</class>
24 |             </onilab_googlecharts>
25 |         </blocks>
26 |     </global>
27 |     <adminhtml>
28 |         <layout>
29 |             <updates>
30 |                 <onilab_googlecharts>
31 |                     <file>onilab/google_charts.xml</file>
32 |                 </onilab_googlecharts>
33 |             </updates>
34 |         </layout>
35 |     </adminhtml>
36 | </config>
37 | 


--------------------------------------------------------------------------------
/app/code/community/Onilab/GoogleCharts/Block/Adminhtml/Dashboard/Graph.php:
--------------------------------------------------------------------------------
 1 | <?php
 2 | 
 3 | class Onilab_GoogleCharts_Block_Adminhtml_Dashboard_Graph extends Mage_Adminhtml_Block_Dashboard_Graph
 4 | {
 5 | //    protected $_width = '700';
 6 | //    protected $_height = '300';
 7 | 
 8 |     public function __construct()
 9 |     {
10 |         parent::__construct();
11 |         $this->setTemplate($this->_getTabTemplate());
12 |     }
13 | 
14 |     /**
15 |      * Get tab template
16 |      *
17 |      * @return string
18 |      */
19 |     protected function _getTabTemplate()
20 |     {
21 |         return 'onilab/google_charts/dashboard/graph.phtml';
22 |     }
23 | 
24 |     public function getChartData()
25 |     {
26 |         $this->_allSeries = $this->getRowsData($this->_dataRows);
27 | 
28 |         foreach ($this->_axisMaps as $axis => $attr) {
29 |             $this->setAxisLabels($axis, $this->getRowsData($attr, true));
30 |         }
31 | 
32 |         $timezoneLocal = Mage::app()->getStore()->getConfig(Mage_Core_Model_Locale::XML_PATH_DEFAULT_TIMEZONE);
33 | 
34 |         list ($dateStart, $dateEnd) = Mage::getResourceModel('reports/order_collection')
35 |             ->getDateRange($this->getDataHelper()->getParam('period'), '', '', true);
36 | 
37 |         $dateStart->setTimezone($timezoneLocal);
38 |         $dateEnd->setTimezone($timezoneLocal);
39 | 
40 |         $dates = array();
41 |         $datas = array();
42 | 
43 |         while ($dateStart->compare($dateEnd) < 0) {
44 |             switch ($this->getDataHelper()->getParam('period')) {
45 |                 case '24h':
46 |                     $d = $dateStart->toString('yyyy-MM-dd HH:00');
47 |                     $dateStart->addHour(1);
48 |                     break;
49 |                 case '7d':
50 |                 case '1m':
51 |                     $d = $dateStart->toString('yyyy-MM-dd');
52 |                     $dateStart->addDay(1);
53 |                     break;
54 |                 case '1y':
55 |                 case '2y':
56 |                     $d = $dateStart->toString('yyyy-MM');
57 |                     $dateStart->addMonth(1);
58 |                     break;
59 |             }
60 |             foreach ($this->getAllSeries() as $index => $serie) {
61 |                 if (in_array($d, $this->_axisLabels['x'])) {
62 |                     $datas[$index][] = (float)array_shift($this->_allSeries[$index]);
63 |                 } else {
64 |                     $datas[$index][] = 0;
65 |                 }
66 |             }
67 |             $dates[] = strtotime($d);
68 |         }
69 | 
70 |         return [$datas, $dates];
71 |     }
72 | }


--------------------------------------------------------------------------------
/app/design/adminhtml/default/default/template/onilab/google_charts/scripts.phtml:
--------------------------------------------------------------------------------
 1 | <script type="text/javascript">
 2 |     (function (window) {
 3 |         var OnilabGoogleCharts = function () {
 4 |                 document.addEventListener('DOMContentLoaded', this._init.bind(this));
 5 |             },
 6 |             module = OnilabGoogleCharts.prototype;
 7 | 
 8 |         module._charts = [];
 9 |         module._elementIdToChartMap = [];
10 |         module._chartData = [];
11 |         module._canCreateChart = false;
12 |         module._init = function () {
13 |             google.charts.load('current', {'packages': ['corechart']});
14 |             google.charts.setOnLoadCallback((function () {
15 |                 this._canCreateChart = true;
16 |             }).bind(this));
17 | 
18 |             if (document.addEventListener) {
19 |                 window.addEventListener('resize', this.resizeCharts.bind(this));
20 |             } else if (document.attachEvent) {
21 |                 window.attachEvent('onresize', this.resizeCharts.bind(this));
22 |             } else {
23 |                 window.resize = this.resizeCharts.bind(this);
24 |             }
25 |             var elements = document.querySelectorAll('.tab-item-link');
26 |             for (var i = 0; i < elements.length; i++) {
27 |                 elements[i].addEventListener('click', this.resizeCharts.bind(this));
28 |             }
29 |             document.dispatchEvent(new CustomEvent('onilab-google-charts-ready'));
30 |         };
31 | 
32 |         module.createChart = function (elementId, columns, rows, options) {
33 |             if (!this._canCreateChart) {
34 |                 setTimeout(this.createChart.bind(this, elementId, columns, rows, options), 100);
35 |                 return;
36 |             }
37 |             var element = document.getElementById(elementId);
38 |             var data = new google.visualization.DataTable();
39 |             for (var i = 0; i < columns.length; i++) {
40 |                 data.addColumn(columns[i][0], columns[i][1]);
41 |             }
42 |             data.addRows(rows);
43 |             var index = this._charts.length;
44 |             if (this._elementIdToChartMap[elementId]) {
45 |                 index = this._elementIdToChartMap[elementId];
46 |             }
47 |             this._elementIdToChartMap[elementId] = index;
48 |             this._chartData[index] = [elementId, columns, rows, options];
49 |             this._charts[index] = new google.visualization.AreaChart(element);
50 |             this._charts[index].draw(data, options);
51 |         };
52 | 
53 |         module.resizeCharts = function () {
54 |             if (this._chartData) {
55 |                 for (var i = 0; i < this._chartData.length; i++) {
56 |                     try {
57 |                         this.createChart(this._chartData[i][0], this._chartData[i][1], this._chartData[i][2], this._chartData[i][3]);
58 |                     } catch (e) {
59 |                     }
60 |                 }
61 |                 return;
62 |             }
63 |             setTimeout(this.resizeCharts.bind(this), 50);
64 |         };
65 | 
66 |         window.onilabGoogleCharts = new OnilabGoogleCharts;
67 |     })(window);
68 | </script>


--------------------------------------------------------------------------------
/app/design/adminhtml/default/default/template/onilab/google_charts/dashboard/graph.phtml:
--------------------------------------------------------------------------------
  1 | <?php
  2 | /**
  3 |  * Magento Enterprise Edition
  4 |  *
  5 |  * NOTICE OF LICENSE
  6 |  *
  7 |  * This source file is subject to the Magento Enterprise Edition End User License Agreement
  8 |  * that is bundled with this package in the file LICENSE_EE.txt.
  9 |  * It is also available through the world-wide-web at this URL:
 10 |  * http://www.magento.com/license/enterprise-edition
 11 |  * If you did not receive a copy of the license and are unable to
 12 |  * obtain it through the world-wide-web, please send an email
 13 |  * to license@magento.com so we can send you a copy immediately.
 14 |  *
 15 |  * DISCLAIMER
 16 |  *
 17 |  * Do not edit or add to this file if you wish to upgrade Magento to newer
 18 |  * versions in the future. If you wish to customize Magento for your
 19 |  * needs please refer to http://www.magento.com for more information.
 20 |  *
 21 |  * @category    design
 22 |  * @package     default_default
 23 |  * @copyright Copyright (c) 2006-2018 Magento, Inc. (http://www.magento.com)
 24 |  * @license http://www.magento.com/license/enterprise-edition
 25 |  */
 26 | ?>
 27 | <div style="margin:20px;">
 28 |     <p class="switcher a-right" style="padding:5px 10px;"><?php echo $this->__('Select Range') ?>:
 29 |         <select name="period" id="order_<?php echo $this->getHtmlId() ?>_period" onchange="changeDiagramsPeriod(this);">
 30 |             <?php foreach ($this->helper('adminhtml/dashboard_data')->getDatePeriods() as $_value => $_label): ?>
 31 |                 <?php if (in_array($_value, array('custom'))) continue; ?>
 32 |                 <option value="<?php echo $_value ?>" <?php if ($this->getRequest()->getParam('period') == $_value): ?> selected="selected"<?php endif; ?>><?php echo $_label ?></option>
 33 |             <?php endforeach; ?>
 34 |         </select></p>
 35 |     <br/>
 36 |     <?php
 37 |     $_containerStyle = "width:{$this->getWidth()}px;height:{$this->getHeight()}px; margin:0 auto;";
 38 |     ?>
 39 |     <?php if ($this->getCount()): ?>
 40 |         <?php $elementId = uniqid('onilab_googlechart_dashboard_graph_') ?>
 41 |         <p id="<?php echo $elementId ?>" style="<?php echo $_containerStyle ?>"></p>
 42 |         <span style="text-align: center; display: block"><?php echo $this->__('Check for updates at ') ?> <a href="https://github.com/onilab/magento-1-google-api-chart-fix" target="_blank">GitHub</a></span>
 43 |         <script type="application/javascript">
 44 |             <?php list($datas, $dateList) = $this->getChartData() ?>
 45 |             <?php
 46 |             $data = array_pop($datas);
 47 |             $rowsCount = count($data);
 48 |             $preparedRows = [];
 49 |             for ($i = 0; $i < $rowsCount; $i++) {
 50 |                 $preparedRows[] = [$dateList[$i], $data[$i]];
 51 |             }
 52 |             $rowsJson = json_encode($preparedRows);
 53 |             ?>
 54 |             (function () {
 55 |                 var select = document.getElementById('order_orders_period'),
 56 |                     selectValue = select.value,
 57 |                     dateFormat = 'hh:mm a',
 58 |                     gridlines = 8;
 59 |                 if (select) {
 60 |                     if (select.value === '7d') {
 61 |                         gridlines = 4;
 62 |                         dateFormat = 'E';
 63 |                     }
 64 |                     if (select.value === '1m') {
 65 |                         dateFormat = 'dd MMM';
 66 |                     }
 67 |                     if (select.value === '1y' || select.value === '2y') {
 68 |                         dateFormat = 'MMM YYYY';
 69 |                     }
 70 |                 }
 71 |                 var data = <?php echo $rowsJson ?>,
 72 |                     ticks = [];
 73 |                 for (var i = 0; i < data.length; i++) {
 74 |                     if (data[i][0] > 0) {
 75 |                         data[i][0] = new Date(data[i][0] * 1000 + (new Date()).getTimezoneOffset() * 60 * 1000);
 76 |                         ticks.push(data[i][0]);
 77 |                     }
 78 |                 }
 79 |                 var config = {
 80 |                     width: <?php echo $this->getWidth() ?>,
 81 |                     height: <?php echo $this->getHeight() ?>,
 82 |                     colors: ['#EA7601', 'red'],
 83 |                     legend: 'none',
 84 |                     chartArea: {width: '90%', height: '80%'},
 85 |                     vAxis: {
 86 |                         gridlines: {color: '#e6e6e6'},
 87 |                         baselineColor: '#e6e6e6',
 88 |                         format: '0'
 89 |                     },
 90 |                     hAxis: {
 91 |                         gridlines: {
 92 |                             color: '#e6e6e6',
 93 |                             count: gridlines
 94 |                         },
 95 |                         baselineColor: '#e6e6e6',
 96 |                         format: dateFormat
 97 |                     },
 98 |                     backgroundColor: {stroke: '#e6e6e6'}
 99 |                 };
100 |                 if (selectValue === '1y') {
101 |                     config.hAxis.ticks = ticks;
102 |                 }
103 |                 var init = function () {
104 |                     onilabGoogleCharts.createChart('<?php echo $elementId ?>', [
105 |                         ['datetime', 'Time'],
106 |                         ['number', '<?php echo $this->getTitle() ?>']
107 |                     ], data, config);
108 |                 };
109 |                 document.addEventListener('onilab-google-charts-ready', init);
110 |                 if (window.onilabGoogleCharts) {
111 |                     init();
112 |                 }
113 |             })();
114 |         </script>
115 |     <?php else: ?>
116 |         <p class="a-center" style="<?php echo $_containerStyle ?>"><?php echo $this->__('No Data Found') ?></p>
117 |     <?php endif; ?>
118 | </div>
119 | 


--------------------------------------------------------------------------------