tshow expired status in invoices tab - electrum - Electrum Bitcoin wallet (HTM) git clone https://git.parazyd.org/electrum (DIR) Log (DIR) Files (DIR) Refs (DIR) Submodules --- (DIR) commit 47c491624e36ed4306f0b134a502ead0f1789582 (DIR) parent 38e7d8ebe5212324f27454028adbfc02540e2f88 (HTM) Author: ThomasV <thomasv@gitorious> Date: Fri, 13 Jun 2014 16:53:43 +0200 show expired status in invoices tab Diffstat: M gui/qt/main_window.py | 12 ++++++++---- M lib/paymentrequest.py | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) --- (DIR) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py t@@ -83,6 +83,8 @@ def format_status(x): return _('Unpaid') elif x == PR_PAID: return _('Paid') + elif x == PR_EXPIRED: + return _('Expired') class StatusBarButton(QPushButton): t@@ -927,7 +929,7 @@ class ElectrumWindow(QMainWindow): if not status: return False, msg - self.invoices[pr.get_id()] = (pr.get_domain(), pr.get_memo(), pr.get_amount(), PR_PAID, tx.hash()) + self.invoices[pr.get_id()] = (pr.get_domain(), pr.get_memo(), pr.get_amount(), pr.get_expiration_date(), PR_PAID, tx.hash()) self.wallet.storage.put('invoices', self.invoices) self.update_invoices_tab() self.payment_request = None t@@ -965,7 +967,7 @@ class ElectrumWindow(QMainWindow): pr = self.payment_request pr_id = pr.get_id() if pr_id not in self.invoices: - self.invoices[pr_id] = (pr.get_domain(), pr.get_memo(), pr.get_amount(), PR_UNPAID, None) + self.invoices[pr_id] = (pr.get_domain(), pr.get_memo(), pr.get_amount(), pr.get_expiration_date(), PR_UNPAID, None) self.wallet.storage.put('invoices', self.invoices) self.update_invoices_tab() else: t@@ -1144,10 +1146,12 @@ class ElectrumWindow(QMainWindow): l.clear() for key, value in invoices.items(): try: - domain, memo, amount, status, tx_hash = value + domain, memo, amount, expiration_date, status, tx_hash = value except: invoices.pop(key) continue + if status == PR_UNPAID and expiration_date and expiration_date < time.time(): + status = PR_EXPIRED item = QTreeWidgetItem( [ domain, memo, self.format_amount(amount), format_status(status)] ) l.addTopLevelItem(item) t@@ -1334,7 +1338,7 @@ class ElectrumWindow(QMainWindow): return k = self.invoices_list.indexOfTopLevelItem(item) key = self.invoices.keys()[k] - domain, memo, value, status, tx_hash = self.invoices[key] + domain, memo, value, expiration, status, tx_hash = self.invoices[key] menu = QMenu() menu.addAction(_("Details"), lambda: self.show_invoice(key)) if status == PR_UNPAID: (DIR) diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py t@@ -256,6 +256,9 @@ class PaymentRequest: def has_expired(self): return self.details.expires and self.details.expires < int(time.time()) + def get_expiration_date(self): + return self.details.expires + def get_amount(self): return sum(map(lambda x:x[1], self.outputs))