Business/NickelBox
2
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Don't show closed registers in picker list

Browse Source
This commit is contained in:
Skylar Ittner 2018-06-02 13:53:13 -06:00
parent 5df113c70d
commit b6eb0a3b8e
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lang/en_us.php
View File

@ -111,4 +111,5 @@ define("STRINGS", [
"adding register" => "Adding register", "adding register" => "Adding register",
"register saved" => "Register saved.", "register saved" => "Register saved.",
"register name taken" => "Register name already taken. Use a different name.", "register name taken" => "Register name already taken. Use a different name.",
"no open registers" => "No open cash registers. Go to the Registers page to open one."
]); ]);

15
lib/chooseregister.php
View File

@ -4,6 +4,8 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this * License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. * file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/ */
$registers = $database->select("registers", ['[>]cash_drawer' => ['registerid' => 'registerid']], ['registers.registerid (id)', 'registername (name)'], ['AND' => ['open[!]' => null, 'close' => null], 'ORDER' => 'registername']);
?> ?>
<div class="row justify-content-center"> <div class="row justify-content-center">
@ -14,9 +16,11 @@
</h3> </h3>
<div class="card-body"> <div class="card-body">
<h5 class="card-title"><?php lang("choose register"); ?></h5> <h5 class="card-title"><?php lang("choose register"); ?></h5>
<?php
if (count($registers) > 0) {
?>
<div class="list-group"> <div class="list-group">
<?php <?php
$registers = $database->select("registers", ['registers.registerid (id)', 'registername (name)']);
foreach ($registers as $r) { foreach ($registers as $r) {
?> ?>
<button class="list-group-item" name="register" value="<?php echo $r['id']; ?>"> <button class="list-group-item" name="register" value="<?php echo $r['id']; ?>">
@ -26,6 +30,15 @@
} }
?> ?>
</div> </div>
<?php
} else {
?>
<div class="alert alert-info">
<?php lang("no open registers"); ?>
</div>
<?php
}
?>
</div> </div>
<div class="card-footer"> <div class="card-footer">
</div> </div>

2
pages/pos.php
View File

@ -9,7 +9,7 @@ $register = [
"id" => "" "id" => ""
]; ];
if (isset($_GET['switch']) || !isset($_SESSION['register']) || !$database->has('registers', ['registerid' => $_SESSION['register']])) { if (isset($_GET['switch']) || !isset($_SESSION['register']) || !$database->has("registers", ['[>]cash_drawer' => ['registerid' => 'registerid']], ['AND' => ['open[!]' => null, 'close' => null, 'registerid' => $_SESSION['register']]])) {
require_once __DIR__ . "/../lib/chooseregister.php"; require_once __DIR__ . "/../lib/chooseregister.php";
} else { } else {
$register = $database->get('registers', ['registerid (id)', 'registername (name)'], ['registerid' => $_SESSION['register']]); $register = $database->get('registers', ['registerid (id)', 'registername (name)'], ['registerid' => $_SESSION['register']]);