Víðir Valberg Guðmundsson
e2404b1778
Merge pull request #372 from bornhack/dependabot/pip/src/requirements/pytz-2019.2
...
Bump pytz from 2019.1 to 2019.2 in /src/requirements
2019-08-09 10:26:27 +02:00
Víðir Valberg Guðmundsson
8465190e75
Merge pull request #374 from bornhack/dependabot/pip/src/requirements/oauthlib-3.1.0
...
Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements
2019-08-09 10:25:50 +02:00
Víðir Valberg Guðmundsson
db4ff33b87
Merge pull request #376 from bornhack/sponsors
...
Added sponsor logo
2019-08-09 10:25:26 +02:00
Víðir Valberg Guðmundsson
6f55bda732
Merge pull request #379 from flokli/qrcode-caption
...
qrcode: move caption before qrcode
2019-08-09 10:20:02 +02:00
807579ec5d
qrcode: move caption before qrcode
...
This allows reading the qr code description on small screens (like from
the laptop at the infodesk) without scrolling down all the time ;-)
2019-08-08 21:13:25 +02:00
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
95e04b3741
ShopTicket: use @property instead of get_orp() method
...
This looks much more natural when being used from inside templates.
2019-08-08 21:06:44 +02:00
b72101ab70
Added sponsor logo
...
Sponsor: e-tilbudsavis
2019-08-08 16:58: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
59dec88c04
Fix subject.
2019-08-08 11:53:46 +02:00
Víðir Valberg Guðmundsson
ddd5b61cd1
Templates fixes.
2019-08-08 11:38:08 +02:00
8b0df39d13
missing logger
2019-08-08 11:24:44 +02:00
d1c3535c7e
read file as binary
2019-08-08 11:21:53 +02:00
f594815685
use .read() so we pass the actual bytes from the file
2019-08-08 11:12:28 +02:00
Víðir Valberg Guðmundsson
17ff6efb8f
Use list_display instead.
2019-08-08 11:11:17 +02:00
Víðir Valberg Guðmundsson
cd66b5fd5d
More email stuff.
2019-08-08 11:09:25 +02:00
Víðir Valberg Guðmundsson
4def56ad92
Adding outgoingemailadmin.
2019-08-08 11:03:46 +02:00
Víðir Valberg Guðmundsson
89d7d95f78
Adding outgoingemailadmin.
2019-08-08 11:01:09 +02:00
0be95742a2
missing imports and other small fixes
2019-08-08 10:55:38 +02:00
7f95f41055
email sponsor tickets one by one
2019-08-08 10:44:37 +02:00
Víðir Valberg Guðmundsson
38b7cae7d7
Fix missing colon.
2019-08-08 10:28:02 +02:00
Víðir Valberg Guðmundsson
2ba70c692f
Remove multiple attachment code - was not even done
2019-08-08 10:26:47 +02:00
Víðir Valberg Guðmundsson
2751b92cb8
Find the right sponsors.
2019-08-08 10:03:27 +02:00
Víðir Valberg Guðmundsson
74a9e9df71
Check if tickets are generated. Also show if tickets are generated in the admin.
2019-08-08 09:55:06 +02:00
ac19a6db4b
add management command to email sponsor tickets
2019-08-08 09:44:47 +02:00
Víðir Valberg Guðmundsson
3600ed6190
Third times the charm?
2019-08-07 23:33:56 +02:00
Víðir Valberg Guðmundsson
c088594e74
Actually add more attachments
2019-08-07 23:29:13 +02:00
Víðir Valberg Guðmundsson
ba23234a15
Multiple attachments on mails
2019-08-07 23:25:52 +02:00
ec2247a9eb
Bump oauthlib from 3.0.2 to 3.1.0 in /src/requirements
...
Bumps [oauthlib](https://github.com/oauthlib/oauthlib ) from 3.0.2 to 3.1.0.
- [Release notes](https://github.com/oauthlib/oauthlib/releases )
- [Changelog](https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst )
- [Commits](https://github.com/oauthlib/oauthlib/compare/v3.0.2...v3.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-07 05:45:00 +00:00
Víðir Valberg Guðmundsson
943dcf8abd
Add Mikjaer Studios logo.
2019-08-06 12:07:41 +02:00
540bfdcbac
Added more sponsor logos
...
Added Umbraco, Dansk Magisterforening and zibra group
2019-08-06 11:51:12 +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
7be4aa6545
Ticket tokens and badge tokens can be blank since we generate them on save. Also use the correct method for generating badge tokens, and do a small regression test for that.
2019-08-03 22:53:01 +02:00
Víðir Valberg Guðmundsson
b842bb99e7
Upgrade django to 2.2.4
2019-08-01 20:26:48 +02:00
Víðir Valberg Guðmundsson
08d0dd7161
Make provided laptop default=True.
2019-08-01 09:34:00 +02:00
dbd7a30e20
Bump pytz from 2019.1 to 2019.2 in /src/requirements
...
Bumps [pytz](https://github.com/stub42/pytz ) from 2019.1 to 2019.2.
- [Release notes](https://github.com/stub42/pytz/releases )
- [Commits](https://github.com/stub42/pytz/compare/release_2019.1...release_2019.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-01 05:38:56 +00:00
Víðir Valberg Guðmundsson
b89f09105c
Make team guide only visible for approved members. Fix #369 .
2019-07-31 21:14:17 +02:00
Víðir Valberg Guðmundsson
80793d3d1d
Add "use_provided_speaker_laptop" to eventproposal_detail.html. Also correct a typo.
2019-07-31 20:22:11 +02:00
Víðir Valberg Guðmundsson
5748f9c1ee
Fix tests - I think.
2019-07-31 20:12:58 +02:00
Víðir Valberg Guðmundsson
7236462023
Adding "use_provided_speaker_laptop" to EventProposal.
2019-07-31 12:47:38 +02:00
Víðir Valberg Guðmundsson
f1ce253d4a
Fix some stuff for new tickets. Also fix bootstrap-dev script.
2019-07-30 23:38:03 +02:00
Víðir Valberg Guðmundsson
7dc82ee4ee
Merge pull request #370 from bornhack/ticket_type_create_single_ticket_option
...
Add "single_ticket_per_product" boolean to ticket types
2019-07-30 22:58:36 +02:00
Víðir Valberg Guðmundsson
9f251c85a6
Merge pull request #367 from bornhack/dependabot/pip/src/requirements/ipython-7.7.0
...
Bump ipython from 7.6.1 to 7.7.0 in /src/requirements
2019-07-30 22:53:53 +02:00
Víðir Valberg Guðmundsson
0373816355
Add "single_ticket_per_product" boolean to ticket types so we can control ticket creation.
2019-07-30 22:51:01 +02:00
c8a4eb1f78
Bump coverage from 4.5.3 to 4.5.4 in /src/requirements
...
Bumps [coverage](https://github.com/nedbat/coveragepy ) from 4.5.3 to 4.5.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases )
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst )
- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-4.5.3...coverage-4.5.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-30 05:38:22 +00:00
024f5dd093
this was probably what it was meant to be
2019-07-30 01:46:27 +02:00
Víðir Valberg Guðmundsson
2c8f04a9a0
Merge pull request #361 from bornhack/backoffice_invoice_scanning
...
Save ticket tokens to db. Rename some fields to make using tickets more sane. Initial scanning of tickets.
2019-07-29 22:41:37 +02:00
Víðir Valberg Guðmundsson
55860efb8c
Add create tickets action for orders.
2019-07-29 22:32:49 +02:00
Víðir Valberg Guðmundsson
7a2127d1ff
Make it easier to set ticket type for products.
2019-07-29 21:31:07 +02:00
Víðir Valberg Guðmundsson
70984ab40f
Remove unused template.
2019-07-29 21:26:31 +02:00
Víðir Valberg Guðmundsson
c954363f3e
Merge branch 'master' into backoffice_invoice_scanning
2019-07-29 21:17:27 +02:00
Víðir Valberg Guðmundsson
5d3cfe6210
Order tickets in account page.
2019-07-29 21:16:48 +02:00
444aa59159
s/name/title/g
2019-07-29 17:00:25 +02:00
d9fa973e4b
Bump ipython from 7.6.1 to 7.7.0 in /src/requirements
...
Bumps [ipython](https://github.com/ipython/ipython ) from 7.6.1 to 7.7.0.
- [Release notes](https://github.com/ipython/ipython/releases )
- [Commits](https://github.com/ipython/ipython/compare/7.6.1...7.7.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-29 05:56:22 +00:00
62db982c59
Added higer resolution sponsor logos ( #366 )
...
* Added higer resolution sponsor logos
Better for higher DPI monitors
* Added Siteimprove logo
2019-07-28 19:51:30 +02:00
Víðir Valberg Guðmundsson
5eec38d344
It is BornHack with a capital H.
2019-07-26 14:52:06 +02:00
Víðir Valberg Guðmundsson
b7feb96c9b
Adding a badge token to tickets that grant that.
2019-07-24 21:08:36 +02:00
Víðir Valberg Guðmundsson
f0bfb42ca8
Merge pull request #363 from bornhack/dependabot/pip/src/requirements/django-extensions-2.2.1
...
Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements
2019-07-23 22:34:29 +02:00
Víðir Valberg Guðmundsson
0a67177e5f
Merge pull request #351 from bornhack/dependabot/pip/src/requirements/pillow-6.1.0
...
Bump pillow from 6.0.0 to 6.1.0 in /src/requirements
2019-07-23 22:02:34 +02:00
5dc55d03a7
Bump django-extensions from 2.1.9 to 2.2.1 in /src/requirements
...
Bumps [django-extensions](https://github.com/django-extensions/django-extensions ) from 2.1.9 to 2.2.1.
- [Release notes](https://github.com/django-extensions/django-extensions/releases )
- [Changelog](https://github.com/django-extensions/django-extensions/blob/master/CHANGELOG.md )
- [Commits](https://github.com/django-extensions/django-extensions/compare/2.1.9...2.2.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-23 20:02:07 +00:00
Víðir Valberg Guðmundsson
04d858adf3
Merge branch 'master' into backoffice_invoice_scanning
2019-07-23 21:55:31 +02:00
Víðir Valberg Guðmundsson
8beb90a824
Only make it sticky when there is space.
2019-07-23 21:50:21 +02:00
Víðir Valberg Guðmundsson
ee00ae3ee5
Make info page more "browsable".
2019-07-23 21:43:09 +02:00
Víðir Valberg Guðmundsson
2627055077
Fix tests.
2019-07-23 21:15:19 +02:00
ca0ed4fb27
redirect back to shop after adding something to an order, and make link to shopping cart bigger
2019-07-21 16:27:25 +02:00
8de597d5e5
better wording on bank transfer page
2019-07-21 15:55:14 +02:00
d276032389
better subjects for content team emails, and add quotes in body
2019-07-21 15:26:57 +02:00
413f6bb276
Added new pictures for the frontpages of camp 2019, 2020 and 2021. ( #362 )
2019-07-21 14:56:37 +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
9fc13e43bc
make some more room on the proforma invoice because multipage pdf generation is fucked right now
2019-07-18 11:09:25 +02:00
Víðir Valberg Guðmundsson
ceb20bc24b
Adding a button with link to shop on the 2019 frontpage.
2019-07-18 10:03:08 +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
0df4395787
Merge pull request #357 from bornhack/dependabot/pip/src/requirements/django-bootstrap3-11.1.0
...
Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements
2019-07-17 08:57:08 +02:00
Víðir Valberg Guðmundsson
f9b388e23b
Merge pull request #358 from bornhack/dependabot/pip/src/requirements/graphene-django-2.4.0
...
Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements
2019-07-17 08:56:31 +02:00
Víðir Valberg Guðmundsson
9d9fe57266
Merge pull request #359 from bornhack/sponsors
...
Added new sponsor logos
2019-07-17 08:56:09 +02:00
879a62d4fa
Bump django-filter from 2.1.0 to 2.2.0 in /src/requirements
...
Bumps [django-filter](https://github.com/carltongibson/django-filter ) from 2.1.0 to 2.2.0.
- [Release notes](https://github.com/carltongibson/django-filter/releases )
- [Changelog](https://github.com/carltongibson/django-filter/blob/master/CHANGES.rst )
- [Commits](https://github.com/carltongibson/django-filter/compare/2.1.0...2.2.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-17 05:36:11 +00:00
70a7157734
Added new sponsor logos
...
- SiLabs
- Dansk Magisterforening
2019-07-16 12:07:51 +02:00
939d17c8bd
use event_type from last event from the loop, fix backtrace when updating a speakerproposal which has more than one eventproposal of the same type
2019-07-16 10:35:19 +02:00
0c53ae33c8
Bump graphene-django from 2.3.2 to 2.4.0 in /src/requirements
...
Bumps [graphene-django](https://github.com/graphql-python/graphene-django ) from 2.3.2 to 2.4.0.
- [Release notes](https://github.com/graphql-python/graphene-django/releases )
- [Commits](https://github.com/graphql-python/graphene-django/compare/v2.3.2...v2.4.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-15 06:00:24 +00:00
5fa07f130a
add author field to rideshare, add help_text on all rideshare fields, fixup the rideshare templates a bit
2019-07-13 09:27:14 +02:00
2cad801769
make rideshare table sortable
2019-07-11 21:08:46 +02:00
9193ebcae6
pull button right
2019-07-11 20:56:09 +02:00
e4f6670c45
fixup rideshare a bit
2019-07-11 20:48:14 +02:00
881b0f4cf4
add the word Included to the VAT line on customorder invoices
2019-07-11 08:02:04 +02:00
83753cbcee
Bump django-bootstrap3 from 11.0.0 to 11.1.0 in /src/requirements
...
Bumps [django-bootstrap3](https://github.com/dyve/django-bootstrap3 ) from 11.0.0 to 11.1.0.
- [Release notes](https://github.com/dyve/django-bootstrap3/releases )
- [Changelog](https://github.com/dyve/django-bootstrap3/blob/master/HISTORY.rst )
- [Commits](https://github.com/dyve/django-bootstrap3/compare/11.0.0...11.1.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-07-10 05:39:05 +00:00
Víðir Valberg Guðmundsson
24c95a82fd
Don't empty out comment and invoice address when closing order.
2019-07-09 21:03:56 +02:00
5359ca6a35
add djangodenmark sponsor logo
2019-07-09 14:05:27 +02:00
928ab96437
also generate for instances where pdf is None (happens after instantiating a new)
2019-07-09 11:46:25 +02:00
Víðir Valberg Guðmundsson
fa855fb69e
Add cancel and proforma buttons to review and pay template.
2019-07-09 10:59:03 +02:00
Víðir Valberg Guðmundsson
3ba33649cb
Redirect to review if the order is closed but not paid. Also remove the option to remove products when the order is closed.
2019-07-09 10:46:30 +02:00
effd900b62
add proforma invoice support
2019-07-09 10:38:14 +02:00
Víðir Valberg Guðmundsson
fef09baa3d
Make review and pay button save changes made to order. Also move shop related templates back into shop app.
2019-07-09 10:07:00 +02:00
Víðir Valberg Guðmundsson
9adc2a878f
Add "review and pay" as a step in order payment. ( #356 )
2019-07-09 00:29:18 +02:00
Víðir Valberg Guðmundsson
1f2652d134
WIP Refactor of bootstrap-devsite ( #234 )
...
* Remove some repitition to make adding stuff like camps a bit better.
* added camp colours and changed to use example.com addresses
* tweaks to get factory boy to correctly save the profiles
also changed to use django specific subclass of factory boy
* Changed structure and added a few more models
Structure changed to have methods for each category, that are then called for a better overview.
Also:
- Added SponsorTiers and Sponsors
- Added Tokens and TokenFinds
- Added 2021
- Uses faker for longer descriptions
* Added blackness to new bootstrap script
2019-07-08 21:01:20 +02:00
Víðir Valberg Guðmundsson
cad6c3f0d6
Merge pull request #350 from bornhack/dependabot/pip/src/requirements/ipython-7.6.1
...
Bump ipython from 7.5.0 to 7.6.1 in /src/requirements
2019-07-08 16:03:21 +02:00
Víðir Valberg Guðmundsson
d398dc44f7
Merge pull request #352 from bornhack/dependabot/pip/src/requirements/oauthlib-3.0.2
...
Bump oauthlib from 3.0.1 to 3.0.2 in /src/requirements
2019-07-08 16:03:04 +02:00
Víðir Valberg Guðmundsson
f2961505a8
Merge pull request #349 from bornhack/dependabot/pip/src/requirements/django-2.2.3
...
Bump django from 2.2.2 to 2.2.3 in /src/requirements
2019-07-08 16:01:53 +02:00
4656d5b6a8
Smaller logo in letterhead ( #353 )
...
To prevent logo from overlapping test on eg. invoices
2019-07-08 15:21:31 +02:00
Víðir Valberg Guðmundsson
Florian Klink
Thomas Flummer
Thomas Steen Rasmussen
dependabot-preview[bot]
Thomas Flummer
lgandersen