Commit graph

82 commits

Author SHA1 Message Date
Jasper Janin 7b12c266b3 Add user group reference to orders 2022-10-27 21:32:22 +02:00
Charlotte Van Petegem 202d5d3e7a
Revert "Merge branch 'master' of github.com:ZeusWPI/Haldis"
This reverts commit 28fa1b7592, reversing
changes made to b14671413c.
2022-10-27 21:23:13 +02:00
Jasper Janin bf8eb94117 Add user group reference to orders 2022-10-27 20:24:35 +02:00
Charlotte Van Petegem 687d389fa2
Fix not being able to delete an item from the list at the bottom of an order 2022-06-10 18:28:31 +02:00
Midgard 44feb1a4ff
Change forgotten order_id to order_slug in a few places 2022-05-25 10:29:46 +02:00
mcbloch a33c76f84b fix modify link 2022-05-20 19:14:10 +02:00
mcbloch 98214f8b84 Add share slug and qr code to order page 2022-05-20 19:04:25 +02:00
mcbloch 7702fdecbe change url usage to unique 7char slugs 2022-05-20 19:04:22 +02:00
Midgard b5202a9de6
Don't crash when rendering None price 2022-05-11 02:43:08 +02:00
Midgard 03f1e56161
Fix bug with form inside form 2022-05-02 22:25:06 +02:00
Midgard cf27a7de8a
For loops don't work in this template engine 2022-05-02 22:04:45 +02:00
Midgard 85d8892176
Hide buttons for which user has no permission 2022-05-02 21:56:38 +02:00
Midgard ced04acb2e
Remove TODO buttons 2022-04-22 01:19:11 +02:00
Midgard 09e2d704cd
Add price editor 2022-04-22 01:19:07 +02:00
Midgard fc630e9061
Support marking items as paid 2022-04-20 18:09:45 +02:00
Midgard adcc0dd69e
Confine li spacing to .main 2021-07-24 17:51:26 +02:00
Midgard 4a96c0c286
Correct phone URL, add phone URL on location 2021-07-24 17:51:26 +02:00
Midgard e82742eb62
Remove pills introduced in previous commit 2021-07-24 17:51:26 +02:00
Midgard 16bd9243d4
Aggregate comments 2021-07-24 17:51:26 +02:00
Midgard 1ff8ceb521
Improve design
Remove main CSS from shop view page. Make it theme independent and
maximize contrast.

Improve spacing in "add item" list.

Refactor old term "showcase" to "shop_view" in code.
2021-07-24 17:51:25 +02:00
Midgard 65d6de21fa
Change no courier text from "No-one" to "no-one yet" 2021-06-19 01:00:22 +02:00
Midgard 787669823c
Improve spacing between items in ordered dishes 2020-10-13 02:27:31 +02:00
Midgard 695331dd1a
Fix margin in ordered dishes, less bold 2020-10-13 02:18:43 +02:00
Midgard 342e94a7bf
Remove aligned price in menu and my_items 2020-10-13 02:10:45 +02:00
Midgard d3e6c1b08c
Use columns in order info faster, align prices in menu 2020-10-13 02:08:52 +02:00
Midgard c23a11bfdb
Fix flow quirks in "order information" section 2020-10-13 02:01:07 +02:00
Midgard 8cefb48768
Collapse other dishes, save expanded dish in hash 2020-10-13 01:42:03 +02:00
Midgard 837dc682bc
Tweak UI a bit after demo 2020-10-12 22:40:27 +02:00
Midgard 9641435b64
Add norobot tag on order pages 2020-09-26 00:39:50 +02:00
Midgard 7856302028
Improve order menu design 2020-09-25 21:12:41 +02:00
Midgard 0b93307f1f
Fix mobile order page, show dish descriptions 2020-09-01 16:35:18 +02:00
Midgard 6651a8d513
Show less TODOs on order page 2020-09-01 16:26:29 +02:00
Midgard 8ccc508747
Tweak layout 2020-08-26 19:30:01 +02:00
Midgard 1bea3d2fcc
Show stop date if needed, change to "add from favourites" 2020-08-26 19:30:00 +02:00
Midgard 48d67cbd89
Remove weird d from colours, add separate bg 2020-08-26 19:30:00 +02:00
Midgard 65ed818875
Start redesign of order page 2020-08-26 19:29:59 +02:00
Midgard cd67eab29b
Remove colons after some titles
Some titles had a colon, some hadn't. Titles don't need colons.
2020-08-08 15:43:58 +02:00
Midgard 289b36b918
Correct timer behaviour, reload when time up 2020-03-05 00:40:16 +01:00
Midgard 0f9a816eea
Make choice updating after dish change smoother 2020-03-04 22:35:55 +01:00
Midgard 54dc1f23bf
Show choices immediately when changing dish 2020-03-04 22:07:33 +01:00
Midgard f60c1d180c
Stub for choice selection 2020-03-03 16:21:01 +01:00
Midgard f2112ec26d
Restore form field location
Ugh, how did that happen
2020-02-29 20:04:14 +01:00
Midgard b44d34003d
Make whitespace match convention
Convention according to our EditorConfig.
2020-02-29 17:37:33 +01:00
Midgard 172d5d1e08
Fix dish change detection once and for all 2020-02-29 15:40:14 +01:00
Midgard 729dab2ba4
Fix anonymous ordering and dish change 2020-02-26 21:25:51 +01:00
Midgard e15b085006
Add message about options appearing on submit 2020-02-26 20:16:50 +01:00
Midgard ccb034ef7f
Fix bug on anonymous order view
Change to temporary message
2020-02-26 18:10:09 +01:00
Midgard 2b962e99d4
Eliminate excessive whitespace in options
These would show when editing the option by pressing backspace
2020-02-24 14:33:43 +01:00
Midgard b8ac141310
Fix mistake in dish change detection
When the form is submitted, the URL has no dish parameter any more.
To fix this, add a hidden form field to say which dish the form was for.
2020-02-24 14:20:36 +01:00
Midgard 513e495665
Add own logic and form elements
Bypass WTForms and use manually written <select> and all that.
2020-02-23 23:31:11 +01:00