' + (parseFloat(Math.round(totalsum * 100) / 100).toFixed(2)).replace(".", decpoint) + "
";
closingPart += '' + MAN_CLOSING_INCOME_CASH[lang] + ' (' + currency + '): ' + (parseFloat(Math.round(cashsum * 100) / 100).toFixed(2)).replace(".", decpoint) + "
";
closingPart += '' + MAN_CLOSING_DET_TXT[lang] + '
';
+
closingPart += '';
closingPart += '';
closingPart += '';
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index f798078..fd67fdc 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -1091,7 +1091,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage");
}
// CAUTION: change version also in config.txt!!!
- $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.2",
+ $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.3",
"user" => $currentUser,
"menu" => $mainMenu,
"waitermessage" => $waiterMessage,
diff --git a/webapp/php/closing.php b/webapp/php/closing.php
index 03cae2e..aa29666 100644
--- a/webapp/php/closing.php
+++ b/webapp/php/closing.php
@@ -220,12 +220,31 @@ mysqli_free_result( $dbresult );
return $sum;
}
+private function getUserGroupedSumOfClosing($pdo,$closingid) {
+$sql = "SELECT userid,username,";
+
+$sql .= "ROUND(sum(brutto),2) as billsumall,";
+
+$sql .= "ROUND(sum(if(paymentid='1',brutto,'0.00')),2) as sumonlybar,";
+
+$sql .= "ROUND(sum(if(status = 'c',brutto,'0.00')),2) as sumcash ";
+
+$sql .= "FROM %bill%,%user% WHERE userid=%user%.id AND closingid=? GROUP BY userid";
+
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute(array($closingid));
+$result = $stmt->fetchAll();
+
+return $result;
+}
+
/*
* Get all closings that are requested:
* if month and year is null or empty ==> last 30 closings
* otherwise query by date
*/
private function getClosings($month, $year) {
+$pdo = DbUtils::openDbAndReturnPdoStatic();
$monthText=$month;
if ($month < 10) {
$monthText = "0" . $month;
@@ -246,7 +265,8 @@ $closingDate = $zeile['closingdate'];
$remark = $zeile['remark'];
$totalSum = $this->getSumOfBillsWithClosingId($theId, false);
$cashSum = $this->getSumOfBillsWithClosingId($theId, true);
-$closingEntry = array("id" => $theId, "closingDate" => $closingDate, "remark" => $remark, "totalsum" => $totalSum, "cashsum" => $cashSum);
+$userSums = $this->getUserGroupedSumOfClosing($pdo, $theId);
+$closingEntry = array("id" => $theId, "closingDate" => $closingDate, "remark" => $remark, "totalsum" => $totalSum, "cashsum" => $cashSum, "usersums" => $userSums);
$resultarray[] = $closingEntry;
}
mysqli_free_result( $dbresult );
diff --git a/webapp/php/reports.php b/webapp/php/reports.php
index 82a8c23..7198cba 100644
--- a/webapp/php/reports.php
+++ b/webapp/php/reports.php
@@ -164,6 +164,8 @@ class Reports {
$retRatings = $this->getRatings($pdo,$allDates['last30days'],$allDates['lastMonthComplete'], $allDates['currentTimeStr']);
+ $usersums = $this->getUserSums($pdo);
+
$pdo->commit();
$retArray = array("today" => $retArrayToday,
@@ -173,7 +175,8 @@ class Reports {
"prodsums" => $retArrayProds,
"lastmonthname" => $allDates['lastMonthName'],
"thismonthname" => $allDates['thisMonthName'],
- "ratings" => $retRatings
+ "ratings" => $retRatings,
+ "usersums" => $usersums
);
return $retArray;
@@ -370,5 +373,30 @@ class Reports {
return array("statistics" => $reports,"remarks" =>$result);
}
+
+ function getUserSums($pdo) {
+ $sql = "SELECT userid,username as iter,";
+
+ $sql .= "ROUND(sum(brutto),2) as sum,";
+
+ $sql .= "ROUND(sum(if(paymentid='1',brutto,'0.00')),2) as sumonlybar,";
+
+ $sql .= "ROUND(sum(if(status = 'c',brutto,'0.00')),2) as sumcash ";
+
+ $sql .= "FROM %bill%,%user% WHERE userid=%user%.id AND closingid is null GROUP BY userid";
+
+ $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+ $stmt->execute();
+ $result = $stmt->fetchAll();
+
+ $sumMax = 0.0;
+ foreach ($result as $a) {
+ if ($a["sum"] > $sumMax) {
+ $sumMax = $a["sum"];
+ }
+ }
+
+ return array("max" => $sumMax, "content" => $result);
+ }
}
?>
\ No newline at end of file
diff --git a/webapp/reports.html b/webapp/reports.html
index c943045..dd79d83 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -22,6 +22,11 @@