EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

just some tweaking to get the premium selection right

pull/1/head
eric 2012-09-07 17:11:25 -04:00
parent b8c0c8f98e
commit f3ecec8410
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
frontend/views.py
View File

@ -607,8 +607,11 @@ class PledgeView(FormView):
preapproval_amount = D(models.Premium.objects.get(id=premium_id).amount) preapproval_amount = D(models.Premium.objects.get(id=premium_id).amount)
except: except:
preapproval_amount = None preapproval_amount = None
if not preapproval_amount and self.transaction: if self.transaction:
preapproval_amount = self.transaction.amount if preapproval_amount:
preapproval_amount = preapproval_amount if preapproval_amount>self.transaction.amount else self.transaction.amount
else:
preapproval_amount = self.transaction.amount
return preapproval_amount return preapproval_amount
def get_form_kwargs(self): def get_form_kwargs(self):
@ -626,30 +629,26 @@ class PledgeView(FormView):
raise e raise e
transactions = self.campaign.transactions().filter(user=self.request.user, status=TRANSACTION_STATUS_ACTIVE, type=PAYMENT_TYPE_AUTHORIZATION) transactions = self.campaign.transactions().filter(user=self.request.user, status=TRANSACTION_STATUS_ACTIVE, type=PAYMENT_TYPE_AUTHORIZATION)
premium_id = self.request.REQUEST.get('premium_id', None)
if transactions.count() == 0: if transactions.count() == 0:
premium_id = self.request.REQUEST.get('premium_id', None)
ack_name='' ack_name=''
ack_dedication='' ack_dedication=''
anonymous='' anonymous=''
else: else:
self.transaction = transactions[0] self.transaction = transactions[0]
if self.transaction.premium is not None: if premium_id == None and self.transaction.premium is not None:
premium_id = self.transaction.premium.id premium_id = self.transaction.premium.id
else:
premium_id = None
ack_name=self.transaction.ack_name ack_name=self.transaction.ack_name
ack_dedication=self.transaction.ack_dedication ack_dedication=self.transaction.ack_dedication
anonymous=self.transaction.anonymous anonymous=self.transaction.anonymous
self.data = {'preapproval_amount':self.get_preapproval_amount(), self.data = {'preapproval_amount':self.get_preapproval_amount(), 'premium_id':premium_id,
'premium_id':premium_id, 'ack_name':ack_name, 'ack_dedication':ack_dedication, 'anonymous':anonymous}
'ack_name':ack_name, 'ack_dedication':ack_dedication, 'anonymous':anonymous}
if self.request.method == 'POST': if self.request.method == 'POST':
self.data.update(self.request.POST.dict()) self.data.update(self.request.POST.dict())
if self.request.method == 'POST' or premium_id:
return {'data':self.data} return {'data':self.data}
else: else:
return {} return {'initial':self.data}
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
"""set up the pledge page""" """set up the pledge page"""