diff --git a/lang/en_us.php b/lang/en_us.php
index 633cf16..18b6ed9 100644
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -117,4 +117,5 @@ define("STRINGS", [
"manage" => "Manage",
"x report" => "X Report",
"z report" => "Z Report",
+ "pick cash" => "Choose",
]);
diff --git a/lib/generatereceipt.php b/lib/generatereceipt.php
index 0d67570..4ffbcfd 100644
--- a/lib/generatereceipt.php
+++ b/lib/generatereceipt.php
@@ -117,7 +117,7 @@ class GenerateReceipt {
$receipt->appendHeader(new ReceiptLine(lang("x report", false), "", "", ReceiptLine::LINEFORMAT_BOLD | ReceiptLine::LINEFORMAT_CENTER));
- $receipt->appendLine(new ReceiptLine("Date:", "", date(DATETIME_FORMAT)));
+ $receipt->appendLine(new ReceiptLine("Printed:", "", date(DATETIME_FORMAT)));
$receipt->appendLine(new ReceiptLine("Register:", "", $registername));
$receipt->appendLine(new ReceiptLine("Transactions:", "", $transactioncount));
@@ -172,7 +172,7 @@ class GenerateReceipt {
$receipt->appendHeader(new ReceiptLine(lang("z report", false), "", "", ReceiptLine::LINEFORMAT_BOLD | ReceiptLine::LINEFORMAT_CENTER));
- $receipt->appendLine(new ReceiptLine("Date:", "", date(DATETIME_FORMAT)));
+ $receipt->appendLine(new ReceiptLine("Printed:", "", date(DATETIME_FORMAT)));
$receipt->appendLine(new ReceiptLine("Register:", "", $registername));
$receipt->appendLine(new ReceiptLine("Transactions:", "", $transactioncount));
diff --git a/lib/receipts.php b/lib/receipts.php
index e3d4aa1..31a5c25 100644
--- a/lib/receipts.php
+++ b/lib/receipts.php
@@ -53,13 +53,13 @@ class ReceiptLine {
return "
";
}
$html = "";
- if (!empty($this->left)) {
+ if (!empty($this->left) || $this->left === 0 || $this->left === "0") {
$html .= '' . htmlspecialchars($this->left) . ' ';
}
- if (!empty($this->middle)) {
+ if (!empty($this->middle) || $this->middle === 0 || $this->middle === "0") {
$html .= '' . htmlspecialchars($this->middle) . ' ';
}
- if (!empty($this->right)) {
+ if (!empty($this->right) || $this->right === 0 || $this->right === "0") {
$html .= '' . htmlspecialchars($this->right) . '';
}
$classes = ["flex"];
diff --git a/pages.php b/pages.php
index c3e6c9e..afcb399 100644
--- a/pages.php
+++ b/pages.php
@@ -74,6 +74,9 @@ define("PAGES", [
"editregister" => [
"title" => "edit register",
"navbar" => false,
+ "styles" => [
+ "static/css/editregister.css",
+ ],
"scripts" => [
"static/js/editregister.js"
]
diff --git a/pages/editregister.php b/pages/editregister.php
index cd3113f..aca731d 100644
--- a/pages/editregister.php
+++ b/pages/editregister.php
@@ -11,6 +11,7 @@ $regdata = [
'id' => '',
'name' => ''
];
+$cash = [];
$editing = false;
@@ -33,7 +34,7 @@ if (!empty($VARS['id'])) {
}
if ($editing) {
-
+ $cash = $database->select('cash_drawer', ['cashid', 'open', 'close'], ['AND' => ['registerid' => $regdata['id'], 'open[!]' => null, 'close[!]' => null], 'ORDER' => 'cashid', 'LIMIT' => 30]);
}
?>
@@ -59,6 +60,30 @@ if ($editing) {
+