Compare commits
No commits in common. "432aed665a2f4f3c29298ae9c86beeef4c8b8acb" and "84f71ea056cea23a10faa5a4302eea4abf51371d" have entirely different histories.
432aed665a
...
84f71ea056
6 changed files with 8 additions and 15 deletions
|
@ -150,10 +150,10 @@ std::string marketFeeAsString(int sum, int percent, int maxFee)
|
|||
return feeStream.str();
|
||||
}
|
||||
|
||||
std::string paymentAsString(int sumInCent, int percent, int maxFeeInCent)
|
||||
std::string paymentAsString(int sum, int percent)
|
||||
{
|
||||
std::stringstream feeStream;
|
||||
feeStream << std::right << std::setw(10) << std::showbase
|
||||
<< std::put_money(sumInCent - marketFee(sumInCent, percent, maxFeeInCent), false);
|
||||
<< std::put_money(sum - marketFee(sum, percent), false);
|
||||
return feeStream.str();
|
||||
}
|
|
@ -47,8 +47,8 @@ class Marketplace
|
|||
BasketVec basket_;
|
||||
};
|
||||
|
||||
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);
|
||||
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);
|
||||
|
||||
#endif
|
|
@ -1,15 +1,10 @@
|
|||
#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
|
||||
|
@ -72,7 +67,7 @@ QVariant ReportModel::data(const QModelIndex& index, int role) const
|
|||
case 5:
|
||||
return seller->sumAsString().c_str();
|
||||
case 6:
|
||||
return paymentAsString(seller->sumInCents(), feeInPercent_, maxFeeInCent_).c_str();
|
||||
return paymentAsString(seller->sumInCents(), 20).c_str();
|
||||
default:
|
||||
return "???";
|
||||
}
|
||||
|
|
|
@ -16,8 +16,6 @@ class ReportModel : public QAbstractTableModel
|
|||
|
||||
private:
|
||||
Marketplace* market_;
|
||||
int feeInPercent_{};
|
||||
int maxFeeInCent_{};
|
||||
};
|
||||
|
||||
#endif
|
Loading…
Reference in a new issue