martin/kima2
1
0
Fork 0
Code Issues Pull requests Releases 26 Wiki Activity

use fees from settings

Browse source
This commit is contained in:
Martin Brodbeck 2018-07-30 15:19:29 +02:00
parent a4ae6a586a
commit 432aed665a
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/core/marketplace.cpp
View file

@ -150,10 +150,10 @@ std::string marketFeeAsString(int sum, int percent, int maxFee)
return feeStream.str();
}
std::string paymentAsString(int sum, int percent)
std::string paymentAsString(int sumInCent, int percent, int maxFeeInCent)
{
std::stringstream feeStream;
feeStream << std::right << std::setw(10) << std::showbase
<< std::put_money(sum - marketFee(sum, percent), false);
<< std::put_money(sumInCent - marketFee(sumInCent, percent, maxFeeInCent), false);
return feeStream.str();
}

6
src/core/marketplace.h
View file

@ -47,8 +47,8 @@ class Marketplace
BasketVec basket_;
};
double marketFee(int sum, int percent, int maxFee = 5000);
std::string marketFeeAsString(int sum, int percent, int maxFee = 5000);
std::string paymentAsString(int sum, int percent);
double marketFee(int sumInCent, int percent, int maxFeeInCent);
std::string marketFeeAsString(int sumInCent, int percent, int maxFeeInCent);
std::string paymentAsString(int sumInCent, int percent, int maxFeeInCent);
#endif

7
src/gui/reportmodel.cpp
View file

@ -1,10 +1,15 @@
#include "reportmodel.h"
#include <QFont>
#include <QSettings>
ReportModel::ReportModel(Marketplace* market, QObject* parent)
: QAbstractTableModel(parent), market_(market)
{
QSettings settings;
feeInPercent_ = settings.value("global/feeInPercent").toInt();
maxFeeInCent_ = settings.value("global/maxFeeInEuro").toInt() * 100;
}
int ReportModel::rowCount([[maybe_unused]] const QModelIndex& parent) const
@ -67,7 +72,7 @@ QVariant ReportModel::data(const QModelIndex& index, int role) const
case 5:
return seller->sumAsString().c_str();
case 6:
return paymentAsString(seller->sumInCents(), 20).c_str();
return paymentAsString(seller->sumInCents(), feeInPercent_, maxFeeInCent_).c_str();
default:
return "???";
}

2
src/gui/reportmodel.h
View file

@ -16,6 +16,8 @@ class ReportModel : public QAbstractTableModel
private:
Marketplace* market_;
int feeInPercent_{};
int maxFeeInCent_{};
};
#endif