klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-25 02:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,433 Commits 23 Branches 0 Tags 106 MiB
4bc4d266c2
Commit Graph

320 Commits

Author SHA1 Message Date
Skia
10ee5e1708 Merge branch 'counter' into 'master' 
Tests for counter

See merge request !77
 2017-06-07 19:45:05 +02:00
Krophil
eb510e102c Test for click 2017-06-07 19:28:15 +02:00
klmp200
0076c9cdb4 Macro for pagination 2017-06-07 18:39:42 +02:00
Krophil
0af72500c6 Add some tests on counter 2017-06-07 18:36:26 +02:00
Skia
63acf588ca Add basic unfinished counter test 2017-06-07 18:36:26 +02:00
Skia
ec307cd5df Add db index in counter 2017-05-30 19:33:09 +02:00
Skia
23fe797a9e Make less DB queries (particularly in the Forum) 2017-05-14 04:38:33 +02:00
klmp200
5a7b743c83 Try fix right issues in counter admin 2017-05-06 20:48:48 +02:00
Skia
c7f48bd5f7 Fix counter view with no stock 2017-05-01 19:39:28 +02:00
Skia
423313f008 Update stock translations 2017-04-25 09:41:05 +02:00
Skia
20deda8a8e Merge branch 'master' into stock 2017-04-24 18:07:25 +02:00
Skia
83deae5964 Apply GPLv3 to Sith, and add header to every concerned file 2017-04-24 17:51:12 +02:00
Krophil
553b33c313 Proposal for summary sending confirmation 2017-04-19 11:01:56 +02:00
klmp200
edc438bc0e More readability for sum 2017-04-05 15:08:11 +02:00
klmp200
6ca183ad55 Better sum writing 2017-04-05 14:23:51 +02:00
klmp200
53a2a160be Add CB refills sum 2017-04-05 13:48:43 +02:00
klmp200
34f3fadd3d Rename counter mixin 2017-04-04 15:45:02 +02:00
klmp200
d4815df55f Better right counter management 2017-04-03 15:21:07 +02:00
klmp200
824411b13d Rights fix for counters 2017-04-03 13:50:28 +02:00
klmp200
1430479a1d Some rights fix 2017-04-03 11:57:28 +02:00
klmp200
5d89786c8f Serious counter fix 2017-04-03 10:46:53 +02:00
klmp200
dfd465c7f9 Fix bug where customer can't buy an item when they have the just amount 2017-03-28 00:55:25 +02:00
klmp200
0d918d80d3 Avoid negative value in refilings 2017-03-28 00:34:58 +02:00
klmp200
ccd67e50b8 Avoid unothorised customer to buy in counter by modifying url 2017-03-27 23:28:06 +02:00
klmp200
493d48bcca Pagination length in settings 2017-03-13 23:33:43 +01:00
klmp200
e4deacbe56 Pagination for cash sumary 2017-03-13 16:32:59 +01:00
klmp200
158a140aa4 No negative values for cash summary 2017-03-01 10:21:57 +01:00
Skia
dea234f98a Change is_subscriber and was_subscriber to cached_properties 2017-02-24 02:59:59 +01:00
Skia
27e69fd3b8 Bad hack to fix Firefox broken autofocus 2017-01-18 19:09:58 +01:00
Skia
a826fd40a3 Small update on last operations view 2017-01-13 13:13:31 +01:00
Krophil
4a5d789d9f partners banner added 2017-01-07 17:39:21 +01:00
guillaume-renaud
8f88f7cb70 Take item from stock form addition 2017-01-05 11:16:25 +01:00
guillaume-renaud
21c05cc779 Addition of the ShoppingList view to know the item to buy 2017-01-05 11:14:41 +01:00
guillaume-renaud
c6310c5315 correct missing endif 2017-01-05 11:07:05 +01:00
guillaume-renaud
6c54b246ca Stock admin gestion, items list views, create and edit items 2017-01-05 11:04:12 +01:00
guillaume-renaud
5cb75ec3eb general modifications 2017-01-05 11:02:21 +01:00
guillaume-renaud
887893fb2d Creation of the Stock list, edit, create views and creation StockItem create view 2017-01-05 11:00:08 +01:00
guillaume-renaud
29fb0af893 Addition of the stock parameter to the counter admin list 2017-01-05 11:00:08 +01:00
Skia
72685618a6 Many right fix on counters 2017-01-04 19:39:37 +01:00
Skia
c48449cd50 Add barman stats 2017-01-04 17:38:09 +01:00
Skia
dcd0c1fe75 Allow more than one bar if someone can connect to the counter 2017-01-04 16:14:17 +01:00
Skia
52a0913993 Tiny fix in the counter 2017-01-03 16:42:45 +01:00
Skia
13785fd520 Prevent users that have never subscribed to subscribe on Eboutic 2016-12-20 23:27:54 +01:00
Skia
397778af1c Quick counter fix 2016-12-19 16:58:43 +01:00
Skia
28431ec9be Big refactor: remove Subscriber class 2016-12-10 01:58:30 +01:00
Skia
0d4b697079 Refactor group settings 2016-12-10 01:29:56 +01:00
Skia
d92a706920 Refactor notifications 2016-12-10 00:06:17 +01:00
Skia
80fa99d2ac Add notification 2016-12-08 19:47:28 +01:00
Skia
e98ffb5cd5 Fix unappropriate behavior when delete selling 2016-11-10 13:51:56 +01:00
guillaume-renaud
57b663c4c5 counter inactive state with settings variable, traduction file problem fixed 2016-11-08 18:48:27 +01:00
guillaume-renaud
7f6424d51e Fix the number of minutes for a counter to be inactive to 10 2016-11-08 18:47:50 +01:00
guillaume-renaud
0d6b93d085 Add inactive state for counters 2016-11-08 18:47:40 +01:00
guillaume-renaud
be7e0401dd Fix the number of minutes for a counter to be inactive to 10 2016-11-08 18:42:31 +01:00
guillaume-renaud
63f10c13d4 Add inactive state for counters 2016-11-08 18:42:12 +01:00
klmp200
160c7806df Fix contributing.md and fix quantity display on eticket 2016-11-06 23:15:43 +01:00
klmp200
b6966c9502 Add number of places on ebticket 2016-11-04 00:43:28 +01:00
klmp200
677c50a4b1 Add unknown event translation 2016-10-25 21:53:40 +02:00
klmp200
bafa9ac10c Small fix for auto-mail about eticket 2016-10-25 18:25:59 +02:00
klmp200
b00fc23fc4 Add automatic mail when an eticket has been bought 2016-10-21 17:47:56 +02:00
Skia
3e99f97b7a Merge branch 'sli' into 'master' 
Add ban for alcohol



See merge request !17
 2016-10-21 11:00:40 +02:00
klmp200
224374f5e8 More readable user_account 2016-10-19 01:57:54 +02:00
Skia
47c01d6d10 Fix request in cash summary list 2016-10-18 14:48:47 +02:00
klmp200
2daaf992f2 Add groups, allow to ban users from counters and from buying alcohol 2016-10-16 03:45:06 +02:00
klmp200
1c97c8a74f Swag dropdown on user account + autofocus for refillings on counters 2016-10-16 02:47:21 +02:00
klmp200
c9005e2c31 Fix for etickets 2016-10-15 19:58:51 +02:00
klmp200
257cb9cfe7 Add ban for alcohol 2016-10-15 02:33:38 +02:00
Skia
5931351c0a Another tiny template improvement 2016-10-12 12:32:04 +02:00
Skia
0d8bebcd80 Tiny template update 2016-10-10 18:43:40 +02:00
Skia
13265e6a0d Allow more control on the dates for cash summaries sums 2016-10-10 18:29:13 +02:00
klmp200
d285fbe04a Add account number and suscription on counter 2016-10-08 23:07:10 +02:00
Skia
63217b2ead Improve product display 2016-10-05 15:57:04 +02:00
Skia
7fdcb0c815 Finish labels in accounting 2016-10-05 15:54:11 +02:00
Skia
64b4484620 Some templating 2016-10-04 00:41:08 +02:00
Skia
deeb2b5b6f Migrate and fix etickets 2016-10-04 00:32:07 +02:00
Skia
d6138a7a0c Make the etickets 2016-10-03 19:30:05 +02:00
Skia
2ef5a4d37b Runtime error fix 2016-09-30 18:43:53 +02:00
Skia
ca3b7fda5a Improve invoice call template 2016-09-29 18:34:58 +02:00
Skia
51f342a7d3 Add invoices calls 2016-09-29 18:19:58 +02:00
Skia
ddceb82abf Display uncategorized products 2016-09-29 16:19:05 +02:00
Skia
db07b54ed1 Allow the counter admin to edit cash registers summaries 2016-09-29 14:54:03 +02:00
Skia
c2276dab2b Remove useless mixin 2016-09-29 12:53:09 +02:00
Skia
2e7e78b8ce Add last ops view to the bars 2016-09-28 11:09:54 +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
klmp200
f7722ed564 Fixed permissions on stats 2016-09-27 16:44:12 +02:00
klmp200
f22f2cbde6 Only club members can view counter's stats 2016-09-26 23:56:24 +02:00
Skia
303db0bc7d Translation and explicit string 2016-09-26 11:31:45 +02:00
Skia
a4ad7f0e85 Add token to counter to see pictures and to prevend misuses 2016-09-26 11:17:56 +02:00
Skia
9e4e9597d1 Add the merge user function 2016-09-21 14:09:26 +02:00
Skia
95b22cafe0 Template fixes 2016-09-15 11:51:05 +02:00
Skia
35d811317c Add top 100 to counters 2016-09-15 11:07:03 +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
90e47c9d7d Add a restriction on the counter login view to authorize only the sellers 2016-09-09 01:54:26 +02:00
Skia
4c2bf9cbf9 Launderette and product list fixes 2016-09-08 02:09:17 +02:00
Skia
b1f6754e6e Refactor lots of tabed templates, and create TabedViewMixin 2016-09-04 19:25:03 +02:00
Skia
976ae09e55 Fix subscriptions with Sith account 2016-09-04 18:35:20 +02:00
Skia
e1ce661a04 Improvements in counter admin templates 2016-09-04 15:50:43 +02:00
Skia
25dea832be Display bar list with "openness" 2016-09-04 14:17:49 +02:00
Skia
3239a2e481 Fix counter if no date of birth 2016-09-01 16:55:43 +02:00
Skia
a4c5d48159 Some bug fixes 2016-09-01 10:00:31 +02:00
Skia
37d303634c Fix form with files 2016-08-31 15:29:16 +02:00
Skia
f66b999f24 Improve login form 2016-08-31 02:44:46 +02:00
Skia
3305a19f44 Fix permissions on sellings and refillings 2016-08-29 16:07:14 +02:00
Skia
325da79e45 Add support for subscription typed products in eboutic 2016-08-29 03:02:13 +02:00
Skia
b2f13e935e Add missing migration 2016-08-26 23:31:25 +02:00
Skia
01c3991988 Add cash register summaries 2016-08-26 20:57:04 +02:00
Skia
9927310f6e Update login system to support the multiple threads of UWSGI 2016-08-26 20:56:16 +02:00
Skia
bea7b71f2c Delete unwanted obsolete migration files 2016-08-24 22:10:58 +02:00
Skia
4f67bf4c04 Reset all migrations and migrate companies 2016-08-24 22:09:23 +02:00
Skia
8e3eb1e2bf Some templating and add webcam support for profile editing 2016-08-22 02:56:27 +02:00
Skia
4cbfd58660 Add pictures to products 2016-08-21 03:07:15 +02:00
Skia
a49d9850ab Pimp the counter click view 2016-08-21 02:30:49 +02:00
Skia
dbf0653baf Add support for product buying groups + many cosmetics and form pimping 2016-08-20 22:12:46 +02:00
Skia
d54f0f4c65 At last we support trays! 2016-08-20 16:09:46 +02:00
Skia
84efcd87e7 Translate datepicker and add age limit to products 2016-08-20 02:55:48 +02:00
Skia
7e90e657a7 Add ajax-select app and improve some templates 2016-08-19 23:24:23 +02:00
Skia
0689f864d2 Migrate permanencies and add user stats view 2016-08-18 21:32:18 +02:00
Skia
b69c3a6792 Improve and fix user accounts 2016-08-18 21:06:10 +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
1775569ecf Reset all migrations 2016-08-10 13:52:57 +02:00
Skia
1a6373e9ce Add barman list in API 2016-08-07 20:45:06 +02:00
klmp200
c2ccf63021 Added counters in 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
31ecb50c1d Move user account view into core 2016-08-05 09:52:19 +02:00
Skia
260a17ae4f Improve generation of account id 2016-08-05 00:51:04 +02:00
Skia
7002139176 Finish the launderette click view 2016-08-02 00:32:55 +02:00
Skia
2cf39671e2 Make some more validation on the token click form 2016-08-01 19:59:22 +02:00
Skia
4d8e7b0875 Improve launderette, need to finish the click view 2016-08-01 16:36:16 +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
80f72df1de Add product type management views 2016-07-27 20:05:45 +02:00
Skia
f230fbc135 Add product management views 2016-07-27 17:23:02 +02:00
Skia
4408890ab2 Templating and translation 2016-07-27 00:13:20 +02:00
Skia
c099f1c5d7 Make eboutic working 2016-07-26 18:28:36 +02:00
Skia
0ecb78a101 Fix some counter stuff 2016-07-22 13:34:34 +02:00
Skia
525d7e6709 Add atomic transaction in counters 2016-07-22 01:19:04 +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
7a267dbc3f Create the customer when subscribing if it does not exists yet 2016-07-20 00:28:49 +02:00
Skia
97ff4341a7 Translate most of the Sith 2016-07-19 19:03:16 +02:00
Skia
1b4324f38f Add french translation file 2016-07-18 17:47:43 +02:00
Skia
2147f6a468 Add permanencies tracking to counters 2016-07-18 13:22:50 +02:00
Skia
593050d9e2 Improve greatly the counter right management 2016-07-18 00:47:56 +02:00
Skia
e92a73dfb1 Add basic account view for user and refactor user tool bar 2016-07-17 12:38:02 +02:00
Skia
c099cc489b Improve refilling form to handle the checks and the banks 2016-07-17 11:38:19 +02:00
Skia
4498877283 Small fix on counters 2016-07-16 16:48:56 +02:00
Skia
f600e174b1 CSS and templating, Sith begins to look nice 2016-07-16 16:35:45 +02:00
Skia
1feea061f6 Add basic refill support 2016-06-26 20:07:29 +02:00
Skia
9989b75b3e Add string parser in counters 2016-06-26 19:30:28 +02:00
Skia
aafcc9c174 Almost finish the counter views, still need the plateaux 2016-06-02 14:55:12 +02:00
Skia
b6904ad88c WIP: Improve counters view (counter is broken for now) 2016-06-02 00:26:31 +02:00
Skia
ffe2aec980 Implement barman prices and improve counter views 2016-06-01 01:33:20 +02:00
Skia
6c48b7c718 Add Selling and Refilling classes 2016-05-31 19:32:15 +02:00
Skia
8da149c979 Some refactoring between accounting and counter 2016-05-31 13:00:52 +02:00
Skia
b4c3f2f4dc Fix tests 2016-04-20 03:30:49 +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
6eb0ec1620 Tiny fix (le gaulois) 2016-04-19 03:43:13 +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
7a9689a20d Improve the click view, the total is computed, but there is still a lot of work 2016-04-18 17:34:21 +02:00
Skia
a5118ef457 Finish the functionnality of CounterMain 
We now redirect correctly to CounterClick, providing a valid user
 2016-04-18 04:37:37 +02:00
Skia
478d1ed876 Continue the counter views 2016-04-15 11:50:31 +02:00
Skia
c1a151d754 Add timeout for barmen 2016-04-12 13:08:37 +02:00
Skia
20a97526d4 Make counter login forms 2016-04-12 10:00:47 +02:00
Skia
52153438ac Rename and refactor some settings 2016-03-31 10:36:00 +02:00
Skia
debba55350 Add MetaGroup system 2016-03-29 12:45:10 +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