From 099d775102bff5a46ccfbdf0333f7d84d7b99447 Mon Sep 17 00:00:00 2001 From: Petr Baudis Date: Sun, 13 Dec 2015 16:10:03 +0100 Subject: [PATCH] Add missing collateral changes for Transfer --- brmbar3/brmbar-gui-qt4.py | 8 ++++++++ brmbar3/brmbar-gui-qt4/MainPage.qml | 13 ++++++++++--- brmbar3/brmbar/Shop.py | 4 ++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/brmbar3/brmbar-gui-qt4.py b/brmbar3/brmbar-gui-qt4.py index 5b63552..a41fd2c 100755 --- a/brmbar3/brmbar-gui-qt4.py +++ b/brmbar3/brmbar-gui-qt4.py @@ -122,6 +122,14 @@ class ShopAdapter(QtCore.QObject): db.commit() return balance + @QtCore.Slot('QVariant', 'QVariant', 'QVariant', result='QVariant') + def newTransfer(self, uidfrom, uidto, amount): + ufrom = brmbar.Account.load(db, id=uidfrom) + uto = brmbar.Account.load(db, id=uidto) + shop.transfer_credit(ufrom, uto, amount = amount) + db.commit() + return currency.str(float(amount)) + @QtCore.Slot('QVariant', result='QVariant') def balance_user(self, userid): user = brmbar.Account.load(db, id=userid) diff --git a/brmbar3/brmbar-gui-qt4/MainPage.qml b/brmbar3/brmbar-gui-qt4/MainPage.qml index effc9ad..6e555eb 100644 --- a/brmbar3/brmbar-gui-qt4/MainPage.qml +++ b/brmbar3/brmbar-gui-qt4/MainPage.qml @@ -33,6 +33,16 @@ Item { } } + BarButton { + x: 450 + y: 838 + width: 360 + text: "Transfer" + onButtonClick: { + loadPage("Transfer") + } + } + BarButton { id: management x: 855 @@ -50,7 +60,4 @@ Item { width: 1150 text: "* Mroze a Termixy najdes v lednici *" } - - - } diff --git a/brmbar3/brmbar/Shop.py b/brmbar3/brmbar/Shop.py index 1c4ffb0..55c26ba 100644 --- a/brmbar3/brmbar/Shop.py +++ b/brmbar3/brmbar/Shop.py @@ -78,6 +78,10 @@ class Shop: user.debit(transaction, credit, "Credit withdrawal") self.db.commit() + def transfer_credit(self, userfrom, userto, amount): + self.add_credit(amount, userto) + self.withdraw_credit(amount, userfrom) + def buy_for_cash(self, item, amount = 1): # Buy: Currency conversion from item currency to shop currency (buy, sell) = item.currency.rates(self.currency)