src/core/marketplace.cpp

@@ -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();
 }

src/core/marketplace.h

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

src/gui/mainwindow.cpp

@@ -96,7 +96,7 @@ void MainWindow::onPaidButtonTriggered()
         dynamic_cast<BasketModel*>(ui_.basketView->model())->finishSale();
         ui_.lastPriceLabel1->setText(lastPrice);
         ui_.lastPriceLabel2->setText(lastPrice);
-        ui_.basketSumLabel->setText("  0,00 €");
+        ui_.basketSumLabel->setText("   0,00 €");
         statusBar()->showMessage("Verkaufsvorgang erfolgreich durchgeführt.", STATUSBAR_TIMEOUT);
     }
 }

src/gui/mainwindow.ui

@@ -43,7 +43,7 @@
            <enum>QFrame::Box</enum>
           </property>
           <property name="text">
-           <string>  0,00 €</string>
+           <string>   0,00 €</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>

src/gui/reportmodel.cpp

@@ -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 "???";
     }

src/gui/reportmodel.h

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