[Pykafe-commits] SF.net SVN: pykafe: [124] trunk/pykafe/server

[<jn...@us...>]

Revision: 124
          http://pykafe.svn.sourceforge.net/pykafe/?rev=124&view=rev
Author:   jnmbk
Date:     2007-06-10 17:38:03 -0700 (Sun, 10 Jun 2007)

Log Message:
-----------
half of payment things

Modified Paths:
--------------
    trunk/pykafe/server/payment.py
    trunk/pykafe/server/server.py

Modified: trunk/pykafe/server/payment.py
===================================================================
--- trunk/pykafe/server/payment.py	2007-06-11 00:37:05 UTC (rev 123)
+++ trunk/pykafe/server/payment.py	2007-06-11 00:38:03 UTC (rev 124)
@@ -93,4 +93,3 @@
         self.label_2.setText(QtGui.QApplication.translate("PaymentDialog", "Total Cost:", None, QtGui.QApplication.UnicodeUTF8))
         self.label.setText(QtGui.QApplication.translate("PaymentDialog", "Used Time:", None, QtGui.QApplication.UnicodeUTF8))
         self.label_3.setText(QtGui.QApplication.translate("PaymentDialog", "guest", None, QtGui.QApplication.UnicodeUTF8))
-

Modified: trunk/pykafe/server/server.py
===================================================================
--- trunk/pykafe/server/server.py	2007-06-11 00:37:05 UTC (rev 123)
+++ trunk/pykafe/server/server.py	2007-06-11 00:38:03 UTC (rev 124)
@@ -243,10 +243,11 @@
             self.changeColor("green")
         elif state == ClientSession.notReady:
             if self.session.state == ClientSession.waitingMoney:
-                total = self.session.calculateTotal(self.config)
                 self.server.payment(self)
+                #total = self.session.calculateTotal(self.config)
                 #dialog = Ui_PaymentDialog()
                 #self.parent()
+                """
                 self.paymentDialog = QtGui.QDialog(self.parent())
                 QtCore.QObject.connect(self.paymentDialog, QtCore.SIGNAL("accepted()"), self.sendOptions)
                 settingsUi = Ui_SettingsWindow()
@@ -269,9 +270,11 @@
                     #logger.add(logger.logTypes.information, _("Money paid"), self.name, member.userName, total)
                     #Database().runOnce("insert into safe values(?,?,?)", (QtCore.QDateTime.currentDateTime().toTime_t(), self.config.last_cashier, total))
                     #logger.add(logger.logTypes.information, _("money paid"), self.name, self.session.user, self.session.calculateTotal()
-                    pass
+                """
+                pass
             if self.session.state == ClientSession.loggedIn:
-                total = self.session.calculateTotal(self.config)
+                self.server.payment(self)
+                """total = self.session.calculateTotal(self.config)
                 payingType, credit = Database().runOnce("select paying_type, debt from members where username=?",(self.session.user,))[0]
                 if payingType == _("Pre Paid"):
                     print "user is pre_paid and has %s credit" % currency(credit)
@@ -285,7 +288,8 @@
                 else:
                     #logger.add(logger.logTypes.information, _("Money paid"), self.name, member.userName, total)
                     #Database().runOnce("insert into safe values(?,?,?)", (QtCore.QDateTime.currentDateTime().toTime_t(), self.config.last_cashier, total))
-                    pass
+                    pass"""
+                pass
             if self.config.filter_enable:
                 message = "007"
                 filterFile = open(self.config.filter_file)
@@ -302,6 +306,7 @@
             self.sendMessage(message)
             self.setTexts((2,3,4,5), ("","","",""))
             self.changeColor("orange")
+            self.session.initialize()
         elif state == ClientSession.requestedOpening:
             self.changeColor("red")
         elif state == ClientSession.waitingMoney:
@@ -864,8 +869,9 @@
         paymentDialog = QtGui.QDialog(self.parent())
         paymentUi = Ui_PaymentDialog()
         paymentUi.setupUi(paymentDialog)
-        paymentUi.totalCost.setValue(client.session.calculateTotal())
-        time = client.session.startTime.secsTo(QtCore.QDateTime.currentDateTime())        
+        paymentUi.totalCost.setValue(client.session.calculateTotal(self.config))
+        paymentUi.label_3.setText("%s: %s" % (client.name, client.session.user))
+        time = client.session.startTime.secsTo(QtCore.QDateTime.currentDateTime())
         paymentUi.usedTime.setTime(QtCore.QTime().addSecs(time))
         for order in client.session.orders:
             QtGui.QTreeWidgetItem(paymentUi.cafeteriaWidget, order)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.