Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#1202 adding jinjax macro to subscribers plan template #1203

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+127 −123
Open

#1202 adding jinjax macro to subscribers plan template #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
684606f
#1202 adding jinjax macro to subscribers plan template
joeltejeda Jul 14, 2023
ad85ffc
Revert "#1202 adding jinjax macro to subscribers plan template"
chrisjsimpson Jul 15, 2023
893abce
Fix #1202 added maro subscriber_subscription_plan_card.html
chrisjsimpson Jul 15, 2023
ba7e19c
#1202 naming. subscriber_subscription_plan_card(subscription) -> subs…
chrisjsimpson Jul 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 3 additions & 123 deletions subscribie/blueprints/admin/templates/admin/subscribers.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{% extends "admin/layout.html" %}
{% extends "admin/layout.html" %}
{% block title %} Subscribers {% endblock %}

{% block body %}
{% from 'macros/subscriber_subscription_card.html' import subscriber_subscription_card %}

<h2 class="text-center text-dark mb-3">My Subscribers</h2>

Expand Down Expand Up @@ -82,128 +83,7 @@ <h4>Search...</h4>
<ul class="list-unstyled">
{% for subscription in person.subscriptions %}
<li>
<div class="card">
<ul class="list-unstyled px-2">
<li><strong>Title: </strong>
<span class="subscription-title">{{ subscription.plan.title }}</span>
</li>
<li>
<strong>Interval:</strong>
{% if subscription.plan is not sameas None and subscription.plan.interval_unit is not sameas None %}
{{ subscription.plan.interval_unit.capitalize() }}
{% else %}
{{ subscription.plan.interval_unit }}
{% endif %}
</li>
{% if subscription.chosen_options %}
<li>
<details open>
<summary><strong>Chosen Options</strong></summary>
<ul>
{% for choice in subscription.chosen_options %}
<li><strong>{{ choice.choice_group_title }}:</strong> {{ choice.option_title }}</li>
{% endfor %}
</ul>
</details>
</li>
{% endif %}
<li><strong>Subscription ID: </strong>{{ subscription.uuid }}</li>
<li><strong>Date started: </strong>{{ subscription.created_at.strftime('%Y-%m-%d') }}</li>
<li>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
<strong>Price: </strong>
<span class="subscribers-plan-interval_amount">{{ subscription.showIntervalAmount() }}</span>
{% else %}
(One-off. Not a subscription)
{% endif %}
</li>
<li><strong>Sell price: </strong>
<span class="subscribers-plan-sell-price">
{% if subscription.plan.requirements and subscription.plan.requirements.instant_payment %}
{{ subscription.showSellPrice() }}</li>
{% else %}
(No up-front fee)
{% endif %}
</span>
<li><strong>Status:</strong>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
{% if subscription.stripe_pause_collection == "void" %}
<span class="subscription-status">Paused</span>
{% else %}
<span class="subscription-status">{{ subscription.stripe_status }}</span>
{% endif %}
{% else %}
<span class="subscription-status">Paid</span>
{% endif %}
</li>
{% if subscription.stripe_cancel_at %}
<strong>Automatically Cancels at:</strong>
{{ subscription.stripe_cancel_at | timestampToDate }}
{% endif %}
<li>
</li>
<li>
{% if subscription.plan.requirements and subscription.plan.requirements.note_to_seller_required %}
<details open>
<summary><strong>Order Note</strong></summary>
{% if subscription.note %}
{{ subscription.note.note }}
{% else %}
No note was given.
{% endif %}
</details>
{% endif %}
</li>
<li><strong>Actions: </strong>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
{% if subscription.stripe_status|lower in ['active', 'trialing', 'past_due', 'unpaid'] %}
{% if subscription.stripe_status|lower != 'trialing' and subscription.stripe_pause_collection != 'void' %}
<a href="{{ url_for("admin.pause_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="pause-action">Pause</span>
</a> |
<a href="{{ url_for("admin.cancel_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="cancel-action">Cancel</span>
</a> |
{% endif %}
{% endif %}
{% if subscription.stripe_pause_collection|lower == 'void' %}
<a href="{{ url_for("admin.resume_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="resume-action">Resume</span>
</a> |
<a href="{{ url_for("admin.cancel_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="cancel-action">Cancel</span>
</a> |
{% endif %}
{% endif %}</li>
<li class=mt-2><strong>History: </strong>
<a href="{{ url_for('admin.transactions',
subscriber=subscription.person.uuid) }}">View Transactions
</a>
</li>
<li class=mt-2><strong>Documents: </strong>
{% if subscription.documents|length == 0 %}
None
{% else %}
<ul>
{% for document in subscription.documents %}
{# Show documents assocated with subscription (if any) #}
<li><a href="{{ url_for('document.show_document', document_uuid=document.uuid) }}">
{{ document.name }}</a> |
{{ document.created_at.strftime('%Y-%m-%d') }}</li>
{% endfor %}
</ul>
{% endif %}
</li>
</ul>
</div>
{{ subscriber_subscription_card(subscription) }}
</li>
{% endfor %}
</ul>
Expand Down
124 changes: 124 additions & 0 deletions subscribie/blueprints/admin/templates/macros/subscriber_subscription_card.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{% macro subscriber_subscription_card(subscription) -%}
<div class="card">
<ul class="list-unstyled px-2">
<li><strong>Title: </strong>
<span class="subscription-title">{{ subscription.plan.title }}</span>
</li>
<li>
<strong>Interval:</strong>
{% if subscription.plan is not sameas None and subscription.plan.interval_unit is not sameas None %}
{{ subscription.plan.interval_unit.capitalize() }}
{% else %}
{{ subscription.plan.interval_unit }}
{% endif %}
</li>
{% if subscription.chosen_options %}
<li>
<details open>
<summary><strong>Chosen Options</strong></summary>
<ul>
{% for choice in subscription.chosen_options %}
<li><strong>{{ choice.choice_group_title }}:</strong> {{ choice.option_title }}</li>
{% endfor %}
</ul>
</details>
</li>
{% endif %}
<li><strong>Subscription ID: </strong>{{ subscription.uuid }}</li>
<li><strong>Date started: </strong>{{ subscription.created_at.strftime('%Y-%m-%d') }}</li>
<li>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
<strong>Price: </strong>
<span class="subscribers-plan-interval_amount">{{ subscription.showIntervalAmount() }}</span>
{% else %}
(One-off. Not a subscription)
{% endif %}
</li>
<li><strong>Sell price: </strong>
<span class="subscribers-plan-sell-price">
{% if subscription.plan.requirements and subscription.plan.requirements.instant_payment %}
{{ subscription.showSellPrice() }}</li>
{% else %}
(No up-front fee)
{% endif %}
</span>
<li><strong>Status:</strong>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
{% if subscription.stripe_pause_collection == "void" %}
<span class="subscription-status">Paused</span>
{% else %}
<span class="subscription-status">{{ subscription.stripe_status }}</span>
{% endif %}
{% else %}
<span class="subscription-status">Paid</span>
{% endif %}
</li>
{% if subscription.stripe_cancel_at %}
<strong>Automatically Cancels at:</strong>
{{ subscription.stripe_cancel_at | timestampToDate }}
{% endif %}
<li>
</li>
<li>
{% if subscription.plan.requirements and subscription.plan.requirements.note_to_seller_required %}
<details open>
<summary><strong>Order Note</strong></summary>
{% if subscription.note %}
{{ subscription.note.note }}
{% else %}
No note was given.
{% endif %}
</details>
{% endif %}
</li>
<li><strong>Actions: </strong>
{% if subscription.plan.requirements and subscription.plan.requirements.subscription %}
{% if subscription.stripe_status|lower in ['active', 'trialing', 'past_due', 'unpaid'] %}
{% if subscription.stripe_status|lower != 'trialing' and subscription.stripe_pause_collection != 'void' %}
<a href="{{ url_for("admin.pause_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="pause-action">Pause</span>
</a> |
<a href="{{ url_for("admin.cancel_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="cancel-action">Cancel</span>
</a> |
{% endif %}
{% endif %}
{% if subscription.stripe_pause_collection|lower == 'void' %}
<a href="{{ url_for("admin.resume_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="resume-action">Resume</span>
</a> |
<a href="{{ url_for("admin.cancel_stripe_subscription",
subscription_id=subscription.stripe_subscription_id,
confirm="") }}">
<span class="cancel-action">Cancel</span>
</a> |
{% endif %}
{% endif %}</li>
<li class=mt-2><strong>History: </strong>
<a href="{{ url_for('admin.transactions',
subscriber=subscription.person.uuid) }}">View Transactions
</a>
</li>
<li class=mt-2><strong>Documents: </strong>
{% if subscription.documents|length == 0 %}
None
{% else %}
<ul>
{% for document in subscription.documents %}
{# Show documents assocated with subscription (if any) #}
<li><a href="{{ url_for('document.show_document', document_uuid=document.uuid) }}">
{{ document.name }}</a> |
{{ document.created_at.strftime('%Y-%m-%d') }}</li>
{% endfor %}
</ul>
{% endif %}
</li>
</ul>
</div>
{%- endmacro %}