0001-nanterre-permettre-de-payer-plusieurs-factures-fixes.patch

Benjamin Dauvergne, 27 juin 2017 09:57

Voir les différences: en ligne côte à côte

Subject: [PATCH] nanterre: permettre de payer plusieurs factures (fixes
 #17199)

 tests/test_nanterre_saga.py   | 14 +++++++++++---
 zoo/zoo_nanterre/api_views.py | 32 +++++++++++++++++++++-----------
 zoo/zoo_nanterre/saga.py      | 12 +++++++++---
 3 files changed, 41 insertions(+), 17 deletions(-)

             elt.attrib['xmlns'] = 'ns'
             sub = ET.SubElement(elt, node)
             sub.text = content
             print ET.tostring(elt)
             return ET.tostring(elt)
         f['jean'].content['cles_de_federation']['technocarte'] = '1234'
-...
     <factures>
         <facture date_facture="10/10/2017" date_limite_recouvrement="20/10/2017"
                  etat="en cours" incident_paiement="paiement" montant_initial="10.00"
                                    reste_a_payer="0.0" num="34">
                                    reste_a_payer="1.0" num="34">
             <creances>
                 <creance imputation="1234" montant="1.2" libelle="PISCINE" num_creance="123"/>
             </creances>
         </facture>
         <facture date_facture="10/10/2017" date_limite_recouvrement="20/10/2017"
                  etat="en cours" incident_paiement="paiement" montant_initial="10.00"
                                    reste_a_payer="2.0" num="35">
             <creances>
                 <creance imputation="1234" montant="3.2" libelle="PISCINE" num_creance="123"/>
             </creances>
         </facture>
     </factures>''')
             elif 'Transaction' in request.body:
                 return xml_literal('TransactionReturn',
-...
                 'identifier': f['jean'].id,
             }))
             assert response.json['err'] == 0
             assert len(response.json['data']) == 1
             assert len(response.json['data']) == 2
             num = response.json['data'][0]['num']
             num2 = response.json['data'][1]['num']
             response = app.post_json(
                 reverse('rsu-api-saga-transaction', kwargs={
-...
                 }),
                 params={
                     'num_facture': num,
                     'num_factures': [num2],
                     'urlretour_asynchrone': 'http://async.example.com/coin',
                     'urlretour_synchrone': 'http://async.example.com/coin',
                     'email': 'john.doe@example.com',

     class TransactionSagaSerializer(serializers.Serializer):
         num_facture = serializers.CharField()
         num_facture = serializers.CharField(required=False, default='')
         num_factures = serializers.ListField(child=serializers.CharField(), required=False, default=[])
         urlretour_asynchrone = serializers.URLField()
         urlretour_synchrone = serializers.URLField()
         email = serializers.EmailField(required=False)
         def validate(self, data):
             if not data['num_facture'] and not data['num_factures']:
                 raise serializers.ValidationError('vous devez fournir num_facture ou num_factures')
             return data
     class SagaTransaction(SagaFactures):
         def post(self, request, identifier, format=None):
             factures, error_response = self.get_factures(identifier)
             if error_response:
                 return error_response
             serializer = TransactionSagaSerializer(data=request.data)
             if not serializer.is_valid():
                 return Response({
-...
                     'errors': flatten_errors(serializer.errors),
                 }, status=400)
             data = serializer.validated_data
             factures, error_response = self.get_factures(identifier)
             if error_response:
                 return error_response
             factures_a_payer = []
             for facture in factures:
                 if facture.num == serializer.validated_data['num_facture']:
                     break
             else:
                 if facture.num == data['num_facture'] or facture.num in data['num_factures']:
                     factures_a_payer.append(facture)
             if not factures_a_payer:
                 return Response({
                     'err': 1,
                     'errors': [
                         'numéro de facture inconnu',
                         u'numéro(s) de facture inconnu',
+                    ]
                 })
             data = serializer.validated_data
             email = data.get('email') or self.individu.content['email'] or ''
             url, error = self.ws.transaction(
                 facture=facture,
                 facture_or_factures=factures_a_payer,
                 urlretour_asynchrone=data['urlretour_asynchrone'],
                 urlretour_synchrone=data['urlretour_synchrone'],
                 email=email)

                     yield facture
             return list(helper()), None
         def transaction(self, facture, urlretour_asynchrone, urlretour_synchrone, email):
         def transaction(self, facture_or_factures, urlretour_asynchrone, urlretour_synchrone, email):
             body = '''
             <Transaction>
               <num_service>{num_service}</num_service>
-...
               <email>{email}</email>
               <urlretour_synchrone>{urlretour_synchrone}</urlretour_synchrone>
             </Transaction>'''
             if isinstance(facture_or_factures, Facture):
                 id_facture = unicode(facture_or_factures.num)
                 montant = facture_or_factures.reste_a_payer
             else:
                 id_facture = u'--'.join(unicode(facture.num) for facture in facture_or_factures)
                 montant = sum(facture.reste_a_payer for facture in facture_or_factures)
             tree, error = self.soap_call(
                 self.paiement_url, body, 'TransactionReturn',
                 num_service=self.num_service,
                 id_facture=facture.num,
                 montant=facture.reste_a_payer,
                 id_facture=id_facture,
                 montant=montant,
                 urlretour_asynchrone=urlretour_asynchrone,
                 urlretour_synchrone=urlretour_synchrone,
                 email=email)
+    -

Projet

Général

Profil

Produits Entr'ouvert » Zoo

0001-nanterre-permettre-de-payer-plusieurs-factures-fixes.patch