gnue-pos/src Config.py Handler.py POSClient.py ...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-pos
Branch:         
Changes by:     Jason Cater <address@hidden>    03/07/07 01:29:13

Modified files:
        src            : Config.py Handler.py POSClient.py 
        src/frontends/wx: Driver.py 
        src/hardware/receiptprinter: escpos.py plain.py 

Log message:
        * Misc work
        * Start of Layaway support

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Config.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Handler.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/POSClient.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/frontends/wx/Driver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/hardware/receiptprinter/escpos.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/hardware/receiptprinter/plain.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnue-pos/src/Config.py
diff -c gnue-pos/src/Config.py:1.5 gnue-pos/src/Config.py:1.6
*** gnue-pos/src/Config.py:1.5  Wed Jul  2 21:56:35 2003
--- gnue-pos/src/Config.py      Mon Jul  7 01:29:13 2003
***************
*** 53,59 ****
    { 'Name'       : 'ManualItemSKU',
      'Type'       : 'Setting',
      'Comment'    : 'The SKU to use for manually keyed items.',
!     'Description': 'The SKU to use for manually keyed items. (Can be empty to 
disabled)',
      'Typecast'   :  GTypecast.text,
      'Default'    : '9999' },
  
--- 53,59 ----
    { 'Name'       : 'ManualItemSKU',
      'Type'       : 'Setting',
      'Comment'    : 'The SKU to use for manually keyed items.',
!     'Description': 'The SKU to use for manually keyed items. (Can be empty to 
disable)',
      'Typecast'   :  GTypecast.text,
      'Default'    : '9999' },
  
***************
*** 114,116 ****
--- 114,117 ----
      'Default'    : '' },
  
  )
+ 
Index: gnue-pos/src/Handler.py
diff -c gnue-pos/src/Handler.py:1.5 gnue-pos/src/Handler.py:1.6
*** gnue-pos/src/Handler.py:1.5 Fri Jul  4 01:37:40 2003
--- gnue-pos/src/Handler.py     Mon Jul  7 01:29:13 2003
***************
*** 42,49 ****
      self.__ManualItemRequestBasePrice = gConfig('ManualItemRequestBasePrice')
      self.__TaxRate = float(gConfig('TaxRate'))/100
  
-     self._RequestLogin(None)
- 
      self.__loggedin = 0
      self.__quantityRequestedFlag = 0
      self.__ticket = 0
--- 42,47 ----
***************
*** 54,62 ****
              'EndTicket': self._EndTicket,
              'CancelTicket': self._CancelTicket,
  
              'AddTicketItem': self._AddTicketItem,
              'CancelTicketItem': self._CancelTicketItem,
-             'UpdateQuantity': self._UpdateQuantity,
  
              'LoginEntered': self._LoginEntered,
              'PasswordEntered': self._PasswordEntered,
--- 52,66 ----
              'EndTicket': self._EndTicket,
              'CancelTicket': self._CancelTicket,
  
+             'BeginLayaway': self._BeginLayaway,
+             'EndLayaway': self._EndLayaway,
+             'RequestBeginLayaway': self._RequestBeginLayaway,
+             'RequestEndLayaway': self._RequestEndLayaway,
+ 
+             'AddDiscount': self._AddDiscount,
+             'AddTender': self._AddTender,
              'AddTicketItem': self._AddTicketItem,
              'CancelTicketItem': self._CancelTicketItem,
  
              'LoginEntered': self._LoginEntered,
              'PasswordEntered': self._PasswordEntered,
***************
*** 96,101 ****
--- 100,108 ----
              'TaxExemptionEntered': self._TaxExemptionEntered,
      })
  
+   def run(self):
+     self._RequestLogin(None)
+ 
  
    def _LoginEntered(self, event):
      self.__login = event.value
***************
*** 141,153 ****
  
  
    def _QuantityEntered(self, event):
!     if not event.value:
        self.dispatchEvent('RequestSKU')
      try:
        self.__quantity = float(event.value)
        self.dispatchEvent('RequestSKU')
      except ValueError:
        self.dispatchEvent('RequestQuantity')
  
    def _CancelItemEntered(self, event):
      if not event.value:
--- 148,165 ----
  
  
    def _QuantityEntered(self, event):
!     if not event.value or event.value == '0':
        self.dispatchEvent('RequestSKU')
+ 
      try:
        self.__quantity = float(event.value)
+       if self.__quantity < 0:
+         raise ValueError
        self.dispatchEvent('RequestSKU')
      except ValueError:
+       self.dispatchEvent('Warning',message='Quantity must be entered')
        self.dispatchEvent('RequestQuantity')
+       return
  
    def _CancelItemEntered(self, event):
      if not event.value:
***************
*** 188,202 ****
      event.dispatchAfter(self.__manualEvents.pop(0))
  
    def _ManualDepartmentEntered(self, event):
      self.__manualDepartment = event.value
      self.dispatchEvent(self.__manualEvents.pop(0))
  
    def _ManualDescriptionEntered(self, event):
      self.__manualDescription = event.value
      self.dispatchEvent(self.__manualEvents.pop(0))
  
    def _ManualBasePriceEntered(self, event):
!     self.__manualBasePrice = float(event.value)
      v = self.__manualEvents.pop(0)
      if v == 'RequestManualPrice':
        self.dispatchEvent(v, default=self.__manualBasePrice)
--- 200,230 ----
      event.dispatchAfter(self.__manualEvents.pop(0))
  
    def _ManualDepartmentEntered(self, event):
+     if not len(event.value):
+       self.dispatchEvent('Warning',message='Department must be entered')
+       self.dispatchEvent('RequestManualDepartment')
+       return
      self.__manualDepartment = event.value
      self.dispatchEvent(self.__manualEvents.pop(0))
  
    def _ManualDescriptionEntered(self, event):
+     if not len(event.value):
+       self.dispatchEvent('Warning',message='Description must be entered')
+       self.dispatchEvent('RequestManualDescription')
+       return
      self.__manualDescription = event.value
      self.dispatchEvent(self.__manualEvents.pop(0))
  
    def _ManualBasePriceEntered(self, event):
!     try:
!       self.__manualBasePrice = float(event.value)
!       if self.__manualBasePrice < 0:
!         raise ValueError
!     except ValueError:
!       self.dispatchEvent('Warning',message='Base price must be entered')
!       self.dispatchEvent('RequestManualBasePrice')
!       return
! 
      v = self.__manualEvents.pop(0)
      if v == 'RequestManualPrice':
        self.dispatchEvent(v, default=self.__manualBasePrice)
***************
*** 204,212 ****
        self.dispatchEvent(v)
  
    def _ManualPriceEntered(self, event):
!     self.__manualPrice = float(event.value)
      self.dispatchEvent(self.__manualEvents.pop(0))
  
    #
    #
    #
--- 232,255 ----
        self.dispatchEvent(v)
  
    def _ManualPriceEntered(self, event):
!     try:
!       self.__manualPrice = float(event.value)
!       if self.__manualPrice < 0:
!         raise ValueError
!     except ValueError:
!       self.dispatchEvent('Warning',message='Item price must be entered')
!       self.dispatchEvent('RequestManualPrice')
!       return
! 
      self.dispatchEvent(self.__manualEvents.pop(0))
  
+ 
+   def _RequestBeginLayaway(self, event):
+     pass
+ 
+   def _RequestEndLayaway(self, event):
+     pass
+ 
    #
    #
    #
***************
*** 340,346 ****
--- 383,403 ----
      if event.taxable:
        self.__taxTotal += event.extended
      self.__items.append(event)
+     event.lineitem=len(self.__items)+1
      self._updateTotals()
+ 
+   def _BeginLayaway(self, event):
+     self.__layaway = 1
+ 
+   def _EndLayaway(self, event):
+     self.__layaway = 0
+     self.dispatchEvent('EndTicket')
+ 
+   def _AddTender(self, event):
+     pass
+ 
+   def _AddDiscount(self, event):
+     pass
  
    def _CancelTicketItem(self, event):
      pass
Index: gnue-pos/src/POSClient.py
diff -c gnue-pos/src/POSClient.py:1.11 gnue-pos/src/POSClient.py:1.12
*** gnue-pos/src/POSClient.py:1.11      Fri Jul  4 01:37:40 2003
--- gnue-pos/src/POSClient.py   Mon Jul  7 01:29:13 2003
***************
*** 66,71 ****
--- 66,73 ----
    #
    def run(self):
  
+     self.handler = Handler(self)
+ 
      #
      # Initialize interfaces
      #
***************
*** 113,119 ****
      if hasattr(sys, 'frozen'):
        self.frontend.UILoginHandler().getDummyLogin()
  
!     Handler(self)
  
      #
      # Testing stuff....
--- 115,121 ----
      if hasattr(sys, 'frozen'):
        self.frontend.UILoginHandler().getDummyLogin()
  
!     self.handler.run()
  
      #
      # Testing stuff....
Index: gnue-pos/src/frontends/wx/Driver.py
diff -c gnue-pos/src/frontends/wx/Driver.py:1.11 
gnue-pos/src/frontends/wx/Driver.py:1.12
*** gnue-pos/src/frontends/wx/Driver.py:1.11    Fri Jul  4 01:37:40 2003
--- gnue-pos/src/frontends/wx/Driver.py Mon Jul  7 01:29:13 2003
***************
*** 74,79 ****
--- 74,80 ----
  
      self.registerEventListeners( {
        'Prompt': self._Prompt,
+       'Warning': self._Warning,
        'EmployeeLogin': self._EmployeeLogin,
        'BeginTicket': self._BeginTicket,
        'EndTicket': self._EndTicket,
***************
*** 247,252 ****
--- 248,256 ----
    def _EmployeeLogin(self, event):
      self.statusbar.SetStatusText ('Clerk: %s (%s)' % (event.name, 
event.login), STATUS_USER)
  
+   def _Warning(self, event):
+     self.statusbar.SetStatusText(event.message)
+     wxBell();
  
    def __OnSize(self, event):
      self.frame.Layout()
***************
*** 324,329 ****
--- 328,356 ----
     394: 'RequestCancelLastItem',
     392: 'RequestDuplicateLastItem',
  
+    #
+    310: 'RequestCancelTicket',
+    321: 'RequestReprint',
+ 
  
    }
  
+ 
+ 
+ # F1 = Tender Cash
+ # F2 = Tender Check
+ # F3 = Tender Credit Card
+ # F4 = Tender Gift Cert
+ #
+ # F5 = Begin Layaway
+ # F6 = Make Layaway Payment
+ # F7 = End Layaway
+ #
+ # PrnScrn = Reprint Ticket
+ # Break = Cancel Ticket
+ #
+ # F11 = Tax Exemption
+ #
+ # / = Cancel Item
+ # * = Enter Quantity
+ # + = Duplicate Last Item
Index: gnue-pos/src/hardware/receiptprinter/escpos.py
diff -c gnue-pos/src/hardware/receiptprinter/escpos.py:1.1 
gnue-pos/src/hardware/receiptprinter/escpos.py:1.2
*** gnue-pos/src/hardware/receiptprinter/escpos.py:1.1  Sun Jun 22 23:48:57 2003
--- gnue-pos/src/hardware/receiptprinter/escpos.py      Mon Jul  7 01:29:13 2003
***************
*** 38,42 ****
    #
  
    def init(self):
!     pass
  
--- 38,43 ----
    #
  
    def init(self):
!     self.twocolor = hasattr(self,'twocolor') and self.width or 0
! 
  
Index: gnue-pos/src/hardware/receiptprinter/plain.py
diff -c gnue-pos/src/hardware/receiptprinter/plain.py:1.4 
gnue-pos/src/hardware/receiptprinter/plain.py:1.5
*** gnue-pos/src/hardware/receiptprinter/plain.py:1.4   Wed Jul  2 11:13:06 2003
--- gnue-pos/src/hardware/receiptprinter/plain.py       Mon Jul  7 01:29:13 2003
***************
*** 31,36 ****
--- 31,40 ----
  
  from gnue.common.events.EventAware import EventAware
  
+ LEFT_ALIGN=0
+ CENTER_ALIGN=0
+ RIGHT_ALIGN=2
+ 
  dollarFormat = '$%.02f'
  
  class Driver(EventAware):
***************
*** 52,63 ****
      self.instance = instance
      self.__dict__.update(params)
      self.output = None
  
      self.totalFields = (  ('subtotal',_('Subtotal')),
                            ('mstax','MS Sales Tax (7%)'),
                            ('total',_('Total')) )
  
!     self.receiptColumns = ( ('department',_('Dept'), '%s', 0),
                              ('sku',_('Code'), '%s', 0),
                              ('quantity',_('Units'), '%s', 0),
                              ('description',_('Description'), '%s', 0),
--- 56,68 ----
      self.instance = instance
      self.__dict__.update(params)
      self.output = None
+     self.width = hasattr(self,'width') and self.width or 40
  
      self.totalFields = (  ('subtotal',_('Subtotal')),
                            ('mstax','MS Sales Tax (7%)'),
                            ('total',_('Total')) )
  
!     self.receiptColumns = (
                              ('sku',_('Code'), '%s', 0),
                              ('quantity',_('Units'), '%s', 0),
                              ('description',_('Description'), '%s', 0),
***************
*** 81,94 ****
      self.output = open(self.port,'w')
      self.totals = {}
      self.output.write("""
- ------------------------------
-         Company Header
-         123 N Main St
-       Yourtown, TN 38011
-         (662) 555-1234
- ------------------------------
  
! Receipt # %s
  %s %s %s
  
  """ % (event.serial, '06/23/03','12:13pm','Jason'))
--- 86,99 ----
      self.output = open(self.port,'w')
      self.totals = {}
      self.output.write("""
  
!        Old Towne Market
!      9120 Pigeon Roost Rd
!     Olive Branch, MS 38654
!         (662) 893-5669
! 
! 
! Transaction # %s
  %s %s %s
  
  """ % (event.serial, '06/23/03','12:13pm','Jason'))
***************
*** 131,133 ****
--- 136,141 ----
    def _UpdateTotal(self, event):
      self.totals[event.field] = event.amount
  
+ 
+   def write(self, text, double=0, color=0, alignment=0):
+     pass
\ No newline at end of file