-
-
MAB-LAB
+
+
+
+
+
+
+
MABL
- id==PAGE_ID_HOME?'class="active"':''; ?> >
diff --git a/install/db-install.sql b/install/db-install.sql
index 24fbba5..d6a7a2a 100644
--- a/install/db-install.sql
+++ b/install/db-install.sql
@@ -98,7 +98,7 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%applications` (
# create google play sales and earnings tables
CREATE TABLE IF NOT EXISTS `%PREFIX%googleplay_sales` (
`sale_order_number` bigint(20) NOT NULL,
- `sale_order_charged_date` char(10) NOT NULL,
+ `sale_order_charged_date` datetime NOT NULL,
`sale_charged_timestamp` int(11) NOT NULL,
`sale_financial_status` varchar(25) NOT NULL,
`sale_device_model` varchar(25) NOT NULL,
@@ -128,4 +128,8 @@ CREATE TABLE IF NOT EXISTS `%PREFIX%milestones` (
`mile_description` text,
`mile_duedate` double DEFAULT NULL,
PRIMARY KEY (`mile_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+
+# create indexes
+CREATE INDEX `idx_reports_report_issue` ON `%PREFIX%reports` (`report_issue`);
\ No newline at end of file
diff --git a/install/update-to-8/db-update.sql b/install/update-to-8/db-update.sql
new file mode 100644
index 0000000..b724e60
--- /dev/null
+++ b/install/update-to-8/db-update.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `%PREFIX%googleplay_sales` CHANGE `sale_order_charged_date` `sale_order_charged_date` DATETIME NOT NULL;
+
+CREATE INDEX `idx_reports_report_issue` ON `%PREFIX%reports` (`report_issue`);
\ No newline at end of file
diff --git a/install/update-to-8/update.php b/install/update-to-8/update.php
new file mode 100644
index 0000000..fb3c509
--- /dev/null
+++ b/install/update-to-8/update.php
@@ -0,0 +1,22 @@
+begin();
+
+$mUpdateHelper->applySQLUpdateFile();
+
+$mUpdateHelper->exitOnError();
+
+$mUpdateHelper->printEndStepMsg(true, null, true);
+
+$mUpdateHelper->end();
\ No newline at end of file
diff --git a/pages/apps_stats.inc.php b/pages/apps_stats.inc.php
index 04b9e91..2d1c7d5 100644
--- a/pages/apps_stats.inc.php
+++ b/pages/apps_stats.inc.php
@@ -23,29 +23,187 @@
$pastYear = $currentYear-1;
$currentMonth = date('m');
-$pastMonth = $currentMonth-1;
+$pastMonth = $currentMonth==1?12:$currentMonth-1;
$currentMonthName = date('F');
$pastMonthName = date('F', mktime(0, 0, 0, $pastMonth, 1, $currentYear));
$daysCurrentMonth = date("t");
-?>
+/*?>
+
+ Estimated revenue
+ ="'.$currentYear.'-'.$pastMonth.'-01"',
+ SALE_ORDER_CHARGED_DATE.' ASC',
+ SALE_CURRENCY_CODE.','.SALE_ITEM_PRICE.', MONTH('.SALE_ORDER_CHARGED_DATE.') month, '.SALE_ORDER_CHARGED_DATE,
+ null,
+ null, false);
+
+ if (empty($sales)) {
+ ?>No record found.$v) {
+ echo date('F', mktime(0, 0, 0, $m, 1, $currentYear)), ' : ', round($v, 2), 'EUR', $sep;
+
+ $sep = '';
+
+ if ($prev!=-1) {
+ ?>
+
+
+
+
+
*/?>
+
-
+
-
Sales per Application
-
- Daily Sales per Month
+
+
+
+
+
+
+
+
+ =0 AND DATEDIFF(DATE('.SALE_ORDER_CHARGED_DATE.'), DATE("'.$currentYear.'-'.$currentMonth.'-01") + INTERVAL '.INC_VALUE.' DAY)<=0 ) ) current_month',
+ // group by
+ null, null, false);
+
+ $month = $pastMonth; $year = $pastMonth>$currentMonth?$pastYear:$currentYear;
+ $arr2 = DbHelper::selectRows(TBL_INCREMENTS,
+ null,
+ // order
+ 'inc ASC LIMIT '.date('t', mktime(0, 0, 0, $month, 1, $year)),
+ // projection
+ 'DATE("'.$year.'-'.$month.'-01") + INTERVAL '.INC_VALUE.' DAY,'.
+ '(SELECT COUNT(*) FROM '.TBL_SALES.' WHERE '.$whereFilterApp.' AND ( DATEDIFF(DATE('.SALE_ORDER_CHARGED_DATE.'), DATE("'.$year.'-'.$month.'-01"))>=0 AND DATEDIFF(DATE('.SALE_ORDER_CHARGED_DATE.'), DATE("'.$year.'-'.$month.'-01") + INTERVAL '.INC_VALUE.' DAY)<=0 ) ) past_month1',
+ // group by
+ null, null, false);
+
+ $month = $pastMonth==1?12:$pastMonth-1; $year = $month>$pastMonth?$pastYear:$currentYear; $pastMonthName2 = date('F', mktime(0, 0, 0, $month, 1, $year));
+ $arr3 = DbHelper::selectRows(TBL_INCREMENTS,
+ null,
+ // order
+ 'inc ASC LIMIT '.date('t', mktime(0, 0, 0, $month, 1, $year)),
+ // projection
+ 'DATE("'.$year.'-'.$month.'-01") + INTERVAL '.INC_VALUE.' DAY,'.
+ '(SELECT COUNT(*) FROM '.TBL_SALES.' WHERE '.$whereFilterApp.' AND ( DATEDIFF(DATE('.SALE_ORDER_CHARGED_DATE.'), DATE("'.$year.'-'.$month.'-01"))>=0 AND DATEDIFF(DATE('.SALE_ORDER_CHARGED_DATE.'), DATE("'.$year.'-'.$month.'-01") + INTERVAL '.INC_VALUE.' DAY)<=0 ) ) past_month2',
+ // group by
+ null, null, false);
+
?>
-
+
+
+ | Day of Month |
+ |
+ |
+ |
+ |
+
+
+ $max) {
+ $max = count($arr2);
+ $dateArr =& $arr2;
+ }
+ if (count($arr3)>$max) {
+ $max = count($arr3);
+ $dateArr =& $arr3;
+ }
+
+ $i = 0; $currentPrev = -1; // current month, previous day value
+ for ($i=0; $i<$max; ++$i) {
+ echo '| '.date('d', strtotime($dateArr[$i][0])).' | ';
+
+ $current = isset($arr1[$i])?round($arr1[$i][1], 2):-1;
+ $past1 = isset($arr2[$i])?round($arr2[$i][1], 2):-1;
+ $past2 = isset($arr3[$i])?round($arr3[$i][1], 2):-1;
+
+ if ($past2>0) {
+ $dataPast2[] = '['.$i.','.$past2.']';
+
+ echo ($past2>$current && $past2>$past1 && $current!=-1?''.$past2.'':$past2).' | ';
+
+ } else { echo ' - | '; }
+
+ if ($past1>0) {
+ $dataPast1[] = '['.$i.','.$past1.']';
+
+ echo ($past1>$current && $past1>$past2 && $current!=-1?''.$past1.'':$past1).' | ';
+
+ } else { echo ' - '; }
+
+ if ($current>0) {
+ $dataCurrent[] = '['.$i.','.$current.']';
+
+ if ($currentPrev>0) {
+ echo '', ($current>$past1 && $current>$past2?''.$current.'':$current), ' | ',
+ ' |
';
+
+ } else { echo '', ($current>$past1 && $current>$past2?''.$current.'':$current), ' | | '; }
+
+ } else { echo ' - | | '; }
+
+ $currentPrev = $current;
+ }
+ ?>
+
+
+
+
+
@@ -305,7 +463,7 @@
+
+
diff --git a/pages/apps_stats.php b/pages/apps_stats.php
index 1167d13..62314fc 100644
--- a/pages/apps_stats.php
+++ b/pages/apps_stats.php
@@ -25,6 +25,11 @@
if ($mSelectedAppId==$app[APP_ID])
$mSelectedAppName = $app[APP_NAME];
}
+
+$urlApp = '';
+if ($mSelectedAppId>0) {
+ $urlApp = 'app='.$mSelectedAppId;
+}
?>
@@ -37,9 +42,9 @@
-
isNav('')?'class="active"':''; ?> >Statistics
-
isNav('data')?'class="active"':''; ?> >Data
-
isNav('import')?'class="active"':''; ?> >Import CSV
+
isNav('')?'class="active"':''; ?> >Statistics
+
isNav('data')?'class="active"':''; ?> >Data
+
isNav('import')?'class="active"':''; ?> >Import CSV
diff --git a/pages/apps_stats_data.inc.php b/pages/apps_stats_data.inc.php
index 03190ef..711fa32 100644
--- a/pages/apps_stats_data.inc.php
+++ b/pages/apps_stats_data.inc.php
@@ -10,17 +10,64 @@
* EIRL DEVAUX J. - Medialoha - initial API and implementation
*/
-$where = null;
+$orderOpts = array( array('Date ASC', SALE_ORDER_CHARGED_TIMESTAMP.' ASC'),
+ array('Date DESC', SALE_ORDER_CHARGED_TIMESTAMP.' DESC'));
+$order = isset($_POST['order'])?$_POST['order']:0;
+
+$periodEnd = isset($_POST['periodEnd'])?$_POST['periodEnd']:'';
+
+if (!isset($_POST['periodStart'])) {
+ $periodStart = date('Y-m-d', strtotime((empty($periodEnd)?'':$periodEnd).' -90 days'));
+
+} else { $periodStart = $_POST['periodStart']; }
+
+
+$where = array();
if ($mSelectedAppId>0)
- $where = SALE_APP_ID.'='.$mSelectedAppId;
+ $where[] = SALE_APP_ID.'='.$mSelectedAppId;
+
+$where[] = SALE_ORDER_CHARGED_TIMESTAMP.'>='.strtotime($periodStart);
+
+if (!empty($periodEnd))
+ $where[] = SALE_ORDER_CHARGED_TIMESTAMP.'<='.strtotime($periodEnd);
$sales = DbHelper::selectRows(TBL_SALES.' LEFT JOIN '.TBL_APPLICATIONS.' ON '.APP_ID.'='.SALE_APP_ID,
- $where,
- SALE_ORDER_CHARGED_TIMESTAMP.' ASC',
+ implode(' AND ', $where),
+ $orderOpts[$order][1],
TBL_SALES.'.*, '.APP_NAME,
null, null, false
);
?>
+
+
\ No newline at end of file
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/configure.php b/pages/configure.php
index c534e7b..6d1ae7c 100644
--- a/pages/configure.php
+++ b/pages/configure.php
@@ -119,6 +119,17 @@