rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-27 15:12:25 +00:00
Code Issues Releases Wiki Activity

Retire les éléments de front en JS pour les chèques.

Browse source
This commit is contained in:
Hugo LEVY-FALK 2018-07-02 14:24:53 +02:00
parent 24cdc2329d
commit 3f2de5739c
2 changed files with 1 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cotisations/forms.py
View file

@ -61,21 +61,12 @@ class NewFactureForm(FormRevMixin, ModelForm):
# for something more generic or at least in English # for something more generic or at least in English
if allowed_payment: if allowed_payment:
self.fields['paiement'].queryset = allowed_payment self.fields['paiement'].queryset = allowed_payment
self.fields['cheque'].required = False
self.fields['banque'].required = False
self.fields['cheque'].label = _("Cheque number")
self.fields['banque'].empty_label = _("Not specified")
self.fields['paiement'].empty_label = \ self.fields['paiement'].empty_label = \
_("Select a payment method") _("Select a payment method")
paiement_list = Paiement.objects.filter(type_paiement=1)
if paiement_list:
self.fields['paiement'].widget\
.attrs['data-cheque'] = paiement_list.first().id
class Meta: class Meta:
model = Facture model = Facture
fields = ['paiement', 'banque', 'cheque'] fields = ['paiement']
def clean(self): def clean(self):
cleaned_data = super(NewFactureForm, self).clean() cleaned_data = super(NewFactureForm, self).clean()

18
cotisations/templates/cotisations/new_facture.html
View file

@ -44,7 +44,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
{% endif %} {% endif %}
{% bootstrap_form factureform %} {% bootstrap_form factureform %}
{{ venteform.management_form }} {{ venteform.management_form }}
<!-- TODO: FIXME to include data-type="check" for right option in id_cheque select -->
<h3>{% trans "Invoice's articles" %}</h3> <h3>{% trans "Invoice's articles" %}</h3>
<div id="form_set" class="form-group"> <div id="form_set" class="form-group">
{% for form in venteform.forms %} {% for form in venteform.forms %}
@ -132,20 +131,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
) )
} }
function set_cheque_info_visibility() {
var paiement = document.getElementById("id_Facture-paiement");
var visible = paiement.value == paiement.getAttribute('data-cheque');
p = document.getElementById("id_Facture-paiement");
var display = 'none';
if (visible) {
display = 'block';
}
document.getElementById("id_Facture-cheque")
.parentNode.style.display = display;
document.getElementById("id_Facture-banque")
.parentNode.style.display = display;
}
// Add events manager when DOM is fully loaded // Add events manager when DOM is fully loaded
document.addEventListener("DOMContentLoaded", function() { document.addEventListener("DOMContentLoaded", function() {
document.getElementById("add_one") document.getElementById("add_one")
@ -155,9 +140,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
for (i = 0; i < product_count; ++i){ for (i = 0; i < product_count; ++i){
add_listenner_for_id(i); add_listenner_for_id(i);
} }
document.getElementById("id_Facture-paiement")
.addEventListener("change", set_cheque_info_visibility, true);
set_cheque_info_visibility();
update_price(); update_price();
}); });