sharpetronics/crunchbutton
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

partial #1447

Browse Source
This commit is contained in:
Daniel Camargo 2013-06-21 18:46:08 -03:00
parent 12af998852
commit 702762a4ea
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/controllers/default/cockpit/home/charts.php
View File

@ -364,7 +364,7 @@ class Controller_home_charts extends Crunchbutton_Controller_Account {
o.id_community o.id_community
ORDER BY YEARWEEK(o.date) DESC"; ORDER BY YEARWEEK(o.date) DESC";
$data = $this->parseDataWeeksGroup( $query, 'Orders' ); $data = $this->parseDataWeeksGroup( $query );
$this->render( array( 'data' => $data, 'unit' => 'users' ) ); $this->render( array( 'data' => $data, 'unit' => 'users' ) );
@ -428,9 +428,10 @@ class Controller_home_charts extends Crunchbutton_Controller_Account {
break; break;
case 'orders-per-week-by-community': case 'orders-per-week-by-community':
$query = "SELECT CONCAT('Week ', YEARWEEK(date)) AS `week`,
COUNT(*) AS Orders, $query = "SELECT YEARWEEK(date) AS Week,
c.name AS 'Community' COUNT(*) AS Total,
c.name AS 'Group'
FROM `order` o FROM `order` o
INNER JOIN user u ON u.id_user = o.id_user INNER JOIN user u ON u.id_user = o.id_user
LEFT JOIN community c ON o.id_community = c.id_community LEFT JOIN community c ON o.id_community = c.id_community
@ -441,7 +442,7 @@ class Controller_home_charts extends Crunchbutton_Controller_Account {
GROUP BY YEARWEEK(date), c.name GROUP BY YEARWEEK(date), c.name
ORDER BY YEARWEEK(date) DESC"; ORDER BY YEARWEEK(date) DESC";
$data = $this->parseDataWeeksSimple( $query, 'Orders' ); $data = $this->parseDataWeeksGroup( $query );
$this->render( array( 'data' => $data, 'unit' => 'orders' ) ); $this->render( array( 'data' => $data, 'unit' => 'orders' ) );

4
include/controllers/default/cockpit/home/index.php
View File

@ -51,10 +51,10 @@ class Controller_home extends Crunchbutton_Controller_Account {
), ),
'Tracking Marketing Efforts' => array( 'Tracking Marketing Efforts' => array(
'active-users-per-week' => 'Active Users per Week', 'active-users-per-week' => 'Active Users per Week',
// 'active-users-by-community' => 'Active users by community', 'active-users-by-community' => 'Active users by community',
'orders-by-weekday-by-community' => 'Orders by Weekday by Community', 'orders-by-weekday-by-community' => 'Orders by Weekday by Community',
'orders-per-week' => 'Orders per Week', 'orders-per-week' => 'Orders per Week',
// 'orders-per-week-by-community' => 'Orders per Week by Community', 'orders-per-week-by-community' => 'Orders per Week by Community',
// 'orders-using-giftcard-per-week' => 'Orders using Gift Card per Week',*/ // 'orders-using-giftcard-per-week' => 'Orders using Gift Card per Week',*/
), ),
); );