Projet

Général

Profil

0001-lingo-refactor-TIPI-payment-form-rendering-26057.patch

Serghei Mihai (congés, retour 15/05), 26 novembre 2018 10:18

Télécharger (3,48 ko)

Voir les différences: 

Subject: [PATCH 1/2] lingo: refactor TIPI payment form rendering (#26057)


 combo/apps/lingo/models.py                      |  9 +++++++++
 combo/apps/lingo/templates/lingo/tipi_form.html | 15 +++++++--------
 2 files changed, 16 insertions(+), 8 deletions(-)
combo/apps/lingo/models.py
723 723 

  		




  724
  724
  
    
    def get_cell_extra_context(self, context):

  		




  725
  725
  
    
        extra_context = super(TipiPaymentFormCell, self).get_cell_extra_context(context)

  		




  
  726
  
    
        context['reference_fields'] = (

  		




  
  727
  
    
            {'name': 'exer', 'pattern': '[0-9]+', 'length': '4', 'placeholder': '0'*4, 'protocol': 'any'},

  		




  
  728
  
    
            {'name': 'idpce', 'pattern': '[0-9]+', 'length': '8', 'placeholder': '0'*8, 'protocol': 'pesv2'},

  		




  
  729
  
    
            {'name': 'idligne', 'pattern': '[0-9]+', 'length': '6', 'placeholder': '0'*6, 'protocol': 'pesv2'},

  		




  
  730
  
    
            {'name': 'rolrec', 'pattern': '[A-Z0-9]+', 'length': '2', 'placeholder': '0'*2, 'protocol': 'rolmre'},

  		




  
  731
  
    
            {'name': 'roldeb', 'pattern': '[0-9]+', 'length': '2', 'placeholder': '0'*2, 'protocol': 'rolmre'},

  		




  
  732
  
    
            {'name': 'roldet', 'pattern': '[0-9]+', 'length': '13', 'placeholder': '0'*13, 'protocol': 'rolmre'}

  		




  
  733
  
    
        )

  		




  726
  734
  
    
        context['title'] = self.title

  		




  727
  735
  
    
        context['url'] = self.url

  		




  728
  736
  
    
        context['mode'] = 'T' if self.test_mode else 'M'

  		




  729
  737
  
    
        context['pesv2'] = (self.control_protocol == 'pesv2')

  		




  
  738
  
    
        context['control_protocol'] = self.control_protocol

  		




  730
  739
  
    
        context['regies'] = []

  		




  731
  740
  
    
        for regie in self.regies.split(','):

  		




  732
  741
  
    
            regie_id = regie.strip()

  		












  

    
      combo/apps/lingo/templates/lingo/tipi_form.html
    
  





  24
  24
  
    
    </ul>

  		




  25
  25
  
    
    <p>

  		




  26
  26
  
    
      <label>{% trans "Reference" %}</label>

  		




  27
  
  
    
      <input type="text" id="exer" required pattern="[0-9]+" maxlength="4" size="4" placeholder="0000" /> -

  		




  28
  
  
    
      {% if pesv2 %}

  		




  29
  
  
    
      <input type="text" id="idpce" required pattern="[0-9]+" maxlength="8" size="8" placeholder="00000000" /> -

  		




  30
  
  
    
      <input type="text" id="idligne" required pattern="[0-9]+" maxlength="6" size="6" placeholder="000000" />

  		




  31
  
  
    
      {% else %}

  		




  32
  
  
    
      <input type="text" id="rolrec" required pattern="[A-Z0-9]+" maxlength="2" size="2" placeholder="00" /> -

  		




  33
  
  
    
      <input type="text" id="roldeb" required pattern="[0-9]+" maxlength="2" size="2" placeholder="00" /> -

  		




  34
  
  
    
      <input type="text" id="roldet" required pattern="[0-9]+" maxlength="13" size="13" placeholder="0000000000000" />

  		




  
  27
  
    
      {% regroup reference_fields by protocol as fields %}

  		




  
  28
  
    
      {% for field in fields %}

  		




  
  29
  
    
      {% for f in field.list %}

  		




  
  30
  
    
      {% if field.grouper == control_protocol or field.grouper == 'any' %}

  		




  
  31
  
    
      <input type="text" id="{{ f.name }}" required pattern="{{ f.pattern }}" maxlength="{{ f.length }}" size="{{ f.length }}" placeholder="{{ f.placeholder }}" />{% if field.grouper == 'any' or not forloop.last %} - {% endif %}

  		




  35
  32
  
    
      {% endif %}

  		




  
  33
  
    
      {% endfor %}

  		




  
  34
  
    
      {% endfor %}

  		




  36
  35
  
    
    </p>

  		




  37
  36
  
    
    <ul class="errorlist" id="montant_error" style="display: none">

  		




  38
  37
  
    
      <li>{% trans "invalid amount" %}</li>

  		




  39
  
  
    
-