Commit Graph

334 Commits

Author SHA1 Message Date
klmp200 2c6f17063a Can delete Godfathers 2016-09-29 15:06:39 +02:00
klmp200 a008f34288 Fix bug where slots appears when slot expired 2016-09-28 17:22:34 +02:00
Skia 2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +02:00
klmp200 8ef45bf03c Rename is_token to check_token 2016-09-28 10:53:27 +02:00
klmp200 17b098ca2a Fixed lookup for loged barmen 2016-09-27 22:57:06 +02:00
Skia f152791d90 Merge branch 'sli' into 'master'
Only club members can view counter's stats

N'importe qui peut accéder aux tops 100, c'est pas très cool de voir ce que dépensent les autres…

See merge request !9
2016-09-27 20:12:57 +02:00
klmp200 3c408551aa Remove nested exception for stats and added property on AnonymusUser 2016-09-27 16:56:30 +02:00
Skia a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
Skia 37072e1640 Clean up some useless prints 2016-09-26 11:17:55 +02:00
Skia 7a2985b186 Add product top 10 2016-09-26 11:17:55 +02:00
Skia 24d744ee9c Merge branch 'krophil' into 'master'
Krophil

Few changes in css

See merge request !7
2016-09-26 09:25:13 +02:00
Skia 4749c45c97 Merge branch 'sli' into 'master'
Hided launderette slots and tokens for non authorized users and added is_office and is_launderette



See merge request !8
2016-09-26 09:23:35 +02:00
klmp200 380f41445a Modify property names 2016-09-22 13:07:22 +02:00
klmp200 e250acf82d Used settings for office and launderette 2016-09-22 13:00:00 +02:00
Skia ffd4dac2e2 Allow club staff to delete their sellings 2016-09-22 12:52:15 +02:00
Skia ae6a613f9a Add promo_17.png 2016-09-21 15:41:12 +02:00
Skia 9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
klmp200 748ad1c5c2 Fixed some mistakes 2016-09-21 14:01:44 +02:00
klmp200 2d16b9c296 Hided launderette slots and tokens for non authorized users and added is_office and is_launderette 2016-09-21 13:33:02 +02:00
Skia f1e54439e1 Small stats fix 2016-09-21 12:19:34 +02:00
Skia 324bd69312 Small templates fixes 2016-09-20 20:38:12 +02:00
krophil 1d9c058132 Revert "radius removed"
This reverts commit 26a1300417.
2016-09-20 17:12:09 +02:00
krophil 62c4036dee radius removed 2016-09-20 13:22:05 +02:00
krophil b11c5bbd1d Merging 2016-09-20 13:19:44 +02:00
Skia 1e0904b48e Merge branch 'sli' into 'master'
Quick fix to hide account number in profile page when not owner user or root

Faut vite cacher les numéros de compte des gens à qui ils n'apartiennent pas, sinon c'est la faille de sécu D:

See merge request !6
2016-09-19 20:43:33 +02:00
Skia 5b83aff351 Small UI fix 2016-09-19 20:40:38 +02:00
Skia 5ba2ab925d Add godfathers 2016-09-19 20:29:43 +02:00
klmp200 584025acf0 Quick fix to hide account number in profile page when not owner user or root 2016-09-18 22:50:10 +02:00
Skia 35d811317c Add top 100 to counters 2016-09-15 11:07:03 +02:00
Skia 6aaeb7cdc9 Rename membership to memberships 2016-09-15 11:06:51 +02:00
Skia 6cf253365b Add cash register summary view 2016-09-13 02:04:49 +02:00
Skia 6cacfb8d8d Add counter activity 2016-09-12 17:34:33 +02:00
Skia 54444b31ba Some template improvements 2016-09-11 19:00:12 +02:00
Skia 7aec32cef0 Some quick improvement on account view 2016-09-09 20:38:27 +02:00
Skia 5e26e5bde7 Merge branch 'sli' 2016-09-09 19:56:48 +02:00
Skia 5b5006892d Make sellings for clubs 2016-09-09 16:23:35 +02:00
Skia 90e47c9d7d Add a restriction on the counter login view to authorize only the sellers 2016-09-09 01:54:26 +02:00
klmp200 2f7dc9ec19 Used lambda function in user detail 2016-09-08 04:15:34 +02:00
klmp200 41d5a02d77 Fixed account order and detail account view 2016-09-08 03:38:28 +02:00
klmp200 8d060af46c Removed wierd hack 2016-09-08 03:21:39 +02:00
klmp200 bca8dc039a Added macros for slots and tokens display 2016-09-07 23:06:38 +02:00
klmp200 61c77a7877 Added address on profile 2016-09-07 02:07:01 +02:00
klmp200 c0296b9ada Added slots on user profile 2016-09-07 01:51:34 +02:00
klmp200 a64b10776e Monthly user account 2016-09-06 22:13:48 +02:00
klmp200 78bf4b7b84 Fixed markdown api issue 2016-09-06 21:59:13 +02:00
Skia b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
klmp200 80549c7a33 Fixed get_age 2016-09-04 16:26:02 +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
Skia 25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00