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

Fixed rechare computation of prepaid orders with metric

This commit is contained in:
Marc Aymerich 2016-11-29 21:11:24 +00:00
parent 9ff6491e4f
commit f6125f6bbb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -524,10 +524,11 @@ class ServiceHandler(plugins.Plugin, metaclass=plugins.PluginMount):
bmetric = order.billed_metric bmetric = order.billed_metric
if bmetric is None: if bmetric is None:
bmetric = order.get_metric(order.billed_on) bmetric = order.get_metric(order.billed_on)
bsize = self.get_price_size(rini, order.billed_until) bsize = self.get_price_size(rini, rend)
prepay_discount = self.get_price(account, bmetric) * bsize prepay_discount = self.get_price(account, bmetric) * bsize
prepay_discount = round(prepay_discount, 2) prepay_discount = round(prepay_discount, 2)
for cini, cend, metric in order.get_metric(rini, rend, changes=True): for cini, cend, metric in order.get_metric(rini, rend, changes=True):
cini = max(cini, rini)
size = self.get_price_size(cini, cend) size = self.get_price_size(cini, cend)
price = self.get_price(account, metric) * size price = self.get_price(account, metric) * size
discounts = () discounts = ()