Skip to content

PR for addition of transaction history table to subscription page #583

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

Open
Naman-56-56 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

PR for addition of transaction history table to subscription page #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
42 changes: 42 additions & 0 deletions spoken/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,9 +962,50 @@ def subscription(request):
context = {}
context["subscription_amount"] = settings.SUBSCRIPTION_AMOUNT
template = 'spoken/templates/subscription.html'

# Get user's past transactions
if user.is_authenticated:
# Get subscriptions for this user - try multiple matching strategies
# since existing data might not have user field properly set
user_subscriptions = AcademicSubscription.objects.filter(
Q(user=user) | Q(email=user.email)
).select_related('transaction').prefetch_related('academic_details__academic').order_by('-created')

# Prepare transaction data for template
transactions = []
for subscription in user_subscriptions:
# Get academic details for this subscription
academic_details = subscription.academic_details.all()

if academic_details.exists():
for detail in academic_details:
transaction_data = {
'payment_date': subscription.created.date(),
'subscription_end_date': detail.subscription_end_date,
'institute_name': detail.academic.institution_name,
'gst_number': detail.gst_number or 'N/A',
}

# Add transaction details if available
if subscription.transaction:
transaction_data.update({
'transaction_id': subscription.transaction.transaction_id or subscription.transaction.order_id,
'order_status': subscription.transaction.order_status or 'PENDING'
})
else:
transaction_data.update({
'transaction_id': 'N/A',
'order_status': 'NO_TRANSACTION'
})

transactions.append(transaction_data)

context['user_transactions'] = transactions

if request.method == 'GET':
form = AcademicSubscriptionForm(user=user)
context['form'] = form

return render(request, template, context=context)
if request.method == 'POST':
form = AcademicSubscriptionForm(request.POST, user=user)
Expand All @@ -977,6 +1018,7 @@ def subscription(request):
subscription_amount = settings.SUBSCRIPTION_AMOUNT * total_academic_centers
email = form.cleaned_data.get('email')
data = {
'user': user, # Add the user to link subscription to logged-in user
'name': form.cleaned_data.get('name'),
'email': form.cleaned_data.get('email'),
'phone': form.cleaned_data.get('phone'),
Expand Down
121 changes: 118 additions & 3 deletions static/spoken/templates/subscription.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,61 @@
font-size: 1.2rem;
}
.is-invalid {
border-color: #dc3545 !important;
box-shadow: 0 0 4px #dc3545;
}
border-color: #dc3545 !important;
box-shadow: 0 0 4px #dc3545;
}

/* Transaction history table styling */
.table-responsive {
border: 1px solid #dee2e6;
border-radius: 5px;
margin-bottom: 20px;
}

.thead-dark th {
background-color: #343a40;
color: #ffffff;
border-color: #454d55;
font-weight: 600;
font-size: 0.9rem;
}

.table-striped tbody tr:nth-of-type(odd) {
background-color: rgba(0, 123, 255, 0.05);
}

.table-hover tbody tr:hover {
background-color: rgba(0, 123, 255, 0.1);
}

.badge {
font-size: 0.8rem;
padding: 0.4em 0.6em;
}

.badge-success {
background-color: #28a745;
}

.badge-warning {
background-color: #ffc107;
color: #212529;
}

.badge-danger {
background-color: #dc3545;
}

.badge-secondary {
background-color: #6c757d;
}

.transaction-history h3 {
margin-bottom: 20px;
color: #495057;
border-bottom: 2px solid #007bff;
padding-bottom: 10px;
}
</style>
{% endblock %}
{% block heading %}
Expand Down Expand Up @@ -103,6 +155,69 @@
</div>
</form>

<!-- User Transaction History -->
{% if user.is_authenticated and user_transactions %}
<div class="row transaction-history" style="margin-top: 30px;">
<div class="col-sm-12">
<h3><i class="fa fa-history"></i> Your Transaction History</h3>
<div class="table-responsive">
<table class="table table-striped table-hover">
<thead class="thead-dark">
<tr>
<th><i class="fa fa-calendar"></i> Payment Date</th>
<th><i class="fa fa-receipt"></i> Transaction ID</th>
<th><i class="fa fa-calendar-check"></i> Subscription End Date</th>
<th><i class="fa fa-university"></i> Institute Name</th>
<th><i class="fa fa-file-text"></i> GST Number</th>
<th><i class="fa fa-info-circle"></i> Status</th>
</tr>
</thead>
<tbody>
{% for transaction in user_transactions %}
<tr>
<td>{{ transaction.payment_date|date:"d M Y" }}</td>
<td>
<small class="text-muted">{{ transaction.transaction_id }}</small>
</td>
<td>{{ transaction.subscription_end_date|date:"d M Y" }}</td>
<td>{{ transaction.institute_name }}</td>
<td>{{ transaction.gst_number }}</td>
<td>
{% if transaction.order_status == 'CHARGED' %}
<span class="badge badge-success">
<i class="fa fa-check"></i> Paid
</span>
{% elif transaction.order_status == 'PENDING' or transaction.order_status == 'PENDING_VBV' or transaction.order_status == 'AUTHORIZING' %}
<span class="badge badge-warning">
<i class="fa fa-clock-o"></i> Pending
</span>
{% elif transaction.order_status == 'NO_TRANSACTION' %}
<span class="badge badge-secondary">
<i class="fa fa-exclamation"></i> No Payment
</span>
{% else %}
<span class="badge badge-danger">
<i class="fa fa-times"></i> Failed
</span>
{% endif %}
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
{% elif user.is_authenticated %}
<div class="row" style="margin-top: 30px;">
<div class="col-sm-12">
<div class="alert alert-info">
<i class="fa fa-info-circle"></i> No transaction history found for your account.
</div>
</div>
</div>
{% endif %}

<div id="paymentMsg">

</div>
Expand Down