Changeset 3036 for pykota/trunk/bin

Show
Ignore:
Timestamp:
10/13/06 23:51:14 (18 years ago)
Author:
jerome
Message:

Charging for ink usage, finally !

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • pykota/trunk/bin/cupspykota

    r3023 r3036  
    574574        """Precomputes the job price with a software method.""" 
    575575        self.logdebug("Precomputing job's price...") 
    576         self.softwareJobPrice = self.UserPQuota.computeJobPrice(self.softwareJobSize) 
     576        self.softwareJobPrice = self.UserPQuota.computeJobPrice(self.softwareJobSize, self.preaccounter.inkUsage) 
    577577        self.logdebug("Precomputed job's price is %.3f credits." \ 
    578578                                   % self.softwareJobPrice) 
    … …  
    12701270                # update the quota for the current user on this printer  
    12711271                self.printInfo(_("Updating user %s's quota on printer %s") % (self.UserName, self.PrinterName)) 
    1272                 self.JobPrice = self.UserPQuota.increasePagesUsage(self.JobSize) 
     1272                self.JobPrice = self.UserPQuota.increasePagesUsage(self.JobSize, self.accounter.inkUsage) 
    12731273             
    12741274            # adds the current job to history