[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
gnue-pos ./README src/Config.py src/Handler.py ...
|
From: |
Jason Cater |
|
Subject: |
gnue-pos ./README src/Config.py src/Handler.py ... |
|
Date: |
Wed, 02 Jul 2003 11:13:07 -0400 |
CVSROOT: /cvsroot/gnue
Module name: gnue-pos
Branch:
Changes by: Jason Cater <address@hidden> 03/07/02 11:13:06
Modified files:
. : README
src : Config.py Handler.py POSClient.py
src/frontends/wx: Driver.py
src/hardware/receiptprinter: plain.py
Log message:
More work on logic
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/README.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Config.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Handler.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/POSClient.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/frontends/wx/Driver.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/hardware/receiptprinter/plain.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
Patches:
Index: gnue-pos/README
diff -c gnue-pos/README:1.4 gnue-pos/README:1.5
*** gnue-pos/README:1.4 Mon Jun 16 01:14:12 2003
--- gnue-pos/README Wed Jul 2 11:13:06 2003
***************
*** 7,12 ****
--- 7,13 ----
GNUe Forms (w/Wx Drivers)
GNUe Reports
GNUe Small Business (Or a custom backend)
+ Appropriate Hardware as needed (Receipt printers, pole displays, etc)
It currently requires wxPython 2.4 or greater, so it will work on
Win32, GTK (Linux/*BSD), and MacOSX.
***************
*** 24,34 ****
Non-inventoried transactions
* add description/department/price at time of sale
Mouse-less operation
Long-term Goals:
- Multiple printer support
Credit Card backend support
- Display Pole support
Touch-screen support
Hardware Support:
--- 25,37 ----
Non-inventoried transactions
* add description/department/price at time of sale
Mouse-less operation
+ Multiple printer support
+ Display Pole support
+ Manually keyed items
+ Tax exempt purchases
Long-term Goals:
Credit Card backend support
Touch-screen support
Hardware Support:
Index: gnue-pos/src/Config.py
diff -c gnue-pos/src/Config.py:1.3 gnue-pos/src/Config.py:1.4
*** gnue-pos/src/Config.py:1.3 Mon Jun 30 19:59:03 2003
--- gnue-pos/src/Config.py Wed Jul 2 11:13:06 2003
***************
*** 71,74 ****
--- 71,95 ----
'Typecast' : GTypecast.boolean,
'Default' : 1 },
+ { 'Name' : 'TaxRate',
+ 'Type' : 'Setting',
+ 'Comment' : '',
+ 'Description': '',
+ 'Typecast' : GTypecast.number,
+ 'Default' : 7.00 },
+
+ { 'Name' : 'TaxState',
+ 'Type' : 'Setting',
+ 'Comment' : '',
+ 'Description': '',
+ 'Typecast' : GTypecast.text,
+ 'Default' : 'MS' },
+
+ { 'Name' : 'SKULabel',
+ 'Type' : 'Setting',
+ 'Comment' : '',
+ 'Description': '',
+ 'Typecast' : GTypecast.text,
+ 'Default' : 'Item Code' },
+
)
Index: gnue-pos/src/Handler.py
diff -c gnue-pos/src/Handler.py:1.1 gnue-pos/src/Handler.py:1.2
*** gnue-pos/src/Handler.py:1.1 Mon Jun 30 19:59:03 2003
--- gnue-pos/src/Handler.py Wed Jul 2 11:13:06 2003
***************
*** 40,46 ****
self.__ManualItemSKUisDepartment = gConfig('ManualItemSKUisDepartment')
self.__ManualItemRequestBasePrice = gConfig('ManualItemRequestBasePrice')
!
self._RequestLogin(None)
--- 40,46 ----
self.__ManualItemSKUisDepartment = gConfig('ManualItemSKUisDepartment')
self.__ManualItemRequestBasePrice = gConfig('ManualItemRequestBasePrice')
! self.__TaxRate = float(gConfig('TaxRate'))/100
self._RequestLogin(None)
***************
*** 48,58 ****
--- 48,65 ----
self.__quantityRequestedFlag = 0
self.__ticket = 0
+ self.__taxTotal = 0
+ self.__subTotal = 0
+
self.registerEventListeners( {
'BeginTicket': self._BeginTicket,
'EndTicket': self._EndTicket,
'CancelTicket': self._CancelTicket,
+ 'AddTicketItem': self._AddTicketItem,
+ 'CancelTicketItem': self._CancelTicketItem,
+ 'UpdateQuantity': self._UpdateQuantity,
+
'LoginEntered': self._LoginEntered,
'PasswordEntered': self._PasswordEntered,
'SKUEntered': self._SKUEntered,
***************
*** 120,126 ****
def _QuantityEntered(self, event):
self.__loggedin = 1
self.__quantityRequestedFlag = 1
! self.dispatchEvent(UpdateQuantity, quantity=float(event.value))
try:
self.__quantity = float(event.value)
except ValueError:
--- 127,133 ----
def _QuantityEntered(self, event):
self.__loggedin = 1
self.__quantityRequestedFlag = 1
! self.dispatchEvent('UpdateQuantity', quantity=float(event.value))
try:
self.__quantity = float(event.value)
except ValueError:
***************
*** 172,178 ****
def _RequestSKU(self, event):
! self.dispatchEvent('Prompt', label='Enter Item Code:',
response='SKUEntered',
endingEvents=('RequestQuantity',
'RequestSuspendTicket',
'RequestResumeTicket',
--- 179,185 ----
def _RequestSKU(self, event):
! self.dispatchEvent('Prompt', label='Enter %s:' % gConfig('SKULabel'),
response='SKUEntered',
endingEvents=('RequestQuantity',
'RequestSuspendTicket',
'RequestResumeTicket',
***************
*** 232,238 ****
self.dispatchEvent('Prompt', label='Enter Base Price:',
response='ManualBasePriceEntered')
def _RequestManualPrice(self, event):
! self.dispatchEvent('Prompt', label='Enter Item Price:',
response='ManualPriceEntered')
def _RequestEndManualItem(self, event):
self.dispatchEvent('EndManualItem', sku=self.__manualSKU,
--- 239,245 ----
self.dispatchEvent('Prompt', label='Enter Base Price:',
response='ManualBasePriceEntered')
def _RequestManualPrice(self, event):
! self.dispatchEvent('Prompt', label='Enter Sales Price:',
response='ManualPriceEntered')
def _RequestEndManualItem(self, event):
self.dispatchEvent('EndManualItem', sku=self.__manualSKU,
***************
*** 254,259 ****
--- 261,271 ----
def _BeginTicket(self, event):
self.__ticket = event.serial
+ self.__taxTotal = 0
+ self.__subTotal = 0
+ self.dispatchEvent('UpdateTotal', field="subtotal", amount=0.0)
+ self.dispatchEvent('UpdateTotal', field="tax", amount=0.0)
+ self.dispatchEvent('UpdateTotal', field="total", amount=0.0)
def _EndTicket(self, event):
event.dispatchAfter('RequestSKU')
***************
*** 261,264 ****
--- 273,294 ----
def _CancelTicket(self, event):
self.__ticket = 0
event.dispatchAfter('RequestSKU')
+
+ def _AddTicketItem(self, event):
+ self.__subTotal += event.extended
+ if event.taxable:
+ self.__taxTotal += event.extended
+
+ self.dispatchEvent('UpdateTotal', field="subtotal",
amount=self.__subTotal)
+ self.dispatchEvent('UpdateTotal', field="tax",
amount=round(self.__taxTotal* self.__TaxRate,2))
+ self.dispatchEvent('UpdateTotal', field="total", amount=self.__subTotal +
round(self.__taxTotal* self.__TaxRate,2))
+
+ def _CancelTicketItem(self, event):
+ pass
+
+ def _UpdateQuantity(self, event):
+ pass
+
+
+
Index: gnue-pos/src/POSClient.py
diff -c gnue-pos/src/POSClient.py:1.9 gnue-pos/src/POSClient.py:1.10
*** gnue-pos/src/POSClient.py:1.9 Mon Jun 30 19:59:03 2003
--- gnue-pos/src/POSClient.py Wed Jul 2 11:13:06 2003
***************
*** 119,125 ****
## self.dispatchEvent('AddTicketItem', description='Gift Certificate',
department=999,
## quantity=1, each=30.00, extended=30.00)
## self.dispatchEvent('UpdateTotal', field="subtotal", amount=95.93)
! ## self.dispatchEvent('UpdateTotal', field="mstax", amount=6.72)
## self.dispatchEvent('UpdateTotal', field="total", amount=102.65)
## self.dispatchEvent('Prompt', label='Enter User ID:', field="login")
## self.dispatchEvent('EndTicket')
--- 119,125 ----
## self.dispatchEvent('AddTicketItem', description='Gift Certificate',
department=999,
## quantity=1, each=30.00, extended=30.00)
## self.dispatchEvent('UpdateTotal', field="subtotal", amount=95.93)
! ## self.dispatchEvent('UpdateTotal', field="tax", amount=6.72)
## self.dispatchEvent('UpdateTotal', field="total", amount=102.65)
## self.dispatchEvent('Prompt', label='Enter User ID:', field="login")
## self.dispatchEvent('EndTicket')
Index: gnue-pos/src/frontends/wx/Driver.py
diff -c gnue-pos/src/frontends/wx/Driver.py:1.6
gnue-pos/src/frontends/wx/Driver.py:1.7
*** gnue-pos/src/frontends/wx/Driver.py:1.6 Mon Jun 30 19:59:03 2003
--- gnue-pos/src/frontends/wx/Driver.py Wed Jul 2 11:13:06 2003
***************
*** 45,51 ****
class Driver(BaseDriver):
def init(self):
self.totalFields = ( ('subtotal',_('Subtotal')),
! ('mstax','MS Sales Tax (7%)'),
('total',_('Total')) )
self.receiptColumns = ( ('department',_('Dept'), '%s', 0),
--- 45,51 ----
class Driver(BaseDriver):
def init(self):
self.totalFields = ( ('subtotal',_('Subtotal')),
! ('tax','%s Sales Tax' % (gConfig('TaxState'))),
('total',_('Total')) )
self.receiptColumns = ( ('department',_('Dept'), '%s', 0),
***************
*** 241,244 ****
'=': 'RequestTender',
'-': 'RequestCancelLastItem',
'+': 'RequestDuplicateLastItem',
! }
\ No newline at end of file
--- 241,244 ----
'=': 'RequestTender',
'-': 'RequestCancelLastItem',
'+': 'RequestDuplicateLastItem',
! }
Index: gnue-pos/src/hardware/receiptprinter/plain.py
diff -c gnue-pos/src/hardware/receiptprinter/plain.py:1.3
gnue-pos/src/hardware/receiptprinter/plain.py:1.4
*** gnue-pos/src/hardware/receiptprinter/plain.py:1.3 Mon Jun 30 19:59:03 2003
--- gnue-pos/src/hardware/receiptprinter/plain.py Wed Jul 2 11:13:06 2003
***************
*** 114,120 ****
for field, foo, format, bar in self.receiptColumns:
try:
if field == 'taxable':
! if event['taxable']:
self.output.write('* ')
else:
self.output.write(' ')
--- 114,120 ----
for field, foo, format, bar in self.receiptColumns:
try:
if field == 'taxable':
! if event.taxable:
self.output.write('* ')
else:
self.output.write(' ')
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- gnue-pos ./README src/Config.py src/Handler.py ...,
Jason Cater <=