Commit graph

339 commits

Author SHA1 Message Date
6b0f31a0c2 fix width 2018-08-08 09:25:37 +02:00
f260bc2b0c make font settings cross platform 2018-08-08 09:16:23 +02:00
2561b03583 opening manual on windows works 2018-08-08 08:19:19 +02:00
a196e49410 open manual 2018-08-07 20:39:15 +02:00
18c2163318 ... 2018-08-07 16:06:01 +02:00
8cd4b58b53 more on installer 2018-08-07 12:52:24 +02:00
d784a26872 forbid adding sellers if there are already sold articles 2018-08-07 11:02:19 +02:00
52c4f39e23 text of menu item labels improved 2018-08-07 10:53:34 +02:00
593ae8531c read/save window geometry (position + size) 2018-08-07 10:52:51 +02:00
cdc737a823 cut names if necessary 2018-08-07 09:30:06 +02:00
a7a83ba3b9 fully support special seller "Sonderkonto" 2018-08-07 09:27:15 +02:00
a3b832b087 print articles of special seller 2018-08-07 08:53:31 +02:00
d1c5d3a6f8 handle "Sonderkonto" in imports 2018-08-07 08:31:43 +02:00
410eb775aa hide "Sonderkonto" 2018-08-07 08:14:26 +02:00
50ec5b3015 insert or ignore is better here 2018-08-07 08:02:27 +02:00
3a40f586fa update db: insert special seller 2018-08-07 07:57:47 +02:00
205e5eaae3 dont be so verbose 2018-08-06 21:41:48 +02:00
bc35f95a06 more on seller receipt 2018-08-06 21:36:26 +02:00
1607f8946e use simple iso string 2018-08-06 21:31:40 +02:00
f45e295c75 printing of seller receipt works now 2018-08-06 21:24:10 +02:00
4a92832e19 printer bugfixes 2018-08-06 20:57:12 +02:00
88d7225e61 printing seller receipt started 2018-08-06 16:38:55 +02:00
6e6510ebcf printing sale receipt 2018-08-06 16:14:45 +02:00
23659078b4 ugly hackl to allow umlauts in pos text 2018-08-06 14:59:57 +02:00
b2c64d8631 win tweak 2018-08-06 13:52:58 +02:00
e8d839eccb more on printer 2018-08-06 13:39:12 +02:00
a34fd9aefd first steps in printing via libusb 2018-08-06 12:52:45 +02:00
77040e9f27 code cleanup 2018-08-06 10:00:22 +02:00
f71f257eb0 successfully claim printer interace 2018-08-06 09:59:06 +02:00
76d6c7c069 pos printer introduced 2018-08-05 21:51:30 +02:00
a84b22f867 code cleanup 2018-08-05 14:57:20 +02:00
3ba230d9b9 import export nearly finished 2018-08-05 14:52:34 +02:00
de91a804a0 Added linker flag for windows 2018-08-03 11:33:23 +02:00
0a91de4d86 importing sales started 2018-08-02 15:28:35 +02:00
c82378dfa9 export sales works now 2018-08-02 15:06:35 +02:00
dc54809146 code cleanup 2018-08-02 14:42:15 +02:00
67643c665f import sellers from excel works now 2018-08-02 14:39:32 +02:00
23708b0f1e fix library name 2018-08-02 13:49:53 +02:00
876c8468df find jsoncpp without pkgconfig 2018-08-02 13:48:56 +02:00
ebe7035298 find xlnt without pkgconfig 2018-08-02 13:43:54 +02:00
2d670f4e18 fix 2018-08-02 13:06:51 +02:00
36643cf737 format money even when locale is not supported 2018-08-02 13:06:37 +02:00
da4e223b16 code cleanup 2018-08-02 12:36:37 +02:00
61da9adce5 import / export sellers completed 2018-08-02 12:34:56 +02:00
045bc8dd20 export sellers as json file 2018-08-02 11:15:15 +02:00
b2d696ccb5 don't check fpr empty names 2018-08-02 09:49:42 +02:00
cf268a62b1 ... 2018-08-01 15:55:13 +02:00
e295c6a743 started with xls import 2018-08-01 15:36:41 +02:00
7d405234d4 fix bcrypt issue 2018-08-01 11:27:13 +02:00
2cc7a288fe choos uuid generator platform-specific 2018-08-01 10:13:26 +02:00
22ae5aedf2 missing include added 2018-08-01 09:44:55 +02:00
60e2a3b014 typo 2018-08-01 09:37:11 +02:00
4a41036aec now printing reports 2018-07-31 16:15:48 +02:00
a6c5366b63 fix dbpath for windows 2018-07-31 12:31:57 +02:00
b1570b3a99 code cleanup 2018-07-31 10:29:09 +02:00
46aab9a836 export report as csv file implemented 2018-07-31 10:28:07 +02:00
e13339a432 qt in german 2018-07-30 19:37:19 +02:00
454c7881ec small about dialog change 2018-07-30 19:29:16 +02:00
e69e601133 code refacturing 2018-07-30 19:26:10 +02:00
1d3125fbdc initial about added 2018-07-30 16:39:33 +02:00
432aed665a use fees from settings 2018-07-30 15:19:29 +02:00
a4ae6a586a minor tweaks 2018-07-30 15:06:26 +02:00
84f71ea056 lots of smaller improvements 2018-07-30 14:43:02 +02:00
c3b17fbb8b create article with correct cash point no 2018-07-30 13:49:23 +02:00
9e85e2892d settings implemented 2018-07-30 13:40:58 +02:00
06c99052df new report dialog 2018-07-30 09:50:54 +02:00
efb1f3ffbf about qt dialog added 2018-07-29 09:56:37 +02:00
68591c415e reconnect selection model 2018-07-28 17:38:45 +02:00
0a22faf856 cancel sales / items finished 2018-07-28 14:31:37 +02:00
9c56ec55a5 fix enabling foreign keys in sqlite 2018-07-28 14:16:02 +02:00
940688edd5 delete sales 2018-07-28 11:52:43 +02:00
9ab8ca7a4b remove article (incomplete) 2018-07-27 16:41:34 +02:00
99bc19f7a3 cancel sale button activated 2018-07-27 16:04:01 +02:00
a130fa33c2 use unique_ptr for model 2018-07-27 10:34:27 +02:00
fcf5f04539 code cleanup 2018-07-27 10:16:07 +02:00
fb8bcc71e2 delete model to prevent memory leak 2018-07-27 10:10:48 +02:00
2003530587 replace model correctly 2018-07-27 09:55:47 +02:00
17c65a50ea hopefully delete model correctly 2018-07-26 20:42:44 +02:00
9f30bad90b show message in status bar 2018-07-26 08:59:54 +02:00
9041d34357 fix cashing app 2018-07-26 08:55:03 +02:00
3ec2143f28 connecting basket model and sale model 2018-07-26 08:34:01 +02:00
f697487d6b code cleanup 2018-07-26 07:56:32 +02:00
69dd1afba5 Order sales by timestamp (descending) 2018-07-25 16:11:25 +02:00
e24b6c4e5f Initial implementation of salemodel 2018-07-25 16:04:45 +02:00
bc67018c1c store sales 2018-07-25 09:31:17 +02:00
1ce329b99b set locale in main() 2018-07-24 15:37:19 +02:00
669a708bce format money correctly 2018-07-24 07:50:51 +02:00
fa7938ca20 use C++ features to show price 2018-07-23 21:21:05 +02:00
96d0a03ba8 show article price as string 2018-07-23 14:25:18 +02:00
10d3a681b1 code cleanup 2018-07-23 14:18:54 +02:00
3efa289b5b show last sum 2018-07-23 14:18:24 +02:00
527241a0f3 cancel article / complete sale 2018-07-23 13:39:49 +02:00
3c318ffab9 code beautifying 2018-07-23 12:59:11 +02:00
42c5f35576 enable/disable delete button 2018-07-23 12:58:27 +02:00
609003fc06 enable/disable button 2018-07-23 12:49:19 +02:00
5de88ef7a9 make slots normal functions 2018-07-23 09:14:43 +02:00
b100fc8e51 store and load articles correctly 2018-07-23 08:57:35 +02:00
4143fc2e89 using paid button 2018-07-23 08:21:28 +02:00
0f786a04e1 message text improved 2018-07-23 08:21:05 +02:00
97d05c93dd check for 0,50 cent steps 2018-07-22 20:56:20 +02:00
ee8c059441 More on basket 2018-07-22 20:10:22 +02:00
d0f0d604ed make buttons disabled 2018-07-22 13:50:04 +02:00
150ce946d1 finish current sale 2018-07-21 21:18:22 +02:00
8b534e1229 fill basket 2018-07-21 19:24:56 +02:00
f315cc81a6 new price dialog 2018-07-20 22:21:42 +02:00
74ac9f6299 more on selling 2018-07-20 22:10:05 +02:00
0ad460346c Find seller by sellerno 2018-07-20 22:07:42 +02:00
31a037460a code cleanup (fixing tests but not sure why) 2018-07-20 13:07:48 +02:00
6000bb3ef2 code cleanup 2018-07-20 11:52:26 +02:00
74719b762f platform tweak 2018-07-20 08:18:28 +02:00
a17bc8f89a basic widget layout 2018-07-19 10:48:16 +02:00
10b5cab5a4 new name for db 2018-07-18 15:08:20 +02:00
e038d82cfc link boost statically 2018-07-18 15:04:18 +02:00
33f24ab7be Now we can decide to make only-delete-changes in the db 2018-07-18 14:36:53 +02:00
de95d5f341 sorting sellers 2018-07-18 09:00:46 +02:00
f5ba2f6014 Merge branch 'master' of ssh://brodbeck-online.de:60022/martin/kima2-cpp 2018-07-18 08:17:33 +02:00
d39c72b0a2 fixed deleting sellers 2018-07-18 08:17:30 +02:00
c1ca54a1d1 bugfix 2018-07-17 20:17:46 +02:00
e766b3ff95 small change 2018-07-17 16:40:07 +02:00
4fdaba01d3 more on sellerdialog (deleting still not ok) 2018-07-17 16:37:16 +02:00
ffbf27c1f8 more on deleting sellers (not yet ok!) 2018-07-17 15:32:16 +02:00
46e7de47ec only allow to select rows 2018-07-17 13:03:06 +02:00
9d125bbd39 make adding new sellers more convinient 2018-07-17 12:52:56 +02:00
e06458b419 more on seller dialog 2018-07-17 11:40:09 +02:00
90e132bcc8 load sellers 2018-07-17 11:09:35 +02:00
300c883fdc show something in the statusbar. 2018-07-17 10:37:21 +02:00
5eef98074e create db at the right place 2018-07-17 10:19:41 +02:00
c946bf6924 set some infos globally 2018-07-17 08:25:41 +02:00
2812f582a1 more on sellers 2018-07-16 18:04:25 +02:00
a2ad2eb57d more on sellers 2018-07-16 15:30:24 +02:00
207edb27ba more on sellerdialog 2018-07-16 12:00:17 +02:00
31d46866f2 more on mainwindow 2018-07-14 15:54:29 +02:00
a490dafb02 use unique pointer 2018-07-14 15:54:11 +02:00
5ebb7b3e67 new dialog 2018-07-14 15:53:47 +02:00
a255fab884 new menu item 2018-07-14 15:53:28 +02:00
90cd0c4b54 add include directory (for gui) 2018-07-14 15:53:01 +02:00
ace6d29f2b initial qt5 main window 2018-07-14 14:03:35 +02:00
be6ddf9420 code cleanup 2018-07-13 14:33:13 +02:00
2d93da5cc2 mark article as to be deleted (since we have only ad-hoc articles) 2018-07-13 14:16:16 +02:00
372937e096 code cleanup 2018-07-13 14:05:22 +02:00
78e7dc772b insert/update/delete completed 2018-07-13 13:58:32 +02:00
9ec6ac383f cleanup articles 2018-07-13 13:54:02 +02:00
ba86af4064 update article in db 2018-07-13 13:14:08 +02:00
d321a5d95e source no added 2018-07-13 13:05:36 +02:00
c7d8eddf86 now storing and updateing sellers, storing articles 2018-07-13 13:05:19 +02:00
d50e496f79 get article no 2018-07-13 13:04:30 +02:00
e04a24f7a1 marketplace added 2018-07-13 13:04:19 +02:00
f838977283 more on sales 2018-07-13 10:51:07 +02:00
91357d7c7f remove article from sale 2018-07-13 10:12:16 +02:00
2fb72f1701 refacturing 2018-07-12 14:39:08 +02:00
051ed3e730 refacturing 2018-07-12 14:38:22 +02:00
9c624065bb more on pointers 2018-07-12 14:37:56 +02:00
b69531ced4 using shared_ptr 2018-07-12 13:42:22 +02:00
2c5368c621 more on article 2018-07-12 13:36:13 +02:00
7063637ad4 Added boost::date_time dependency 2018-07-12 13:34:38 +02:00
6b6dddcaaa initial commit 2018-07-12 13:34:17 +02:00
70ce0ceb19 flags changed 2018-07-12 12:18:51 +02:00
7c40ea6f97 use non-owning raw pointers in getArticles() 2018-07-12 12:15:27 +02:00
d64606c861 beautify code 2018-07-12 12:06:55 +02:00
2131f12237 using shared_ptr 2018-07-12 08:26:03 +02:00
b2650fad26 some getters added 2018-07-11 15:59:38 +02:00
4fdbc268a5 more on states 2018-07-11 15:59:08 +02:00
976dcbcbeb store sellers with state == NEW 2018-07-11 15:58:09 +02:00
f42855dc50 more on articles 2018-07-11 13:25:39 +02:00
94edacc6e6 more on sellers 2018-07-11 12:54:10 +02:00
37ae599c80 new class introduced 2018-07-11 12:53:18 +02:00
8b08fad47a more on articles 2018-07-11 12:52:57 +02:00
4d8396fac1 code beautifying 2018-07-11 11:53:46 +02:00
1778f48bc6 create all needed tables 2018-07-11 11:53:06 +02:00
b422664f81 handle db initialization 2018-07-11 09:43:40 +02:00
0f3e7ba799 small changes 2018-07-11 08:33:40 +02:00
eeae4fe609 more on database (tests) 2018-07-10 15:46:55 +02:00
9705426c31 create db with sellers and articles 2018-07-10 14:12:37 +02:00
79d96c22bc transactions 2018-07-10 12:51:23 +02:00
be9c951d02 more work on entities 2018-07-10 12:51:03 +02:00
caa35b36ac more on database 2018-07-09 21:03:59 +02:00
5e5ba3b31f dtor added 2018-07-09 20:51:33 +02:00
6a075f2402 remove ctor/dtor 2018-07-09 17:50:43 +02:00
96113653e7 code cleanup 2018-07-09 16:07:04 +02:00
8f3dda3520 ... 2018-07-09 16:06:39 +02:00
0c72b31953 New classes added 2018-07-09 16:06:27 +02:00
c1fa3cb404 ... 2018-07-09 13:03:43 +02:00
74b7f5f57f uuid handling improved 2018-07-09 13:03:25 +02:00
7a6c664014 Code beautifying 2018-07-09 13:03:03 +02:00
1e8c4eac5f Database class added 2018-07-06 13:30:23 +02:00
0104e72997 using boost uuid 2018-07-06 10:54:44 +02:00
60365877d6 initial commit 2018-07-06 10:54:22 +02:00
c7abfe33d6 subdir added 2018-07-06 10:53:49 +02:00
f1707c6598 Adding some more initial files 2018-07-05 16:29:43 +02:00