reynir/bornhack-website
1
0
Fork 0
Code Issues Pull requests 1 Releases Wiki Activity
2009 commits 2 branches 0 tags 164 MiB
Commit graph

55 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 00af109e2f
add flake8 and isort to pre-commit config, make flake8 and isort happy (#441) 
* add flake8 to pre-commit config, and fixup many things to make flake8 happy

* add isort and sort all imports, add to pre-commit and requirements
 2020-02-12 13:10:41 +01:00
Thomas Steen Rasmussen 377a77143c black everything, working on #355 2020-02-07 18:46:34 +01:00
Víðir Valberg Guðmundsson 20f380dfd6
Planked code form betterforms. (Aka django 3.0 upgrade) (#436) 
* Bump django from 2.2.8 to 3.0.2 in /src/requirements

Bumps [django](https://github.com/django/django) from 2.2.8 to 3.0.2.
- [Release notes](https://github.com/django/django/releases)
- [Commits](https://github.com/django/django/compare/2.2.8...3.0.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Planked code form betterforms.

* Remove betterform from requirements.

* Try with master of django-allauth-2fa.

* Use static templatetag library, staticfiles is gone.

* Use newly released django-allauth-2fa 0.8 instead of git url.

* Django 3.0.3 is out.

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
 2020-02-07 18:21:34 +01:00
Víðir Valberg Guðmundsson 30e1049dbc Use the right comment. 2019-08-11 15:59:02 +02:00
Víðir Valberg Guðmundsson b5e1623cb7 Adding missing th 2019-08-11 13:30:28 +02:00
Víðir Valberg Guðmundsson 78ddb33fcb More to the shop ticket list. 2019-08-11 13:26:11 +02:00
Víðir Valberg Guðmundsson 814cbb4af5 Add a list over shop tickets. 2019-08-11 13:18:19 +02:00
Florian Klink aa252c3d11 info_desk/scan.html: show quantity if it's a ShopTicket and single_ticket_per_product is set 
fixes #377.
 2019-08-08 21:07:57 +02:00
Víðir Valberg Guðmundsson 9dd6b0b23c Fix scanning stuff. 2019-08-08 13:06:24 +02:00
Víðir Valberg Guðmundsson 470115a0d9 Search for orders and mark them as paid. 2019-08-08 12:43:59 +02:00
Víðir Valberg Guðmundsson 94a142f6b9 Polishing finding tickets by scanning and marking stuff as handed out/checked in. 2019-08-04 00:18:52 +02:00
Víðir Valberg Guðmundsson 70984ab40f Remove unused template. 2019-07-29 21:26:31 +02:00
Víðir Valberg Guðmundsson cad3b21fc4 handed_out -> ticket_generated 2019-07-18 21:20:29 +02:00
Víðir Valberg Guðmundsson b1b810f165 Rename handed_out field on ORP to ticket_generated. Rename checked_in on tickets to used. Add save token migration. 2019-07-18 21:04:49 +02:00
Víðir Valberg Guðmundsson 5911d2042b Initial work on a more lean infodesk. 2019-07-17 22:02:47 +02:00
Víðir Valberg Guðmundsson bf2f0c7898 Blackness. 2019-06-16 14:32:24 +02:00
Thomas Steen Rasmussen d65b57e651 set invoice_date and creditor for expenses for reimbursements 2019-04-07 17:28:56 +02:00
Thomas Steen Rasmussen e6f5accaa6 add currency, show 0 DKK instead of None, enable jquery datatables for chain table in backoffice 2019-03-30 11:16:24 +01:00
Thomas Steen Rasmussen 30a687181e change backoffice chain list to a table 2019-03-30 11:12:02 +01:00
Thomas Steen Rasmussen 78e68a2299 make the important text bold 2019-03-30 11:01:49 +01:00
Thomas Steen Rasmussen ad256b0df4 add admin links to expense and revenue list and detail templates. Do we have a nicer way of linking to stuff in the admin? 2019-03-30 07:21:11 +01:00
Thomas Steen Rasmussen 3e79567713 add chain&credebtor views to backoffice 2019-03-30 06:54:45 +01:00
Thomas Steen Rasmussen b8fb36d346 add reimbursement_user to description of expense 2019-01-20 17:15:33 +01:00
Thomas Steen Rasmussen a057bd6464
Revenue and economy revamp (#285) 
* rework economy stuff, add revenue model, unfinished code!

* part 2 of economy overhaul. add views for dealing with revenue. rework expense views.
 2018-11-20 17:12:32 +01:00
Thomas Steen Rasmussen 794e905050 show both user and reimbursement_user for reimbursements 2018-09-13 14:09:17 +02:00
Thomas Steen Rasmussen ffe2fc056a show the correct name when creating reimbursement 2018-09-13 13:53:49 +02:00
Thomas Steen Rasmussen ac54e4cb16 show unapproved expenses seperately in backoffice, crosslink expenses and reimbursements in list and detailviews on main page and in backoffice 2018-08-30 19:32:23 +02:00
Thomas Steen Rasmussen fc3a993547 do not show the expense which represents the actual reimbursement, and do not count it towards the total 2018-08-30 12:39:43 +02:00
Thomas Steen Rasmussen 8b3e00d9d4 make it impossible for users to approve expenses they submitted themselves 2018-08-30 01:35:37 +02:00
Víðir Valberg Guðmundsson b2fa1dc92c WIP Reimbursement feature (#278) 
* Almost done, need the send to economic part.

* Add a way to approve/reject an reimbursement and send mails accordingly.

* finish work on custom invoice address

* add textfield notes to Order for internal orga notes about the order

* Almost done, need the send to economic part.

* Add a way to approve/reject an reimbursement and send mails accordingly.

* economy commit of doom.. replace reimbursement app with an economy app, add Expense and Reimbursement models, add management of expenses and reimbursements to backoffice. Rework and cleanup permissions stuff, add Camp.Permissions pseudo model to hold all our non-model permissions. still experimental, expect rough edges, but basic functionality should work.
 2018-08-30 00:52:32 +02:00
Víðir Valberg Guðmundsson 84fff61ddb Forgot something. 2018-08-18 16:55:33 +02:00
Víðir Valberg Guðmundsson f15f878508 Add a proposal edit permission. 2018-08-18 16:37:20 +02:00
Víðir Valberg Guðmundsson 1af78e6ff7 Add email to SpeakerProposal and Speaker models. 2018-08-18 14:11:30 +02:00
Víðir Valberg Guðmundsson 83fa993ed1 Show SpeakerProposal email. 2018-08-18 13:36:11 +02:00
Víðir Valberg Guðmundsson 9fd5dc27bf User should be superuser to access complete backoffice. 2018-08-15 23:47:25 +02:00
Víðir Valberg Guðmundsson ccfb3d13d0 Fix access to backoffice with infodesk permissions. 2018-08-15 20:53:54 +02:00
Thomas Steen Rasmussen 458ce45198 add village gear sections to backoffice 2018-08-05 09:29:58 +02:00
Stephan Telling d03af1c11e
use django.utils timezone rather than datetime 2018-08-01 12:25:43 +02:00
Stephan Telling e04038e4a0
add backoffice pages for merchandise orders and what merchandise to order 2018-08-01 11:50:16 +02:00
Stephan Telling e2ef635abc
overwrite get_queryset on ProductHandoutView and delete unused imports 2018-08-01 11:33:36 +02:00
Thomas Steen Rasmussen 2305416461 only show tables when at least one proposal is found 2018-06-03 23:24:50 +02:00
Thomas Steen Rasmussen 3180ec457d switch backoffice to use the regular CampViewMixin 2018-06-03 18:33:51 +02:00
Thomas Steen Rasmussen 811b8171af working on #232, this commit changes backoffice to be camp specific (although many of the actual functions are camp independent). Add backoffice/mixins.py with BackofficeViewMixin to keep it DRY. Add backoffice views to manage proposals. Move SpeakerProposal and EventProposal detail template to includes to they can be used from backoffice. Rename our commonmark templatetags so the names are more intuitive. 2018-06-03 15:34:04 +02:00
Thomas Steen Rasmussen 18c33383b7 add url support for speakerproposals and eventproposals, including new models Url and UrlType. Also switch to Django 2.0 path() syntax in various urls.py files getting rid of a lot of ugly regex \o/ 2018-05-23 23:28:27 +02:00
Thomas Steen Rasmussen 9b2e164ddb add a backoffice view to approve public credit names, fixes #217 2018-04-22 08:28:46 +02:00
Víðir Valberg Guðmundsson ff758b15ff Initial work on uprading. 2018-04-03 18:44:10 +02:00
Thomas Steen Rasmussen 477177a936 remove unneeded imports from backoffice app 2018-03-04 14:30:27 +01:00
Thomas Steen Rasmussen a0c646e1cf polish backoffice part 2 2017-12-12 22:48:45 +01:00
Thomas Steen Rasmussen 8595377066 rework backoffice part 1; ticket checkin and badge handout views still need some work 2017-12-12 21:57:17 +01:00
Thomas Steen Rasmussen 0806ff138e typo 2017-12-04 10:49:24 +01:00