diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 3563d6e..4874700 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -138,10 +138,6 @@ MainWindow::MainWindow() }); connect(m_ui.importSellerAction, &QAction::triggered, this, &MainWindow::onImportSellerActionTriggered); - connect(m_ui.importSellerJsonAction, &QAction::triggered, this, - &MainWindow::onImportSellerJsonActionTriggered); - connect(m_ui.exportSellerJsonAction, &QAction::triggered, this, - &MainWindow::onExportSellerJsonActionTriggered); connect(m_ui.exportSalesJsonAction, &QAction::triggered, this, &MainWindow::onExportSalesJsonActionTriggered); connect(m_ui.importSalesJsonAction, &QAction::triggered, this, @@ -483,59 +479,6 @@ void MainWindow::onImportSellerActionTriggered() .exec(); } -void MainWindow::onImportSellerJsonActionTriggered() -{ - if (!m_marketplace->getSales().empty()) { - QMessageBox(QMessageBox::Icon::Information, "Import nicht möglich", - "Der Import ist nicht möglich, da schon Verkäufe getätigt wurden.", - QMessageBox::StandardButton::Ok, this) - .exec(); - return; - } - - auto filename = QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(), - "JSON Dateien (*.json)"); - - if (filename.isEmpty()) - return; - -#if defined(_WIN64) || defined(_WIN32) - fs::path filePath(filename.toStdWString()); -#else - fs::path filePath(filename.toStdString()); -#endif - - std::size_t numImported{}; - numImported = JsonUtil::importSellers(filePath, m_marketplace.get()); - - updateStatLabel(); - - using namespace std::string_literals; - std::ostringstream msg; - msg << "Aus der JSON-Datei wurden "s << std::to_string(numImported) - << " Verkäufer importiert."; - QMessageBox(QMessageBox::Icon::Information, "Verkäufer erfolgreich importiert", - msg.str().c_str(), QMessageBox::StandardButton::Ok, this) - .exec(); -} - -void MainWindow::onExportSellerJsonActionTriggered() -{ - auto filename = QFileDialog::getSaveFileName( - this, "Verkäufer exportieren", QString("kima2_verkaeufer.json"), "JSON Dateien (*.json)"); - - if (filename.isEmpty()) - return; - -#if defined(_WIN64) || defined(_WIN32) - fs::path filePath(filename.toStdWString()); -#else - fs::path filePath(filename.toStdString()); -#endif - - JsonUtil::exportSellers(filePath, m_marketplace.get()); -} - void MainWindow::onExportSalesJsonActionTriggered() { QSettings settings; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 39f8c37..42ac25f 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -40,8 +40,6 @@ class MainWindow : public QMainWindow void onPaidButtonTriggered(); void onGivenSpinBoxValueChanged(double value); void onImportSellerActionTriggered(); - void onImportSellerJsonActionTriggered(); - void onExportSellerJsonActionTriggered(); void onExportSalesJsonActionTriggered(); void onImportSalesJsonActionTriggered(); void setSaleModel(); diff --git a/src/gui/mainwindow.ui b/src/gui/mainwindow.ui index d409caa..49ba0fc 100644 --- a/src/gui/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -440,16 +440,8 @@ drucken &Verkäufer - - - Importieren - - - - - - + @@ -513,7 +505,7 @@ drucken Exportieren für andere Kasse (JSON) - + Aus CSV-Datei (initial) @@ -548,6 +540,11 @@ drucken Lizenz + + + Importieren (aus CSV-Datei) + +