diff --git a/modules/ing/browser.py b/modules/ing/browser.py index 647a7eea731127909043337d30cdf84d2898b527..fe2853482f65e3d57f1d218814617a7690c940b4 100644 --- a/modules/ing/browser.py +++ b/modules/ing/browser.py @@ -190,8 +190,6 @@ def get_market_balance(self, account): def get_iban(self, account): if account.type in [Account.TYPE_CHECKING, Account.TYPE_SAVINGS]: self.go_account_page(account) - # nedeed for transfer - account._estimated_balance = self.page.get_estimated_balance() account.iban = self.ibanpage.go().get_iban() if account.type in (Account.TYPE_MARKET, Account.TYPE_PEA): diff --git a/modules/ing/pages/accounts_list.py b/modules/ing/pages/accounts_list.py index dc6563ebb863c314e49a6dd783d30b6f58097721..46a7a9a3d04093f58b9756ec788c31ce4f84e3fa 100644 --- a/modules/ing/pages/accounts_list.py +++ b/modules/ing/pages/accounts_list.py @@ -172,7 +172,6 @@ class item(ItemElement): obj_type = AddType(Field('label')) obj_coming = NotAvailable obj__jid = Attr('//input[@name="javax.faces.ViewState"]', 'value') - obj__estimated_balance = None def obj_balance(self): balance = CleanDecimal('./span[@class="solde"]/label', replace_dots=True)(self) @@ -323,11 +322,6 @@ def load_space_page(self): self.fillup_form(form, r"\),\{(.*)\},'", on_click) form.submit() - def get_estimated_balance(self): - # nedeed to do transfer - if self.doc.xpath('//div[@class="previsionnel"]'): - return CleanDecimal('//div[@class="previsionnel"]//div[@class="solde_value"]//label[@class="digits positive"]', replace_dots=True)(self.doc) - class IbanPage(LoggedPage, HTMLPage): def get_iban(self): iban = CleanText('//tr[td[1]//text()="IBAN"]/td[2]')(self.doc).strip().replace(' ', '') diff --git a/modules/ing/pages/transfer.py b/modules/ing/pages/transfer.py index 431aff3d632a4bb33a1411b7ac0907cd69cdc434..58372e0f26bb58ce4f32e2493c14b81b5538f09a 100644 --- a/modules/ing/pages/transfer.py +++ b/modules/ing/pages/transfer.py @@ -80,11 +80,15 @@ def parse(self, el): self.env['label'] = account.label self.env['iban'] = account.iban - def get_origin_account_id(self, origin): return [Attr('.', 'data-acct-number')(div) for div in self.doc.xpath('//div[@id="internalAccounts"]//div[@data-acct-number]') if Attr('.', 'data-acct-number')(div) in origin.id][0] + def update_origin_account_estimated_balance(self, origin): + for div in self.doc.xpath('//div[@id="internalAccounts"]//div[@data-acct-number]'): + if Attr('.', 'data-acct-number')(div) in origin.id: + origin._estimated_balance = CleanDecimal('.//span[@class="solde"]', replace_dots=True, default=NotAvailable)(div) + def get_transfer_form(self, txt): form = self.get_form(xpath='//form[script[contains(text(), "%s")]]' % txt) form['AJAXREQUEST'] = '_viewRoot' @@ -98,6 +102,8 @@ def go_to_recipient_selection(self, origin): form['screenStep'] = '1' form.submit() + # update account estimated balance + self.update_origin_account_estimated_balance(origin) # Select debit account form = self.get_transfer_form('SetDebitAccount') form['selectedDebitAccountNumber'] = self.get_origin_account_id(origin)