Membership No. #{{ user.stripe_customer.invoice_prefix }}
-
{{ user.primary_product.name}}
+
{{ user.active_subscription.primary_product.name}}
{% comment %}
{{user.subscribed_price.human_readable_price}}
{% endcomment %}
- {% if user.primary_product.gift_giver_subscription %}
+ {% if user.active_subscription.gift_giver_subscription %}
Gifted by {{user.gift_giver}}
{% endif %}
Since {{ user.active_subscription.created|date:"d M Y" }}
diff --git a/app/templates/base.html b/app/templates/base.html
index c3a51a56..841ac7ff 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -1,5 +1,6 @@
-{% load wagtailuserbar django_vite menu_tags setting %}
+{% load wagtailuserbar django_vite menu_tags setting tz %}
+{% timezone "Europe/London" %}
@@ -10,6 +11,7 @@
+
{% block head_title %}Left Book Club{% endblock %}
{% include "wagtailseo/meta.html" %}
{% vite_hmr_client %}
@@ -47,7 +49,7 @@
src'https://www.facebook.com/tr?id={{ FACEBOOK_PIXEL }}&ev=PageView&noscript=1'
/>
- {% endif %}
+ {% endif %}
@@ -73,3 +75,4 @@
{% block bottom_of_page %}{% endblock %}
+{% endtimezone %}
diff --git a/app/templatetags/setting.py b/app/templatetags/setting.py
index 1f9a12b4..13f20f61 100644
--- a/app/templatetags/setting.py
+++ b/app/templatetags/setting.py
@@ -1,9 +1,11 @@
import json
+import urllib.parse
from django import template
from django.conf import settings
from django.utils.safestring import mark_safe
from django.utils.translation import gettext_lazy as _
+from oauth2_provider.models import Application
register = template.Library()
@@ -29,3 +31,19 @@ def user_data(context):
user_data = request.user.get_analytics_data()
return {"user_data": mark_safe(json.dumps(user_data))}
+
+
+@register.simple_tag(takes_context=True)
+def oauth_application_from_query(context):
+ try:
+ request = context["request"]
+ next = request.GET.get("next", None)
+ if next is not None:
+ url_parts = urllib.parse.urlparse(next)
+ params = urllib.parse.parse_qs(url_parts.query)
+ client_id = params.get("client_id", None)
+ if client_id is not None and len(client_id) > 0:
+ app = Application.objects.filter(client_id__in=client_id).first()
+ return app
+ except:
+ return None
diff --git a/app/urls.py b/app/urls.py
index 102be747..711e3e87 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -1,9 +1,13 @@
+import logging
+
from django.conf import settings
from django.conf.urls.static import static
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from django.templatetags.static import static as get_static_path
from django.urls import include, path, re_path
+from django.utils.decorators import method_decorator
+from django.views.decorators.csrf import csrf_exempt
from django.views.generic import TemplateView
from django.views.generic.base import RedirectView
from shopify_webhook.views import WebhookView
@@ -29,9 +33,6 @@
SubscriptionCheckoutView,
)
-# from wagtail_transfer import urls as wagtailtransfer_urls
-
-
urlpatterns = [
path("oauth/", include("oauth2_provider.urls", namespace="oauth2_provider")),
path("django/", admin.site.urls),
@@ -116,7 +117,7 @@
path("accounts/", include("allauth.urls")),
path("stripe/", include("djstripe.urls", namespace="djstripe")),
path("customer_portal/", StripeCustomerPortalView.as_view(), name="customerportal"),
- path("shopify/webhook/", WebhookView.as_view(), name="shopify_webhook"),
+ path(settings.SHOPIFY_WEBHOOK_PATH, WebhookView.as_view(), name="shopify_webhook"),
path(
ShippingCostView.url_pattern, ShippingCostView.as_view(), name="shippingcosts"
),
diff --git a/app/views.py b/app/views.py
index 55ed3d72..ad112cc5 100644
--- a/app/views.py
+++ b/app/views.py
@@ -28,7 +28,7 @@
from app import analytics
from app.forms import CountrySelectorForm, GiftCodeForm, StripeShippingForm
from app.models import LBCProduct
-from app.models.stripe import ShippingZone
+from app.models.stripe import LBCSubscription, ShippingZone
from app.models.wagtail import MembershipPlanPrice
from app.utils.mailchimp import tag_user_in_mailchimp
from app.utils.shopify import create_shopify_order
@@ -449,20 +449,14 @@ class CancellationView(LoginRequiredTemplateView):
def get_context_data(self, subscription_id=None, **kwargs: Any) -> Dict[str, Any]:
context = super().get_context_data(**kwargs)
- if subscription_id and self.request.user.stripe_customer is not None:
+ if (
+ subscription_id is not None
+ and self.request.user.stripe_customer is not None
+ ):
try:
- subscription_id = subscription_id
- subscription = self.request.user.stripe_customer.subscriptions.get(
- id=subscription_id
- )
- context["subscription"] = subscription
- if subscription.metadata.get("gift_mode", None) is not None:
- context["gift_mode"] = True
- promo_code_id = subscription.metadata.get("promo_code", None)
- if promo_code_id is not None:
- context[
- "gift_recipient_subscription"
- ] = gift_recipient_subscription_from_code(promo_code_id)
+ context["subscription"] = LBCSubscription.objects.filter(
+ customer=self.request.user.stripe_customer, id=subscription_id
+ ).first()
return context
except djstripe.models.Subscription.DoesNotExist:
raise Http404
@@ -474,15 +468,25 @@ def post(self, request, *args, subscription_id=None, **kwargs):
if request.method == "POST":
if subscription_id is None:
subscription_id = request.user.active_subscription.id
- if (
- request.user.stripe_customer is not None
- and request.user.stripe_customer.subscriptions.filter(
- id=subscription_id
- ).exists()
- ):
- analytics.cancel_membership(request.user.stripe_customer.subscriber)
- stripe.Subscription.modify(subscription_id, cancel_at_period_end=True)
- return HttpResponseRedirect(reverse("account_membership"))
+ if request.user.stripe_customer is not None:
+ sub = LBCSubscription.objects.filter(
+ customer=request.user.stripe_customer, id=subscription_id
+ ).first()
+ if sub is not None:
+ analytics.cancel_membership(request.user.stripe_customer.subscriber)
+ stripe.Subscription.modify(
+ subscription_id, cancel_at_period_end=True
+ )
+ if sub.gift_giver_subscription is not None:
+ stripe.Subscription.modify(
+ sub.gift_giver_subscription.id, cancel_at_period_end=True
+ )
+ if sub.gift_recipient_subscription is not None:
+ stripe.Subscription.modify(
+ sub.gift_recipient_subscription.id,
+ cancel_at_period_end=True,
+ )
+ return HttpResponseRedirect(reverse("account_membership"))
raise Http404
@@ -512,7 +516,7 @@ def get_context_data(
initial={"country": country_id}
),
"url_pattern": ShippingCostView.url_pattern,
- "current_book": product.current_book(),
+ "current_book": product.current_book,
}
)