diff --git a/htdocs/boutique/index.php b/htdocs/boutique/index.php index 01b3928a96b05bc68af68495fe04023db66b5ea6..28cd6ec397a8e8889aefeb0504101fed9aed613b 100644 --- a/htdocs/boutique/index.php +++ b/htdocs/boutique/index.php @@ -41,19 +41,23 @@ print '<tr><td valign="top" width="40%" class="notopnoleft">'; /* * Turnover */ + print_titre($langs->trans('SalesTurnover')); print '<table class="noborder" cellspacing="0" cellpadding="3" width="100%">'; -print '<tr class="liste_titre"><td>'.$langs->trans("Description").'</td>'; +print '<tr class="liste_titre"><td>'.$langs->trans("Month").'</td>'; print '<td align="right">'.$langs->trans("Total").'</td></tr>'; $now=dol_now(); -$sql = "SELECT sum(t.value) as value, MONTH(o.date_purchased) as mois"; -$sql .= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; -$sql .= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; -$sql .= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")"; -$sql .= " GROUP BY mois ORDER BY mois"; +$sql = "SELECT SUM(t.value) as value, MONTH(o.date_purchased) as month"; +$sql.= " FROM ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders_total as t"; +$sql.= " JOIN ".$conf->global->OSC_DB_NAME.".".$conf->global->OSC_DB_TABLE_PREFIX."orders as o ON o.orders_id = t.orders_id"; +//$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR(".$dbosc->idate($now).")"; +$sql.= " WHERE t.class = 'ot_subtotal' AND YEAR(o.date_purchased) = YEAR('".$db->idate($now)."')"; +$sql.= " GROUP BY month"; +$sql.= " ORDER BY month"; +//print $sql;exit; $result=$dbosc->query($sql); if ($result) @@ -116,7 +120,7 @@ if ($resql) { $obj = $dbosc->fetch_object($resql); - print "<tr><td>$obj->orders_id</td><td>$obj->customers_name</td><td>".price($obj->value)."</td><td>$obj->payment_method</td></tr>"; + print "<tr><td>".$obj->orders_id."</td><td>".$obj->customers_name."</td><td>".price($obj->value)."</td><td>".$obj->payment_method."</td></tr>"; $i++; } print "</table><br>"; @@ -235,6 +239,7 @@ else } print '</tr></table>'; -$dbosc->close(); llxFooter(); + +$dbosc->close();