Commit graph

163 commits

Author SHA1 Message Date
Laetitia Getti
30d74e5dd9 add grouped order code in overview page 2023-08-16 12:58:39 +00:00
Laetitia Getti
6fe83b9275 integrate code for joining grouped order in dashboard
- move home page into order app and name it 'dashboard'
2023-08-16 12:58:39 +00:00
b4bdfb8cf4 Add the ability to use a code to join an order. 2023-08-14 17:44:49 +02:00
cf2c79cc3f Make "join order" part of the order's app 2023-08-14 14:57:51 +02:00
5164ebbb95 Change comment to be more readable 2023-08-12 21:02:09 +02:00
53d35094c0 Remove extraneous comments, rename test functions.
- Removed uneeded comments (like previous commits).
- Renamed some test functions to make them more explicit, and remove the
  associated docstring.
2023-08-12 21:02:09 +02:00
b4df449bcb Small code & comments changes.
- removed comments when they were not helping understanding the code.
- changed some variable names to ease readability
- make use of dict.update() to ease readability
- use dict comprehensions when possible to ease readability
- changed the naming from intial to origin (bad translation from english)
2023-08-12 21:00:42 +02:00
b001fc152c Enhance comments, minor code refactor.
- removes comments when they were not useful
- format comments to be less than 80 chars long (this is not covered by black)
- remove the CODE_LENGTH from the top level models.py, and use it in the function instead.
2023-08-12 21:00:42 +02:00
SimGetti
59ad699edf Replace last instances of is_ongoing by is_open 2023-08-11 16:52:23 +00:00
SimGetti
59f3870c41 Replace any instance of is_ongoing by is_open 2023-08-11 16:52:23 +00:00
Laetitia Getti
49c3a3f615 fix link in mail button and add note in mail 2023-08-11 16:36:37 +02:00
Laetitia Getti
4885025e99 use example.com, guillemets français and base_mail.html 2023-08-11 09:22:03 +00:00
Laetitia Getti
660117af80 send mail notification on order 2023-08-11 09:22:03 +00:00
Laetitia Getti
8953e1adf2 change duplicate grouped order test 2023-08-11 10:31:05 +02:00
Laetitia Getti
817428ea1f Precise comments in create_code function 2023-08-10 11:10:47 +02:00
Laetitia Getti
cb2373020e add reverse function in migration file 2023-08-09 11:32:09 +02:00
Laetitia Getti
6006cbe8df use the grouped order unique code in url path 2023-08-09 08:09:43 +00:00
Laetitia Getti
2083142d47 generate a 6 digit long unique code for each grouped order 2023-08-09 08:09:43 +00:00
BastienTest
9e52ded095 #122 - Modification de "Nouvelle commande" vers "Nouvelle commande groupée" 2023-08-08 23:20:54 +02:00
Laetitia Getti
5c6516c9b1 improve csv test 2023-08-01 11:02:18 +02:00
Laetitia Getti
25d0ef5604 csv export of a grouped order 2023-08-01 11:02:18 +02:00
Laetitia Getti
52b7804281 improve total computing on order form 2023-08-01 08:07:03 +00:00
Laetitia Getti
e4bd680fe2 simplifying code 2023-08-01 08:07:03 +00:00
Laetitia Getti
eaa365dccd ordering test files 2023-08-01 08:07:03 +00:00
Laetitia Getti
a02d748ccb the orga can delete orders 2023-08-01 08:07:03 +00:00
Laetitia Getti
0aba581434 orga can order after deadline and update version 2023-07-26 10:50:58 +02:00
Laetitia Getti
27fc20090e display total price on order form 2023-07-25 13:58:22 +02:00
Laetitia Getti
c8811f93d0 sort items by name 2023-07-25 10:55:54 +02:00
Laetitia Getti
d1b58ea5b7 values remain in the form when an error is raised 2023-07-24 18:15:48 +02:00
Laetitia Getti
5c7bcac49b add note to grouped order orga 2023-07-24 17:48:39 +02:00
Laetitia Getti
a40abe5525 vertical item names and check column 2023-07-24 16:31:20 +02:00
Laetitia Getti
7a65f189fd only display non null values and sort with alphabetical order 2023-07-20 17:26:52 +02:00
Laetitia Getti
7d1fd312f4 generate pdf list with weasyprint 2023-07-20 14:41:31 +02:00
Laetitia Getti
1829ab75f4 icon on mail download button 2023-07-07 17:15:03 +02:00
Laetitia Getti
75a7c5e44e tabs in fullwidth 2023-07-07 17:15:03 +02:00
Laetitia Getti
f4c08a3a23 duplicate grouped order
closes #7
2023-07-07 17:15:03 +02:00
Laetitia Getti
7e6d17c840 add back button on grouped order detail page 2023-07-07 15:07:01 +02:00
Laetitia Getti
05df89eefd delete grouped order
closes #59
2023-07-07 15:07:01 +02:00
Laetitia Getti
afea416d42 use GOForm for updating and warning message when deadline in the past
closes #94
2023-07-07 15:07:01 +02:00
Laetitia Getti
f32987457d separate views into several files 2023-07-07 15:07:01 +02:00
Laetitia Getti
4f98a5ec88 separate date and time in grouped order create form
closes #88
2023-07-07 15:07:01 +02:00
Laetitia Getti
8a2852794e update grouped order 2023-07-07 15:07:01 +02:00
Laetitia Getti
384f81d4ab front for grouped order create page 2023-07-07 15:06:59 +02:00
Laetitia Getti
248ee2f914 email list download 2023-07-07 15:06:43 +02:00
Laetitia Getti
daea05835a order detail on click in a modal 2023-07-07 15:06:42 +02:00
Laetitia Getti
040872d66d tabs on overview page 2023-07-07 15:06:04 +02:00
Laetitia Getti
b9de21235e change some icons 2023-07-07 15:06:04 +02:00
Laetitia Getti
04846caa0e display bug on validate buttons 2023-07-07 15:06:02 +02:00
Laetitia Getti
bc83967330 fixes after rebase 2023-07-07 15:05:28 +02:00
Laetitia Getti
ef00d0b367 fix for orders with cards on mobile 2023-07-07 15:05:28 +02:00
Laetitia Getti
32e5cda52e icons for order index 2023-07-07 15:05:28 +02:00
Laetitia Getti
4bb7854e89 card for order page on mobile 2023-07-07 15:05:26 +02:00
Laetitia Getti
165ec58d3a forkawesome icons 2023-07-07 15:04:21 +02:00
68c08d65b7 Small fixes while reading the code. 2023-06-23 20:50:31 +02:00
Laetitia Getti
725ad6ddbe fixes on add item form and displayed quantities
closes #81
2023-06-20 11:47:58 +02:00
Laetitia Getti
7db5eb17f8 no ordereditems created when quantity is 0 2023-06-20 08:34:13 +00:00
Laetitia Getti
04d3ab69a2 we cannot order when there is no item available 2023-06-20 08:34:13 +00:00
Laetitia Getti
400cfe69b4 nb of orders on index 2023-06-07 11:12:48 +02:00
Laetitia Getti
f08d4c8d59 move xhtml dependency to requirements.txt 2023-06-05 14:35:57 +02:00
Laetitia Getti
7ab2db66e2 delete an item when it's not ordered yet 2023-06-05 14:33:30 +02:00
Laetitia Getti
a14267368c impossible to order above max_limit for items 2023-06-05 14:33:30 +02:00
Laetitia Getti
2087b49fc4 order forbidden when deadline is passed 2023-06-05 14:33:30 +02:00
Laetitia Getti
26f7c313fc pdf sheet generation - part 2 2023-05-25 16:35:56 +02:00
Arthur Vuillard
75b81c2861 fix black formatting in a file 2023-05-25 15:41:49 +02:00
Laetitia Getti
6432e99c58 grouped order sheet generation - part 1 2023-05-25 15:41:49 +02:00
Laetitia Getti
af466f960f titles visible on mobile 2023-05-25 15:41:49 +02:00
Laetitia Getti
92b87a3d3e possibility to copy order link 2023-05-25 15:37:19 +02:00
Laetitia Getti
9e76ef80d4 move methods from views to models 2023-05-25 15:37:19 +02:00
Laetitia Getti
53a7d04597 lint code 2023-05-25 15:37:19 +02:00
Laetitia Getti
90e23ed016 input date in grouped order creation form 2023-05-25 15:37:19 +02:00
Laetitia Getti
daf06196ff front updates 2023-05-25 15:37:19 +02:00
Laetitia Getti
04628fccb3 display place only if it exists 2023-05-24 16:36:00 +02:00
Laetitia Getti
f03258bee2 compute grouped order total price when displayed 2023-05-24 16:36:00 +02:00
Laetitia Getti
539410ba66 overview page 2023-05-24 16:13:07 +02:00
Laetitia Getti
141a2dd2b1 add authir name on confirmation page 2023-05-24 16:13:07 +02:00
Laetitia Getti
6bff6881cc improve order form 2023-05-24 16:13:07 +02:00
Laetitia Getti
d03102fe57 afficher et calculer le prix de la commande 2023-05-24 16:13:07 +02:00
Laetitia Getti
4e4c0440f7 confirmation page after a user orders 2023-05-24 13:58:34 +02:00
Laetitia Getti
3a27af2085 error when no article is ordered 2023-05-24 13:58:34 +02:00
Laetitia Getti
78b8d355d5 basic order page 2023-05-24 13:58:34 +02:00
Laetitia Getti
5075ed3f27 customUser with email as username 2023-05-24 13:58:34 +02:00
Laetitia Getti
97c507ae15 add placeholders on grouped orders create form 2023-05-24 13:52:36 +02:00
Laetitia Getti
72d7ea82de add description and place fields in grouped order 2023-05-24 13:52:36 +02:00
Laetitia Getti
f10ab88dc2 add price and max limit fields for items 2023-05-24 13:52:36 +02:00
Laetitia Getti
417967095f create grouped order button 2023-05-24 13:52:36 +02:00
Laetitia Getti
8382348729 we cannot create two similar grouped orders 2023-05-24 13:52:36 +02:00
Laetitia Getti
04b754a51d date form validation 2023-05-24 13:52:36 +02:00
Laetitia Getti
dc78511d9a grouped order creation and add items 2023-05-24 13:46:24 +02:00
Laetitia Getti
a1c118790c static-root in settings 2023-04-27 17:19:39 +02:00
Laetitia Getti
66ce8f4df3 integrate bulma in order index page 2023-04-27 17:15:28 +02:00
Laetitia Getti
c1984ed677 rename readme and change accounts urls 2023-04-27 15:29:02 +02:00
Laetitia Getti
3afaafbcdb change grouped_order_orga to grouped_order_overview 2023-04-27 15:11:46 +02:00
Laetitia Getti
8ab776fad0 correct tests 2023-04-20 12:24:41 +02:00
Laetitia Getti
1edd6322f4 Orga View only accessible by orga user 2023-04-19 18:14:10 +02:00
Laetitia Getti
2fdc1b6862 index view only shows grouped orders organized by logged user 2023-04-19 18:14:09 +02:00
Laetitia Getti
e16447dcff tests and test fixtures 2023-04-19 18:13:44 +02:00
Laetitia Getti
d0279578a5 tests on GroupedOrderDetailView 2023-04-19 18:13:07 +02:00
Laetitia Getti
d650ec2913 install flake8 and check files 2023-04-19 18:01:29 +02:00
Laetitia Getti
5ec40a5ea3 install black and format files 2023-04-19 18:00:25 +02:00
Laetitia Getti
0aaef7aea8 install pytest 2023-04-19 17:59:06 +02:00