Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 7 additions & 5 deletions src/economy/templates/includes/expense_detail_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<div class="card-header">Expense Details for {{ expense.pk }}</div>
<div class="card-body">
<table class="table">
<tr>
<th>Created By</th>
<td>{{ expense.user.profile.get_name }}</td>
</tr>
{% if request.resolver_match.app_name == "backoffice" %}
<tr>
<th>Created By</th>
<td>{{ expense.user.profile.get_name }}</td>
</tr>
{% endif %}
<tr>
<th>Amount</th>
<td>{{ expense.amount }} DKK</td>
Expand All @@ -28,7 +30,7 @@
</tr>
<tr>
<th>Paid by BornHack?</th>
<td>This expense was paid by {% if expense.paid_by_bornhack %}<b>BornHack</b>{% else %}<b>{{ expense.user.profile.get_name }}</b>, and will be reimbursed.{% endif %}</td>
<td>This expense was paid by {% if expense.paid_by_bornhack %}<b>BornHack</b>{% elif request.resolver_match.app_name == "backoffice" %}<b>{{ expense.user.profile.get_name }}</b>, and will be reimbursed.{% else %}the creator of the expense{% endif %}</td>
</tr>
<tr>
<th>Filename</th>
Expand Down
16 changes: 10 additions & 6 deletions src/economy/templates/includes/expense_list_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@
<th>Camp</th>
{% endif %}
<th>Invoice Date</th>
<th>Created By</th>
{% if not reimbursement %}
<th>Paid by</th>
{% if request.resolver_match.app_name == "backoffice" %}
<th>Created By</th>
{% if not reimbursement %}
<th>Paid by</th>
{% endif %}
{% endif %}
<th>Creditor</th>
<th>Amount</th>
Expand All @@ -34,9 +36,11 @@
<td data-order="{{ expense.camp.title|sortable }}">{{ expense.camp.title }}</td>
{% endif %}
<td data-order="{{ expense.invoice_date|sortable }}">{{ expense.invoice_date }}</td>
<td>{{ expense.user.profile.get_name }}</td>
{% if not reimbursement %}
<td>{% if expense.paid_by_bornhack %}BornHack{% else %}{{ expense.user.profile.get_name }}{% endif %}</td>
{% if request.resolver_match.app_name == "backoffice" %}
<td>{{ expense.user.profile.get_name }}</td>
{% if not reimbursement %}
<td>{% if expense.paid_by_bornhack %}BornHack{% else %}{{ expense.user.profile.get_name }}{% endif %}</td>
{% endif %}
{% endif %}
<td>{{ expense.creditor.name }}</td>
<td data-order="{{ expense.amount }}">{{ expense.amount }} DKK</td>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
<table class="table">
<tr>
<th>Reimbursement User</th>
<td>{{ reimbursement.reimbursement_user }}</td>
<td>{{ reimbursement.reimbursement_user.profile.get_name }}</td>
</tr>
<tr>
<th>Created By</th>
<td>{{ reimbursement.user }}</td>
<td>{{ reimbursement.user.profile.get_name }}</td>
</tr>
<tr>
<th>Total Amount</th>
Expand Down
10 changes: 6 additions & 4 deletions src/economy/templates/includes/revenue_detail_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
<div class="card-header">Revenue Details for {{ revenue.pk }}</div>
<div class="card-body">
<table class="table">
<tr>
<th>Created By</th>
<td>{{ revenue.user }}</td>
</tr>
{% if request.resolver_match.app_name == "backoffice" %}
<tr>
<th>Created By</th>
<td>{{ revenue.user.profile.get_name }}</td>
</tr>
{% endif %}
<tr>
<th>Amount</th>
<td>{{ revenue.amount }} DKK</td>
Expand Down
8 changes: 6 additions & 2 deletions src/economy/templates/includes/revenue_list_panel.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
<th>Camp</th>
{% endif %}
<th>Invoice Date</th>
<th>Created By</th>
{% if request.resolver_match.app_name == "backoffice" %}
<th>Created By</th>
{% endif %}
<th>Debtor</th>
<th>Amount</th>
<th>Description</th>
Expand All @@ -25,7 +27,9 @@
<td data-order="{{ revenue.camp.title|sortable }}">{{ revenue.camp.title }}</td>
{% endif %}
<td data-order="{{ revenue.invoice_date|sortable }}">{{ revenue.invoice_date }}</td>
<td>{{ revenue.user.email }}</td>
{% if request.resolver_match.app_name == "backoffice" %}
<td>{{ revenue.user.profile.get_name }}</td>
{% endif %}
<td>{{ revenue.debtor }}</td>
<td data-order="{{ revenue.amount }}">{{ revenue.amount }} DKK</td>
<td>{{ revenue.description }}</td>
Expand Down
Loading