symposion_app

Conservancy/symposion_app

Fork 0

Commit graph

00f87e30b7 Adds an upper limit on quantity boxes (it’s set to 500 for the moment though). Christopher Neugebauer 2016-04-25 16:16:22 +10:00
42912519f1 Adds entered_by to manual payments. Closes #22. Christopher Neugebauer 2016-04-25 16:06:29 +10:00
bf053242de Closes #25 — changes what invoice_access will redirect to Christopher Neugebauer 2016-04-25 16:00:33 +10:00
c135c77d6c Merge branch 'cart_status_overhaul' Christopher Neugebauer 2016-04-25 15:37:13 +10:00
397ba207bb Adds utility to defeat segfaults in tests. Hopefully you won’t need it. Christopher Neugebauer 2016-04-25 15:32:59 +10:00
63dfd353c1 Replaces active/released flags in Cart with a single int flag. Closes #41 Christopher Neugebauer 2016-04-25 14:31:25 +10:00
203a4a2212 Merge branch 'documentation' Christopher Neugebauer 2016-04-25 13:25:11 +10:00
213c11ac11 Removes sphinx warnings Christopher Neugebauer 2016-04-25 13:24:57 +10:00
c0b0ae780d Removes confusingness from cart.py Christopher Neugebauer 2016-04-25 13:20:48 +10:00
9d25725514 Documents the template tags Christopher Neugebauer 2016-04-25 13:15:06 +10:00
1b9f76823f Etc Christopher Neugebauer 2016-04-25 12:59:43 +10:00
4373b7260d Finishes the public views documentation Christopher Neugebauer 2016-04-25 12:53:01 +10:00
2d8602a6da views documentation Christopher Neugebauer 2016-04-25 11:14:17 +10:00
eefec32cb0 Makes private helper functions private Christopher Neugebauer 2016-04-25 10:19:20 +10:00
9c289acadd Starts documenting the public views. Christopher Neugebauer 2016-04-25 10:15:13 +10:00
32ffa25895 Adds util.all_arguments_optional Christopher Neugebauer 2016-04-25 09:57:36 +10:00
d921860614 Updates for-zookeeper-users Christopher Neugebauer 2016-04-25 09:52:53 +10:00
05c55bd7db Merge branch 'master' into documentation Christopher Neugebauer 2016-04-25 09:51:19 +10:00
6f1a3684c5 Merge pull request #36 from glasnt/patch-1 Christopher Neugebauer 2016-04-25 09:50:37 +10:00
b0d1f69f1a Writes the integration guide Christopher Neugebauer 2016-04-25 09:49:19 +10:00
9e215d1575 Merge branch 'master' into documentation Christopher Neugebauer 2016-04-25 09:07:15 +10:00
12e54ac5ba Merge branch 'payments_api_improvements' Christopher Neugebauer 2016-04-25 08:35:25 +10:00
f309d92a24 Discusses access control for payments Christopher Neugebauer 2016-04-25 08:34:54 +10:00
00b79a4bec Documentation now reflects that issue #37 is solved. Christopher Neugebauer 2016-04-25 08:27:20 +10:00
12e04c248f Credit notes are now generated when invoices are overpaid, or invoices are paid into void or refunded invoices. Closes #37. Christopher Neugebauer 2016-04-25 08:13:44 +10:00
9a4574ef2c DRYs up test_invoice a bit Christopher Neugebauer 2016-04-25 07:42:05 +10:00
67b047e7b3 Simplifies invoice-getting documentation. Christopher Neugebauer 2016-04-25 07:15:03 +10:00
9f72b67510 Uses for_id_or_404 in views.py Christopher Neugebauer 2016-04-25 07:14:14 +10:00
ca8f67c2f3 Adds for_id, which lets you get an InvoiceController or CreditNoteController by the ID of the invoice/credit note/. Closes #38. Christopher Neugebauer 2016-04-25 07:13:37 +10:00
dc3d64e6a8 Merge branch 'documentation' Christopher Neugebauer 2016-04-24 21:42:50 +10:00
3b3744578e First pass at the payments documentation. Christopher Neugebauer 2016-04-22 17:30:00 +10:00
86ac7bdd03 Explains the name “registration” Christopher Neugebauer 2016-04-22 16:43:32 +10:00
670671a3b3 Adds a CONTRIBUTING guide Christopher Neugebauer 2016-04-22 16:41:59 +10:00
135aa7e333 Nested list RST formatting Katie McLaughlin 2016-04-22 16:20:11 +10:00
32135dbb25 Merge branch 'user-documentation' Christopher Neugebauer 2016-04-22 16:08:34 +10:00
e9ebf5da03 Writes inventory and overview documentation, and updates docstrings on a LOT of modules. Christopher Neugebauer 2016-04-22 14:08:13 +10:00
539dbd3525 Merge branch 'models-reorg' Christopher Neugebauer 2016-04-22 15:07:12 +10:00
875f736d67 Consolidates models.py into a directory module. Christopher Neugebauer 2016-04-22 15:06:24 +10:00
6c94eb9e91 Adds Registrasion support to the templates and apps. Christopher Neugebauer 2016-03-30 15:13:50 +11:00
278ca23c29 Merge branch 'admin_models_cleanup' Christopher Neugebauer 2016-04-12 19:41:31 +10:00
ffa1ca6783 Fixes flags admin Christopher Neugebauer 2016-04-12 11:43:38 +10:00
87e6fa064a Merge branch 'master' into admin_models_cleanup Christopher Neugebauer 2016-04-12 11:39:54 +10:00
961a11b64c Merge branch 'rename_to_flags' Christopher Neugebauer 2016-04-12 08:53:24 +10:00
d3f7431f7d Squashes migrations from rename_to_flags branch; marks as normal migration Christopher Neugebauer 2016-04-12 08:47:17 +10:00
c24b9ee213 Makes EnablingConditionBase a minimal reification of an abstract base model FlagBase, replaces enablingconditionbase with flagbase where possible, and fixes method names and documentation Christopher Neugebauer 2016-04-12 08:30:33 +10:00
638ec26126 Replaces the mandatory/non-mandatory concept with the enabled_if_true/disabled_if_false concept. Closes #4. Christopher Neugebauer 2016-04-11 20:02:16 +10:00
61dbe60cfa Renames the admin-visible names for many model classes, and adds a default ordering where they’re useful too. Christopher Neugebauer 2016-04-11 19:23:38 +10:00
c4c8a7ab82 Tidies up the admin interface for flags Christopher Neugebauer 2016-04-11 18:12:37 +10:00
e88a287fef renames test_enabling_condition to test_flag Christopher Neugebauer 2016-04-11 17:59:20 +10:00
7b476fd5cb s/enabling_condition/flag Christopher Neugebauer 2016-04-11 17:56:11 +10:00
4fedc73304 Renames EnablingCondition to Flag where possible Christopher Neugebauer 2016-04-11 17:55:00 +10:00
eefdb41cfc Merge branch 'credit_notes' Christopher Neugebauer 2016-04-11 13:12:32 +10:00
7e8d044a9f Adds the ability to apply or refund a credit note. Christopher Neugebauer 2016-04-11 13:11:31 +10:00
680ce689f6 Adds initial credit note display view Christopher Neugebauer 2016-04-11 12:11:14 +10:00
2c94e7538a Adds available_credit tag, and adds a view for refunding an invoice to generate a credit note. Christopher Neugebauer 2016-04-11 11:07:24 +10:00
6b10a0a7e4 Adds CreditNote, CreditNoteController, related models, and tests. Christopher Neugebauer 2016-04-10 14:41:43 +10:00
ae8f39381f Flake8 fixes Christopher Neugebauer 2016-04-08 19:49:18 +10:00
b320b227aa Merge branch 'guided_registration_3' Christopher Neugebauer 2016-04-08 19:44:55 +10:00
97438624e1 Makes the guided registration stay on the front page if an incorrect voucher is added but a valid profile is filled out. Resolves #9 Christopher Neugebauer 2016-04-08 19:41:55 +10:00
01b9adbaf4 Re-writes the guided registration to individually track completed categories, and keep the form page the same until every category is finished. Resolves #14 Christopher Neugebauer 2016-04-08 17:32:06 +10:00
a12460e351 Merge branch 'invoices_and_payments' Christopher Neugebauer 2016-04-08 17:08:10 +10:00
ea1d6f52e6 Adds payment access codes. Christopher Neugebauer 2016-04-08 13:15:24 +10:00
3dab78ab25 Adds the access_code field to Attendee model Christopher Neugebauer 2016-04-08 12:21:39 +10:00
94a42c100b Adds manual payment functionality Christopher Neugebauer 2016-04-07 19:19:19 +10:00
2fbe789090 Adds validate_allowed_to_pay(), which validates whether you’re allowed to pay for an invoice Christopher Neugebauer 2016-04-07 18:26:31 +10:00
0e80e0336c adds invoice_recipient to AttendeeProfileBase Christopher Neugebauer 2016-04-07 16:59:03 +10:00
38cdb8aa63 Makes invoice model, controller, and test changes to match issue #15 design doc Christopher Neugebauer 2016-04-07 08:28:43 +10:00
5633554854 Tests now use TestingInvoiceController Christopher Neugebauer 2016-04-07 10:23:38 +10:00
ac10ea4ee8 s/cart_controller_helper/controller_helpers/ Christopher Neugebauer 2016-04-07 10:19:18 +10:00
8e95bb7469 flake8 fixes Christopher Neugebauer 2016-04-07 13:26:25 +10:00
2b59151429 Merge branch 'random_fixes' Christopher Neugebauer 2016-04-07 08:00:39 +10:00
0b7ccfc827 Enforces minimum quantity of 0 for quantity boxes Christopher Neugebauer 2016-04-06 22:57:40 +10:00
dba3773636 Adds db indices Christopher Neugebauer 2016-04-06 22:12:29 +10:00
53413388e0 Optimises queries through simplifying repeated queries and select_related use Christopher Neugebauer 2016-04-06 18:28:33 +10:00
5debbb2ac8 Merge branch 'random_fixes' Christopher Neugebauer 2016-04-06 17:41:08 +10:00
2f77f5bb23 Replaces .active = False; .save() pattern in tests with a test controller method Christopher Neugebauer 2016-04-06 17:24:25 +10:00
8ad265a65a Fixes tests now that $0 invoices pay themselves Christopher Neugebauer 2016-04-06 17:19:09 +10:00
c9a62db774 Resolves #17 - cannot generate invoice if there are no product items Christopher Neugebauer 2016-04-06 17:02:11 +10:00
812cc0b9c8 Resolves #6 — Help text for items without a description is much much nicer Christopher Neugebauer 2016-04-06 16:45:54 +10:00
4021aa3c8e Resolves #12 — each item category shows what items you have already purchased in each category Christopher Neugebauer 2016-04-06 16:33:04 +10:00
eb5dd59036 Merge branch 'fix_cart' Christopher Neugebauer 2016-04-06 16:13:06 +10:00
cc318dfa9b Fixes tests Christopher Neugebauer 2016-04-06 16:09:57 +10:00
40bc5985f4 Propagates the error messages up from enabling condition testing Christopher Neugebauer 2016-04-06 15:40:16 +10:00
0340b6da20 Adds “fix_errors” query to “checkout”, which allows users to have issues fix Christopher Neugebauer 2016-04-06 14:34:16 +10:00
39b130811c Removes superfluous test Christopher Neugebauer 2016-04-06 14:28:37 +10:00
c8c16072ba fix_simple_errors() now removes exhausted vouchers from the voucher set. Christopher Neugebauer 2016-04-06 13:01:25 +10:00
0d57da8d6f Makes apply_voucher() idempotent, adds _test_voucher to validate_cart, and updates tests. Christopher Neugebauer 2016-04-06 12:48:05 +10:00
8d07518a9b Fixes an incorrect voucher test Christopher Neugebauer 2016-04-06 12:22:32 +10:00
6f28c20b70 Factors _test_voucher() method into CartController Christopher Neugebauer 2016-04-06 12:09:16 +10:00
7d97d2d2de Adds fix_simple_errors to cart - it zeroes out unavailable products. Adds test that it does that. Christopher Neugebauer 2016-04-06 11:36:07 +10:00
f5d9458d1a Adds a validation based on available_products to validate_cart, and a test based on simple enabling conditions Christopher Neugebauer 2016-04-06 10:22:44 +10:00
56e46dfce3 Merge pull request #5 from jefftriplett/update-proposal-fields Patrick Altman 2016-04-04 21:49:07 -05:00
1f16614fc4 Fixes *_html proposal fields Jeff Triplett 2016-04-04 18:36:01 -05:00
8b13bb9bc5 Merge branch 'refactor_limits_testing' Christopher Neugebauer 2016-04-03 15:27:05 +10:00
a4d684f444 Raises limits errors in the right parts of the form Christopher Neugebauer 2016-04-03 15:25:39 +10:00
7609965883 flake8 compliance Christopher Neugebauer 2016-04-03 13:21:57 +10:00
4d134e95d7 Refactors discount ceiling testing to make sure that the discount ceiling only considers items where the discount was applied in determining if the discount was reached. Christopher Neugebauer 2016-04-03 12:53:36 +10:00
eab1deff77 Removes set_quantity and add_to_cart from CartController, and factors it into a test controller for testing Christopher Neugebauer 2016-04-03 10:06:35 +10:00
312fffd137 Adds negative quantity tests to _test_limits, and removes _set_quantity_old. Christopher Neugebauer 2016-04-03 09:45:39 +10:00
6c9a68dc5b Fixes #8 properly Christopher Neugebauer 2016-04-02 20:11:40 +11:00