ENH: Add private Workshops and Special Rates #66

jakereps · 2016-08-29T16:48:39Z

Placeholder for private workshops and special rate functionality.

Resolves #64
Resolves #65

thermokarst

Looks great @jakereps! 👍

Just a few minor questions/comments here. Let me know if you want to discuss further. Thanks!!

thermokarst · 2016-09-14T20:04:52Z

payments/models.py

+                                     'a customer receiving a discount in the '
+                                     'form of https://workshops.qiime.org/wor'
+                                     'kshop_slug/rate=discount_code',
+                                     default=uuid.uuid4)


When adding more than one discount rate, all the rates have the same UUID value:

That seems to be a Django issue. Probably something weird to do with the inline admin. I'll do some digging to see if there is any way to fix it.

thermokarst · 2016-09-14T20:07:51Z

static/js/workshop.js

+    var publicWorkshop = $('#id_public');
+    var privateCodeRow = $('.field-private_code');
+    var privateCodeInput = $('#id_private_code');
+    var privateCodeUrlSpan = $('#pcode');


It would be great to have the same helper URL show up in the Inline Rate Editor:

This would require quite a bit of hacking with JS. I tried to go the same route as the private code with the discount code but the help text just goes up to the question mark alt text next to the column header so I put a generic help text. I could try to get it to happen, but it will need a lot more lines than the private code.

thermokarst · 2016-09-14T20:21:00Z

payments/models.py

@@ -105,7 +124,12 @@ class Rate(models.Model):
    price = models.DecimalField(max_digits=6, decimal_places=2,


The max_digits needs to be bumped up to 8, I think:

thermokarst · 2016-09-14T20:25:08Z

templates/payments/workshop_detail.html

-      <input type="submit" class="btn btn-primary pull-right" value="Continue" />
+      <div class="col-md-3 col-md-offset-9">
+          {% if workshop.public %}
+            {{ form.special_code }}


Is this leftover from the earlier version where the discount code was manually entered? If so, can you remove this?

thermokarst · 2016-09-14T20:43:49Z

payments/views.py



 class WorkshopDetail(FormMixin, DetailView):
    model = Workshop
    form_class = OrderForm
    context_object_name = 'workshop'
+    discount_code = None


You can drop this, see below.

thermokarst · 2016-09-14T20:44:00Z

payments/views.py

+
+    # dicount_code must be grabbed before anything begins as putting it
+    # in the get() was somehow being beaten by the get_form_kwargs()
+    def dispatch(self, request, *args, **kwargs):


You can drop this, see below.

thermokarst · 2016-09-14T20:45:37Z

payments/views.py

            return HttpResponseRedirect(reverse('payments:index'))
        return response

    def get_form_kwargs(self):
        kwargs = super().get_form_kwargs()
        kwargs['workshop'] = self.object
+        kwargs['discount_code'] = self.discount_code
        return kwargs

    def get_context_data(self, **kwargs):
        context = super().get_context_data(**kwargs)


Before calling super() just do self.discount_code = self.request.GET.get('rate'), then you should have the discount code everywhere you need it.

thermokarst · 2016-09-14T20:46:10Z

payments/views.py

+
+    # Since there are possible GET parameters we need to conditionally
+    # determine the queryset for the ListView
+    def get_queryset(self):


Nice use of the get_queryset hook!

thermokarst · 2016-09-14T20:46:34Z

payments/models.py

@@ -74,6 +83,16 @@ def get_absolute_url(self):
        return reverse('payments:details', kwargs={'slug': self.slug},
                       subdomain='workshops')

+    def filter_rates(self, rate_code):


I like this convenience method!

thermokarst · 2016-09-14T20:47:06Z

payments/models.py

@@ -57,7 +66,7 @@ def sold_out_rates(self):
        return self.rate_set.filter(sold_out=True)

    class Meta:
-        unique_together = (('title', 'slug'), )
+        unique_together = (('title', 'slug'), ('private_code', 'public'))


jakereps · 2016-09-14T23:31:09Z

Thanks @thermokarst! Looking into the rate uuid bug, and a way to handle the dynamic url helpers like the secret code does, everything else was addressed!

jakereps · 2016-09-20T00:09:18Z

So everything should be good, @thermokarst. Got rid of the UUID bug by changing the behavior of the form entirely, and added dynamic URL's. In order to do the dynamic URLs the JS had to get a little bit ugly, but hey, it works? ¯_(ツ)_/¯

thermokarst

Looks great @jakereps! One minor change inline.

Also, I think we need to include a check inSubmitOrder, right at the beginning of the post handler, we need to double check that there are still available tickets at the rate the purchaser is trying to buy at. If there aren't they should be bounced back to the workshop detail page with a note that the rate is sold out. Right now we only check that tickets are available before starting the purchase process, but there could be situations where tickets sell out while someone is in the process of purchasing.

thermokarst · 2016-09-30T04:17:08Z

payments/views.py

@@ -49,7 +49,7 @@ def get_queryset(self):
            queryset = Workshop.objects.filter(private_code=self.private_code)

        if queryset is None or len(queryset) == 0:
-            queryset = Workshop.objects.filter(draft=False, public=True)
+            queryset = Workshop.objects.filter(draft=False)


thermokarst · 2016-09-30T04:18:11Z

payments/views.py

@@ -67,12 +67,15 @@ class WorkshopDetail(FormMixin, DetailView):
    form_class = OrderForm
    context_object_name = 'workshop'

+    # discount_code is needed on POST as well, so only getting it on


I don't know if this dispatch is quite what we need. Query params on GET requests are generally frowned upon. How about we just stash the discount code in the session on GET? See below for more.

thermokarst · 2016-09-30T04:19:39Z

payments/views.py

+    def dispatch(self, request, *args, **kwargs):
+        self.discount_code = self.request.GET.get('rate')
+        return super().dispatch(request, *args, **kwargs)
+
    def get(self, request, *args, **kwargs):
        response = super().get(request, *args, **kwargs)


Before the call to super() you can do:

self.request.session['discount_code'] = request.GET.get('rate')

thermokarst · 2016-09-30T04:20:46Z

payments/views.py

@@ -83,7 +86,7 @@ def get_form_kwargs(self):
        return kwargs


kwargs['discount_code'] = self.request.session.get('discount_code')

thermokarst · 2016-09-30T04:22:56Z

payments/views.py

        rates = []
-        for rate in self.object.rate_set.order_by('price'):
+        for rate in self.object.filter_rates(self.discount_code):


for rate in self.object.filter_rates(self.request.session.get('discount_code'))

jakereps · 2016-10-05T18:33:12Z

This should be good to go, @thermokarst! Did I miss something that it's re-assigned to me?

Edit: Ahhh, I did miss something.

jakereps · 2016-10-05T23:00:44Z

Ok, this one should be good to go after tests! Thanks @thermokarst 👍

thermokarst · 2016-10-09T23:14:01Z

Thanks for this @jakereps !! 🌮 🌮 🌮

jakereps added the stat:DO-NOT-MERGE Please do not merge this until this label has been removed. label Aug 29, 2016

jakereps closed this Aug 31, 2016

jakereps force-pushed the special-rates branch from b0d9133 to ada3823 Compare August 31, 2016 20:39

jakereps reopened this Aug 31, 2016

jakereps force-pushed the special-rates branch 3 times, most recently from fd14f40 to 0b446ad Compare September 9, 2016 23:20

thermokarst self-assigned this Sep 9, 2016

thermokarst removed the stat:DO-NOT-MERGE Please do not merge this until this label has been removed. label Sep 9, 2016

jakereps added 6 commits September 13, 2016 12:46

WIP: Add form to detail page

57d8904

WIP: Add GET functionality

363299e

WIP: Clean up view code

c6f039b

WIP: Add Admin capabilities, JS

2cc2f53

ENH: Improve private workshop functionality

f0e4cd1

ENH: Add hidden rates

2643b69

jakereps force-pushed the special-rates branch from 0b446ad to 2643b69 Compare September 13, 2016 19:48

WIP: Remove debug line

62769c2

thermokarst suggested changes Sep 14, 2016

View reviewed changes

Addresses comments

5467ad3

jakereps added 2 commits September 19, 2016 13:56

ENH: Fix Inline issues

2462d72

ENH: Add dynamic URLs to rate codes

e18a3dd

jakereps force-pushed the special-rates branch from a16b45f to e18a3dd Compare September 20, 2016 00:07

ENH: Addresses feature changes

3036213

jakereps force-pushed the special-rates branch from 906e034 to 3036213 Compare September 23, 2016 19:46

BUG: Custom Uniqueness Validation

03164ca

jakereps force-pushed the special-rates branch from 85b4b05 to 03164ca Compare September 26, 2016 17:44

thermokarst suggested changes Sep 30, 2016

View reviewed changes

REF: Move stuff around

6b72b03

thermokarst assigned jakereps and unassigned thermokarst Oct 5, 2016

ENH: Add final rate sold out check

c84cff1

thermokarst approved these changes Oct 9, 2016

View reviewed changes

thermokarst merged commit a371ea8 into qiime2:master Oct 9, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ENH: Add private Workshops and Special Rates #66

ENH: Add private Workshops and Special Rates #66

jakereps commented Aug 29, 2016

thermokarst left a comment

thermokarst Sep 14, 2016

jakereps Sep 14, 2016 •

edited

thermokarst Sep 14, 2016

jakereps Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

thermokarst Sep 14, 2016

jakereps commented Sep 14, 2016

jakereps commented Sep 20, 2016

thermokarst left a comment

thermokarst Sep 30, 2016

thermokarst Sep 30, 2016

thermokarst Sep 30, 2016

thermokarst Sep 30, 2016

thermokarst Sep 30, 2016

jakereps commented Oct 5, 2016 •

edited

jakereps commented Oct 5, 2016

thermokarst commented Oct 9, 2016

		@@ -105,7 +124,12 @@ class Rate(models.Model):
		price = models.DecimalField(max_digits=6, decimal_places=2,

ENH: Add private Workshops and Special Rates #66

ENH: Add private Workshops and Special Rates #66

Conversation

jakereps commented Aug 29, 2016

thermokarst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakereps Sep 14, 2016 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakereps commented Sep 14, 2016

jakereps commented Sep 20, 2016

thermokarst left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jakereps commented Oct 5, 2016 • edited

jakereps commented Oct 5, 2016

thermokarst commented Oct 9, 2016

jakereps Sep 14, 2016 •

edited

jakereps commented Oct 5, 2016 •

edited