arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-23 16:32:15 +00:00
Code Issues Projects Releases Wiki Activity

Basic invoice UI improvements - closes #232

Browse Source
This commit is contained in:
David Taylor
2016-07-10 10:49:23 +01:00
parent 05b2de561e
commit 39d27d2730
4 changed files with 39 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RIGS/finance.py
View File

@@ -144,6 +144,7 @@ class InvoiceEvent(generic.View):
if created: if created:
invoice.invoice_date = datetime.date.today() invoice.invoice_date = datetime.date.today()
messages.success(self.request, 'Invoice created successfully')
return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk})) return HttpResponseRedirect(reverse_lazy('invoice_detail', kwargs={'pk': invoice.pk}))

4
RIGS/models.py
View File

@@ -526,6 +526,10 @@ class Invoice(models.Model):
def balance(self): def balance(self):
return self.sum_total - self.payment_total return self.sum_total - self.payment_total
@property
def is_closed(self):
return self.balance == 0 or self.void
def __str__(self): def __str__(self):
return "%i: %s (%.2f)" % (self.pk, self.event, self.balance) return "%i: %s (%.2f)" % (self.pk, self.event, self.balance)

42
RIGS/templates/RIGS/event_detail.html
View File

@@ -25,9 +25,17 @@
class="hidden-xs">Duplicate</span></a> class="hidden-xs">Duplicate</span></a>
{% if event.is_rig %} {% if event.is_rig %}
{% if perms.RIGS.add_invoice %} {% if perms.RIGS.add_invoice %}
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
class="glyphicon glyphicon-gbp"></span> <span {% if event.invoice and event.invoice.is_closed %}
class="hidden-xs">Invoice</span></a> btn-success
{% elif event.invoice %}
btn-warning
{% else %}
btn-danger
{% endif %}
" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span>
<span class="hidden-xs">Invoice</span></a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
@@ -190,9 +198,17 @@
class="hidden-xs">Duplicate</span></a> class="hidden-xs">Duplicate</span></a>
{% if event.is_rig %} {% if event.is_rig %}
{% if perms.RIGS.add_invoice %} {% if perms.RIGS.add_invoice %}
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
class="glyphicon glyphicon-gbp"></span> <span {% if event.invoice and event.invoice.is_closed %}
class="hidden-xs">Invoice</span></a> btn-success
{% elif event.invoice %}
btn-warning
{% else %}
btn-danger
{% endif %}
" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span>
<span class="hidden-xs">Invoice</span></a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>
@@ -227,9 +243,17 @@
class="hidden-xs">Duplicate</span></a> class="hidden-xs">Duplicate</span></a>
{% if event.is_rig %} {% if event.is_rig %}
{% if perms.RIGS.add_invoice %} {% if perms.RIGS.add_invoice %}
<a href="{% url 'invoice_event' event.pk %}" class="btn btn-default" title="Invoice Rig"><span <a id="invoiceDropdownLabel" href="{% url 'invoice_event' event.pk %}" class="btn
class="glyphicon glyphicon-gbp"></span> <span {% if event.invoice and event.invoice.is_closed %}
class="hidden-xs">Invoice</span></a> btn-success
{% elif event.invoice %}
btn-warning
{% else %}
btn-danger
{% endif %}
" title="Invoice Rig"><span
class="glyphicon glyphicon-gbp"></span>
<span class="hidden-xs">Invoice</span></a>
{% endif %} {% endif %}
{% endif %} {% endif %}
</div> </div>

2
RIGS/templates/RIGS/invoice_detail.html
View File

@@ -38,7 +38,7 @@
</div> </div>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<div class="panel panel-{% if object.void %}danger{% else %}info{% endif %}"> <div class="panel panel-{% if object.void %}danger{% elif object.is_closed %}success{% else %}info{% endif %}">
<div class="panel-heading">Event Details</div> <div class="panel-heading">Event Details</div>
<div class="panel-body"> <div class="panel-body">
<dl class="dl-horizontal"> <dl class="dl-horizontal">