diff --git a/modules/bnporc/enterprise/pages.py b/modules/bnporc/enterprise/pages.py index ea9d52fc..6c2006ec 100644 --- a/modules/bnporc/enterprise/pages.py +++ b/modules/bnporc/enterprise/pages.py @@ -155,6 +155,7 @@ class AccountsPage(BEPage): else: account._link_id = parse_qs(link.attrib['href'])['ch4'][0] account.id = to_unicode(tdid.text.strip().replace(' ', '')) + account.iban = 'FR76' + account.id # just in case we are showing the converted balances account._main_currency = Account.get_currency(tdcur.text) # we have to ignore those accounts, because using NotAvailable diff --git a/modules/bnporc/perso/accounts_list.py b/modules/bnporc/perso/accounts_list.py index b264de54..0e183f2a 100644 --- a/modules/bnporc/perso/accounts_list.py +++ b/modules/bnporc/perso/accounts_list.py @@ -39,14 +39,23 @@ class AccountsList(Page): def on_loaded(self): pass + def _parse_iban(self, account, url): + m = re.search('ch4=(\w+)', url) + if m: + account.iban = unicode(m.group(1)) + def _parse_account_group(self, table): typename = unicode(table.attrib.get('summary', '').replace('Liste des contrats/comptes ', '')) typeid = self.ACCOUNT_TYPES.get(typename, Account.TYPE_UNKNOWN) - for tr in table.xpath('.//tr[not(@class)]'): + account = None + for tr in table.xpath('.//tr'): if tr.find('td') is not None and tr.find('td').attrib.get('class', '') == 'typeTitulaire': account = self._parse_account(tr) account.type = typeid yield account + elif tr.get('class', '') == 'listeActionBig' and account is not None: + self._parse_iban(account, tr.xpath('.//a')[-1].get('href', '')) + account = None def _parse_account(self, tr): account = Account() @@ -84,18 +93,18 @@ class AccountsList(Page): return Decimal(FrenchTransaction.clean_amount(elem.text)) def get_list(self): - l = [] + accounts = [] for table in self.document.xpath('//table[@class="tableCompte"]'): for account in self._parse_account_group(table): - l.append(account) + accounts.append(account) - if len(l) == 0: + if len(accounts) == 0: # oops, no accounts? check if we have not exhausted the allowed use # of this password for img in self.document.getroot().cssselect('img[align="middle"]'): if img.attrib.get('alt', '') == 'Changez votre code secret': raise BrowserPasswordExpired('Your password has expired') - return l + return accounts def get_execution_id(self): return self.document.xpath('//input[@name="_flowExecutionKey"]')[0].attrib['value'] diff --git a/modules/bnporc/pro.py b/modules/bnporc/pro.py index 1c1bf433..5a6a5766 100644 --- a/modules/bnporc/pro.py +++ b/modules/bnporc/pro.py @@ -63,6 +63,11 @@ class ProAccountsList(Page): account._link_id = p.get('ch4', None) account._stp = p.get('stp', None) + for input_tag in tr.xpath('.//input[starts-with(@id, "urlRib")]'): + m = re.search('ch4=(\w+)', input_tag.get('value', '')) + if m: + account.iban = unicode(m.group(1)) + accounts.append(account) # If there are also personnal accounts linked, display the page and iter on them.