Changeset 3036 for pykota/trunk/bin/cupspykota

Timestamp:

10/13/06 23:51:14 (18 years ago)

Author:

jerome

Message:

Charging for ink usage, finally !

Files:

• pykota/trunk/bin/cupspykota (modified) (2 diffs)

pykota/trunk/bin/cupspykota

@@ -574 +574 @@
         """Precomputes the job price with a software method."""
         self.logdebug("Precomputing job's price...")
-        self.softwareJobPrice = self.UserPQuota.computeJobPrice(self.softwareJobSize)
+        self.softwareJobPrice = self.UserPQuota.computeJobPrice(self.softwareJobSize, self.preaccounter.inkUsage)
         self.logdebug("Precomputed job's price is %.3f credits." \
                                    % self.softwareJobPrice)
@@ -1270 +1270 @@
                 # update the quota for the current user on this printer 
                 self.printInfo(_("Updating user %s's quota on printer %s") % (self.UserName, self.PrinterName))
-                self.JobPrice = self.UserPQuota.increasePagesUsage(self.JobSize)
+                self.JobPrice = self.UserPQuota.increasePagesUsage(self.JobSize, self.accounter.inkUsage)
             
             # adds the current job to history