From b6eb0a3b8efb8f76b26540ea69f255e02f5ab9f6 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Sat, 2 Jun 2018 13:53:13 -0600
Subject: [PATCH] Don't show closed registers in picker list

---
 lang/en_us.php         |  1 +
 lib/chooseregister.php | 33 +++++++++++++++++++++++----------
 pages/pos.php          |  2 +-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/lang/en_us.php b/lang/en_us.php
index e743a67..4cf7179 100644
--- a/lang/en_us.php
+++ b/lang/en_us.php
@@ -111,4 +111,5 @@ define("STRINGS", [
     "adding register" => "Adding register",
     "register saved" => "Register saved.",
     "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."
 ]);
diff --git a/lib/chooseregister.php b/lib/chooseregister.php
index 6767b7c..fc81396 100644
--- a/lib/chooseregister.php
+++ b/lib/chooseregister.php
@@ -4,6 +4,8 @@
  * 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/.
  */
+
+$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">
@@ -14,18 +16,29 @@
             </h3>
             <div class="card-body">
                 <h5 class="card-title"><?php lang("choose register"); ?></h5>
-                <div class="list-group">
-                    <?php
-                    $registers = $database->select("registers", ['registers.registerid (id)', 'registername (name)']);
-                    foreach ($registers as $r) {
-                        ?>
-                        <button class="list-group-item" name="register" value="<?php echo $r['id']; ?>">
-                            <?php echo $r['name']; ?>
-                        </button>
-                        <?php
-                    }
+                <?php
+                if (count($registers) > 0) {
                     ?>
+                    <div class="list-group">
+                        <?php
+                        foreach ($registers as $r) {
+                            ?>
+                            <button class="list-group-item" name="register" value="<?php echo $r['id']; ?>">
+                                <?php echo $r['name']; ?>
+                            </button>
+                            <?php
+                        }
+                        ?>
+                    </div>
+                    <?php
+                } else {
+                    ?>
+                <div class="alert alert-info">
+                    <?php lang("no open registers"); ?>
                 </div>
+                <?php
+                }
+                ?>
             </div>
             <div class="card-footer">
             </div>
diff --git a/pages/pos.php b/pages/pos.php
index c769034..7033c20 100644
--- a/pages/pos.php
+++ b/pages/pos.php
@@ -9,7 +9,7 @@ $register = [
     "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";
 } else {
     $register = $database->get('registers', ['registerid (id)', 'registername (name)'], ['registerid' => $_SESSION['register']]);