AaronFiore/electrum
1
0
Fork 0
Code Activity

fix: store key of invoices for retrieval

Browse Source
This commit is contained in:
ThomasV
2014-07-13 23:56:24 +02:00
parent 6f246fe90e
commit 4193fffc33
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gui/qt/main_window.py
View File

@@ -1332,12 +1332,13 @@ class ElectrumWindow(QMainWindow):
invoices = self.wallet.storage.get('invoices', {}) invoices = self.wallet.storage.get('invoices', {})
l = self.invoices_list l = self.invoices_list
l.clear() l.clear()
for value in sorted(invoices.values(), key=lambda x: -x[3]): for key, value in sorted(invoices.items(), key=lambda x: -x[1][3]):
domain, memo, amount, expiration_date, status, tx_hash = value domain, memo, amount, expiration_date, status, tx_hash = value
if status == PR_UNPAID and expiration_date and expiration_date < time.time(): if status == PR_UNPAID and expiration_date and expiration_date < time.time():
status = PR_EXPIRED status = PR_EXPIRED
date_str = datetime.datetime.fromtimestamp(expiration_date).isoformat(' ')[:-3] date_str = datetime.datetime.fromtimestamp(expiration_date).isoformat(' ')[:-3]
item = QTreeWidgetItem( [ domain, memo, date_str, self.format_amount(amount, whitespaces=True), format_status(status)] ) item = QTreeWidgetItem( [ domain, memo, date_str, self.format_amount(amount, whitespaces=True), format_status(status)] )
item.setData(0, 32, key)
item.setFont(0, QFont(MONOSPACE_FONT)) item.setFont(0, QFont(MONOSPACE_FONT))
item.setFont(3, QFont(MONOSPACE_FONT)) item.setFont(3, QFont(MONOSPACE_FONT))
l.addTopLevelItem(item) l.addTopLevelItem(item)
@@ -1501,7 +1502,7 @@ class ElectrumWindow(QMainWindow):
msg += '\nStatus: ' + pr.get_status() msg += '\nStatus: ' + pr.get_status()
msg += '\nMemo: ' + pr.get_memo() msg += '\nMemo: ' + pr.get_memo()
msg += '\nPayment URL: ' + pr.payment_url msg += '\nPayment URL: ' + pr.payment_url
msg += '\n\nOutputs:\n' + '\n'.join(map(lambda x: x[0] + ' ' + self.format_amount(x[1])+ self.base_unit(), pr.get_outputs())) msg += '\n\nOutputs:\n' + '\n'.join(map(lambda x: x[1] + ' ' + self.format_amount(x[2])+ self.base_unit(), pr.get_outputs()))
QMessageBox.information(self, 'Invoice', msg , 'OK') QMessageBox.information(self, 'Invoice', msg , 'OK')
def do_pay_invoice(self, key): def do_pay_invoice(self, key):
@@ -1522,8 +1523,7 @@ class ElectrumWindow(QMainWindow):
item = self.invoices_list.itemAt(position) item = self.invoices_list.itemAt(position)
if not item: if not item:
return return
k = self.invoices_list.indexOfTopLevelItem(item) key = str(item.data(0, 32).toString())
key = self.invoices.keys()[k]
domain, memo, value, expiration, status, tx_hash = self.invoices[key] domain, memo, value, expiration, status, tx_hash = self.invoices[key]
menu = QMenu() menu = QMenu()
menu.addAction(_("Details"), lambda: self.show_invoice(key)) menu.addAction(_("Details"), lambda: self.show_invoice(key))