Redesign Squarelet billing pages by dnass · Pull Request #716 · MuckRock/squarelet

dnass · 2026-07-06T12:09:57Z

No description provided.

mitchelljkotler

This looks like it is still under development, let me know if you have any questions

mitchelljkotler · 2026-07-07T19:45:10Z

+    form_class = UpdateSubscriptionFrequencyForm
+    template_name = "subscriptions/update_subscription_frequency.html"
+
+    def get_queryset(self):


You shouldn't need to override get_queryset or get_object here - it should do the right thing if you pass in a slug as a kwarg from the URL

The route 404s when I remove these overrides. The URL also contains the subscription pk, could that be the issue?

mitchelljkotler · 2026-07-07T19:46:05Z

+    form_class = CancelSubscriptionForm
+    template_name = "subscriptions/cancel_subscription.html"
+
+    def get_queryset(self):


dnass · 2026-07-07T20:51:52Z

@mitchelljkotler Thanks for reviewing. The only piece of this I haven't tackled yet is switching from a monthly plan to annual or vice versa. I'm happy to take a crack at it if you can lay out the general approach for me.

allanlasser · 2026-07-10T21:39:38Z

I made a few fixes and one change so far:

FIX: calls individual_organization.subscriptions.first() when constructing context for the /selectplan view. It was erroring since it hadn't been updated to the multi-subscription assumption.
FIX: adds proper card-call mocking for tests
CHANGE: prefers username as the URL param for individual organizations, not the slug of the individual_organization. The slug and the username will diverge, like for my username (lasser.allan gets slugified to lasserallan), which breaks some pages. Individual organizations are an invisible concept for users, so it's better to prefer the username here. I added a class mixin for finding the right object based on whether we're dealing with an individual or group org.

Flagging that this should be rebased against master, and there'll be some merge conflicts along the way.

gitguardian · 2026-07-20T17:45:54Z

️✅ There are no secrets present in this pull request anymore.

If these secrets were true positive and are still valid, we highly recommend you to revoke them.
While these secrets were previously flagged, we no longer have a reference to the
specific commits where they were detected. Once a secret has been leaked into a git
repository, you should consider it compromised, even if it was deleted immediately.
Find here more information about risks.

^{_{🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request.}}

allanlasser

We already have a squarelet/payments/forms.py and squarelet/payments/views.py—let's update those files intead of adding the subscriptions module.

allanlasser

Need a consolidated view of all payments in addition to a payment history for a specific org. Let's use the templates/subscriptions/payments.html as a base for two layouts:
1. A template "organization_payments.html" that lists just payments for a single org.
2. A template "payments_hub.html" that list all payments a user can see, across all orgs they belong to. Just show the 5 most recent payments, with a link to view all payments for the org—this leads to the organziation_payments template.
Support removing cards
Activity stream logging when staff take actions for accountability
Update "Upgrade" button link (currently points to old payment page)
~~Modify current subscription in-place (upgrade/downgrade) for pro-ration benefits. No support for adding second subscription yet—will come in follow-up change.~~ Moving this handling to a new branch and PR
~~Changing plan frequency is unimplemented~~ Move change frequency feature to a new branch and PR #755
#753

allanlasser · 2026-07-24T13:38:59Z

Belonging to an organization with multiple subscriptions creates some unintentional chaos on user profile pages. This worked well when there was just 1 subscription. Perhaps we can consolidate this into a single card—the most important information is the benefits a user inherits, and making that clear to them.

Update: I'm thinking about tying the benefits list data to entitlements; this way, benefits are an "plain language" description of the entitlement and they can be composed on plans.

Update 2: We can handle this separately without blocking this branch. I opened #753 to address.

1. Use username for user payment routes, not individual_org slug. 2. Protect individual payment routes to just object owners or staff.

…nization object

The ability to change a subscription's billing frequency is not ready to ship with the billing redesign. Extract this work-in-progress to the 677-billing-frequency branch and remove it here: the org and user UpdateSubscriptionFrequency views, BaseUpdateSubscriptionFrequency, UpdateSubscriptionFrequencyForm, both update-frequency URLs, the update_subscription_frequency template, and the "Change to monthly/annual" link on the manage subscriptions page. The informational Annual/Monthly badge is kept. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

allanlasser · 2026-07-28T21:44:00Z

This code is in great shape. I've moved any further changes onto dedicated branches for smaller, interative PRs upon this foundation. I'm merging this into a release-ready branch so we can mark it done, but hold off on merging until all the follow-on work is complete.

allanlasser temporarily deployed to squarelet-pi-677-redesi-v2n1vz July 6, 2026 12:13 Inactive

allanlasser temporarily deployed to squarelet-pi-677-redesi-v2n1vz July 6, 2026 12:38 Inactive