moep/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make ProductPaymentForm's recurring field hidden

Browse source
This commit is contained in:
PCoder 2018-10-03 22:54:45 +02:00
commit b3e3af1c1a
2 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
hosting/forms.py
View file

@ -109,6 +109,17 @@ class ProductPaymentForm(GenericPaymentForm):
'readonly': 'readonly' } 'readonly': 'readonly' }
) )
) )
if self.product.product_is_subscription:
self.fields['amount'].label = "{amt} ({payment_type})".format(
amt=_('Amount in CHF'),
payment_type=_('Monthly subscription')
)
else:
self.fields['amount'].label = "{amt} ({payment_type})".format(
amt=_('Amount in CHF'),
payment_type = _('One time payment')
)
self.fields['recurring'].widget=forms.HiddenInput()
def clean_amount(self): def clean_amount(self):
amount = self.cleaned_data.get('amount') amount = self.cleaned_data.get('amount')

7
hosting/static/hosting/js/payment.js
View file

@ -165,9 +165,14 @@ $(document).ready(function () {
function submitBillingForm() { function submitBillingForm() {
var billing_form = $('#billing-form'); var billing_form = $('#billing-form');
var recurring_input = $('#id_generic_payment_form-recurring');
billing_form.append('<input type="hidden" name="generic_payment_form-product_name" value="' + $('#id_generic_payment_form-product_name').val() + '" />'); billing_form.append('<input type="hidden" name="generic_payment_form-product_name" value="' + $('#id_generic_payment_form-product_name').val() + '" />');
billing_form.append('<input type="hidden" name="generic_payment_form-amount" value="' + $('#id_generic_payment_form-amount').val() + '" />'); billing_form.append('<input type="hidden" name="generic_payment_form-amount" value="' + $('#id_generic_payment_form-amount').val() + '" />');
billing_form.append('<input type="hidden" name="generic_payment_form-recurring" value="' + ($('#id_generic_payment_form-recurring').prop('checked') ? 'on' : '') + '" />'); if (recurring_input.attr('type') === 'hidden') {
billing_form.append('<input type="hidden" name="generic_payment_form-recurring" value="' + (recurring_input.val() === 'True' ? 'on' : '') + '" />');
} else {
billing_form.append('<input type="hidden" name="generic_payment_form-recurring" value="' + (recurring_input.prop('checked') ? 'on' : '') + '" />');
}
billing_form.append('<input type="hidden" name="generic_payment_form-description" value="' + $('#id_generic_payment_form-description').val() + '" />'); billing_form.append('<input type="hidden" name="generic_payment_form-description" value="' + $('#id_generic_payment_form-description').val() + '" />');
billing_form.submit(); billing_form.submit();
} }