Commit graph

212 commits

Author SHA1 Message Date
Thomas Steen Rasmussen 7d4ad533f7 remove oooold typo 2021-08-01 18:12:58 +02:00
Thomas Steen Rasmussen 792fc2bfc0 unbreak refund order function, while here show on order list and detail pages if an order is refunded, also fix tickettype detail stats so they dont include refunded orders 2021-08-01 17:45:37 +02:00
Thomas Steen Rasmussen 517f29940a remove FK from ShopTicket to Order and replace with an FK to OrderProductRelation 2021-07-29 09:03:52 +02:00
Thomas Steen Rasmussen a494bdfd4b backoffice: add totals to the bottom of ticket type details table 2021-07-26 18:09:11 +02:00
Thomas Steen Rasmussen 02b796e90b rename to paid_order_count 2021-07-22 08:06:43 +02:00
Thomas Steen Rasmussen f61d0b85e8 use Count() to get the number of paid orders for the product 2021-07-22 08:02:28 +02:00
Thomas Steen Rasmussen 21b479e253 only count paid orders 2021-07-22 07:12:13 +02:00
Thomas Steen Rasmussen 41467447a8 always mark OPR as ticket_generated=True 2021-07-22 00:35:07 +02:00
Thomas Steen Rasmussen 0e0374b577 calculate profit in the database, skip the margin calculation for now 2021-07-22 00:07:30 +02:00
Thomas Steen Rasmussen ec816a5c11 realise there can be more than one thing on each ticket, fix 2021-07-21 23:14:48 +02:00
Thomas Steen Rasmussen 0973709ef0 fix profit margin calculation 2021-07-21 21:36:50 +02:00
Thomas Steen Rasmussen 5c410939ed add detailed ticket stats view 2021-07-21 21:29:55 +02:00
Thomas Steen Rasmussen a8c4894b8f brush the dust off of the event system, add a new eventtype ticket_stats, add a management command to post ticket stats to irc, add a backoffice view showing ticket stats 2021-07-21 18:53:53 +02:00
Thomas Steen Rasmussen 01687ea11a run pre-commit --all-files, it's been a while since last time 2021-07-19 15:06:10 +02:00
Thomas Steen Rasmussen 952052b2ff enable save_as in ProductAdmin 2021-05-25 17:38:28 +02:00
Thomas Steen Rasmussen fbda2b4b53 more work on backoffice economy stuff, chains and credebtors section now only shows expenses and revenues for the current camp, thanks to some ORM foo; while here add a cost and a comment field to the Product table, and fix a bug in bootstrap_devsite and a few nags to make new flake8 happy 2020-10-17 02:35:12 +02:00
Thomas Steen Rasmussen 5b5a400027 fix link in proforma invoice 2020-08-16 14:38:48 +02:00
Thomas Steen Rasmussen 7f05372bb9 rename cash payment method to 'in person' - it could also be called izettle, but lets keep the brandname out of it :) Orders with payment method IN_PERSON can be paid at the infodesk with izettle. While here update some text on the checkout page and update icons to FA 2020-08-12 17:49:24 +02:00
Thomas Steen Rasmussen 64b8f0ee10 the old NullBooleanField defaulted to blank=True, BooleanField with null=True does not, TIL 2020-08-11 10:16:53 +02:00
Thomas Steen Rasmussen db20fd7b68 fix django3.1 compatibility 2020-08-11 02:35:18 +02:00
Thomas Steen Rasmussen 26e471ef2a only allow the order review view for unpaid orders, fixes #571 2020-08-03 23:59:53 +02:00
Thomas Steen Rasmussen 25de8984d7 add some more bank info, fixes #605 2020-08-03 23:55:50 +02:00
Thomas Steen Rasmussen d83428b2b0 forgot to remove camp kwarg from add_creditnote_email 2020-06-27 16:04:05 +02:00
Thomas Steen Rasmussen bd53f64208 add responsible_team to most emails, while here run pre-commit run --all-files 2020-06-22 17:25:08 +02:00
Thomas Flummer 1c88ed8073
Added title blocks to templates that did not have one (#511)
In most cases this mirrors the primary header on the page, but in some cases the title is simplified and/or nested to reflect the depth of the current page

Co-authored-by: Thomas Steen Rasmussen <tykling@bornhack.org>
2020-06-03 21:30:10 +02:00
Thomas Steen Rasmussen eff4bfaf1c
SpeakerAvailability, EventSession, autoscheduler, and other goodies (#497)
* fix old bug where the get_days() method would return the wrong number of days, this was not discovered because our bootstrap script has been creating 9 day camps instead of 8 day camps (this has been fixed in a different commit)

* remove stray debug print

* output camp days in local timezone (CEST usually), not UTC

* speakeravailability commit of doom, originally intended for #385 but goes a bit further than that. Adds SpeakerAvailability and EventSession models, and models for the new autoscheduler. Update bootstrap script and more. New conference_autoscheduler dependency. Work in progress, but ready for playing around!

* add conference-scheduler to requirements

* rework migrations, work at bit with postgres range fields and bounds, change how speakeravailability is saved (continuous ranges instead of 1 hour chunks), add tests for utils/range_fields.py including adding hypothesis to requirements/dev.txt, add a test which runs our bootstrap script

* catch name collision in the right place, and load missing postgres extension in the migration

* add some verbosity to see what the travis issue might be

* manually create btree_gist extension in postgres, not sure why the BtreeGistExtension() operation in program/migrations/0085... isn't working in travis?

* create extension in the right database maybe

* lets try this then

* ok so the problem is not that the btree_gist extension isn't getting loaded, the problem is that GIST indexes do not work with uuid fields in postgres 9.6, lets take another stab at getting pg10 with postgis to work with in travis

* lets try normal socket connection

* add SPEAKER_AVAILABILITY_DAYCHUNK_HOURS=3 to travis environment_settings.py

* rework migrations, change so an autoschedule can work with multiple eventtypes, change AutoSlot model to use a DateTimeRangeField so we can use the database for more efficient lookups, add 'conflicts' self m2m for EventLocation to indicate when a room conflicts with another room, add a support_autoscheduling bool to EventType, add workshops to bootstrap script, add timing output to bootstrap script

* update README a bit, move some functionality to model methods, update jquery and jquery.datatables, include datatables in base.html instead of in each page, start adding backoffice schedule management views (unfinished), yolo commit so I can show valberg something

* Switch to a more simple way of using the autoscheduler, meaning we can remove the whole autoscheduler app and all models. All autoscheduler code is now in program/autoscheduler.py and a bit in backoffice views. Add more backoffice CRUD views for schedule management. Add datatables moment.js plugin to help table sorting of dates. Add Speaker{Proposal}EventConflict model to allow speakers to inform us which events they want to attend so we dont schedule them at the same time. Add EventTag model. New models not hooked up to anything yet.

* handle cases where there is no solution without failing, also dont return anything here

* wrong block kiddo

* switch from EventInstance to EventSlot as the way we schedule events. Finish backoffice content team views (mostly). Many small changes. Prod will need data migration of EventInstances -> EventSlots when the time comes.

* keep speakeravailability stuff a bit more DRY by using the AvailabilityMatrixViewMixin everywhere, add event_duration_minutes to EventSession create/update form, reverse the order we delete/create EventSlot objects when updating an EventSession

* go through all views, fix various little bugs here and there

* add missing migration

* add django-taggit, add tags for Events, add tags in bootstrap script, make AutoScheduler use tags. Add tags in forms and templates.

* fix taggit entry in requirements

* Fix our iCal view: Add uuid field to Event, add uuid property to EventSlot which calculates a consitent UUID for an event at a start time at a location. Use this as the schedule uuid. While here fix so our iCal export is valid, a few fields were missing, the iCal file now validates 100% OK.

* fix our FRAB xml export view

* comment the EventSlot.uuid property better

* typo in comment

* language

Co-Authored-By: Benjamin Balder Bach <benjamin@overtag.dk>

* language

Co-Authored-By: Benjamin Balder Bach <benjamin@overtag.dk>

* Update src/backoffice/templates/autoschedule_debug_events.html

Co-Authored-By: Benjamin Balder Bach <benjamin@overtag.dk>

* add a field to make this form look less weird. No difference in functionality.

* remove stray print and refactor this form init a bit

* fix ScheduleView

* only show slots where all speakers are available when scheduling events manually in backoffice

* make event list sortable by video recording column

* update description on {speaker|event}proposal models reason field

* remove badge showing number of scheduled slots for each event in backoffice eventlist. it was unclear what the number meant and it doesn't really fit

* remember to consider events in the same location when deciding whether a slot is available or not

* add is_available() method to EventLocation, add clean_location() method to EventSlot, call it from EventSlot.clean(), update a bit of text in eventslotunschedule template

* fix EventSession.get_available_slots() so it doesnt return busy slots as available, and since this means we can no longer schedule stuff in the lunchbreak lower the number of talks in the bootstrap script a bit so we have a better chance of having a solvable problem

* fix the excludefilter in EventSession.get_available_slots() for real this time, also fix an icon and add link in event schedule template in backoffice

* show message when no slots are available for manual scheduling in backoffice

* add event_conflicts to SpeakerUpdateView form in backoffice

* fix link to speaker object in speakerproposal list in backoffice

* allow blank tags

* make duration validation depend on the eventtype event_duration_minutes if we have one. fix help_text and label and placeholder for all duration fields

* allow music acts up to 180 mins in the bootstrap data

* fix wrong eventtype name for recreational events in speakerproposalform

* stretch the colspan one cell more

* save event_conflicts m2m when submitting speaker and event together

* form not self, and add succes message

* move js function toggleclass() to bornhack.js and rename to toggle_sa_form_class(), function is used in several templates and was missing when submitting combined proposals

* move the no-js removal to the top of ready() function

This will allow other javascript initialization (eg. DataTable) to see the elements and initialize accordingly (eg. column width for tables)

* Fixed problem with event feedback detail view

* Fixed problem with event feedback list view

* introduce a get_tzrange_days() function and use that to get the relevant days for the matrix instead of camp.get_days(), thereby fixing some display issues when eventsessions cross dates

* show submitting user and link to proposal on backoffice event detail page, change User to Submitter in backoffice speaker list table

* show warning by the buttons when a proposal cannot be approved, and show better text on approve/reject buttons

* disable js schedule, save m2m, prefetch some stuff

* fix broken date header in table

* remove use of djangos regular slugify function, use the new utils.slugs.unique_slugify() instead

Co-authored-by: Thomas Steen Rasmussen <tykling@bornhack.org>
Co-authored-by: Benjamin Balder Bach <benjamin@overtag.dk>
Co-authored-by: Thomas Flummer <tf@flummer.net>
2020-06-03 21:18:06 +02:00
Thomas Steen Rasmussen 8da8ac65c7 admin_static no longer exists in django 3.0, just use static now, fixes #482 2020-03-10 18:49:55 +01:00
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
Thomas Steen Rasmussen 0cb7b688fa sort products by category weight on shop page 2019-12-16 23:41:05 +01: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
Thomas Steen Rasmussen 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 b7feb96c9b Adding a badge token to tickets that grant that. 2019-07-24 21:08:36 +02: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 2627055077 Fix tests. 2019-07-23 21:15:19 +02:00
Thomas Steen Rasmussen 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
Thomas Steen Rasmussen 8de597d5e5 better wording on bank transfer page 2019-07-21 15:55:14 +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
Thomas Steen Rasmussen 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
Thomas Steen Rasmussen 881b0f4cf4 add the word Included to the VAT line on customorder invoices 2019-07-11 08:02:04 +02: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
Thomas Steen Rasmussen 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
Thomas Steen Rasmussen effd900b62 add proforma invoice support 2019-07-09 10:38:14 +02:00