Move printer config from printer module to tillconfig

quicktill/delivery.py

@@ -246,7 +246,7 @@ def printout(self):
             return
         menu = [(f"Print labels on {x}",
                  printer.label_print_delivery, (x, self.dn))
-                for x in printer.labelprinters]
+                for x in tillconfig.label_printers]
         ui.automenu(menu, title="Delivery print options",
                     colour=ui.colour_confirm)
 

quicktill/foodcheck.py

@@ -5,7 +5,6 @@
 from . import event
 from . import user
 from . import ui_ncurses
-from . import printer
 from . import pdrivers
 
 import logging
@@ -77,7 +76,8 @@ def add_arguments(parser):
     @staticmethod
     def run(args):
         tillconfig.mainloop = event.SelectorsMainLoop()
-        printer.driver = pdrivers.nullprinter(name="disabled-printer")
+        tillconfig.receipt_printer = pdrivers.nullprinter(
+            name="disabled-printer")
         tillconfig.firstpage = lambda: page(commitcode=args.commitcode,
                                             quitcode=args.quitcode,
                                             menuurl=args.url)

quicktill/foodorder.py

@@ -5,7 +5,7 @@
 import datetime
 import hashlib
 import logging
-from . import ui, keyboard, td, printer, tillconfig, user
+from . import ui, keyboard, td, tillconfig, user
 from . import lockscreen
 from . import register
 from .models import zero, penny
@@ -324,7 +324,7 @@ def __init__(self, func, transid, menuurl, kitchenprinters,
         self.h = 20
         self.w = 64
         kpprob = self._kitchenprinter_problem()
-        rpprob = printer.driver.offline()
+        rpprob = tillconfig.receipt_printer.offline()
         if kpprob and rpprob:
             ui.infopopup(
                 ["Both the kitchen printer and receipt printer report "
@@ -431,7 +431,7 @@ def printkey(self):
 
     def finish(self, tablenumber):
         # Check on the printer before we do any work...
-        rpprob = printer.driver.offline()
+        rpprob = tillconfig.receipt_printer.offline()
         if rpprob:
             ui.infopopup(
                 ["The receipt printer is reporting a problem.  Please fix it "
@@ -466,7 +466,7 @@ def finish(self, tablenumber):
         if r == True:
             user = ui.current_user()
             with ui.exception_guard("printing the customer copy"):
-                print_food_order(printer.driver, number, self.ml,
+                print_food_order(tillconfig.receipt_printer, number, self.ml,
                                  verbose=True, tablenumber=tablenumber,
                                  footer=self.footer, transid=self.transid,
                                  print_total=self.print_total)
@@ -482,7 +482,7 @@ def finish(self, tablenumber):
                     sys.exc_info()[0], sys.exc_info()[1])
                 try:
                     print_food_order(
-                        printer.driver, number, self.ml,
+                        tillconfig.receipt_printer, number, self.ml,
                         verbose=False, tablenumber=tablenumber,
                         footer=self.footer, transid=self.transid,
                         user=user.shortname if user else None)

quicktill/jsonfoodorder.py

@@ -3,7 +3,7 @@
 import traceback
 import datetime
 import logging
-from . import ui, keyboard, td, printer, tillconfig, user
+from . import ui, keyboard, td, tillconfig, user
 from .user import log as userlog
 from . import lockscreen
 from . import register
@@ -439,7 +439,7 @@ def __init__(self, func, transid, menuurl, kitchenprinters,
         self.h = 20
         self.w = 64
         kpprob = self._kitchenprinter_problem()
-        rpprob = printer.driver.offline()
+        rpprob = tillconfig.receipt_printer.offline()
         if kpprob and rpprob:
             ui.infopopup(
                 ["Both the kitchen printer and receipt printer report "
@@ -537,7 +537,7 @@ def printkey(self):
 
     def finish(self, tablenumber):
         # Check on the printer before we do any work...
-        rpprob = printer.driver.offline()
+        rpprob = tillconfig.receipt_printer.offline()
         if rpprob:
             ui.infopopup(
                 ["The receipt printer is reporting a problem.  Please fix it "
@@ -571,7 +571,7 @@ def finish(self, tablenumber):
         if r == True:
             user = ui.current_user()
             with ui.exception_guard("printing the customer copy"):
-                print_food_order(printer.driver, number, self.ml,
+                print_food_order(tillconfig.receipt_printer, number, self.ml,
                                  verbose=True, tablenumber=tablenumber,
                                  footer=self.menu.footer, transid=self.transid)
             try:
@@ -586,7 +586,7 @@ def finish(self, tablenumber):
                     sys.exc_info()[0], sys.exc_info()[1])
                 try:
                     print_food_order(
-                        printer.driver, number, self.ml,
+                        tillconfig.receipt_printer, number, self.ml,
                         verbose=False, tablenumber=tablenumber,
                         footer=self.menu.footer, transid=self.transid,
                         user=user.shortname)

quicktill/managestock.py

@@ -55,7 +55,7 @@ def print_stocklist_menu(sinfo, title):
     td.s.add_all(sinfo)
     menu = [(f"Print labels on {x}",
              printer.stocklabel_print, (x, sinfo))
-            for x in printer.labelprinters]
+            for x in tillconfig.label_printers]
     ui.automenu(menu, title="Stock print options", colour=ui.colour_confirm)
 
 
@@ -313,7 +313,7 @@ def correct_stocktype():
 @user.permission_required(
     'reprint-stocklabel', 'Re-print a single stock label')
 def reprint_stocklabel():
-    if not printer.labelprinters:
+    if not tillconfig.label_printers:
         ui.infopopup(["There are no label printers configured."],
                      title="Error")
         return
@@ -329,7 +329,7 @@ def reprint_stocklabel_choose_printer(item):
         text="Re-printed stock label"))
     menu = [(f"Print label on {x}",
              printer.stocklabel_print, (x, [item]))
-            for x in printer.labelprinters]
+            for x in tillconfig.label_printers]
     ui.automenu(menu, title="Choose where to print label",
                 colour=ui.colour_confirm)
 
@@ -451,7 +451,7 @@ def _finish_print_pricelist(dept_id, include_all):
         l = l.filter(StockItem.stocklineid != None)
     l = l.all()
 
-    with printer.driver as d:
+    with tillconfig.receipt_printer as d:
         d.printline(f"\t{tillconfig.pubname}", emph=1)
         d.printline()
         d.printline("\tPrice List", colour=1)

quicktill/managetill.py

@@ -170,7 +170,7 @@ def long_toast():
 
     def raise_print_exception():
         with ui.exception_guard("testing exception raised in printer driver"):
-            with printer.driver as d:
+            with tillconfig.receipt_printer as d:
                 d.printline("This line is printed before the exception")
                 raise Exception
 

quicktill/printer.py

@@ -8,10 +8,6 @@
 import datetime
 now = datetime.datetime.now
 
-# XXX should be in tillconfig?
-driver = None
-labelprinters = []
-
 # Do we print check digits on stock labels?
 checkdigit_print = config.BooleanConfigItem(
     'core:checkdigit_print', False, display_name="Print check digits?",
@@ -28,7 +24,7 @@ def print_receipt(transid):
         return
     if not trans.lines:
         return
-    with driver as d:
+    with tillconfig.receipt_printer as d:
         d.printline(f"\t{tillconfig.pubname}", emph=1)
         for i in tillconfig.pubaddr().splitlines():
             d.printline(f"\t{i}", colour=1)
@@ -109,7 +105,7 @@ def print_receipt(transid):
 
 
 def print_sessioncountup(s):
-    with driver as d:
+    with tillconfig.receipt_printer as d:
         d.printline(f"\t{tillconfig.pubname}", emph=1)
         d.printline(f"\tSession {s.id}", colour=1)
         d.printline(f"\t{ui.formatdate(s.date)}", colour=1)
@@ -155,7 +151,7 @@ def print_sessiontotals(session_id):
     till_totals = dict(s.payment_totals)
     actual_totals = dict((x.paytype, x.amount) for x in s.actual_totals)
 
-    with driver as d:
+    with tillconfig.receipt_printer as d:
         d.printline(f"\t{tillconfig.pubname}", emph=1)
         d.printline(f"\tSession {s.id}", colour=1)
         d.printline(f"\t{ui.formatdate(s.date)}", colour=1)
@@ -209,7 +205,7 @@ def print_deferred_payment_wrapper(trans, paytype, amount, user_name):
     Print a wrapper for money (cash, etc.) to be set aside to use
     towards paying a part-paid transaction in a future session.
     """
-    with driver as d:
+    with tillconfig.receipt_printer as d:
         for i in range(4):
             d.printline(f"\t{tillconfig.pubname}", emph=1)
             d.printline(f"\tDeferred transaction {trans.id}", emph=1)
@@ -294,7 +290,7 @@ def print_restock_list(rl):
     We can't assume that any of these objects are in the current
     session.
     """
-    with driver as d:
+    with tillconfig.receipt_printer as d:
         d.printline(f"\t{tillconfig.pubname}", emph=1)
         d.printline("\tRe-stock list")
         d.printline(f"\tPrinted {ui.formattime(now())}")
@@ -325,7 +321,7 @@ def kickout():
     with ui.exception_guard("kicking out the cash drawer",
                             title="Printer error"):
         try:
-            driver.kickout()
+            tillconfig.cash_drawer.kickout()
         except pdrivers.PrinterError as e:
             ui.infopopup([f"Could not kick out the cash drawer: {e.desc}"],
                          title="Printer problem")

quicktill/session.py

@@ -125,7 +125,7 @@ def confirmendsession():
     if not r:
         return
     # Check that the printer has paper before ending the session
-    pp = printer.driver.offline()
+    pp = tillconfig.receipt_printer.offline()
     if pp:
         ui.infopopup(["Could not end the session: there is a problem with "
                       f"the printer: {pp}"], title="Printer problem")

quicktill/till.py

@@ -570,17 +570,28 @@ def main():
     for opt, val in config.items():
         if opt == 'printer':
             if args.disable_printer:
-                printer.driver = pdrivers.nullprinter(name="disabled-printer")
+                tillconfig.receipt_printer = pdrivers.nullprinter(
+                    name="disabled-printer")
             else:
-                printer.driver = val
-                lockscreen.CheckPrinter("Receipt printer", printer.driver)
+                tillconfig.receipt_printer = val
+                lockscreen.CheckPrinter("Receipt printer", val)
+        elif opt == "cash_drawer":
+            if args.disable_printer:
+                tillconfig.cash_drawer = pdrivers.nullprinter(
+                    name="disabled-cash-drawer")
+            else:
+                tillconfig.cash_drawer = val
         elif opt == 'labelprinters':
-            printer.labelprinters = val
+            tillconfig.label_printers = val
         elif opt == 'database':
             tillconfig.database = val
         elif opt == 'all_payment_methods':
+            # This will be obsolete as of version 23 and should show
+            # a warning if present
             tillconfig.all_payment_methods = val
         elif opt == 'payment_methods':
+            # This will be obsolete as of version 23 and should show
+            # a warning if present
             tillconfig.payment_methods = val
         elif opt == 'keyboard_driver':
             tillconfig.keyboard_driver = val
@@ -609,9 +620,12 @@ def main():
         else:
             log.warning("Unknown configuration option '%s'", opt)
 
-    if printer.driver is None:
+    if tillconfig.receipt_printer is None:
         log.info("no printer configured: using nullprinter()")
-        printer.driver = pdrivers.nullprinter()
+        tillconfig.receipt_printer = pdrivers.nullprinter()
+
+    if tillconfig.cash_drawer is None:
+        tillconfig.cash_drawer = tillconfig.receipt_printer
 
     if args.database is not None:
         tillconfig.database = args.database

quicktill/tillconfig.py

@@ -20,6 +20,10 @@
 keyboard = None
 keyboard_right = None
 
+receipt_printer = None
+label_printers = []
+cash_drawer = None
+
 pubname = config.ConfigItem(
     'core:sitename', "Default site name", display_name="Site name",
     description="Site name to be printed on receipts")