Compare commits
40 commits
Author | SHA1 | Date | |
---|---|---|---|
8a5038e462 | |||
068a50e289 | |||
da89a0d2c7 | |||
429d66dd4d | |||
37c8446ea4 | |||
a896e0d40e | |||
3668e2484f | |||
52dc7f1974 | |||
ab7b14f12e | |||
0c7f071b9d | |||
d0c50c9b9a | |||
a17cb22e05 | |||
205dac5326 | |||
b0d2d6b284 | |||
7f11ba4e5d | |||
32d0ec7749 | |||
54e5c70447 | |||
379fd4a73c | |||
8a94b53379 | |||
d9b13d0e1a | |||
6f885dd64e | |||
1a698a6cd2 | |||
ac9ae8b34e | |||
4385624988 | |||
4cfd8d5572 | |||
528ae1ff31 | |||
649c26db4b | |||
13a1d26d96 | |||
f898844c7c | |||
e6b71a7e4d | |||
f4b4ccbbea | |||
e79a81797c | |||
8efdf7b6fe | |||
a46e8d89c9 | |||
3e293ba447 | |||
245e41bbf0 | |||
b0444112a8 | |||
c4ccd43b45 | |||
16745a248c | |||
19ea7f27de |
29 changed files with 171 additions and 280 deletions
5
.gitmodules
vendored
5
.gitmodules
vendored
|
@ -3,7 +3,4 @@
|
|||
url = https://github.com/nlohmann/json.git
|
||||
[submodule "subprojects/singleapplication"]
|
||||
path = subprojects/singleapplication/singleapplication.git
|
||||
url = https://github.com/itay-grudev/SingleApplication.git
|
||||
[submodule "subprojects/csv-parser"]
|
||||
path = subprojects/csv-parser
|
||||
url = https://github.com/vincentlaucsb/csv-parser.git
|
||||
url = https://github.com/itay-grudev/SingleApplication.git
|
32
.vscode/settings.json
vendored
32
.vscode/settings.json
vendored
|
@ -65,7 +65,37 @@
|
|||
"condition_variable": "cpp",
|
||||
"mutex": "cpp",
|
||||
"hash_map": "cpp",
|
||||
"future": "cpp"
|
||||
"future": "cpp",
|
||||
"bit": "cpp",
|
||||
"compare": "cpp",
|
||||
"concepts": "cpp",
|
||||
"forward_list": "cpp",
|
||||
"map": "cpp",
|
||||
"set": "cpp",
|
||||
"string": "cpp",
|
||||
"unordered_set": "cpp",
|
||||
"iterator": "cpp",
|
||||
"memory_resource": "cpp",
|
||||
"random": "cpp",
|
||||
"semaphore": "cpp",
|
||||
"stop_token": "cpp",
|
||||
"__bit_reference": "cpp",
|
||||
"__bits": "cpp",
|
||||
"__config": "cpp",
|
||||
"__debug": "cpp",
|
||||
"__errc": "cpp",
|
||||
"__hash_table": "cpp",
|
||||
"__locale": "cpp",
|
||||
"__mutex_base": "cpp",
|
||||
"__node_handle": "cpp",
|
||||
"__split_buffer": "cpp",
|
||||
"__threading_support": "cpp",
|
||||
"__tree": "cpp",
|
||||
"__tuple": "cpp",
|
||||
"__verbose_abort": "cpp",
|
||||
"format": "cpp",
|
||||
"ios": "cpp",
|
||||
"locale": "cpp"
|
||||
},
|
||||
"C_Cpp.clang_format_path": "/usr/bin/clang-format",
|
||||
"cmake.configureOnOpen": true,
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
cmake_minimum_required(VERSION 3.8)
|
||||
cmake_minimum_required(VERSION 3.10)
|
||||
|
||||
project(kima2 VERSION 1.6.1)
|
||||
project(kima2 VERSION 1.8.3)
|
||||
|
||||
set(CMAKE_MODULE_PATH "${CMAKE_HOME_DIRECTORY}/cmake")
|
||||
|
||||
|
@ -17,6 +17,7 @@ else()
|
|||
endif()
|
||||
|
||||
configure_file(config.h.in ${PROJECT_BINARY_DIR}/config.h)
|
||||
configure_file(de.rustysoft.kima2.metainfo.xml.in ${PROJECT_BINARY_DIR}/de.rustysoft.kima2.metainfo.xml)
|
||||
|
||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
|
||||
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
|
||||
|
@ -79,6 +80,8 @@ else(WIN32 AND NOT UNIX)
|
|||
DESTINATION share/${PROJECT_NAME})
|
||||
install(FILES "${CMAKE_SOURCE_DIR}/misc/kima2.svg"
|
||||
DESTINATION share/icons/hicolor/scalable/apps)
|
||||
install(FILES de.rustysoft.kima2.metainfo.xml
|
||||
DESTINATION share/metainfo)
|
||||
endif (WIN32 AND NOT UNIX)
|
||||
|
||||
if( MINGW )
|
||||
|
@ -95,10 +98,9 @@ if( MINGW )
|
|||
${MINGW_PATH}/libwinpthread-1.dll
|
||||
${MINGW_PATH}/libsqlite3-0.dll
|
||||
${MINGW_PATH}/libusb-1.0.dll
|
||||
${MINGW_PATH}/libxlnt.dll
|
||||
${MINGW_PATH}/libicuuc71.dll
|
||||
${MINGW_PATH}/libicuin71.dll
|
||||
${MINGW_PATH}/libicudt71.dll
|
||||
${MINGW_PATH}/libicuuc75.dll
|
||||
${MINGW_PATH}/libicuin75.dll
|
||||
${MINGW_PATH}/libicudt75.dll
|
||||
${MINGW_PATH}/libpcre2-16-0.dll
|
||||
${MINGW_PATH}/libpcre2-8-0.dll
|
||||
${MINGW_PATH}/zlib1.dll
|
||||
|
@ -115,7 +117,7 @@ if( MINGW )
|
|||
${MINGW_PATH}/libmd4c.dll
|
||||
${MINGW_PATH}/libbrotlicommon.dll
|
||||
${MINGW_PATH}/libbrotlidec.dll
|
||||
${MINGW_PATH}/libfmt.dll
|
||||
#${MINGW_PATH}/libfmt.dll
|
||||
${MINGW_PATH}/libb2-1.dll
|
||||
${MINGW_PATH}/libiconv-2.dll)
|
||||
install(FILES ${MINGW_PATH}/../share/qt6/plugins/platforms/qwindows.dll
|
||||
|
@ -123,14 +125,13 @@ if( MINGW )
|
|||
DESTINATION bin/platforms)
|
||||
#install(FILES ${MINGW_PATH}/../share/qt6/plugins/printsupport/windowsprintersupport.dll
|
||||
# DESTINATION bin/printsupport)
|
||||
install(FILES ${MINGW_PATH}/../share/qt5/translations/qtbase_de.qm
|
||||
install(FILES ${MINGW_PATH}/../share/qt6/translations/qtbase_de.qm
|
||||
${MINGW_PATH}/../share/qt6/translations/qt_de.qm
|
||||
${MINGW_PATH}/../share/qt6/translations/qt_help_de.qm
|
||||
${MINGW_PATH}/../share/qt6/translations/qtmultimedia_de.qm
|
||||
#${MINGW_PATH}/../share/qt6/translations/qtquickcontrols_de.qm
|
||||
#${MINGW_PATH}/../share/qt6/translations/qtscript_de.qm
|
||||
#${MINGW_PATH}/../share/qt6/translations/qtxmlpatterns_de.qm
|
||||
DESTINATION bin/translations)
|
||||
DESTINATION bin/share/qt6/translations)
|
||||
install(FILES ${MINGW_PATH}/../share/qt6/plugins/styles/qmodernwindowsstyle.dll
|
||||
DESTINATION bin/styles)
|
||||
endif( MINGW )
|
||||
|
||||
include(InstallRequiredSystemLibraries)
|
||||
|
|
2
LICENSE
2
LICENSE
|
@ -1,4 +1,4 @@
|
|||
Copyright © 2018-2022 Martin Brodbeck
|
||||
Copyright © 2018-2024 Martin Brodbeck
|
||||
|
||||
Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der
|
||||
zugehörigen Dokumentationen (die "Software") erhält, die Erlaubnis erteilt,
|
||||
|
|
12
README.md
12
README.md
|
@ -13,20 +13,16 @@ Verkaufsdaten nach dem Verkaufsende auszutauschen.
|
|||
Ebenso können über einen ESC/POS-Drucker Quittungen ausgestellt werden.
|
||||
|
||||
## Installation
|
||||
Auf [rustysoft.de](https://www.rustysoft.de/software/kima2/) werden verschiedene Installationspakete (Arch Linux,
|
||||
Ubuntu, Windows) angeboten. Bitte die Hinweise dort beachten.
|
||||
Auf [rustysoft.de](https://www.rustysoft.de/software/kima2/) werden die Installationsmöglichkeiten (Flatpak, Windows-Installer) erläutert. Bitte die Hinweise dort beachten.
|
||||
|
||||
### Selbst compilieren
|
||||
## Selbst compilieren
|
||||
KIMA2 benötigt folgende Libraries:
|
||||
* Qt 6
|
||||
* boost >= 1.62
|
||||
* boost >= 1.80
|
||||
* libusb-1.0
|
||||
* xlnt >= 1.5.0
|
||||
* nlohmann-json (als 3rdparty submodule vorhanden)
|
||||
* csv-parser (als 3rdparty submodule vorhanden)
|
||||
|
||||
Da Features aus C++20 verwendet werden sowie std::filesystem, sollte als Compiler mindestens
|
||||
GCC 12 verwendet werden.
|
||||
Da Features aus C++20 sowie von neueren Compilern verwendet werden, sollte als Compiler mindestens GCC 14 verwendet werden.
|
||||
|
||||
Die Installationsschritte unter Linux sind wie folgt:
|
||||
```
|
||||
|
|
27
de.rustysoft.kima2.metainfo.xml.in
Normal file
27
de.rustysoft.kima2.metainfo.xml.in
Normal file
|
@ -0,0 +1,27 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<component type="desktop-application">
|
||||
<id>de.rustysoft.kima2</id>
|
||||
|
||||
<name>KIMA2</name>
|
||||
<summary>A small cash point program for children’s stuff markets</summary>
|
||||
|
||||
<metadata_license>MIT</metadata_license>
|
||||
<project_license>GPL-3.0-or-later</project_license>
|
||||
|
||||
<releases>
|
||||
<release version="@PROJECT_VERSION@" type="stable" date="2024-01-23" />
|
||||
</releases>
|
||||
|
||||
<description>
|
||||
<p>
|
||||
A small cash point program for children's stuff markets. German language only.
|
||||
</p>
|
||||
</description>
|
||||
|
||||
<launchable type="desktop-id">de.rustysoft.kima2.desktop</launchable>
|
||||
<screenshots>
|
||||
<screenshot type="default">
|
||||
<image>https://rustysoft.de/images/software/kima2/screenshot.png</image>
|
||||
</screenshot>
|
||||
</screenshots>
|
||||
</component>
|
Binary file not shown.
Binary file not shown.
|
@ -1,4 +1,4 @@
|
|||
project('kima2', 'cpp', default_options : ['cpp_std=c++20'], version : '1.6.1')
|
||||
project('kima2', 'cpp', default_options : ['cpp_std=c++20'], version : '1.8.0')
|
||||
|
||||
conf_data = configuration_data()
|
||||
conf_data.set('PROJECT_VERSION', '"' + meson.project_version() + '"')
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
# Maintainer: Martin Brodbeck <martin at brodbeck-online dot de>
|
||||
pkgname=kima2
|
||||
pkgver=1.6.1
|
||||
pkgver=1.7.1
|
||||
pkgrel=1
|
||||
pkgdesc="A small cash point program for children's things markets (German only)"
|
||||
arch=('i686' 'x86_64')
|
||||
url="http://www.rustysoft.de/software/kima2"
|
||||
license=('custom')
|
||||
depends=('glibc' 'libusb' 'qt6-base' 'sqlite3' 'xlnt')
|
||||
depends=('glibc' 'libusb' 'qt6-base' 'sqlite3')
|
||||
makedepends=('boost>=1.62')
|
||||
source=(git+https://git.rustysoft.de/martin/kima2)
|
||||
sha256sums=('SKIP')
|
||||
|
|
|
@ -3,8 +3,8 @@ Type=Application
|
|||
Name=KIMA2
|
||||
GenericName=Cash Point Program
|
||||
GenericName[de]=Kassenprogramm
|
||||
Comment=A small cash point program
|
||||
Comment[de]=Ein kleines Kassenprogramm
|
||||
Comment=A small cash point program for children's stuff markets
|
||||
Comment[de]=Ein kleines Kassenprogramm für Kindersachenmärkte
|
||||
Exec=kima2
|
||||
Icon=kima2
|
||||
Categories=Office;
|
||||
|
|
|
@ -13,7 +13,6 @@ BuildRequires: boost-date-time
|
|||
BuildRequires: sqlite-devel
|
||||
BuildRequires: libusb-devel
|
||||
BuildRequires: qt5-qtdeclarative-devel
|
||||
#BuildRequires: pkgconfig(xlnt)
|
||||
#BuildRequires: pkgconfig(pthreads)
|
||||
|
||||
%description
|
||||
|
|
|
@ -1,22 +1,12 @@
|
|||
set(Boost_USE_STATIC_LIBS ON)
|
||||
|
||||
find_package(Boost 1.62 REQUIRED)
|
||||
find_package(Boost 1.78 REQUIRED)
|
||||
find_package(SQLite3 REQUIRED)
|
||||
|
||||
# Because csv-parser needs threads:
|
||||
set(THREADS_PREFER_PTHREAD_FLAG ON)
|
||||
find_package(Threads REQUIRED)
|
||||
|
||||
find_package(fmt)
|
||||
|
||||
|
||||
if (MINGW)
|
||||
find_package(XLNT REQUIRED STATIC)
|
||||
else (MINGW)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(XLNT REQUIRED xlnt>=1.3)
|
||||
endif (MINGW)
|
||||
|
||||
set(CORE_SOURCES
|
||||
database.cpp
|
||||
entity.cpp
|
||||
|
@ -26,7 +16,6 @@ set(CORE_SOURCES
|
|||
article.cpp
|
||||
sale.cpp
|
||||
marketplace.cpp
|
||||
excelreader.cpp
|
||||
csvreader.cpp
|
||||
jsonutil.cpp
|
||||
utils.cpp
|
||||
|
@ -34,12 +23,12 @@ set(CORE_SOURCES
|
|||
|
||||
|
||||
add_library(core STATIC ${CORE_SOURCES})
|
||||
target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include)
|
||||
#target_include_directories(core PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/csv-parser/single_include)
|
||||
if (WIN32)
|
||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json ${XLNT_LIBRARY} Threads::Threads fmt::fmt)
|
||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json)
|
||||
target_link_libraries(core PRIVATE bcrypt)
|
||||
else()
|
||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json ${XLNT_LIBRARIES} Threads::Threads fmt::fmt)
|
||||
target_link_libraries(core PRIVATE sqlite3 nlohmann_json::nlohmann_json)
|
||||
endif()
|
||||
|
||||
target_include_directories(core PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
|
|
|
@ -3,7 +3,8 @@
|
|||
|
||||
#include <fstream>
|
||||
|
||||
#include <csv.hpp>
|
||||
// #include <csv.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
|
||||
#ifdef DELETE
|
||||
#undef DELETE
|
||||
|
@ -13,17 +14,16 @@ namespace fs = std::filesystem;
|
|||
|
||||
std::size_t CsvReader::readSellersFromFile(const fs::path &filePath, Marketplace *market)
|
||||
{
|
||||
csv::CSVFormat format;
|
||||
format.delimiter(';');
|
||||
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
// Windows: Somhow this is necessary in order to open file names with umlauts
|
||||
auto wide = filePath.wstring();
|
||||
std::string fileName(wide.begin(), wide.end());
|
||||
|
||||
csv::CSVReader csvReader(fileName, format);
|
||||
std::ifstream infile(fileName);
|
||||
#else
|
||||
csv::CSVReader csvReader(filePath.string(), format);
|
||||
// csv::CSVReader csvReader(filePath.string(), format);
|
||||
std::ifstream infile(filePath.string());
|
||||
#endif
|
||||
|
||||
for (auto &seller : market->getSellers()) {
|
||||
|
@ -32,28 +32,35 @@ std::size_t CsvReader::readSellersFromFile(const fs::path &filePath, Marketplace
|
|||
|
||||
market->storeToDb(true);
|
||||
|
||||
for (csv::CSVRow &row : csvReader) {
|
||||
if (!row[0].is_int()) {
|
||||
std::string line;
|
||||
|
||||
while (getline(infile, line)) {
|
||||
std::vector<std::string> strs;
|
||||
boost::split(strs, line, boost::is_any_of(";"));
|
||||
|
||||
auto seller = std::make_unique<Seller>();
|
||||
|
||||
try {
|
||||
int sellerNo = std::stoi(strs[0]);
|
||||
seller->setSellerNo(sellerNo);
|
||||
} catch (std::invalid_argument const &ex) {
|
||||
continue;
|
||||
}
|
||||
|
||||
auto seller = std::make_unique<Seller>();
|
||||
seller->setSellerNo(row[0].get<int>());
|
||||
if (row[1].is_int()) {
|
||||
seller->setNumArticlesOffered(row[1].get<int>());
|
||||
} else {
|
||||
if (isNumber(strs[1]))
|
||||
seller->setNumArticlesOffered(std::stoi(strs[1]));
|
||||
else
|
||||
seller->setNumArticlesOffered(0);
|
||||
}
|
||||
|
||||
// If both, first name and last name, are empty, use N. N.
|
||||
// Else, use the real values.
|
||||
if (row[2].get<std::string>().empty() && row[3].get<std::string>().empty()) {
|
||||
if (strs[2].empty() && strs[2].empty()) {
|
||||
seller->setFirstName("N.");
|
||||
seller->setLastName("N.");
|
||||
} else {
|
||||
std::string firstName = row[2].get<std::string>();
|
||||
std::string firstName = strs[2];
|
||||
seller->setFirstName(trim(firstName));
|
||||
std::string lastName = row[3].get<std::string>();
|
||||
std::string lastName = strs[3];
|
||||
seller->setLastName(trim(lastName));
|
||||
}
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <chrono>
|
||||
#include <filesystem>
|
||||
#include <fmt/chrono.h>
|
||||
#include <format>
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
#include <vector>
|
||||
|
@ -47,7 +47,7 @@ void Database::newDb()
|
|||
fs::path destPath = sourcePath.parent_path() / sourcePath.stem();
|
||||
|
||||
auto chronoTime = std::chrono::system_clock::now();
|
||||
std::string timeString = fmt::format("{0:%FT%H-%M-%S}", chronoTime);
|
||||
std::string timeString = std::format("{0:%FT%H-%M-%S}", chronoTime);
|
||||
|
||||
destPath += std::string("_") += timeString += ".db";
|
||||
|
||||
|
|
|
@ -1,72 +0,0 @@
|
|||
#include "excelreader.h"
|
||||
#include "utils.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <xlnt/xlnt.hpp>
|
||||
|
||||
namespace fs = std::filesystem;
|
||||
|
||||
std::size_t ExcelReader::readSellersFromFile(const fs::path &filePath, Marketplace *market)
|
||||
{
|
||||
xlnt::workbook wb;
|
||||
std::ifstream mystream(filePath, std::ios::binary);
|
||||
if (!mystream.is_open()) {
|
||||
throw std::runtime_error("Could not open Excel file");
|
||||
}
|
||||
wb.load(mystream);
|
||||
|
||||
for (auto &seller : market->getSellers()) {
|
||||
seller->setState(Seller::State::DELETE);
|
||||
}
|
||||
|
||||
market->storeToDb(true);
|
||||
auto ws = wb.sheet_by_index(0);
|
||||
|
||||
for (auto row : ws.rows(true)) {
|
||||
// Skip the row if the first value is not a number (= seller no)
|
||||
if (row[0].data_type() != xlnt::cell::type::number) {
|
||||
continue;
|
||||
}
|
||||
|
||||
auto seller = std::make_unique<Seller>();
|
||||
seller->setSellerNo(row[0].value<int>());
|
||||
seller->setNumArticlesOffered(row[1].value<int>());
|
||||
|
||||
// If both, first name and last name, are empty, use N. N.
|
||||
// Else, use the real values.
|
||||
if (row[2].value<std::string>().empty() && row[3].value<std::string>().empty()) {
|
||||
seller->setFirstName("N.");
|
||||
seller->setLastName("N.");
|
||||
} else {
|
||||
std::string firstName = row[2].value<std::string>();
|
||||
seller->setFirstName(trim(firstName));
|
||||
std::string lastName = row[3].value<std::string>();
|
||||
seller->setLastName(trim(lastName));
|
||||
}
|
||||
|
||||
market->getSellers().push_back(std::move(seller));
|
||||
}
|
||||
|
||||
// Add one additional seller "RESERVE RESERVE"
|
||||
auto seller = std::make_unique<Seller>();
|
||||
seller->setSellerNo(market->getNextSellerNo());
|
||||
seller->setFirstName("RESERVE");
|
||||
seller->setLastName("RESERVE");
|
||||
market->getSellers().push_back(std::move(seller));
|
||||
|
||||
// If there was no special seller "Sonderkonto" in import data, then create one
|
||||
auto specialSeller = market->findSellerWithSellerNo(0);
|
||||
if (!specialSeller) {
|
||||
auto seller = std::make_unique<Seller>();
|
||||
seller->setSellerNo(0);
|
||||
seller->setLastName("Sonderkonto");
|
||||
seller->setFirstName("Sonderkonto");
|
||||
seller->setNumArticlesOffered(0);
|
||||
market->getSellers().push_back(std::move(seller));
|
||||
}
|
||||
|
||||
market->sortSellers();
|
||||
market->storeToDb();
|
||||
|
||||
return market->getSellers().size() - 1; // minus 1 because we don't count the "special" seller
|
||||
}
|
|
@ -1,19 +0,0 @@
|
|||
#ifndef EXCEL_READER_H
|
||||
#define EXCEL_READER_H
|
||||
|
||||
#include "marketplace.h"
|
||||
#include "seller.h"
|
||||
|
||||
#include <filesystem>
|
||||
#include <memory>
|
||||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
class ExcelReader
|
||||
{
|
||||
public:
|
||||
static std::size_t readSellersFromFile(const std::filesystem::path &filePath,
|
||||
Marketplace *market);
|
||||
};
|
||||
|
||||
#endif
|
|
@ -102,8 +102,10 @@ void JsonUtil::importSales(const std::filesystem::path &filePath, Marketplace *m
|
|||
|
||||
int source_no = jsonValues["source_no"];
|
||||
if (source_no == cashPointNo) {
|
||||
throw std::runtime_error("Die Kassen-Nr. der zu imporierenden Daten wird von dieser Kasse "
|
||||
"hier bereits verwendet.");
|
||||
std::string ret = "Die Kassen-Nr. ";
|
||||
ret += std::to_string(source_no);
|
||||
ret += " der zu imporierenden Daten wird von dieser Kasse hier bereits verwendet.";
|
||||
throw std::runtime_error(ret);
|
||||
}
|
||||
|
||||
market->setSalesToDelete(jsonValues["source_no"]);
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
#include <algorithm>
|
||||
#include <clocale>
|
||||
#include <fmt/format.h>
|
||||
#include <format>
|
||||
#include <iomanip>
|
||||
#include <numeric>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using namespace fmt;
|
||||
//using namespace fmt;
|
||||
|
||||
std::string formatCentAsEuroString(const int cent, int width)
|
||||
{
|
||||
|
@ -32,7 +32,7 @@ std::string formatCentAsEuroString(const int cent, int width)
|
|||
#else
|
||||
std::locale myLocale{"de_DE.utf8"};
|
||||
#endif
|
||||
return fmt::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
|
||||
return std::format(myLocale, "{:{}.2Lf} €", cent / 100.0L, width);
|
||||
}
|
||||
|
||||
std::string <rim(std::string &str, const std::string &chars)
|
||||
|
@ -61,3 +61,10 @@ bool case_insensitive_match(std::string s1, std::string s2)
|
|||
return true; // The strings are same
|
||||
return false; // not matched
|
||||
}
|
||||
|
||||
bool isNumber(const std::string &str)
|
||||
{
|
||||
return !str.empty() && std::find_if(str.begin(), str.end(), [](unsigned char c) {
|
||||
return !std::isdigit(c);
|
||||
}) == str.end();
|
||||
}
|
|
@ -10,5 +10,6 @@ std::string <rim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
|
|||
std::string &rtrim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
|
||||
std::string &trim(std::string &str, const std::string &chars = "\t\n\v\f\r ");
|
||||
bool case_insensitive_match(std::string s1, std::string s2);
|
||||
bool isNumber(const std::string &str);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -42,7 +42,7 @@ add_executable(kima2 ${GUI_SOURCES} kima2.rc)
|
|||
target_include_directories(kima2 PRIVATE ${PROJECT_BINARY_DIR})
|
||||
target_include_directories(kima2 PRIVATE ${PROJECT_SOURCE_DIR}/subprojects/singleapplication/singleapplication.git)
|
||||
# target_link_libraries(kima2 core printer Qt5::Widgets Qt5::PrintSupport Qt5::Network stdc++fs)
|
||||
target_link_libraries(kima2 core printer Qt::Core Qt::PrintSupport Qt::Network stdc++fs)
|
||||
target_link_libraries(kima2 core printer Qt::Core Qt::PrintSupport Qt::Network)
|
||||
|
||||
if(WIN32)
|
||||
set_target_properties(kima2 PROPERTIES LINK_FLAGS "-mwindows")
|
||||
|
|
|
@ -15,7 +15,7 @@
|
|||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
SingleApplication kimaApp(argc, argv);
|
||||
SingleApplication kimaApp(argc, argv, false, SingleApplication::Mode::User | SingleApplication::ExcludeAppPath | SingleApplication::ExcludeAppVersion);
|
||||
|
||||
// QCoreApplication::setOrganizationName("RustySoft");
|
||||
QCoreApplication::setOrganizationDomain("rustysoft.de");
|
||||
|
|
|
@ -9,7 +9,6 @@
|
|||
#include <config.h>
|
||||
|
||||
#include <core/csvreader.h>
|
||||
#include <core/excelreader.h>
|
||||
#include <core/jsonutil.h>
|
||||
#include <core/utils.h>
|
||||
#include <printer/posprinter.h>
|
||||
|
@ -100,14 +99,13 @@ MainWindow::MainWindow()
|
|||
for (auto location : locations) {
|
||||
if (QFile::exists(location + QString("/Benutzerhandbuch.pdf"))) {
|
||||
QDesktopServices::openUrl(
|
||||
QUrl(QString("file:///") + location + QString("/Benutzerhandbuch.pdf"),
|
||||
QUrl::TolerantMode));
|
||||
QUrl::fromLocalFile(location + QString("/Benutzerhandbuch.pdf")));
|
||||
}
|
||||
}
|
||||
});
|
||||
connect(m_ui.licenseAction, &QAction::triggered, this, [this]() {
|
||||
QString licenseText(
|
||||
"Copyright © 2018-2022 Martin Brodbeck\n\n"
|
||||
"Copyright © 2018-2024 Martin Brodbeck\n\n"
|
||||
"Hiermit wird unentgeltlich jeder Person, die eine Kopie der Software und der "
|
||||
"zugehörigen Dokumentationen (die \"Software\") erhält, die Erlaubnis erteilt, "
|
||||
"sie uneingeschränkt zu nutzen, inklusive und ohne Ausnahme mit dem Recht, "
|
||||
|
@ -137,12 +135,8 @@ MainWindow::MainWindow()
|
|||
this->setWindowTitle("KIMA2 - Kasse Nr. " +
|
||||
QSettings().value("global/cashPointNo").toString());
|
||||
});
|
||||
connect(m_ui.importSellerExcelAction, &QAction::triggered, this,
|
||||
&MainWindow::onImportSellerExcelActionTriggered);
|
||||
connect(m_ui.importSellerJsonAction, &QAction::triggered, this,
|
||||
&MainWindow::onImportSellerJsonActionTriggered);
|
||||
connect(m_ui.exportSellerJsonAction, &QAction::triggered, this,
|
||||
&MainWindow::onExportSellerJsonActionTriggered);
|
||||
connect(m_ui.importSellerAction, &QAction::triggered, this,
|
||||
&MainWindow::onImportSellerActionTriggered);
|
||||
connect(m_ui.exportSalesJsonAction, &QAction::triggered, this,
|
||||
&MainWindow::onExportSalesJsonActionTriggered);
|
||||
connect(m_ui.importSalesJsonAction, &QAction::triggered, this,
|
||||
|
@ -345,7 +339,8 @@ void MainWindow::onCancelArticleButtonClicked([[maybe_unused]] bool checked)
|
|||
m_ui.basketView->model()->removeRow(iter->row());
|
||||
}
|
||||
|
||||
m_ui.basketSumLabel->setText(m_marketplace->getBasketSumAsString().c_str()); // Update basket sum
|
||||
m_ui.basketSumLabel->setText(
|
||||
m_marketplace->getBasketSumAsString().c_str()); // Update basket sum
|
||||
m_ui.sellerNoEdit->setFocus();
|
||||
}
|
||||
|
||||
|
@ -428,7 +423,8 @@ void MainWindow::onCancelAllArticlesButtonClicked([[maybe_unused]] bool checked)
|
|||
|
||||
dynamic_cast<BasketModel *>(m_ui.basketView->model())->cancelSale();
|
||||
|
||||
m_ui.basketSumLabel->setText(m_marketplace->getBasketSumAsString().c_str()); // Update basket sum
|
||||
m_ui.basketSumLabel->setText(
|
||||
m_marketplace->getBasketSumAsString().c_str()); // Update basket sum
|
||||
m_ui.sellerNoEdit->setFocus();
|
||||
}
|
||||
|
||||
|
@ -445,7 +441,7 @@ void MainWindow::onAbout()
|
|||
">info@rustysoft.de</a>></p>");
|
||||
}
|
||||
|
||||
void MainWindow::onImportSellerExcelActionTriggered()
|
||||
void MainWindow::onImportSellerActionTriggered()
|
||||
{
|
||||
if (!m_marketplace->getSales().empty()) {
|
||||
QMessageBox(QMessageBox::Icon::Information, "Import nicht möglich",
|
||||
|
@ -455,9 +451,9 @@ void MainWindow::onImportSellerExcelActionTriggered()
|
|||
return;
|
||||
}
|
||||
|
||||
auto filename = QFileDialog::getOpenFileName(
|
||||
this, "Verkäufer importieren", QString(),
|
||||
"Alle unterstützte Dateien (*.xlsx *.csv);;Excel Dateien (*.xlsx);;CSV Dateien (*.csv)");
|
||||
auto filename =
|
||||
QFileDialog::getOpenFileName(this, "Verkäufer importieren", QString(),
|
||||
"Alle unterstützte Dateien (*.csv);;CSV Dateien (*.csv)");
|
||||
|
||||
if (filename.isEmpty())
|
||||
return;
|
||||
|
@ -469,86 +465,19 @@ void MainWindow::onImportSellerExcelActionTriggered()
|
|||
#endif
|
||||
|
||||
std::size_t numImported{};
|
||||
if (case_insensitive_match(filePath.extension().string(), std::string(".xlsx"))) {
|
||||
try {
|
||||
numImported = ExcelReader::readSellersFromFile(filePath, m_marketplace.get());
|
||||
} catch (const std::exception &e) {
|
||||
QMessageBox(QMessageBox::Icon::Critical, "Fehler beim Importieren",
|
||||
"Beim Import aus der Excel-Datei ist ein Fehler aufgetreten. "
|
||||
"Sie könnten ggf. versuchen, die Daten aus einer .csv Datei zu imporieren.",
|
||||
QMessageBox::StandardButton::Ok, this)
|
||||
.exec();
|
||||
std::cerr << e.what() << std::endl;
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
numImported = CsvReader::readSellersFromFile(filePath, m_marketplace.get());
|
||||
}
|
||||
numImported = CsvReader::readSellersFromFile(filePath, m_marketplace.get());
|
||||
|
||||
updateStatLabel();
|
||||
|
||||
using namespace std::string_literals;
|
||||
std::ostringstream msg;
|
||||
msg << "Aus der Excel/CSV-Datei wurden <b>"s << std::to_string(numImported)
|
||||
msg << "Aus der CSV-Datei wurden <b>"s << std::to_string(numImported)
|
||||
<< "</b> Verkäufer importiert.";
|
||||
QMessageBox(QMessageBox::Icon::Information, "Verkäufer erfolgreich importiert",
|
||||
msg.str().c_str(), QMessageBox::StandardButton::Ok, this)
|
||||
.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 <b>"s << std::to_string(numImported)
|
||||
<< "</b> 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;
|
||||
|
@ -575,27 +504,30 @@ void MainWindow::onImportSalesJsonActionTriggered()
|
|||
{
|
||||
QSettings settings;
|
||||
|
||||
auto filename = QFileDialog::getOpenFileName(this, "Umsätze/Transaktionen importieren",
|
||||
auto filenames = QFileDialog::getOpenFileNames(this, "Umsätze/Transaktionen importieren",
|
||||
QString(), "JSON Dateien (*.json)");
|
||||
|
||||
if (filename.isEmpty())
|
||||
if (filenames.isEmpty())
|
||||
return;
|
||||
|
||||
for(auto filename: filenames) {
|
||||
#if defined(_WIN64) || defined(_WIN32)
|
||||
fs::path filePath(filename.toStdWString());
|
||||
fs::path filePath(filename.toStdWString());
|
||||
#else
|
||||
fs::path filePath(filename.toStdString());
|
||||
fs::path filePath(filename.toStdString());
|
||||
#endif
|
||||
|
||||
delete m_ui.salesView->model();
|
||||
try {
|
||||
JsonUtil::importSales(filePath, m_marketplace.get(),
|
||||
settings.value("global/cashPointNo").toInt());
|
||||
} catch (std::runtime_error &err) {
|
||||
QMessageBox(QMessageBox::Icon::Warning, "Import nicht möglich", err.what(), QMessageBox::Ok,
|
||||
this)
|
||||
.exec();
|
||||
delete m_ui.salesView->model();
|
||||
try {
|
||||
JsonUtil::importSales(filePath, m_marketplace.get(),
|
||||
settings.value("global/cashPointNo").toInt());
|
||||
} catch (std::runtime_error &err) {
|
||||
QMessageBox(QMessageBox::Icon::Warning, "Import nicht möglich", err.what(), QMessageBox::Ok,
|
||||
this)
|
||||
.exec();
|
||||
}
|
||||
}
|
||||
|
||||
setSaleModel();
|
||||
updateStatLabel();
|
||||
}
|
||||
|
|
|
@ -39,9 +39,7 @@ class MainWindow : public QMainWindow
|
|||
void checkSellerNo(bool ctrlPressed = false);
|
||||
void onPaidButtonTriggered();
|
||||
void onGivenSpinBoxValueChanged(double value);
|
||||
void onImportSellerExcelActionTriggered();
|
||||
void onImportSellerJsonActionTriggered();
|
||||
void onExportSellerJsonActionTriggered();
|
||||
void onImportSellerActionTriggered();
|
||||
void onExportSalesJsonActionTriggered();
|
||||
void onImportSalesJsonActionTriggered();
|
||||
void setSaleModel();
|
||||
|
|
|
@ -423,7 +423,7 @@ drucken</string>
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>817</width>
|
||||
<height>30</height>
|
||||
<height>24</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menu_Datei">
|
||||
|
@ -440,16 +440,8 @@ drucken</string>
|
|||
<property name="title">
|
||||
<string>&Verkäufer</string>
|
||||
</property>
|
||||
<widget class="QMenu" name="importSellerMenu">
|
||||
<property name="title">
|
||||
<string>Importieren</string>
|
||||
</property>
|
||||
<addaction name="importSellerExcelAction"/>
|
||||
<addaction name="importSellerJsonAction"/>
|
||||
</widget>
|
||||
<addaction name="actionEditSeller"/>
|
||||
<addaction name="importSellerMenu"/>
|
||||
<addaction name="exportSellerJsonAction"/>
|
||||
<addaction name="importSellerAction"/>
|
||||
</widget>
|
||||
<widget class="QMenu" name="menuHilfe">
|
||||
<property name="title">
|
||||
|
@ -513,9 +505,9 @@ drucken</string>
|
|||
<string>Exportieren für andere Kasse (JSON)</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="importSellerExcelAction">
|
||||
<action name="importSellerActionX">
|
||||
<property name="text">
|
||||
<string>Aus Excel/CSV-Datei (initial)</string>
|
||||
<string>Aus CSV-Datei (initial)</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="importSellerJsonAction">
|
||||
|
@ -548,6 +540,11 @@ drucken</string>
|
|||
<string>Lizenz</string>
|
||||
</property>
|
||||
</action>
|
||||
<action name="importSellerAction">
|
||||
<property name="text">
|
||||
<string>Importieren (aus CSV-Datei)</string>
|
||||
</property>
|
||||
</action>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
set(Boost_USE_STATIC_LIBS ON)
|
||||
|
||||
find_package(Boost 1.62 REQUIRED)
|
||||
find_package(Boost 1.78 REQUIRED)
|
||||
|
||||
if(WIN32)
|
||||
find_package(LIBUSB REQUIRED)
|
||||
|
@ -20,4 +20,4 @@ if(WIN32)
|
|||
else()
|
||||
target_link_libraries(printer core ${LibUSB_LIBRARIES})
|
||||
endif()
|
||||
target_include_directories(printer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
target_include_directories(printer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/.. ${Boost_INCLUDE_DIRS})
|
||||
|
|
|
@ -1 +0,0 @@
|
|||
Subproject commit ea547fdb16c7baf99bd9ced5febba52cc5da3ca3
|
|
@ -1 +1 @@
|
|||
Subproject commit bc889afb4c5bf1c0d8ee29ef35eaaf4c8bef8a5d
|
||||
Subproject commit 9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03
|
|
@ -1 +1 @@
|
|||
Subproject commit a3ed916f591c300e97b873fde36863fa37b49fa9
|
||||
Subproject commit 8c48163c4d3fbba603cfe8a5b94046c9dad71825
|
Loading…
Add table
Reference in a new issue