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

372 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Christopher Neugebauer
9dd31128bb Restricts ‘amend’ product widgets to the original product. 
Fixes #76.
 2016-09-13 13:19:09 +10:00
Christopher Neugebauer
a27264ac92 Filters items_purchased by category. 
Fixes #74
 2016-09-13 12:28:48 +10:00
Christopher Neugebauer
f5e303584b Adds an output_field type to reconciliation sums. 
Fixes #75
 2016-09-13 12:27:07 +10:00
Christopher Neugebauer
ea599bbaad Addresses #72, hopefully. 2016-09-05 21:10:21 +10:00
Christopher Neugebauer
878da1f2d8 Use textfield for some things rather than char field 2016-09-05 19:45:44 +10:00
Christopher Neugebauer
17dd91d56b Fixes bug in the t-shirt-style widget. 2016-09-05 14:45:51 +10:00
Christopher Neugebauer
27d0e1c6be Merge branch 'chrisjrn/team_conditions' 
Fixes #70.
 2016-09-05 10:49:02 +10:00
Christopher Neugebauer
1214b23077 Adds admin and migration for GroupMember conditions 2016-09-05 10:48:38 +10:00
Christopher Neugebauer
0f488e7a12 Makes TeamMemberCondition work 2016-09-05 10:45:10 +10:00
Christopher Neugebauer
1128e43150 Adds test for GroupMemberCondition — it fails, obviously. 2016-09-05 10:45:09 +10:00
Christopher Neugebauer
136c68aa0a Adds GroupMemberCondition, derivatives, and controllers. 2016-09-05 10:01:36 +10:00
Christopher Neugebauer
0601470006 Fixes bug in Radio Buttons products form. 
Fixes #69.
 2016-09-04 14:31:21 +10:00
Christopher Neugebauer
b8cfb57269 Merge branch 'chrisjrn/speaker_conditions' 
Fixes #60, Fixes #61
 2016-09-04 14:21:54 +10:00
Christopher Neugebauer
c2a702d699 Adds admin and migration for speaker tickets. 2016-09-04 14:21:30 +10:00
Christopher Neugebauer
af30063a92 Adds final test, all three now pass. 2016-09-04 14:00:56 +10:00
Christopher Neugebauer
04eefa4e0e Passes first two tests 2016-09-04 13:54:05 +10:00
Christopher Neugebauer
0b306fd59e Adds test for user being a primary presenter of a proposal 2016-09-04 13:41:49 +10:00
Christopher Neugebauer
786bc0324a Stubs out tests for test_speaker 2016-09-04 13:17:56 +10:00
Christopher Neugebauer
9134fa5ed2 Initial version of test_speaker, which creates all of the boilerplate for proposals 2016-09-04 13:11:45 +10:00
Christopher Neugebauer
b3d86e2148 Adds stub for SpeakerConditionController 2016-09-04 12:39:52 +10:00
Christopher Neugebauer
63fe8196e2 Adds SpeakerCondition, SpeakerDiscount, and SpeakerFlag 2016-09-04 12:36:20 +10:00
Christopher Neugebauer
1333fcdea1 Refactors flags and discount classes to be DRYer. 2016-09-04 12:18:10 +10:00
Christopher Neugebauer
7e39339ed9 Merge branch 'chrisjrn/fix_68' 2016-09-03 16:18:41 +10:00
Christopher Neugebauer
43649002cb Makes ProductCondition work if you have both valid and cancelled instances of a product. Fixes #68 2016-09-03 16:18:27 +10:00
Christopher Neugebauer
8e1f799513 Test case for issue #68 2016-09-03 16:11:28 +10:00
Christopher Neugebauer
75d96ce1c1 Merge branch 'chrisjrn/amend_products' 
Closes #33
 2016-09-03 15:56:08 +10:00
Christopher Neugebauer
5703221fba Adds voucher form to registration amendment 2016-09-03 15:53:54 +10:00
Christopher Neugebauer
b9ee438b89 Registration amendments are now limited the products that the user is allowed to add. 2016-09-03 15:43:04 +10:00
Christopher Neugebauer
1152e185d1 Staff can now check out an invoice for a user 2016-09-03 15:16:46 +10:00
Christopher Neugebauer
c2065dd4b9 The form can now amend a user’s registration. 2016-09-03 15:08:44 +10:00
Christopher Neugebauer
84c40a1e1f Refactors ItemController, add items_released 2016-09-03 15:08:25 +10:00
Christopher Neugebauer
83b8b62d74 Attendee view now uses user_id, like the rest of the app 2016-09-03 14:24:58 +10:00