Compare commits
No commits in common. "acc8408b0aec794e47ac9eea45885455b834e6d8" and "f0ec980e8d15f4ab94428c963d8cdcf89a204415" have entirely different histories.
acc8408b0a
...
f0ec980e8d
3 changed files with 2 additions and 18 deletions
|
@ -16,7 +16,7 @@ class Article : public EntityUuid
|
|||
public:
|
||||
Article() = default;
|
||||
Article(int price);
|
||||
virtual ~Article() = default;
|
||||
//virtual ~Article() = default;
|
||||
|
||||
void setArticleNo(int articleNo);
|
||||
void setPrice(int price);
|
||||
|
|
|
@ -14,7 +14,7 @@ class Seller : public EntityInt
|
|||
{
|
||||
public:
|
||||
Seller() = default;
|
||||
virtual ~Seller() = default;
|
||||
~Seller() = default;
|
||||
Seller(const std::string& firstName, const std::string& lastName, int sellerNo = 0,
|
||||
int numArticlesOffered = 0);
|
||||
|
||||
|
|
|
@ -462,11 +462,7 @@ void MainWindow::onImportSellerExcelActionTriggered()
|
|||
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{};
|
||||
if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) {
|
||||
|
@ -502,11 +498,7 @@ void MainWindow::onImportSellerJsonActionTriggered()
|
|||
if (filename.isEmpty())
|
||||
return;
|
||||
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
fs::path filePath(filename.toStdWString());
|
||||
#else
|
||||
fs::path filePath(filename.toStdString());
|
||||
#endif
|
||||
|
||||
JsonUtil::importSellers(filePath, marketplace_.get());
|
||||
updateStatLabel();
|
||||
|
@ -537,11 +529,7 @@ void MainWindow::onExportSalesJsonActionTriggered()
|
|||
if (filename.isEmpty())
|
||||
return;
|
||||
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
fs::path filePath(filename.toStdWString());
|
||||
#else
|
||||
fs::path filePath(filename.toStdString());
|
||||
#endif
|
||||
|
||||
JsonUtil::exportSales(filePath, marketplace_.get(),
|
||||
settings.value("global/cashPointNo").toInt());
|
||||
|
@ -557,11 +545,7 @@ void MainWindow::onImportSalesJsonActionTriggered()
|
|||
if (filename.isEmpty())
|
||||
return;
|
||||
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
fs::path filePath(filename.toStdWString());
|
||||
#else
|
||||
fs::path filePath(filename.toStdString());
|
||||
#endif
|
||||
|
||||
delete ui_.salesView->model();
|
||||
try {
|
||||
|
|
Loading…
Reference in a new issue