Commit graph

1876 commits

Author SHA1 Message Date
Christopher Neugebauer
7c5c155370 Shows an email address. 2016-09-20 18:44:23 +10:00
Christopher Neugebauer
2d469bb398 One more addition. 2016-09-20 14:04:38 +10:00
Christopher Neugebauer
bcd7043862 Merge branch 'chrisjrn/reports_20160919' 2016-09-20 13:48:34 +10:00
Christopher Neugebauer
2ed0a47f15 Adds attendance by field report
Fixes #93
2016-09-20 13:48:08 +10:00
Christopher Neugebauer
e3b662fb67 Adds attendee profile data to the attendee page 2016-09-20 13:47:59 +10:00
Christopher Neugebauer
6611546a35 Moves get_object_from_name into util. 2016-09-20 13:47:59 +10:00
Christopher Neugebauer
6e4d2fab16 Adds ATTENDEE_PROFILE_MODEL as a thing that needs to be specified in settings.py.
Fixes #65
2016-09-20 13:47:50 +10:00
Christopher Neugebauer
e2d027f71b Adds a report for consumption of a discount.
Fixes #78
2016-09-20 13:47:39 +10:00
Christopher Neugebauer
f41bd9c65b Adds paid invoices by date report 2016-09-19 15:03:21 +10:00
Christopher Neugebauer
851c37508a Factors out annotating objects by cart status 2016-09-19 13:39:39 +10:00
Christopher Neugebauer
2c99114d9f Improves wording on reconciliation report 2016-09-19 13:26:46 +10:00
Christopher Neugebauer
7e74a2e0da Updates the treasurer’s reconciliation view to be MUCH more comprehensive. 2016-09-19 13:25:02 +10:00
Scott Bragg
e96bce62ab Merge pull request #57 from lca2017/chrisjrn/september_rebase
Symposion changes for schedule announcement
2016-09-18 20:41:44 +10:00
Christopher Neugebauer
ff16f71df6 September website changes - Pre-registration (#66)
* Factors rendering of external links into its own template. Automagical!

* Adds wagtail templates for keynotes on the front page

* Migrates to Wagtail 1.6

* Migrates content pages to be a streamfield. Flexibility++.

* Fixes editing of ContentPage bodies

* Adds floating images to content pages

* Fixes the layout of floating images

* Adds anchor links to content pages.

* Adds presentation link to the keynote speaker block model

* LCA-ifies the schedule list

* Refactors cms_pages/content_page into a new base template

* cms_pages/content_page now derives from abstract_content_page

* news_index_page now derives from abstract_content_page

* news_page now derives from abstract_content_page.html

* utility_page now uses the content_page base template

* Factors out _right_floating_image.html

* Themes the presentation detail page

* Themes the speaker profile page.

* Themes the schedule list page.

* Minor work on schedule_conference.html

* Themes schedule_detail.html

* Replaces cradle.svg

* Adds a background image to the schedule pages

* Adds libravatar fallback for speaker profile images

* Adds new background images (must update colophon)

* Adds some magic so that we can have slightly different presentation backgrounds for different pages.

* Adds the sponsor block to the bottom of the page.

* Adds sponsor logos to footer.

* All migrations are now in this tree

* Fixes wagtail migrations

* Adjusts presentation_detail to allow for miniconfs (i.e. no target audience)

* Adds unpublishing to presentation detail

* Adds ScheduleHeaderParagraph, which allows us to add some text to the header of schedule pages.

* Adds NamedHeaderParagraph. It allows us to store header paragraphs in the CMS.

* Date formatting in the schedule

* First step for fixing images

* Allows us to automagically load the colophon

* Adds “publish changes” button.

* Can login with email address
2016-09-18 20:40:55 +10:00
Christopher Neugebauer
699b32b938 Adds “publish changes” behaviour to views so that we can publish edits to abstracts. 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
f42766beef Respects unpublishing in lists. 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
970e002157 Do not show a presentation if it is unpublished 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
3b4a51e6d4 Adds “unpublish” option to presentations (to temporarily hide from the schedule and from view by non-staff) 2016-09-18 15:52:45 +10:00
Scott Bragg
5caedcc09f Merge pull request #53 from lca2017/chrisjrn/better_mailer
Better send_mail function
2016-09-18 12:41:33 +10:00
Scott Bragg
50ee66d200 Merge branch 'chrisjrn/better_mailer' of https://github.com/lca2017/symposion into chrisjrn/better_mailer
Conflicts:
	symposion/utils/mail.py
2016-09-18 12:40:45 +10:00
Christopher Neugebauer
96683b6d7d Refactors to be a bit less obtuse 2016-09-18 12:37:08 +10:00
Christopher Neugebauer
d54d47487e send_mail is no longer hardwired to point at symposion/emails (who does that?!) 2016-09-18 12:37:08 +10:00
Christopher Neugebauer
7a001e6228 Makes sure BCC is provided to *every* e-mail. (#65)
* Replaces the monkey patch on send_mail, and replaces it with a monkey patch on EmailMessage’s constructor.

* Removes spurious print statements.

* Minimum viable changes to get schedule to display (#64)

* All migrations are now in this tree

* Replaces the monkey patch on send_mail, and replaces it with a monkey patch on EmailMessage’s constructor.

* Removes spurious print statements.
2016-09-18 12:32:10 +10:00
Scott Bragg
433a99a402 All the migrations seem fixed now 2016-09-17 15:53:47 +10:00
Scott Bragg
fe31b1b7c4 All migrations are now in this tree 2016-09-17 15:50:46 +10:00
Christopher Neugebauer
4a50d69936 Moves total_payments() to Invoice model; adds balance_due() 2016-09-16 09:35:12 +10:00
Christopher Neugebauer
fc81f107ed When setting quantities on products, only raise errors if they’re due to changes made during the current call to set_quantities.
Fixes #54
2016-09-15 16:33:19 +10:00
Christopher Neugebauer
3517bdd281 Makes sure that discounts always apply to the most expensive product in the cart first. Adds test to that effect.
Fixes #88.
2016-09-15 16:01:49 +10:00
Christopher Neugebauer
4026dac3a3 Re-adds admin for TimeOrStockLimitFlag
Fixes #82
2016-09-15 15:46:52 +10:00
Christopher Neugebauer
734592207e Merge branch 'chrisjrn/fix_71'
Fixes #71
2016-09-15 15:39:07 +10:00
Christopher Neugebauer
52fa696a01 Fixes GroupMemberCondition test 2016-09-15 15:33:52 +10:00
Christopher Neugebauer
2c8ed9a51a Adds test for GroupMemberCondition 2016-09-15 15:33:43 +10:00
Christopher Neugebauer
31d057c750 Merge branch 'chrisjrn/cancellation'
Fixes #23
2016-09-15 12:26:56 +10:00
Christopher Neugebauer
2ca644e500 Adds form for generating a cancellation fee. 2016-09-15 12:25:34 +10:00
Christopher Neugebauer
d4f4312178 Adds cancellation fee implementation and tests 2016-09-15 12:15:40 +10:00
Christopher Neugebauer
66dd3d9152 Merge branch 'chrisjrn/auto_credit_note'
Fixes #89
2016-09-15 11:42:07 +10:00
Christopher Neugebauer
fd9980efc5 Makes sure we only apply unclaimed credit notes when auto-applying credit notes. 2016-09-15 11:41:50 +10:00
Christopher Neugebauer
a482b632cc Merge branch 'chrisjrn/auto_credit_note'
Fixes #84
2016-09-15 11:31:54 +10:00
Christopher Neugebauer
77a7689de5 Fixes credit note tests that were broken with the old behaviour 2016-09-15 11:28:14 +10:00
Christopher Neugebauer
5fce13d386 Simplifies credit note tests 2016-09-15 11:28:14 +10:00
Christopher Neugebauer
04b7a7998c Tests correct behaviour when there are multiple credit notes to be applied 2016-09-15 11:28:14 +10:00
Christopher Neugebauer
82254a7bf5 Credit note is automatically applied if you have a single invoice 2016-09-15 10:22:12 +10:00
Christopher Neugebauer
05c5cfcb4e Adds first tests for automatic credit note application 2016-09-15 10:03:27 +10:00
Christopher Neugebauer
66f423eafa Moves tests for credit note functionality into its own test module 2016-09-15 09:38:42 +10:00
Christopher Neugebauer
23658be49a Starts test_helpers.py, so we can get credit note testing stuff into its own module. 2016-09-15 09:29:31 +10:00
Christopher Neugebauer
1cf6645061 Merge branch 'chrisjrn/allow_manual_invoices'
Fixes #58
2016-09-15 09:09:23 +10:00
Christopher Neugebauer
6469bcd8e7 Adds test for manual invoicing 2016-09-15 09:08:57 +10:00
Christopher Neugebauer
2e5a8e3668 First pass at allowing manual invoices. 2016-09-15 09:08:57 +10:00
Christopher Neugebauer
a9bc647570 Replaces _generate with _generate_from_cart and _generate 2016-09-15 08:38:33 +10:00
Christopher Neugebauer
613667aa30 Re-arranges invoice generation code.
- Reduces number of db queries
- Localises the code that interrogates the cart and the code that generates the invoice itself.
2016-09-15 08:31:35 +10:00