from electrum import util, bitcoin, commands, Interface, Wallet
from electrum import SimpleConfig, Wallet, WalletStorage
+from electrum.paymentrequest import PR_UNPAID, PR_PAID
+
from electrum import bmp, pyqrnative
from util import *
-
-
+def format_status(x):
+ if x == PR_UNPAID:
+ return _('Unpaid')
+ elif x == PR_PAID:
+ return _('Paid')
class StatusBarButton(QPushButton):
label = unicode( self.message_e.text() )
if self.gui_object.payment_request:
- outputs = self.gui_object.payment_request.outputs
+ outputs = self.gui_object.payment_request.get_outputs()
else:
outputs = self.payto_e.get_outputs()
def broadcast_transaction(self, tx):
def broadcast_thread():
- if self.gui_object.payment_request:
- refund_address = self.wallet.addresses()[0]
- status, msg = self.gui_object.payment_request.send_ack(str(tx), refund_address)
+ pr = self.gui_object.payment_request
+ if pr is None:
+ return self.wallet.sendtx(tx)
+
+ if pr.has_expired():
self.gui_object.payment_request = None
- else:
- status, msg = self.wallet.sendtx(tx)
+ return False, _("Payment request has expired")
+
+ status, msg = self.wallet.sendtx(tx)
+ 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.wallet.storage.put('invoices', self.invoices)
+ self.update_invoices_tab()
+ self.gui_object.payment_request = None
+ refund_address = self.wallet.addresses()[0]
+ ack_status, ack_msg = pr.send_ack(str(tx), refund_address)
+ if ack_status:
+ msg = ack_msg
+
return status, msg
def broadcast_done(status, msg):
def payment_request_ok(self):
pr = self.gui_object.payment_request
pr_id = pr.get_id()
- # save it
- self.invoices[pr_id] = (pr.get_domain(), pr.get_amount())
- self.wallet.storage.put('invoices', self.invoices)
- self.update_invoices_tab()
+ if pr_id not in self.invoices:
+ self.invoices[pr_id] = (pr.get_domain(), pr.get_memo(), pr.get_amount(), PR_UNPAID, None)
+ self.wallet.storage.put('invoices', self.invoices)
+ self.update_invoices_tab()
+ else:
+ print_error('invoice already in list')
+
+ status = self.invoices[pr_id][3]
+ if status == PR_PAID:
+ self.do_clear()
+ self.show_message("invoice already paid")
+ self.gui_object.payment_request = None
+ return
self.payto_help.show()
self.payto_help.set_alt(lambda: self.show_pr_details(pr))
self.payto_e.setGreen()
self.payto_e.setText(pr.domain)
self.amount_e.setText(self.format_amount(pr.get_amount()))
- self.message_e.setText(pr.memo)
+ self.message_e.setText(pr.get_memo())
def payment_request_error(self):
self.do_clear()
def create_invoices_tab(self):
- l, w = self.create_list_tab([_('Requestor'), _('Amount'), _('Status')])
+ l, w = self.create_list_tab([_('Requestor'), _('Memo'),_('Amount'), _('Status')])
+ h = l.header()
+ h.setStretchLastSection(False)
+ h.setResizeMode(1, QHeaderView.Stretch)
l.setContextMenuPolicy(Qt.CustomContextMenu)
l.customContextMenuRequested.connect(self.create_invoice_menu)
self.invoices_list = l
invoices = self.wallet.storage.get('invoices', {})
l = self.invoices_list
l.clear()
-
- for item, value in invoices.items():
- domain, amount = value
- item = QTreeWidgetItem( [ domain, self.format_amount(amount), ""] )
+ for key, value in invoices.items():
+ try:
+ domain, memo, amount, status, tx_hash = value
+ except:
+ invoices.pop(key)
+ continue
+ item = QTreeWidgetItem( [ domain, memo, self.format_amount(amount), format_status(status)] )
l.addTopLevelItem(item)
l.setCurrentItem(l.topLevelItem(0))
run_hook('create_contact_menu', menu, item)
menu.exec_(self.contacts_list.viewport().mapToGlobal(position))
- def delete_invoice(self, item):
+ def delete_invoice(self, key):
self.invoices.pop(key)
self.wallet.storage.put('invoices', self.invoices)
self.update_invoices_tab()
def show_invoice(self, key):
from electrum.paymentrequest import PaymentRequest
- domain, value = self.invoices[key]
+ domain, memo, value, status, tx_hash = self.invoices[key]
pr = PaymentRequest(self.config)
pr.read_file(key)
pr.domain = domain
def show_pr_details(self, pr):
msg = 'Domain: ' + pr.domain
msg += '\nStatus: ' + pr.get_status()
- msg += '\nMemo: ' + pr.memo
+ msg += '\nMemo: ' + pr.get_memo()
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()))
QMessageBox.information(self, 'Invoice', msg , 'OK')
+ def do_pay_invoice(self, key):
+ from electrum.paymentrequest import PaymentRequest
+ domain, memo, value, status, tx_hash = self.invoices[key]
+ pr = PaymentRequest(self.config)
+ pr.read_file(key)
+ pr.domain = domain
+ pr.verify()
+ self.gui_object.payment_request = pr
+ self.prepare_for_payment_request()
+ self.payment_request_ok()
+
def create_invoice_menu(self, position):
item = self.invoices_list.itemAt(position)
if not item:
return
k = self.invoices_list.indexOfTopLevelItem(item)
key = self.invoices.keys()[k]
+ domain, memo, value, status, tx_hash = self.invoices[key]
menu = QMenu()
menu.addAction(_("Details"), lambda: self.show_invoice(key))
+ if status == PR_UNPAID:
+ menu.addAction(_("Pay Now"), lambda: self.do_pay_invoice(key))
menu.addAction(_("Delete"), lambda: self.delete_invoice(key))
menu.exec_(self.invoices_list.viewport().mapToGlobal(position))
fee_e = BTCAmountEdit(self.get_decimal_point)
fee_e.setAmount(self.wallet.fee)
grid.addWidget(fee_e, 2, 1)
- msg = _('Fee per kilobyte of transaction.') + ' ' \
- + _('Recommended value') + ': ' + self.format_amount(20000)
+ msg = _('Fee per kilobyte of transaction.') + '\n' \
+ + _('Recommended value') + ': ' + self.format_amount(10000) + ' ' + self.base_unit()
grid.addWidget(HelpButton(msg), 2, 2)
if not self.config.is_modifiable('fee_per_kb'):
for w in [fee_e, fee_label]: w.setEnabled(False)
git://git.novaco.in / electrum-nvc.git / blobdiff