Christopher Neugebauer
|
3a6b4125e9
|
Bugfix
|
2016-04-01 12:34:06 +01:00 |
|
Christopher Neugebauer
|
12e4d0a3cb
|
flake8
|
2016-04-01 12:14:39 +01:00 |
|
Christopher Neugebauer
|
a65b7935a9
|
Merge branch 'pluggable_profile'
|
2016-04-01 11:55:38 +01:00 |
|
Christopher Neugebauer
|
89cba55807
|
Pre-fills the attendee name from a speaker profile, if there is one.
Resolves #8.
|
2016-04-01 21:39:54 +11:00 |
|
Christopher Neugebauer
|
be277c17d2
|
BadgeAndProfile is replaced with AttendeeProfileBase — consumer apps should subclass AttendeeProfileBase to make the registration process work :)
|
2016-04-01 21:21:09 +11:00 |
|
Christopher Neugebauer
|
660e8cb75f
|
Removes BadgeAndProfile.get_instance
|
2016-04-01 16:58:55 +11:00 |
|
Christopher Neugebauer
|
28fbacbd28
|
Merge branch 'guided_registration_2'
|
2016-04-01 16:57:38 +11:00 |
|
Christopher Neugebauer
|
d2d2a1b0ec
|
Work for making invoices contain complete profile information
|
2016-04-01 16:54:40 +11:00 |
|
Christopher Neugebauer
|
aa6377f4ce
|
Adds multiply as a template filter (for invoices)
|
2016-04-01 16:54:40 +11:00 |
|
Christopher Neugebauer
|
8324b51094
|
Adds new guided registration process.
|
2016-04-01 16:54:40 +11:00 |
|
Christopher Neugebauer
|
466c664b68
|
factor out handle_profile
|
2016-04-01 16:54:07 +11:00 |
|
Christopher Neugebauer
|
d796b0de32
|
Merge branch 'demo_site_integration'
|
2016-04-01 10:51:53 +11:00 |
|
Christopher Neugebauer
|
8b79670608
|
Fixes issue #8
|
2016-03-31 19:15:04 +11:00 |
|
Christopher Neugebauer
|
5e0c87c435
|
Deletes templates — moved to registrasion-demo repo
|
2016-03-31 19:15:03 +11:00 |
|
Christopher Neugebauer
|
2d5caa3299
|
Renames edit_profile to attendee_edit
|
2016-03-31 19:15:03 +11:00 |
|
Christopher Neugebauer
|
c6394ecf4a
|
Increments version number of django_nested_admin so that you can use Django 1.9
|
2016-03-31 19:15:03 +11:00 |
|
Christopher Neugebauer
|
e0e0d4bf3b
|
views.py renders from registrasion/
|
2016-03-31 19:15:03 +11:00 |
|
Christopher Neugebauer
|
62d5c5b2bf
|
Revert "Registrasion URLs now include django-nested-admin"
This reverts commit 58eed33c429c1035801e840b41aa7104c02b9b5a.
|
2016-03-31 19:14:43 +11:00 |
|
Christopher Neugebauer
|
9ec9e68ee6
|
Registrasion URLs now include django-nested-admin
|
2016-03-31 19:14:42 +11:00 |
|
Christopher Neugebauer
|
96c4998a34
|
Initial Setuptools bits.
|
2016-03-31 19:14:42 +11:00 |
|
Christopher Neugebauer
|
eebf9e81f5
|
Resolves #3 — start_time, end_time, and limit can now be blank. Tests already dealt with the null case.
|
2016-03-31 14:45:39 +11:00 |
|
Christopher Neugebauer
|
4c7024c9ff
|
Merge branch 'more_admins'
|
2016-03-31 14:39:54 +11:00 |
|
Christopher Neugebauer
|
c7b6c81071
|
adds setuptools’ build directory to the flake8 ignore path.
|
2016-03-31 14:38:48 +11:00 |
|
Christopher Neugebauer
|
ba0682a5f9
|
Fleshes out the admin interface and adds help_text attributes to the model fields that need it
|
2016-03-31 14:38:48 +11:00 |
|
Christopher Neugebauer
|
c790d5afd0
|
Merge branch 'refunds'
|
2016-03-28 11:50:31 +11:00 |
|
Christopher Neugebauer
|
cf85af7719
|
Adds refund function, adds tests, makes sure that refunds are obeyed elsewhere in the codebase
|
2016-03-27 21:04:10 +11:00 |
|
Christopher Neugebauer
|
b65223aaa1
|
Adds model for released carts
|
2016-03-27 19:13:05 +11:00 |
|
Christopher Neugebauer
|
3e4e52b165
|
Adds more constraints around payment and voiding of invoices
|
2016-03-27 14:41:43 +11:00 |
|
Christopher Neugebauer
|
8080d7851b
|
Invoices now automatically void themselves if their cart is out of date
|
2016-03-27 14:04:47 +11:00 |
|
Christopher Neugebauer
|
77ab00bc67
|
Merge branch 'category_user_limits'
|
2016-03-27 13:13:09 +11:00 |
|
Christopher Neugebauer
|
0d458bea06
|
Allows Product.limit_per_user to be blank and null. Adds Category.limit_per_user. Adds functionality and tests to verify that this is legal.
|
2016-03-27 13:12:33 +11:00 |
|
Christopher Neugebauer
|
7c99750f3a
|
Simplifies creation of test data in test_cart, adds an extra product category and two new products
|
2016-03-27 13:12:33 +11:00 |
|
Christopher Neugebauer
|
db332da958
|
flake8
|
2016-03-27 13:12:33 +11:00 |
|
Christopher Neugebauer
|
3562772c13
|
Adds RadioBoxProductsForm
|
2016-03-27 13:12:33 +11:00 |
|
Christopher Neugebauer
|
0ae005a5f5
|
Factors _QuantityBoxForm out of _ProductsForm
|
2016-03-27 11:30:11 +11:00 |
|
Christopher Neugebauer
|
834233cd72
|
Factors ProductsForm handling into its own function
|
2016-03-27 11:30:11 +11:00 |
|
Christopher Neugebauer
|
464684f13e
|
Refactors the product_category view to be much simpler
|
2016-03-26 20:21:54 +11:00 |
|
Christopher Neugebauer
|
b13e6f7ce2
|
Factors out voucher form handling into its own function
|
2016-03-26 20:01:46 +11:00 |
|
Christopher Neugebauer
|
2d5cd622c5
|
Makes it invalid for a user to re-enter a voucher code they already have.
|
2016-03-26 19:47:01 +11:00 |
|
Christopher Neugebauer
|
940bf803b6
|
Merge branch 'show_available_discounts'
|
2016-03-26 15:16:04 +11:00 |
|
Christopher Neugebauer
|
36ecf7fd54
|
Adds more tags for the dashboard.
|
2016-03-26 15:14:28 +11:00 |
|
Christopher Neugebauer
|
941b057865
|
Shows the available discounts on the registration form
|
2016-03-26 14:03:25 +11:00 |
|
Christopher Neugebauer
|
fc279b1922
|
Replaces CategoryForm with ProductsForm (makes the form slightly dumber)
|
2016-03-26 13:37:13 +11:00 |
|
Christopher Neugebauer
|
45aa83f854
|
Adds available_products as a method on ProductController
|
2016-03-26 13:37:13 +11:00 |
|
Christopher Neugebauer
|
c41a9cadff
|
recalculate_discounts now uses the available_discounts function from controllers.discount.
|
2016-03-26 13:33:23 +11:00 |
|
Christopher Neugebauer
|
fb3878ce2e
|
Adds available_discounts, which allows enumeration of the discounts that are available for a given set of products and categories
|
2016-03-25 18:59:34 +11:00 |
|
Christopher Neugebauer
|
8d66ed5715
|
Fix flake8 warnings
|
2016-03-25 14:51:39 +11:00 |
|
Christopher Neugebauer
|
4069d4bb32
|
Merge branch 'guided_registration'
|
2016-03-25 14:34:36 +11:00 |
|
Christopher Neugebauer
|
c192fef491
|
Adds basic template tag for available categories. Currently does not check enabling conditions.
|
2016-03-25 14:16:30 +11:00 |
|
Christopher Neugebauer
|
478b328e41
|
Uses the completed_registration flag on the Attendee model
|
2016-03-25 12:50:59 +11:00 |
|