Merge branch 'support-mail-config' into development

Fixes #100 and #108

Author: sedrubal

FabLabKasse/UI/PaymentMethodDialogCode.py

@@ -28,6 +28,7 @@ class PaymentMethodDialog(QtGui.QDialog, Ui_PaymentMethodDialog):
     def __init__(self, parent, cfg, amount):
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
+        self.cfg = cfg
 
         self.method = None
 
@@ -41,7 +42,7 @@ def __init__(self, parent, cfg, amount):
             button = Qt.QPushButton(method.get_title())
             button.setSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
             button.clicked.connect(functools.partial(self.acceptAndSetMethod, method))  # cannot use lambda here because variable method will change in next iteration... python is counterintuitive here....
-            button.setVisible(method.is_enabled(cfg))
+            button.setVisible(method.is_enabled(self.cfg))
             self.layout_methods.addWidget(button)
 
         self.label_betrag.setText(self.parent().shoppingBackend.format_money(amount))
@@ -52,4 +53,4 @@ def acceptAndSetMethod(self, method):
         self.accept()
 
     def getSelectedMethodInstance(self, parent, shopping_backend, amount_to_pay):
-        return self.method(parent, shopping_backend, amount_to_pay)
+        return self.method(parent, shopping_backend, amount_to_pay, self.cfg)

FabLabKasse/UI/PayupCashDialogCode.py

@@ -21,12 +21,16 @@
 import functools
 import logging
 from decimal import Decimal
+from ConfigParser import Error as ConfigParserError
 
 
 class PayupCashDialog(QtGui.QDialog, Ui_PayupCashDialog):
 
-    def __init__(self, parent, amount_total):
-        """payment method dialog for automatic cash payin and payout"""
+    def __init__(self, parent, amount_total, cfg):
+        """
+        payment method dialog for automatic cash payin and payout
+        :param cfg: config from ScriptHelper.getConfig()
+        """
         QtGui.QDialog.__init__(self, parent)
         self.setupUi(self)
         # maximize window - WORKAROUND because showMaximized() doesn't work
@@ -51,6 +55,7 @@ def __init__(self, parent, amount_total):
         self.centsReceived = None
         self.centsPaidOut = None
         self.returnDonated = False
+        self.cfg = cfg
         # The finish button doesn't print a receipt, only the "print receipt and finish" one.
         # Sometimes the later logic still forces receipt printing  (e.g. payment aborted, not everything paid back)
         self.receipt_wanted = False
@@ -271,7 +276,13 @@ def update(self):
                 text = text + u" <p>Ein Rest von {0} konnte leider nicht zurückgezahlt werden.</p>".format(PayupCashDialog.formatCent(self.centsToPayOut - self.centsPaidOut))
             if self.centsToPay > 0:  # payment not aborted
                 text += u"<p>Bitte das Aufräumen nicht vergessen!</p>"
-            text = text + u'<p style="font-size:14px"> Sollte etwas nicht stimmen, benachrichtige bitte sofort einen Betreuer und melde dich bei [email protected].</p></html>'
+            text += u'<p style="font-size:14px"> Sollte etwas nicht stimmen, ' + \
+                u'benachrichtige bitte sofort einen Betreuer'
+            try:
+                email = self.cfg.get('general', 'support_mail')
+                text += u' und melde dich bei {}.</p></html>'.format(email)
+            except ConfigParserError:
+                text += '.</p></html>'
             self.label_status.setText(text)
             self.pushButton_finish.setVisible(True)
             # only ask for receipt if something was paid

FabLabKasse/config.ini.example

@@ -1,4 +1,7 @@
 [general]
+; support mail will be displayed when error occur
+support_mail = [email protected]
+
 ; Path to sqlite3 file
 db_file = development.sqlite3
 

FabLabKasse/gui.py

@@ -41,6 +41,7 @@
 from decimal import Decimal, DecimalException
 from PyQt4 import QtGui, QtCore, Qt
 import functools
+from ConfigParser import Error as ConfigParserError
 
 from libs.flickcharm import FlickCharm
 from libs.pxss import pxss
@@ -632,9 +633,13 @@ def askUser():
                     # TOOD show amount returned on receipt (needs some rework, because it is not yet stored in the order and so we cannot re-print receipts)
                     self.shoppingBackend.print_receipt(paymentmethod.receipt_order_id)
                 except PrinterError,  e:
-                    QtGui.QMessageBox.warning(self, "Quittung", "Drucker scheint offline zu sein." +
-                                              "\nFalls du wirklich eine Quittung brauchst, melde dich bei " +
-                                              "[email protected] mit Datum, Uhrzeit und Betrag.")
+                    try:
+                        email = cfg.get('general', 'support_mail')
+                    except ConfigParserError:
+                        email = u"einem zuständigen Betreuer"
+                    QtGui.QMessageBox.warning(self, "Quittung", u"Drucker scheint offline zu sein.\n"
+                                              u"Falls du wirklich eine Quittung brauchst, melde dich bei "
+                                              u"{} mit Datum, Uhrzeit und Betrag.".format(email))
                     logging.warning("printing receipt failed: {0}".format(repr(e)))
         if paymentmethod.successful:
             paymentmethod.show_thankyou()

FabLabKasse/scriptHelper.py

@@ -26,6 +26,7 @@
 import portalocker
 import sqlite3
 from ConfigParser import ConfigParser
+from ConfigParser import Error as ConfigParserError
 import codecs
 from PyQt4 import QtGui
 import traceback
@@ -64,11 +65,16 @@ def myNewExceptionHook(exctype, value, tb):
         import datetime
         # logging.exception()
         try:
+            cfg = getConfig()
+            try:
+                email = cfg.get('general', 'support_mail')
+            except ConfigParserError:
+                logging.warning("could not read mail address from config in graphical except-hook.")
+                email = "den Verantwortlichen"
             msgbox = QtGui.QMessageBox()
             txt = u"Entschuldigung, das Programm wird wegen eines Fehlers beendet."
-            infotxt = u"Wenn dir Rückgeld entgangen ist, melde dich bei [email protected] und gebe " + \
-                u"neben einer Fehlerbeschreibung folgende Uhrzeit an: "
-            infotxt += u"\n{0}.".format(str(datetime.datetime.today()))
+            infotxt = u"""Wenn dir Rückgeld entgangen ist, melde dich bei {0} und gebe neben einer
+             Fehlerbeschreibung folgende Uhrzeit an:{1}.""".format(email, str(datetime.datetime.today()))
             detailtxt = u"{0}\n{1}".format(str(datetime.datetime.today()), "".join(
                 traceback.format_exception(exctype, value, tb, limit=10)))
             logging.fatal(txt)

FabLabKasse/shopping/backend/abstract.py

@@ -27,6 +27,7 @@
 import locale
 import unittest
 import doctest
+from ConfigParser import Error as ConfigParserError
 
 # counter for unique id values, use next(_id_counter) to get a new ID
 _id_counter = itertools.count()
@@ -80,6 +81,7 @@ def format_qty(qty):
     s = s.replace(".", locale.localeconv()['decimal_point'])
     return s
 
+
 def format_money(amount):
     """format float as money string
 
@@ -113,12 +115,12 @@ def format_money(amount):
     if formatted.endswith("0"):
         formatted = formatted[:-1]
 
-    return u'{} €'.format(formatted).replace('.', ',')
+    return u'{0} €'.format(formatted).replace('.', ',')
 
 
 class Category(object):
     """represents a category of Products"""
-    
+
     def __init__(self, categ_id, name, parent_id=None):
         self.categ_id = categ_id
         self.name = name
@@ -131,11 +133,11 @@ def __repr__(self):
 class Product(object):
 
     """simple representation for a product
-    
+
     :param prod_id: numeric unique product ID
     :type prod_id: int
     :param categ_id: category ID of product, or None if the product is not directly visible
-    
+
                      TODO hide these products from search, or a more explicit solution
     :type categ_id: int | None
     :param name: Name of product
@@ -158,7 +160,7 @@ class Product(object):
     """
 
     def __init__(self, prod_id, name, price, unit, location, categ_id=None, qty_rounding=0, text_entry_required=False):
-        
+
         self.prod_id = prod_id
         self.name = name
         assert isinstance(price, (Decimal, int))
@@ -190,11 +192,11 @@ class OrderLine(object):
     :param Decimal price_subtotal: price for ``qty`` * ``unit``  of this product
 
     :param boolean delete_if_zero_qty: if the qty is zero and the user starts adding something else, then remove this line
-    
-    
+
+
        [ usually True, set to False for products that also may as comment limes costing nothing ]
     """
-    
+
     def __init__(self, order_line_id, qty, unit, name, price_per_unit, price_subtotal, delete_if_zero_qty=True):
 
         self.order_line_id = order_line_id
@@ -241,7 +243,7 @@ class AbstractShoppingBackend(object):
     __metaclass__ = ABCMeta
 
     def __init__(self, cfg):
-        """cfg: config from ScriptHelper.getConfig()"""
+        """:param cfg: config from ScriptHelper.getConfig()"""
         self.cfg = cfg
 
     def format_money(self, amount):
@@ -447,12 +449,16 @@ def pay_order_on_client(self, client):
         new_debt = debt + self.get_current_total()
         debt_limit = client.get_debt_limit()
         if new_debt > debt_limit:
+            try:
+                email = self.cfg.get('general', 'support_mail')
+            except ConfigParserError:
+                email = u"einen zuständigen Betreuer"
             raise DebtLimitExceeded(
-                u"Der Kontostand wäre mit dieser Buchung über seinem Limit.\n" +
-                u"Aktuelles Guthaben: {:.2f}\n"
-                u"Schuldengrenze für dieses Konto: {:.2f}\n\n"
-                u"Bie Fragen bitte an [email protected] wenden."
-                .format(-debt, debt_limit))
+                u"Der Kontostand wäre mit dieser Buchung über seinem Limit.\n"
+                u"Aktuelles Guthaben: {0:.2f}\n"
+                u"Schuldengrenze für dieses Konto: {1:.2f}\n\n"
+                u"Bie Fragen wende dich bitte an {2}."
+                .format(-debt, debt_limit, email))
 
         self._pay_order_on_client_unchecked(client)
 

FabLabKasse/shopping/payment_methods.py

@@ -48,18 +48,20 @@
 class AbstractPaymentMethod(object):
 
     """interface for payment methods
-    
+
     :param QWidget parent: handle for main window - for Qt usage
     :param FabLabKasse.shopping.backend.abstract.AbstractShoppingBackend shopping_backend: ShoppingBackend instance
     :param Decimal amount_to_pay: requested amount (rounded to cents)
+    :param cfg: config object
     """
     __metaclass__ = ABCMeta
 
-    def __init__(self, parent, shopping_backend, amount_to_pay):
+    def __init__(self, parent, shopping_backend, amount_to_pay, cfg):
 
         self.parent = parent
         self.shopping_backend = shopping_backend
         self.amount_to_pay = amount_to_pay
+        self.cfg = cfg
         self.successful = None
         self.amount_paid = None
         self.amount_returned = None
@@ -307,7 +309,8 @@ def get_title():
         return "Bargeld (Automatenkasse)"
 
     def _show_dialog(self):
-        pay_diag = PayupCashDialog(parent=self.parent, amount_total=self.amount_to_pay)
+        pay_diag = PayupCashDialog(parent=self.parent,
+                                   amount_total=self.amount_to_pay, cfg=self.cfg)
         ok = bool(pay_diag.exec_())
         paid_amount = pay_diag.getPaidAmount()
         self.amount_paid = paid_amount  # TODO add amount_returned