Christopher Neugebauer
|
a16cb71463
|
Fixes issue in for_id_or_404
|
2016-09-21 15:58:58 +10:00 |
|
Christopher Neugebauer
|
a445eed239
|
Merge branch 'chrisjrn/reports_20160919'
|
2016-09-20 19:41:47 +10:00 |
|
Christopher Neugebauer
|
94a8c3e3d9
|
Adds speaker registration data.
Addresses #77
|
2016-09-20 19:18:21 +10:00 |
|
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 |
|
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 |
|
Christopher Neugebauer
|
3f53d6f4ff
|
Removes spurious print statement.
|
2016-09-14 15:09:02 +10:00 |
|
Christopher Neugebauer
|
b5cbc3e39e
|
Renames guided_registration_complete to review
|
2016-09-14 15:00:53 +10:00 |
|
Christopher Neugebauer
|
ceb967e6c7
|
Merge branch 'chrisjrn/review_page'
|
2016-09-14 14:59:25 +10:00 |
|
Christopher Neugebauer
|
640db7e3dc
|
Replaces the final stage of guided registration with a review page, which shows after adding anything to your cart.
Fixes #87
|
2016-09-14 14:59:01 +10:00 |
|
Christopher Neugebauer
|
faa25c9b3a
|
Adds missing_categories tag
|
2016-09-14 13:28:15 +10:00 |
|
Christopher Neugebauer
|
4ad96286c3
|
Merge branch 'chrisjrn/better_reports'
|
2016-09-13 18:54:41 +10:00 |
|
Christopher Neugebauer
|
f0730b4de9
|
Flake8 fixes for reports
|
2016-09-13 18:54:28 +10:00 |
|
Christopher Neugebauer
|
cb50f2a3be
|
Replaces a bunch of reports with QuerysetReports
|
2016-09-13 18:53:01 +10:00 |
|
Christopher Neugebauer
|
12b665acb8
|
DRYs QuerysetReport’s headers
|
2016-09-13 18:47:51 +10:00 |
|
Christopher Neugebauer
|
bbce369a38
|
Allows for callable attributes to be specified in QuerysetReports.
|
2016-09-13 18:44:13 +10:00 |
|