Commit Graph

176 Commits

Author SHA1 Message Date
Skia
0b068d3e92 Improve file moderation 2016-11-23 11:30:57 +01:00
guillaume-renaud
57b663c4c5 counter inactive state with settings variable, traduction file problem fixed 2016-11-08 18:48:27 +01:00
Skia
59f5917b8c Fix Page locking 2016-11-05 13:37:39 +01:00
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
Skia
9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
Skia
f29e5ecabb Fix static files for dev 2016-09-14 13:46:17 +02:00
Skia
6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia
b63923d956 Refactor settings 2016-09-12 14:04:50 +02:00
Skia
54444b31ba Some template improvements 2016-09-11 19:00:12 +02:00
Skia
5b5006892d Make sellings for clubs 2016-09-09 16:23:35 +02:00
Skia
d23e07363d Fix settings 2016-09-04 19:26:50 +02:00
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
Skia
d93dda1c0e Merge branch 'sli' into 'master'
Fixed old database bug in dev env



See merge request !2
2016-09-04 15:00:16 +02:00
b0215e7445 Organized settings 2016-09-04 14:56:47 +02:00
5ca8a22123 Fixed Settings 2016-09-04 14:19:56 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
8328e668bd Fixed old database bug in dev env 2016-09-02 21:24:10 +02:00
Skia
c4b1494eee Update settings 2016-08-29 03:34:43 +02:00
Skia
325da79e45 Add support for subscription typed products in eboutic 2016-08-29 03:02:13 +02:00
Skia
dfb13c37f2 Add INSERT to old DB for subscriptions and users 2016-08-29 02:19:29 +02:00
Skia
a4df1ae9a5 Add language chooser 2016-08-24 19:11:09 +02:00
Skia
7e90e657a7 Add ajax-select app and improve some templates 2016-08-19 23:24:23 +02:00
Skia
05bd177a9d Migrate invoices and lot of eboutic improvements 2016-08-18 19:52:20 +02:00
Skia
84364d9018 Improve counter app and migrate products/producttypes/refillings/sellings 2016-08-18 03:04:50 +02:00
Skia
66fdf6cbf7 Migrate and improve subscriptions 2016-08-14 19:28:14 +02:00
Skia
a033c4dfd2 Improve launderette rights to match with launderette club 2016-08-13 16:39:09 +02:00
Skia
43b709bfd5 Make file modale chooser and complete user profile 2016-08-11 04:30:24 +02:00
Skia
a8858fa781 Add home for users and clubs 2016-08-10 16:23:12 +02:00
Skia
792d66da33 Add nice whole file support 2016-08-10 05:48:06 +02:00
Skia
6fbf607492 Fix settings 2016-08-08 00:35:35 +02:00
c2ccf63021 Added counters in api 2016-08-07 20:45:06 +02:00
feb7b4689b First steps with the api 2016-08-07 20:45:06 +02:00
Skia
d824d0d928 Uppercase some choices in settings 2016-08-07 20:06:47 +02:00
Skia
1529af32c5 Add token handling form in launderette 2016-08-06 15:20:38 +02:00
Skia
aa17c44bcc Add location when subscribing 2016-08-05 00:51:04 +02:00
Skia
44a6621aac Update settings 2016-08-04 13:36:33 +02:00
Skia
70e723337d Update settings 2016-08-02 22:32:13 +02:00
Skia
a01fc63a82 Begin launderette 2016-07-28 20:05:56 +02:00
Skia
4c62816816 Add rights to Product and Product Type views 2016-07-28 16:11:18 +02:00
Skia
c099f1c5d7 Make eboutic working 2016-07-26 18:28:36 +02:00
Skia
d837b624e2 Implement parts of the ET API 2016-07-24 18:26:03 +02:00
Skia
1f3e186e27 Update counters and some views 2016-07-21 20:03:56 +02:00
Skia
28aa143f39 Improve Operation numbering in accounting 2016-07-20 18:48:18 +02:00
Skia
1b4324f38f Add french translation file 2016-07-18 17:47:43 +02:00
Skia
593050d9e2 Improve greatly the counter right management 2016-07-18 00:47:56 +02:00
Skia
c099cc489b Improve refilling form to handle the checks and the banks 2016-07-17 11:38:19 +02:00
Skia
171303cfcc Delete settings.py 2016-07-14 17:55:02 +02:00
Skia
e29e94711a Move settings to settings_sample 2016-07-14 16:15:38 +02:00
Skia
109e23cee0 Update report, again 2016-06-20 00:01:26 +02:00
Skia
6c48b7c718 Add Selling and Refilling classes 2016-05-31 19:32:15 +02:00
Skia
6e05207e84 "Finish" the accounting views 2016-05-03 08:50:54 +02:00
Skia
5fcb3e1412 Add basic accounting views 2016-04-20 03:01:14 +02:00
Skia
c6a3559bf5 Improve accounting model according to current site's one 2016-04-20 02:07:01 +02:00
Skia
9a135ade50 Refactor counters view a bit, and protect ClickView if no barman is logged 2016-04-19 19:58:57 +02:00
Skia
25c1e6dc58 Add the basket handling in the click view of the counter
Now there is still to handle the validation by generating the appropriate invoice(s)
2016-04-19 01:54:55 +02:00
Skia
c1a151d754 Add timeout for barmen 2016-04-12 13:08:37 +02:00
Skia
52153438ac Rename and refactor some settings 2016-03-31 10:36:00 +02:00
Skia
5bcc94f992 Improve counters views 2016-03-29 10:30:48 +02:00
Skia
21f1393097 Add basic counter model 2016-03-28 14:54:35 +02:00
Skia
7d7652e319 Small fix (le gaulois) 2016-03-24 11:55:39 +01:00
Skia
2e84ee7d4f Fix subscription and improve views 2016-03-22 11:42:00 +01:00
Skia
a14d940db2 Some refactoring and misc improvements 2016-02-05 16:59:42 +01:00
Skia
d51ab088d8 Add first club views, this still sucks, particularly on the right managment 2016-02-02 16:34:36 +01:00
Skia
03bc0973fe WIP: Move to Jinja2 2016-02-01 17:35:55 +01:00
Skia
4322318c31 Club model implementation, various other changes 2016-01-29 15:20:00 +01:00
Skia
8fc360a977 Improve subscription and add it to admin app 2016-01-28 17:42:22 +01:00
Skia
f71ce2f7df Add first accounting implementation 2016-01-28 16:53:37 +01:00
Skia
b35483d2a9 WIP: Begin ae app with subscription handling 2015-12-15 17:50:50 +01:00
Skia
787fd2f484 Settingize some stuff and add custom AnonymousUser 2015-12-14 15:43:30 +01:00
Skia
aa732a4ec0 WIP: Add custom 403 and 404, but break a bit the permissions! To be fixed 2015-12-07 17:23:52 +01:00
Skia
431b81cd42 Make all the lost password procedure 2015-11-26 10:57:26 +01:00
Skia
6e54fa075e WIP: password change/reset forms 2015-11-25 17:03:18 +01:00
Skia
04bbf0db5b Refactor login and logout with built-in views 2015-11-25 16:20:28 +01:00
Skia
619e27eb52 Basic auth system 2015-11-18 17:09:06 +01:00
Skia
5bd40b2ec4 First commit: basic users 2015-11-18 09:44:06 +01:00