pangea
/
django-orchestra
7
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases Wiki Activity

Fixes on billing

This commit is contained in:
Marc Aymerich 2015-05-26 19:49:09 +00:00
parent 524ca5faae
commit ca6b479e17
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
orchestra/contrib/services/handlers.py
View File

@ -497,23 +497,21 @@ class ServiceHandler(plugins.Plugin, metaclass=plugins.PluginMount):
# Recharge # Recharge
if self.payment_style == self.PREPAY and order.billed_on: if self.payment_style == self.PREPAY and order.billed_on:
rini = order.billed_on rini = order.billed_on
rend = min(bp, order.billed_until)
cmetric = None cmetric = None
acc_discount = 0 for cini, cend, metric in order.get_metric(rini, rend, changes=True):
for cini, cend, metric in order.get_metric(rini, min(bp, order.billed_until), changes=True):
if cmetric is None: if cmetric is None:
cmetric = metric cmetric = metric
cprice = self.get_price(account, cmetric)
csize = self.get_price_size(rini, order.billed_until) csize = self.get_price_size(rini, order.billed_until)
acc_discount += cprice*csize cprice = self.get_price(account, cmetric) * csize
size = self.get_price_size(cini, cend) size = self.get_price_size(cini, cend)
rprice = self.get_price(account, metric) price = self.get_price(account, metric) * size
price = (rprice-cprice) * size
discounts = () discounts = ()
pre_discount = min(price, max(acc_discount, 0)) discount = min(price, max(cprice, 0))
if pre_discount: if pre_discount:
acc_discount -= price cprice -= price
discounts = ( discounts = (
('prepay', -pre_discount), ('prepay', -discount),
) )
# if price-pre_discount: # if price-pre_discount:
lines.append(self.generate_line(order, price, cini, cend, metric=metric, lines.append(self.generate_line(order, price, cini, cend, metric=metric,