boobank: updated transfer command for creditmutuel

Signed-off-by: Matthieu Weber <mweber+weboob@free.fr>
Signed-off-by: Romain Bignon <romain@symlink.me>

modules/creditmutuel/browser.py

@@ -24,6 +24,7 @@ except ImportError:
     from urllib.parse import urlsplit, parse_qsl, urlparse
 
 from datetime import datetime, timedelta
+from random import randint
 
 from weboob.tools.compat import basestring
 from weboob.browser.browsers import LoginBrowser, need_login
@@ -55,7 +56,8 @@ class CreditMutuelBrowser(LoginBrowser):
     card =        URL('/(?P<subbank>.*)/fr/banque/operations_carte.cgi.*',   CardPage)
     noop =        URL('/(?P<subbank>.*)/fr/banque/CR/arrivee.asp.*',         NoOperationsPage)
     info =        URL('/(?P<subbank>.*)/fr/banque/BAD.*',                    EmptyPage)
-    transfert =   URL('/(?P<subbank>.*)/fr/banque/WI_VPLV_VirUniSaiCpt.asp\?(?P<parameters>.*)', TransfertPage)
+    transfert =   URL('/(?P<subbank>.*)/fr/banque/virements/vplw_vi.html',   EmptyPage)
+    transfert_2 = URL('/(?P<subbank>.*)/fr/banque/virements/vplw_cmweb.aspx.*', TransfertPage)
     change_pass = URL('/(?P<subbank>.*)/fr/validation/change_password.cgi',  ChangePasswordPage)
     verify_pass = URL('/(?P<subbank>.*)/fr/validation/verif_code.cgi.*',     VerifCodePage)
     empty =       URL('/(?P<subbank>.*)/fr/$',
@@ -141,23 +143,29 @@ class CreditMutuelBrowser(LoginBrowser):
 
     def transfer(self, account, to, amount, reason=None):
         # access the transfer page
-        parameters = 'RAZ=ALL&Cat=6&PERM=N&CHX=A'
+        self.transfert.go(subbank=self.currentSubBank)
-        page = self.transfert.go(subbank=self.currentSubBank, parameters=parameters)
 
         # fill the form
-        form = self.page.get_form(name='FormVirUniSaiCpt')
+        form = self.page.get_form(xpath="//form[@id='P:F']")
-        form['IDB'] = account[-1]
+        try:
-        form['ICR'] = to[-1]
+            form['data_input_indiceCompteADebiter'] = self.page.get_from_account_index(account)
-        form['MTTVIR'] = '%s' % str(amount).replace('.', ',')
+            form['data_input_indiceCompteACrediter'] = self.page.get_to_account_index(to)
+        except ValueError as e:
+            raise TransferError(e.message)
+        form['[t:dbt%3adouble;]data_input_montant_value_0_'] = '%s' % str(amount).replace('.', ',')
         if reason is not None:
-            form['LIBDBT'] = reason
+            form['[t:dbt%3astring;x(27)]data_input_libelleCompteDebite'] = reason
-            form['LIBCRT'] = reason
+            form['[t:dbt%3astring;x(31)]data_input_motifCompteCredite'] = reason
-        page = form.submit()
+        del form['_FID_GoCancel']
+        del form['_FID_DoValidate']
+        form['_FID_DoValidate.x'] = str(randint(3, 125))
+        form['_FID_DoValidate.y'] = str(randint(3, 22))
+        form.submit()
 
         # look for known errors
-        content = page.response.text
+        content = self.page.get_unicode_content()
-        insufficient_amount_message     = u'Montant insuffisant.'
+        insufficient_amount_message =     u'Le montant du virement doit être positif, veuillez le modifier'
-        maximum_allowed_balance_message = u'Solde maximum autorisé dépassé.'
+        maximum_allowed_balance_message = u'Montant maximum autorisé au débit pour ce compte'
 
         if insufficient_amount_message in content:
             raise TransferError('The amount you tried to transfer is too low.')
@@ -166,18 +174,21 @@ class CreditMutuelBrowser(LoginBrowser):
             raise TransferError('The maximum allowed balance for the target account has been / would be reached.')
 
         # look for the known "all right" message
-        ready_for_transfer_message = u'Confirmez un virement entre vos comptes'
+        ready_for_transfer_message = u'Confirmer un virement entre vos comptes'
-        if ready_for_transfer_message in content:
+        if ready_for_transfer_message not in content:
             raise TransferError('The expected message "%s" was not found.' % ready_for_transfer_message)
 
         # submit the confirmation form
-        form = page.get_form(name='FormVirUniCnf')
+        form = self.page.get_form(xpath="//form[@id='P:F']")
+        del form['_FID_DoConfirm']
+        form['_FID_DoConfirm.x'] = str(randint(3, 125))
+        form['_FID_DoConfirm.y'] = str(randint(3, 22))
         submit_date = datetime.now()
-        page = form.submit()
+        form.submit()
 
         # look for the known "everything went well" message
-        content = page.response.text
+        content = self.page.get_unicode_content()
-        transfer_ok_message = u'Votre virement a été exécuté ce jour'
+        transfer_ok_message = u'Votre virement a &#233;t&#233; ex&#233;cut&#233;'
         if transfer_ok_message not in content:
             raise TransferError('The expected message "%s" was not found.' % transfer_ok_message)
 

modules/creditmutuel/pages.py

@@ -69,7 +69,25 @@ class VerifCodePage(LoggedPage, HTMLPage):
 
 
 class TransfertPage(LoggedPage, HTMLPage):
-    pass
+    def get_account_index(self, direction, account):
+        for div in self.doc.getroot().cssselect(".dw_dli_contents"):
+            inp = div.cssselect("input")[0]
+            if inp.name != direction:
+                continue
+            acct = div.cssselect("span.doux")[0].text.replace(" ", "")
+            if account.endswith(acct):
+                return inp.attrib['value']
+        else:
+            raise ValueError("account %s not found" % account)
+
+    def get_from_account_index(self, account):
+        return self.get_account_index('data_input_indiceCompteADebiter', account)
+
+    def get_to_account_index(self, account):
+        return self.get_account_index('data_input_indiceCompteACrediter', account)
+
+    def get_unicode_content(self):
+        return self.content.decode(self.detect_encoding())
 
 
 class AccountsPage(LoggedPage, HTMLPage):