Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Commit graph

  • 2cbda9172f Fixes bug in product and category, and ceiling enabling conditions Christopher Neugebauer 2016-04-02 20:11:31 +11:00
  • 8796670328 handle_products now uses the transactional set_quantities. Christopher Neugebauer 2016-04-02 19:57:17 +11:00
  • e3ec128147 Factors limits testing in set_quantities into _test_limits() Christopher Neugebauer 2016-04-02 18:10:33 +11:00
  • 194f98bcc4 Refactors available_products to use test_enabling_conditions Christopher Neugebauer 2016-04-02 18:03:42 +11:00
  • 1e7a2abc7f Refactors testing of enabling conditions so that they are done in bulk in ConditionsController, rather than one product at a time. Christopher Neugebauer 2016-04-02 16:26:27 +11:00
  • 5716af0afa Replaces a bunch of len(queryset) with queryset.count() Christopher Neugebauer 2016-04-02 15:56:27 +11:00
  • 1c6dc12781 Replaces user_can_add_within_limit with user_quantity_remaining Christopher Neugebauer 2016-04-02 14:20:43 +11:00
  • 576dddcaad Adds user_quantity_remaining to CategoryController Christopher Neugebauer 2016-04-02 14:03:25 +11:00
  • 39021cd3dd Adds set_quantities, refactors set_quantity in terms of set_quantities Christopher Neugebauer 2016-04-02 13:39:42 +11:00
  • 2e0144effe flake8 Christopher Neugebauer 2016-04-02 13:29:53 +11:00
  • 77b6c87973 Merge branch 'ui_sanitisation' Christopher Neugebauer 2016-04-02 13:28:46 +11:00
  • 8f233c7943 available_products now refers to the user’s product limits as well as enabling conditions Christopher Neugebauer 2016-04-02 13:14:34 +11:00
  • f7289c2101 Adds ‘available_categories’ as something that actually works Christopher Neugebauer 2016-04-02 11:56:03 +11:00
  • bdd3714f47 flake8 style issue Christopher Neugebauer 2016-04-02 11:34:19 +11:00
  • 26af6e8672 Adds messages when items are updated; disables product forms when there are no products available. Christopher Neugebauer 2016-04-02 11:33:20 +11:00
  • 69a65ac3ed Fixes tests on Django 1.9 Christopher Neugebauer 2016-04-02 11:02:01 +11:00
  • 3a6b4125e9 Bugfix Christopher Neugebauer 2016-04-01 12:34:06 +01:00
  • 12e4d0a3cb flake8 Christopher Neugebauer 2016-04-01 12:14:39 +01:00
  • a65b7935a9 Merge branch 'pluggable_profile' Christopher Neugebauer 2016-04-01 11:55:38 +01:00
  • 89cba55807 Pre-fills the attendee name from a speaker profile, if there is one. Christopher Neugebauer 2016-04-01 21:39:54 +11:00
  • be277c17d2 BadgeAndProfile is replaced with AttendeeProfileBase — consumer apps should subclass AttendeeProfileBase to make the registration process work :) Christopher Neugebauer 2016-04-01 21:21:09 +11:00
  • 660e8cb75f Removes BadgeAndProfile.get_instance Christopher Neugebauer 2016-04-01 16:58:55 +11:00
  • 28fbacbd28 Merge branch 'guided_registration_2' Christopher Neugebauer 2016-04-01 16:57:38 +11:00
  • d2d2a1b0ec Work for making invoices contain complete profile information Christopher Neugebauer 2016-04-01 16:17:46 +11:00
  • aa6377f4ce Adds multiply as a template filter (for invoices) Christopher Neugebauer 2016-04-01 14:58:29 +11:00
  • 8324b51094 Adds new guided registration process. Christopher Neugebauer 2016-04-01 11:43:19 +11:00
  • 466c664b68 factor out handle_profile Christopher Neugebauer 2016-04-01 11:41:59 +11:00
  • d796b0de32 Merge branch 'demo_site_integration' Christopher Neugebauer 2016-04-01 10:51:53 +11:00
  • 8b79670608 Fixes issue #8 Christopher Neugebauer 2016-03-31 19:13:31 +11:00
  • 5e0c87c435 Deletes templates — moved to registrasion-demo repo Christopher Neugebauer 2016-03-31 18:59:43 +11:00
  • 2d5caa3299 Renames edit_profile to attendee_edit Christopher Neugebauer 2016-03-31 16:01:59 +11:00
  • c6394ecf4a Increments version number of django_nested_admin so that you can use Django 1.9 Christopher Neugebauer 2016-03-31 15:44:54 +11:00
  • e0e0d4bf3b views.py renders from registrasion/ Christopher Neugebauer 2016-03-31 15:44:20 +11:00
  • 62d5c5b2bf Revert "Registrasion URLs now include django-nested-admin" Christopher Neugebauer 2016-03-31 11:10:17 +11:00
  • 9ec9e68ee6 Registrasion URLs now include django-nested-admin Christopher Neugebauer 2016-03-31 11:01:03 +11:00
  • 96c4998a34 Initial Setuptools bits. Christopher Neugebauer 2016-03-28 20:16:08 +11:00
  • eebf9e81f5 Resolves #3 — start_time, end_time, and limit can now be blank. Tests already dealt with the null case. Christopher Neugebauer 2016-03-31 14:45:39 +11:00
  • 4c7024c9ff Merge branch 'more_admins' Christopher Neugebauer 2016-03-31 14:39:54 +11:00
  • c7b6c81071 adds setuptools’ build directory to the flake8 ignore path. Christopher Neugebauer 2016-03-31 14:34:34 +11:00
  • ba0682a5f9 Fleshes out the admin interface and adds help_text attributes to the model fields that need it Christopher Neugebauer 2016-03-31 12:04:30 +11:00
  • c790d5afd0 Merge branch 'refunds' Christopher Neugebauer 2016-03-28 11:50:31 +11:00
  • cf85af7719 Adds refund function, adds tests, makes sure that refunds are obeyed elsewhere in the codebase Christopher Neugebauer 2016-03-27 19:25:24 +11:00
  • b65223aaa1 Adds model for released carts Christopher Neugebauer 2016-03-27 19:13:05 +11:00
  • 3e4e52b165 Adds more constraints around payment and voiding of invoices Christopher Neugebauer 2016-03-27 14:41:43 +11:00
  • 8080d7851b Invoices now automatically void themselves if their cart is out of date Christopher Neugebauer 2016-03-27 14:04:47 +11:00
  • 77ab00bc67 Merge branch 'category_user_limits' Christopher Neugebauer 2016-03-27 13:13:09 +11:00
  • 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. Christopher Neugebauer 2016-03-27 12:24:48 +11:00
  • 7c99750f3a Simplifies creation of test data in test_cart, adds an extra product category and two new products Christopher Neugebauer 2016-03-27 12:08:17 +11:00
  • db332da958 flake8 Christopher Neugebauer 2016-03-27 11:48:17 +11:00
  • 3562772c13 Adds RadioBoxProductsForm Christopher Neugebauer 2016-03-27 11:18:26 +11:00
  • 0ae005a5f5 Factors _QuantityBoxForm out of _ProductsForm Christopher Neugebauer 2016-03-27 10:23:59 +11:00
  • 834233cd72 Factors ProductsForm handling into its own function Christopher Neugebauer 2016-03-26 20:43:20 +11:00
  • 464684f13e Refactors the product_category view to be much simpler Christopher Neugebauer 2016-03-26 20:21:54 +11:00
  • b13e6f7ce2 Factors out voucher form handling into its own function Christopher Neugebauer 2016-03-26 20:01:46 +11:00
  • 2d5cd622c5 Makes it invalid for a user to re-enter a voucher code they already have. Christopher Neugebauer 2016-03-26 19:47:01 +11:00
  • 940bf803b6 Merge branch 'show_available_discounts' Christopher Neugebauer 2016-03-26 15:16:04 +11:00
  • 36ecf7fd54 Adds more tags for the dashboard. Christopher Neugebauer 2016-03-26 15:14:28 +11:00
  • 941b057865 Shows the available discounts on the registration form Christopher Neugebauer 2016-03-26 14:03:25 +11:00
  • fc279b1922 Replaces CategoryForm with ProductsForm (makes the form slightly dumber) Christopher Neugebauer 2016-03-26 13:30:46 +11:00
  • 45aa83f854 Adds available_products as a method on ProductController Christopher Neugebauer 2016-03-26 13:22:47 +11:00
  • c41a9cadff recalculate_discounts now uses the available_discounts function from controllers.discount. Christopher Neugebauer 2016-03-25 18:59:19 +11:00
  • fb3878ce2e Adds available_discounts, which allows enumeration of the discounts that are available for a given set of products and categories Christopher Neugebauer 2016-03-25 18:09:24 +11:00
  • 8d66ed5715 Fix flake8 warnings Christopher Neugebauer 2016-03-25 14:51:39 +11:00
  • 4069d4bb32 Merge branch 'guided_registration' Christopher Neugebauer 2016-03-25 14:34:36 +11:00
  • c192fef491 Adds basic template tag for available categories. Currently does not check enabling conditions. Christopher Neugebauer 2016-03-25 14:16:30 +11:00
  • 478b328e41 Uses the completed_registration flag on the Attendee model Christopher Neugebauer 2016-03-25 12:50:59 +11:00
  • 8e6364d02a Fixes bug where discount quantity applied to all users rather than specific user. Adds test case. Christopher Neugebauer 2016-03-25 12:50:34 +11:00
  • 83b11cd722 Fixes invoicing payment logic Christopher Neugebauer 2016-03-24 14:20:29 +11:00
  • eff5686dcf Adds logic for required categories Christopher Neugebauer 2016-03-24 14:19:33 +11:00
  • dcad2d5f7c Second pass at guided registration, including profile page Christopher Neugebauer 2016-03-24 13:43:06 +11:00
  • 05923a9a8f Profile form view now edits the relevant form Christopher Neugebauer 2016-03-24 12:58:23 +11:00
  • 236c61eefa Fleshes out badge model, and adds first pass at display of the badge form Christopher Neugebauer 2016-03-24 11:33:11 +11:00
  • eb530bd485 Adds the first pass at a “guided” registration form Christopher Neugebauer 2016-03-23 19:39:07 +11:00
  • d50d6bac48 Fixes voucher handling form to not be compulsory Christopher Neugebauer 2016-03-23 19:36:54 +11:00
  • 7086ea8729 Moves product disabling code into the form class Christopher Neugebauer 2016-03-23 19:36:22 +11:00
  • 2f4ebc22af Merge branch 'category_form' Christopher Neugebauer 2016-03-23 15:05:44 +11:00
  • e118a4e74c Adds dumb process for paying invoices. Christopher Neugebauer 2016-03-23 14:51:04 +11:00
  • 4dc150d734 Fills in quantity boxes from the quantities in the current cart, not overall Christopher Neugebauer 2016-03-23 14:50:52 +11:00
  • 2d6b28c5a6 Adds mechanism for entering a voucher code Christopher Neugebauer 2016-03-23 13:33:33 +11:00
  • cc42490832 Applying a voucher to a cart now uses the voucher code rather than the voucher object. Adds tests for constraints on vouchers. Christopher Neugebauer 2016-03-23 13:29:18 +11:00
  • 745f6db444 Adds “CategoryForm” to forms.py. It’s about to replace the existing ProductItem form Christopher Neugebauer 2016-03-04 18:01:16 -08:00
  • 770e2ca88d Clean up some of the voting status UI Patrick Altman 2016-03-17 13:59:46 -05:00
  • 430d3dad99 Fix up review nav Patrick Altman 2016-03-17 13:45:40 -05:00
  • ad8181091a Merge pull request #130 from pydata/unpublished-conference-schedule Patrick Altman 2016-03-15 19:48:07 -05:00
  • 6789b25e69 Update README.md Anna Ossowski 2016-03-15 17:37:18 +01:00
  • 251f9ea280 Show unpublished conference schedule to staff. Martey Dodoo 2016-03-15 12:08:58 -04:00
  • d10d313f64 Merge pull request #128 from jefftriplett/speaker-twitter-username Patrick Altman 2016-03-15 08:54:58 -05:00
  • 0a487cb269 Merge pull request #129 from pydata/slot-admin-content Patrick Altman 2016-03-15 08:54:14 -05:00
  • 88fc54994b Update README.rst Anna Ossowski 2016-03-15 13:22:29 +01:00
  • f5558d5f0c Update README.rst Anna Ossowski 2016-03-15 13:21:19 +01:00
  • 6fb529aad2 Display content_override in slot admin list view. Martey Dodoo 2016-03-15 05:47:25 -04:00
  • c7ce7fe020 Adds twitter_username to Speaker Jeff Triplett 2016-03-14 22:24:14 -05:00
  • 2717e4c819 Merge pull request #127 from pydata/not-reviewed-error Patrick Altman 2016-03-10 21:07:25 -06:00
  • 78d13a9ffa Fix queryset used in "Not Reviewed" view. Martey Dodoo 2016-03-10 20:35:41 -05:00
  • 68e7e4e594 Checks enabling conditions before adding items to the list Christopher Neugebauer 2016-03-04 14:35:09 -08:00
  • 8400da17da Fixes error in EnablingConditionBase, adds admins for Product and Category enabling conditions Christopher Neugebauer 2016-03-04 14:28:58 -08:00
  • 0182a32f03 Fixes various errors in discount calculation, and adds tests for these Christopher Neugebauer 2016-03-04 13:07:45 -08:00
  • 99f4b8dfe0 Fixes validation error in models.py for adding discounts Christopher Neugebauer 2016-03-04 13:07:18 -08:00
  • a4de15830c Adds checkout view, which generates an invoice, and then redirects to the invoice itself. Christopher Neugebauer 2016-03-04 12:22:01 -08:00
  • 1b7d8a60c1 Adds product_category form, which allows users to add products from a specific category to their cart. Christopher Neugebauer 2016-03-03 13:40:44 -08:00