redfast00
33d2575271
Merge pull request #144 from ZeusWPI/order-courier-delete-items
...
Allow courrier to delete item in order
2019-09-14 00:14:52 +02:00
Jan-Pieter Baert
f394fb7911
Fix unresolved merge conflict
2019-09-13 16:51:38 +02:00
redfast00
ea6202473b
Fix #109
2019-09-13 15:51:49 +02:00
0af72376a1
Increase line length limit to 100
...
Up from 80.
2019-09-12 20:53:26 +02:00
Jan-Pieter Baert
48641adf90
Fix pylint for Haldis
2019-09-12 20:53:25 +02:00
Jan-Pieter Baert
c4f9222558
Fix pylint for views and templates
2019-09-12 20:50:17 +02:00
Jan-Pieter Baert
ec82639c5c
Fix pylint for models files
2019-09-12 20:50:17 +02:00
Jan-Pieter Baert
d21f2d48f5
Fix pylint for database files
2019-09-12 20:50:15 +02:00
Jan-Pieter Baert
cff24dc096
Allow courrier to delete item in order
2019-09-12 18:42:29 +02:00
redfast00
69f98cde9e
Fix wsgi for server deploy
2019-09-11 22:47:06 +02:00
redfast00
5b2f6de323
Fix webhook not having app context
2019-09-11 22:38:01 +02:00
redfast00
5e2d5e659c
Convert forms to POST requests, fix euro filter, fix user close debt
2019-09-11 16:44:36 +02:00
redfast00
b12bcc882d
Make cookies more secure
2019-09-11 16:43:42 +02:00
redfast00
d75732fdcf
Fix db init script
2019-09-11 04:10:24 +02:00
Jan-Pieter Baert
c64e4bd998
Run black and isort on all code
2019-09-08 02:04:34 +02:00
Jan-Pieter Baert
15794b06b7
Add typing to general app files
2019-09-08 01:58:21 +02:00
Jan-Pieter Baert
b7fa92a22a
Add typing to view files
2019-09-08 01:34:16 +02:00
Jan-Pieter Baert
27cb10f745
Add typing to model files
2019-09-08 00:41:50 +02:00
Jan-Pieter Baert
51edd1bdc1
Add typing to database files
2019-09-07 15:05:24 +02:00
mcbloch
d591f846d8
add and run black formatter
2019-09-05 03:33:29 +02:00
mcbloch
f59ec75bea
forgot to remove the old endpoint
2019-09-05 03:25:17 +02:00
mcbloch
e660627249
move routes endpoint to debug blueprint
2019-09-04 17:18:11 +02:00
mcbloch
e5f16f7292
remove unneeded line
2019-09-03 15:01:44 +02:00
mcbloch
d254889f6d
remove old migrations, run via manager
2019-09-03 13:56:13 +02:00
mcbloch
ffa11a6a87
remove python 2, deprecated af
2019-08-31 00:50:01 +02:00
mcbloch
0538c9f984
remove author variables
2019-08-29 15:58:15 +02:00
mcbloch
d0863325a5
Restructuring the codebase!
...
But for real, it's a real shitstorm in there.
- Added context by making the init go through a function
and not implicitly happen via imports
- Fixup all context and contextless function mixups
- splitup the models in sensible different files
- give the dump of view functions in views/__init__.py their own file
- add all routes via blueprints, not half of them
- move the slack notifications function and class to its own file,
no idea what it was doing in a views file in the first place.
2019-08-28 03:46:04 +02:00
iepoev
d7d12f88c4
add stefanos script
2019-08-22 19:44:07 +02:00
redfast00
87903a6d4a
Add Fitchen script
2019-06-28 18:57:41 +02:00
Maxime
e9293f7947
Merge branch 'master' into feature/104/show-map-on-location-page
2019-05-31 17:15:40 +00:00
Maxime
5020556dcb
Merge pull request #121 from ZeusWPI/feature/order_items
...
add order items screen
2019-05-31 17:12:43 +00:00
mcbloch
ec9c034539
add media querries for side padding
2019-05-31 19:05:40 +02:00
Sammy Delanghe
94e0291c5a
make setup script work on other debian - tiny css improvement
2019-05-31 01:07:01 +02:00
Tom Naessens
6327809bbd
Merge branch 'master' into feature/104/show-map-on-location-page
2019-05-31 09:29:07 +12:00
Tom Naessens
7de4dbf5c4
Hide create order button when a user is not logged in
2019-05-31 09:27:44 +12:00
Tom Naessens
8e682f0216
Merge branch 'master' into feature/104/show-map-on-location-page
2019-05-31 09:22:26 +12:00
4e143b9b97
Merge pull request #124 from ZeusWPI/feature/120/order-button-on-location-page
...
Adds a button on the location/ and locations/ page to start a new order
2019-05-31 08:51:00 +12:00
Tom Naessens
41a289fb47
Add a small padding-top above location map for mobile devices
2019-05-30 19:40:17 +12:00
Maxime
3465742021
Merge pull request #122 from ZeusWPI/fix/Create-text-on-edit
...
fixed Create new order message on order edit
2019-05-30 08:58:22 +02:00
Tom Naessens
0619cef246
Some layouting
2019-05-30 18:46:28 +12:00
Tom Naessens
6e74e0e078
Cleaner layout
2019-05-30 18:36:56 +12:00
Tom Naessens
1f3c480967
Basic code, still needs some layout changes
2019-05-30 18:29:08 +12:00
Tom Naessens
2d4ad2a605
Adds a button on the location/ and locations/ page to start a new order at the given location #120
2019-05-30 14:10:47 +12:00
75f3b80acb
fixed Create new order message on order edit
2019-05-30 02:30:22 +02:00
mcbloch
2d9f7e7fc5
add extra order items screen, clickable div with shadow
2019-05-29 20:12:19 +02:00
mcbloch
02c9abe28c
add location name to browser title
2019-05-29 18:02:55 +02:00
56ef2654a5
added open new tab on marker click
2019-05-29 15:48:38 +02:00
7555b9d65c
fixed poput location
2019-05-28 19:52:38 +02:00
Maxime
7802464c66
Merge pull request #113 from ZeusWPI/fix_map
...
Fix map
2019-04-30 17:28:50 +02:00
mcbloch
dd3fe26b86
add anchor so the marker points to the correct location
2019-04-06 19:31:04 +02:00
mcbloch
94fedf8097
Merge remote-tracking branch 'origin' into fix_map
2019-04-06 19:20:06 +02:00
mcbloch
31a731c1b8
do not query osm for 'None' locations
2019-04-06 19:05:52 +02:00
redfast00
909b3fc2e6
Remove Google Analytics
2019-04-05 23:31:36 +02:00
redfast00
b2c637b343
Serve own bootstrap
2019-04-05 23:26:57 +02:00
redfast00
34aca21a0b
Don't load over protocol-relative URI
2019-04-05 23:10:12 +02:00
mcbloch
83e4a10bbc
fix big ass close order issue #107
2019-04-05 18:24:24 +02:00
mcbloch
a3f0dffc30
move script to separate js file, add loging for bad adresses
2019-04-04 20:41:43 +02:00
mcbloch
3a5f31bfac
add database population script
2019-04-04 18:27:50 +02:00
Maxime
82d870e825
Merge pull request #95 from Kortika/feature/map
...
Feature/map
2019-04-04 17:51:00 +02:00
mcbloch
18c2008959
squash database migrations, update model to be equal to the server
2019-04-02 18:03:14 +02:00
Maxime
cd3e31d44b
Merge pull request #96 from ZeusWPI/date_time_update
...
Date time update.
Update looks good, merging.
2019-04-01 23:41:08 +02:00
Kobe Mertens
c32f2ac387
improved formatting of prices
2019-02-16 21:03:56 +01:00
klaasgoethals
71e16064d3
Added startdate and starttime on order page
2019-02-15 19:03:35 +01:00
klaasgoethals
4322f620d7
Show stoptime AND countdown on home and order page
2019-02-15 16:47:02 +01:00
Sitt Min Oo
a472efad7c
revert change to locations.html
2019-02-14 19:51:12 +01:00
Sitt Min Oo
e27d3977dd
removed copy paste check
2019-02-14 19:47:25 +01:00
Sitt Min Oo
ec91384e9a
added mousehovers for marker popups
2019-02-14 19:34:55 +01:00
Sitt Min Oo
eaf9ba8399
fixed name and address on popup
2019-02-14 19:17:02 +01:00
Sitt Min Oo
baf000eaab
edited db models to separate address and tele no. added map for locations
2019-02-14 18:45:24 +01:00
Sitt Min Oo
0a36eab231
added leaflet files and init maps.html
2019-02-14 16:43:29 +01:00
klaasgoethals
7d10608080
Logo's added
2019-02-13 22:31:52 +01:00
klaasgoethals
65b27f7668
Logo with red icon added
2019-02-13 22:28:16 +01:00
klaasgoethals
eece1844f2
Added favicon
2019-02-13 20:25:44 +01:00
debca79f39
Think this should work -- added primmadonna script
2019-01-23 18:11:10 +01:00
Jan-Pieter Baert
6ec294bcf1
forgot to update create_database and typo fix
2019-01-21 18:15:13 +01:00
Jan-Pieter Baert
e046d78d78
fixed formatting
2019-01-21 17:08:55 +01:00
Jan-Pieter Baert
c0a988d88d
added primadonna to take there
2019-01-21 17:01:02 +01:00
Jan-Pieter Baert
03bf116637
added primadonna from takeaway.com
2019-01-21 16:40:43 +01:00
Rien Maertens
0838c5c501
Add logo
2018-11-06 20:24:40 +01:00
Titouan Vervack
ac6659db2d
Sample keys available now!
2018-03-20 10:55:31 +01:00
Robbe Van Herck
b324d0a723
Added Choose for me button in order
2018-03-19 18:52:15 +01:00
Titouan Vervack
b611fe5961
Removed UTF-8 annotations, better count
2018-03-10 00:50:02 +01:00
Titouan Vervack
2e3ef91ec3
Count and display total # of orders
2018-03-09 00:59:33 +01:00
Titouan Vervack
f9b48969b2
Oops, python3
2018-03-09 00:59:14 +01:00
Titouan Vervack
628c5e55c5
Added total nr of orders to order.html
2018-03-08 23:23:40 +01:00
Titouan Vervack
8567d17bab
Use raw_input instead of input
2018-03-08 23:22:51 +01:00
Titouan Vervack
0ff7dca664
Set utf-8 encoding on required files
2018-03-08 23:22:32 +01:00
Feliciaan De Palmenaer
2208c44a8d
Fix crash in admin panel
2018-02-19 21:34:54 +01:00
Rien Maertens
4eda1e3f36
Use adams for oauth
2017-02-18 19:08:11 +01:00
Feliciaan De Palmenaer
6abd9614ab
Fix deprecations
2017-01-06 12:05:31 +01:00
Wout Schellaert
30a5d05362
Fix errors
2016-09-10 23:25:09 +02:00
Wout Schellaert
ba33a05f66
Add top4 products
2016-09-10 23:01:13 +02:00
Wout Schellaert
a6f71195fd
First data
2016-09-10 16:52:46 +02:00
Wout Schellaert
7ca0e36946
Small reformat
2016-09-10 15:49:52 +02:00
Wout Schellaert
38843173d5
Fix imports
2016-08-16 20:05:36 +02:00
Feliciaan De Palmenaer
ce0fe33c0e
Show prices for locations
...
For @procrat
2016-08-01 23:40:04 +02:00
Feliciaan De Palmenaer
6eeb7e8018
Remove prefixFix, no longer necessary
2016-02-18 11:26:41 +01:00
Rien Maertens
bea56b6a1e
Merge branch 'master' of github.com:ZeusWPI/Haldis
2016-02-09 01:09:39 +01:00
Rien Maertens
1ea873fe17
Added <!channel|@channel>
2016-02-09 01:07:34 +01:00
Feliciaan De Palmenaer
a289ad0697
Update models.py
2016-01-04 19:38:10 +01:00
Feliciaan De Palmenaer
59afcab907
OrderItem: repr to no longer show the product if it's deleted
2016-01-04 19:14:08 +01:00
Feliciaan De Palmenaer
3cf49c7634
Fix errbit
2015-11-29 15:19:37 +01:00
Feliciaan De Palmenaer
073f4bba11
Define id
2015-11-05 17:15:03 +01:00
Feliciaan De Palmenaer
b51fb2d6de
Haldis hot fix, anonymous users cannot delete stuff
2015-10-30 20:30:18 +01:00
Tom Naessens
48e314335f
Merge branch 'master' of github.com:ZeusWPI/Haldis
2015-08-18 21:19:47 +02:00
Tom Naessens
fcafbb68fa
Add search field to ProductAdmin
2015-08-18 21:19:41 +02:00
Stijn Seghers
47d4300e83
Product and paid status of an order can't be NULL
2015-08-18 20:47:49 +02:00
Feliciaan De Palmenaer
2497686abe
Better table Fixes #58
2015-06-24 22:24:21 +02:00
Feliciaan De Palmenaer
4de65752ec
Extras
2015-06-24 22:10:26 +02:00
Feliciaan De Palmenaer
a689dcfa1a
Fixing a little bug
2015-06-19 20:44:58 +02:00
Feliciaan De Palmenaer
f0a0d4f001
Show order stoptime
2015-06-18 14:39:42 +02:00
Feliciaan De Palmenaer
3d50650d8e
Add fancy debugtoolbar when debugging
2015-06-09 22:24:48 +02:00
Tom Naessens
71bfe073e6
Professionally revert a commit
2015-06-09 16:57:15 +02:00
Tom Naessens
19661989a7
#SWAG
2015-06-09 16:55:36 +02:00
Tom Naessens
c77f9150db
Add errbit integration
2015-06-09 16:47:11 +02:00
Feliciaan De Palmenaer
dd4754ec0d
Updated forms and orders
2015-06-09 13:46:37 +02:00
Feliciaan De Palmenaer
79d8a93267
After closing, payment status can still be changed
2015-06-05 14:27:55 +02:00
Feliciaan De Palmenaer
e50e97b428
Add initial profile
2015-06-05 11:39:34 +02:00
Feliciaan De Palmenaer
feb1bb0b69
Add link to form
2015-06-05 11:34:39 +02:00
Feliciaan De Palmenaer
47d46223aa
Added print.css and updated requirements, GA
2015-06-05 11:29:14 +02:00
Feliciaan De Palmenaer
46bf2a0cbb
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/38/post_to_slack
...
* 'master' of github.com:ZeusWPI/Foodbot:
Fixed bug for volunteering closes #44
Check if user is allowed to edit
Add paid indicator, fixes #19
spacing
Edit orders
Added phone number
Added alembic and flask-migrate to haldis
2015-06-04 22:57:42 +02:00
Feliciaan De Palmenaer
d6c29b9703
Fixed bug for volunteering closes #44
2015-06-04 22:37:00 +02:00
Feliciaan De Palmenaer
a5e231cc12
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator
...
* 'master' of github.com:ZeusWPI/Foodbot:
Check if user is allowed to edit
spacing
2015-06-04 22:08:04 +02:00
Feliciaan De Palmenaer
09c1bd5a19
Merge pull request #49 from ZeusWPI/feat/47/add_telephone_number
...
Feat/47/add telephone number
2015-06-04 22:02:49 +02:00
Feliciaan De Palmenaer
90b2954be6
Merge pull request #46 from ZeusWPI/add_db_migrations
...
Added alembic and flask-migrate to haldis (fixes #21 )
2015-06-04 21:50:56 +02:00
Feliciaan De Palmenaer
3d5f6ef1ae
Check if user is allowed to edit
2015-06-04 21:36:57 +02:00
Feliciaan De Palmenaer
39cfd77a7d
Merge branch 'master' of github.com:ZeusWPI/Foodbot into feat/19/paid-indicator
...
* 'master' of github.com:ZeusWPI/Foodbot:
Edit orders
2015-06-04 21:24:13 +02:00
Feliciaan De Palmenaer
69eb22c506
Add paid indicator, fixes #19
2015-06-04 21:20:38 +02:00
Feliciaan De Palmenaer
333a7ec5ec
spacing
2015-06-04 19:13:09 +02:00
Feliciaan De Palmenaer
50a8714c51
Edit orders
2015-06-04 19:11:08 +02:00
Feliciaan De Palmenaer
24d1b7c094
Added phone number
2015-06-04 18:45:59 +02:00
Feliciaan De Palmenaer
9b9eec4e63
Post to slack
2015-06-04 18:33:17 +02:00
Feliciaan De Palmenaer
2d6640b8b9
Added alembic and flask-migrate to haldis
2015-06-04 17:29:37 +02:00
Wout Schellaert
3aa16e2690
Merge branch 'master' of https://github.com/ZeusWPI/Foodbot
2015-05-13 13:35:14 +02:00
Wout Schellaert
111944619f
Package restructure and small create_database changes
2015-05-13 13:34:32 +02:00
Tom Naessens
76ec291d02
Fix #35
2015-04-05 13:08:02 +02:00
Wout Schellaert
81913d2d1b
Refactored create_database, put every addition in seperate file
2015-04-04 14:11:55 +02:00
Bart Mesuere
271e53dcae
punctuation is overrated
2015-04-03 21:04:10 +02:00
Feliciaan De Palmenaer
7436bd37e6
Merge pull request #34 from Donvittorio/master
...
find . -type f -exec sed -i s/James/Haldis/g {} \;
2015-04-03 20:30:03 +02:00
Lorin Werthen
7a82ad13cd
#stopJAMES2k15
2015-04-03 19:11:07 +02:00
Lorin Werthen
e3daf80ff6
lower case james
2015-04-03 18:51:19 +02:00
Feliciaan De Palmenaer
da73af3b19
Add nullable false to order
2015-04-03 18:45:33 +02:00
Lorin Werthen
113fbe98b9
find . -type f -exec sed -i s/James/Haldis/g {} \;
2015-04-03 18:41:44 +02:00
Feliciaan De Palmenaer
037b7ee934
why was this added?
...
How the fuck do you type this.
2015-04-03 18:16:01 +02:00
Feliciaan De Palmenaer
e1b35de786
fixing the db script
2015-04-03 18:11:39 +02:00
Feliciaan De Palmenaer
8a975d5d44
Modify the models to stop allowing certain fields to be null
2015-04-03 14:28:28 +02:00
Feliciaan De Palmenaer
4c94953059
Hopefully lets werkzeug log
2015-04-02 21:01:18 +02:00
Feliciaan De Palmenaer
85790c0a45
Adds placeholder to name field, fixes #25
2015-04-02 20:56:31 +02:00
James
f12c7b4849
Merge branch 'master' of github.com:ZeusWPI/James
2015-04-02 13:00:03 +02:00
James
acc389082b
Put things like they were
2015-04-02 12:59:55 +02:00
