Commit graph

294 commits

Author SHA1 Message Date
s3lph
49856473b9 Merge branch 'staging' into 'master'
FIxed: Allow receipts with no transactions.

See merge request s3lph/matemat!54
2018-12-31 16:50:46 +00:00
s3lph
7f23fff033 Merge branch 'fix-receipt-empty-db' into 'staging'
Added database support for empty receipts

See merge request s3lph/matemat!53
2018-12-29 19:58:11 +00:00
s3lph
07a4d3131e Fixed a small bug in the SQL queries and the unit tests 2018-12-29 20:55:53 +01:00
s3lph
9a41d33ef7 Added database support for empty receipts (i.e. when a user didn't issue any transactions during a receipt period) 2018-12-29 20:36:59 +01:00
s3lph
1e6e9aabb2 Merge branch 'staging' into 'master'
Fixed: Crash when creating a receipt with zero transactions

See merge request s3lph/matemat!52
2018-12-23 22:00:30 +00:00
s3lph
ee87b4fb65 Merge branch 'hotfix-receipt-crash' into 'staging'
Hotfix: Receipt crash

See merge request s3lph/matemat!51
2018-12-23 21:53:36 +00:00
s3lph
ea70484d00 Added a test case for empty receipts. 2018-12-23 22:50:26 +01:00
s3lph
3d25540a1f Fixed a crash in receipt generation. 2018-12-23 22:43:19 +01:00
s3lph
185cd8dd0c Merge branch 'staging' into 'master'
Sales Statistics

See merge request s3lph/matemat!49
2018-10-01 19:35:24 +00:00
s3lph
293ad9f06e Merge branch '28-statistics' into 'staging'
Resolve "Statistics"

See merge request s3lph/matemat!48
2018-10-01 19:28:15 +00:00
s3lph
0974e68444 Indentation fixes. 2018-10-01 21:16:25 +02:00
s3lph
d4e2d6591e Implemented sales statistics page. 2018-10-01 21:08:37 +02:00
s3lph
d5253bf954 Merge branch 'staging' into 'master'
Hotfix: Database migration caused data loss.

See merge request s3lph/matemat!47
2018-09-13 16:50:36 +00:00
s3lph
b3a1df9e18 Hotfix: Database migration caused data loss. 2018-09-13 18:39:10 +02:00
s3lph
da122ab864 Merge branch 'staging' into 'master'
Removed mypy check from CI.

See merge request s3lph/matemat!46
2018-09-09 23:42:19 +00:00
s3lph
dcbd093eed Removed mypy check from CI. 2018-09-10 01:38:19 +02:00
s3lph
15327162d1 Merge branch 'staging' into 'master'
Default user/product avatars

See merge request s3lph/matemat!45
2018-09-09 23:36:47 +00:00
s3lph
a48e1d8130 Merge branch '17-avatars-and-product-images' into 'staging'
Resolve "Avatars and Product Images"

See merge request s3lph/matemat!44
2018-09-09 23:29:24 +00:00
s3lph
60fa154dd6 Fixed Dockerfile to support installation of pillow. 2018-09-10 01:25:07 +02:00
s3lph
4ecc848eac Implemented default images. 2018-09-10 00:45:32 +02:00
s3lph
f2f8828db4 Fixed image and price entry on product creation. 2018-09-10 00:12:11 +02:00
s3lph
31b1cc9c21 Implemented image conversion and resizing with pillow. 2018-09-09 23:59:06 +02:00
s3lph
a7a2b5a76f Added pillow dependency. 2018-09-09 23:27:23 +02:00
s3lph
3995245127 Merge branch 'staging' into 'master'
Receipt generation

See merge request s3lph/matemat!43
2018-09-09 21:08:43 +00:00
s3lph
56500e87e5 Finally fixed, it; raised the receipt cronjob to a more sane interval. 2018-09-09 04:18:45 +02:00
s3lph
6fcea8e2b3 Added fallback handling for transactions with unknown dates. 2018-09-09 04:12:11 +02:00
s3lph
b55ad25f58 Added log output to cron job runner. 2018-09-09 04:03:51 +02:00
s3lph
270910f6be Removed debug output. 2018-09-09 04:01:33 +02:00
s3lph
a8e0687095 Fix: Fetch receipt_pref in list_users. 2018-09-09 03:53:52 +02:00
s3lph
0a27e6db56 Hopefully fixed now! 2018-09-09 03:44:49 +02:00
s3lph
71d7bb85ce Added verification of receipt_pref to login test. 2018-09-09 03:40:06 +02:00
s3lph
53233d74c3 Fixed: Fetch receipt preference on login. 2018-09-09 03:38:23 +02:00
s3lph
f11b0e0b93 Even more debug output. 2018-09-09 03:33:09 +02:00
s3lph
660969744c Fixed missing argument in tests. 2018-09-09 03:26:00 +02:00
s3lph
a466e5109f Used another logger. 2018-09-09 03:23:19 +02:00
s3lph
37498f9ab7 More debug output. 2018-09-09 03:17:20 +02:00
s3lph
2161ff79d9 Added log output to receipt generation function. 2018-09-09 03:09:47 +02:00
s3lph
fecaf55b2b Merge branch '19-montly-yearly-receipts' into 'staging'
Resolve "Montly/Yearly Receipts"

See merge request s3lph/matemat!41
2018-09-08 19:08:07 +00:00
s3lph
436da33330 Added a not to the settings UI when sending of receipts has been disabled in the configuration. 2018-09-08 21:05:03 +02:00
s3lph
79e6f83c72 (More or less) proper definition of "months", added more receipt preferences. 2018-09-08 20:44:40 +02:00
s3lph
1c5b442fea Fixed a codestyle error. 2018-09-07 22:47:27 +02:00
s3lph
b19c6edd7f Implemented SMTP receipt sending. 2018-09-07 22:45:20 +02:00
s3lph
2056b0fb81 Implemented cron jobs 2018-09-07 22:04:50 +02:00
s3lph
22d4bd2cd5 Fixed trailing whitespace. 2018-09-07 19:06:47 +02:00
s3lph
2c6996a9b4 Implemented receipt generation, including unit tests. 2018-09-07 19:04:15 +02:00
s3lph
a3fa86fb25 Implemented "Balance change reason" field. 2018-09-01 23:48:10 +02:00
s3lph
3bdc9417fd Database schema: Added user.created column. 2018-09-01 23:23:06 +02:00
s3lph
6901729ac3 Added "plus_sign" option to currency format/parsing. 2018-09-01 17:07:49 +02:00
s3lph
ff0c13d367 Yet another schema change: consumptions now contains the product name rather than the product id. 2018-09-01 02:54:55 +02:00
s3lph
fec9c3d7ac Fixed a pycodestyle warning 2018-08-31 22:31:36 +02:00