nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

credit card is no longer in coming

Browse source
This commit is contained in:
Vincent Paredes 2015-03-30 14:10:22 +02:00 • committed by Romain Bignon
commit c25942ac26
2 changed files with 17 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/societegenerale/browser.py
View file

@ -113,9 +113,9 @@ class SocieteGenerale(Browser):
if self.is_on_page(CardsList): if self.is_on_page(CardsList):
for card_link in self.page.iter_cards(): for card_link in self.page.iter_cards():
self.location(card_link) self.location(card_link)
transactions += list(self.page.iter_transactions(coming=True)) transactions += list(self.page.iter_transactions())
elif self.is_on_page(AccountHistory): elif self.is_on_page(AccountHistory):
transactions += list(self.page.iter_transactions(coming=(account.type == account.TYPE_CARD))) transactions += list(self.page.iter_transactions())
else: else:
self.logger.warning('This account is not supported') self.logger.warning('This account is not supported')

33
modules/societegenerale/pages/accounts_list.py
View file

@ -93,8 +93,6 @@ class AccountsList(BasePage):
if 'CARTE_' in account._link_id: if 'CARTE_' in account._link_id:
account.type = account.TYPE_CARD account.type = account.TYPE_CARD
account.coming = account.balance
account.balance = Decimal('0')
yield account yield account
@ -138,6 +136,7 @@ class Transaction(FrenchTransaction):
class AccountHistory(BasePage): class AccountHistory(BasePage):
rdate = None
def get_part_url(self): def get_part_url(self):
for script in self.document.getiterator('script'): for script in self.document.getiterator('script'):
if script.text is None: if script.text is None:
@ -149,7 +148,7 @@ class AccountHistory(BasePage):
return None return None
def iter_transactions(self, coming): def iter_transactions(self):
url = self.get_part_url() url = self.get_part_url()
if url is None: if url is None:
# There are no transactions in this kind of account # There are no transactions in this kind of account
@ -166,9 +165,7 @@ class AccountHistory(BasePage):
s = StringIO(unicode(el.text).encode('iso-8859-1')) s = StringIO(unicode(el.text).encode('iso-8859-1'))
doc = self.browser.get_document(s) doc = self.browser.get_document(s)
for tr in self._iter_transactions(doc, coming): for tr in self._iter_transactions(doc):
if not tr._coming:
coming = False
yield tr yield tr
el = d.xpath('//dataHeader')[0] el = d.xpath('//dataHeader')[0]
@ -185,7 +182,7 @@ class AccountHistory(BasePage):
sign=p['sign'][0], sign=p['sign'][0],
src=p['src'][0]) src=p['src'][0])
def _iter_transactions(self, doc, coming): def _iter_transactions(self, doc):
t = None t = None
for i, tr in enumerate(self.parser.select(doc.getroot(), 'tr')): for i, tr in enumerate(self.parser.select(doc.getroot(), 'tr')):
try: try:
@ -198,21 +195,19 @@ class AccountHistory(BasePage):
m = re.search('(\d+)/(\d+)', raw) m = re.search('(\d+)/(\d+)', raw)
if not m: if not m:
continue continue
date = t.date if t else datetime.date.today() self.rdate = t.date if t else datetime.date.today()
date = date.replace(day=int(m.group(1)), month=int(m.group(2))) self.rdate = self.rdate.replace(day=int(m.group(1)), month=int(m.group(2)))
if date <= datetime.date.today(): if not t:
coming = False
continue continue
t = Transaction(i) t = Transaction(i)
t.parse(date=date, raw=raw) t._coming = False
t.set_amount(*reversed([el.text for el in tr.xpath('./td[@class="right"]')])) t.set_amount(*reversed([el.text for el in tr.xpath('./td[@class="right"]')]))
try: if date == '':
t._coming = tr.xpath('./td[@headers="AVenir"]')[0].find('img') is not None #credit from main account
except IndexError: t.amount = -t.amount
t._coming = coming date = self.rdate
t.parse(raw=raw, date=date)
if t.label.startswith('DEBIT MENSUEL CARTE'): t.rdate = self.rdate
continue
yield t yield t