gnue-pos/src Handler.py IOProxy.py hardware/rec...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-pos
Branch:         
Changes by:     Jason Cater <address@hidden>    03/08/30 22:35:45

Modified files:
        src            : Handler.py IOProxy.py 
        src/hardware/receiptprinter: plain.py 
Added files:
        src/hardware/logprinter: plain.py 

Log message:
        misc fixes for rollout day

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/Handler.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/IOProxy.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/hardware/logprinter/plain.py?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-pos/src/hardware/receiptprinter/plain.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text

Patches:
Index: gnue-pos/src/Handler.py
diff -c gnue-pos/src/Handler.py:1.8 gnue-pos/src/Handler.py:1.9
*** gnue-pos/src/Handler.py:1.8 Tue Jul 22 13:26:25 2003
--- gnue-pos/src/Handler.py     Sat Aug 30 22:35:45 2003
***************
*** 472,480 ****
      if self._payments > self.total():
        print self._payments-self.total()
        event.dispatchAfter('AddTender', type='CHANGE',
!                           amount=self._payments-self.total())
  
!     elif self._payments == self._subTotal + self.taxes():
        event.dispatchAfter('EndTicket', serial=self._ticket)
      else:
        event.dispatchAfter('RequestSKU')
--- 472,480 ----
      if self._payments > self.total():
        print self._payments-self.total()
        event.dispatchAfter('AddTender', type='CHANGE',
!                           amount=round(self._payments-self.total(),2))
  
!     elif round(self._subTotal + self.taxes() - self._payments,2) == 0:
        event.dispatchAfter('EndTicket', serial=self._ticket)
      else:
        event.dispatchAfter('RequestSKU')
***************
*** 506,516 ****
      self.dispatchEvent('UpdateTotal', field="tax", amount=tax)
      self.dispatchEvent('UpdateTotal', field="total", amount=self.total())
      self.dispatchEvent('UpdateTotal', field="balance", amount=self.total() - 
self._payments)
-     tax = round(self._taxTotal* self._TaxRate,2)
  
  
    def taxes(self):
      return round(self._taxTotal* self._TaxRate,2) * (self._taxExempt == 0)
  
    def total(self):
!     return self._subTotal + self.taxes()
\ No newline at end of file
--- 506,515 ----
      self.dispatchEvent('UpdateTotal', field="tax", amount=tax)
      self.dispatchEvent('UpdateTotal', field="total", amount=self.total())
      self.dispatchEvent('UpdateTotal', field="balance", amount=self.total() - 
self._payments)
  
  
    def taxes(self):
      return round(self._taxTotal* self._TaxRate,2) * (self._taxExempt == 0)
  
    def total(self):
!     return self._subTotal + self.taxes()
Index: gnue-pos/src/IOProxy.py
diff -c gnue-pos/src/IOProxy.py:1.1 gnue-pos/src/IOProxy.py:1.2
*** gnue-pos/src/IOProxy.py:1.1 Fri Aug 15 08:11:01 2003
--- gnue-pos/src/IOProxy.py     Sat Aug 30 22:35:45 2003
***************
*** 42,47 ****
--- 42,49 ----
  # This is a multiplexor of sorts
  # It returns the correct type of IOProxy
  def simpleOpen(*args, **parms):
+   if len(args) == 1 and type(args) == type({}) and not len(parms):
+     parms = args[0]
    try:
      tp = parms['type'].lower()
    except:
Index: gnue-pos/src/hardware/receiptprinter/plain.py
diff -c gnue-pos/src/hardware/receiptprinter/plain.py:1.8 
gnue-pos/src/hardware/receiptprinter/plain.py:1.9
*** gnue-pos/src/hardware/receiptprinter/plain.py:1.8   Tue Aug 19 20:54:28 2003
--- gnue-pos/src/hardware/receiptprinter/plain.py       Sat Aug 30 22:35:45 2003
***************
*** 69,76 ****
      self.totals = {}
      self.newline = "\n"
  
-     print self.dest
- 
      # Get the logo
      logo = gConfig("ReceiptLogo")
  
--- 69,74 ----
***************
*** 108,117 ****
      if not self.output:
        return
  
!     d = simpleOpen(self.device_params)
!     self.output.seek(0)
!     d.write(self.output.read())
!     d.close()
  
  
    def printHeader(self):
--- 106,125 ----
      if not self.output:
        return
  
!     try:
!       copies = int(self.device_params['copies'])
!     except:
!       copies = 1
! 
!     while copies:
!       d = simpleOpen(**self.device_params)
!       self.output.seek(0)
!       d.write(self.output.read())
!       d.close()
!       copies -= 1
!       if copies:
!         self.cutBetweenSheets()
! 
  
  
    def printHeader(self):
***************
*** 125,135 ****
      self.write( gConfig("ReceiptFooter").replace('\\n','\n'), 
alignment=ALIGN_CENTER, color=RED)
  
      shouter = self.dispatchEvent('Receipt:GetNotice')
!     shouter = """\
! Did you know?  Old Towne Market has
! a professional portrait studio. Let
! us take your next family portrait,
! senior picture, or holiday photo."""
  
      if shouter:
        self.write('\n***************************************', indent=1, 
color=1)
--- 133,143 ----
      self.write( gConfig("ReceiptFooter").replace('\\n','\n'), 
alignment=ALIGN_CENTER, color=RED)
  
      shouter = self.dispatchEvent('Receipt:GetNotice')
! ##    shouter = """\
! ##Did you know?  Old Towne Market has
! ##a professional portrait studio. Let
! ##us take your next family portrait,
! ##senior picture, or holiday photo."""
  
      if shouter:
        self.write('\n***************************************', indent=1, 
color=1)
***************
*** 184,190 ****
  
  
    def _AddTicketItem(self, event):
! 
      self.write(str(event.department or "").ljust(3)[:3] + " " + \
                 str(event.description or "").upper().ljust(24)[:24] + " " + \
                 comify(event.extended,2).rjust(10) + \
--- 192,199 ----
  
  
    def _AddTicketItem(self, event):
!     if event.quantity > 1:
!       self.output.write('    %s x $%.02f ea\n' % (event.quantity, event.each))
      self.write(str(event.department or "").ljust(3)[:3] + " " + \
                 str(event.description or "").upper().ljust(24)[:24] + " " + \
                 comify(event.extended,2).rjust(10) + \