Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1856 commits 3 branches 0 tags 57 MiB
Commit graph

1856 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Christopher Neugebauer
4c9f426a47 Simplifies a bunch of older reports. 2016-09-13 16:26:40 +10:00
Christopher Neugebauer
f7326eedf7 Makes as many reports under attendee() as possible a QuerysetReport 2016-09-13 16:24:50 +10:00
Christopher Neugebauer
fa717dee65 Adds QuerysetReport, which allows directly adding a queryset to a report rather than having to preprocess it into a list. 2016-09-13 16:19:18 +10:00
Christopher Neugebauer
53e6278116 Adds a Links report type, which can be used to generate a list of links to display with a report. 2016-09-13 16:02:18 +10:00
Christopher Neugebauer
e8cfd024d3 Makes the reports use actual objects rather than strings 2016-09-13 15:39:25 +10:00
Christopher Neugebauer
f3e419d66d Refactors reports so that rendering of links is done within Python code, not templates. 2016-09-13 15:32:55 +10:00
Christopher Neugebauer
d5295e07a9 Merge branch 'chrisjrn/20160913-bugs' 2016-09-13 13:33:45 +10:00
Christopher Neugebauer
2658c2ccde Improves the error message when per_user_limit on category is breached. 
Fixes #80
 2016-09-13 13:33:20 +10:00
Christopher Neugebauer
1c239c361f Propagates the per_user_limit category error to the products, rather than the category. 
Fixes #79.
 2016-09-13 13:20:02 +10:00
Christopher Neugebauer
3903d2be56 Fixes issues on /amend 2016-09-13 13:19:31 +10:00