diff --git a/api/views.py b/api/views.py index b5d3cc1..cb9650a 100644 --- a/api/views.py +++ b/api/views.py @@ -4,6 +4,7 @@ import dateutil.parser import pytz from django.db import transaction from django.utils import timezone +from djmoney.settings import DEFAULT_CURRENCY from rest_framework import viewsets, serializers from rest_framework.decorators import action from rest_framework.response import Response @@ -185,7 +186,6 @@ class InvoiceViewSet(viewsets.ModelViewSet): context={ 'invoice': invoice, 'company_name': get_dynamic_setting(COMPANY_NAME), - 'logo': get_dynamic_setting(COMPANY_LOGO), 'address': get_dynamic_setting(COMPANY_ADDRESS), } ) @@ -207,7 +207,6 @@ class InvoiceViewSet(viewsets.ModelViewSet): context={ 'invoice': invoice, 'company_name': get_dynamic_setting(COMPANY_NAME), - 'logo': get_dynamic_setting(COMPANY_LOGO), 'address': get_dynamic_setting(COMPANY_ADDRESS), } ) diff --git a/core/management/commands/process_invoice.py b/core/management/commands/process_invoice.py index 23e42a4..326490d 100644 --- a/core/management/commands/process_invoice.py +++ b/core/management/commands/process_invoice.py @@ -76,7 +76,6 @@ class Command(BaseCommand): context={ 'invoice': active_invoice, 'company_name': get_dynamic_setting(COMPANY_NAME), - 'logo': get_dynamic_setting(COMPANY_LOGO), 'address': get_dynamic_setting(COMPANY_ADDRESS), } ) diff --git a/templates/invoice.html b/templates/invoice.html index 0525a5b..1f5b67d 100644 --- a/templates/invoice.html +++ b/templates/invoice.html @@ -1,111 +1,171 @@ - - - - -
-
- -
-
-
-
-
-
- - -
-
-
-
-
-

invoice
- order #{{ invoice.id }}

-
-
-
-
-
-
-
- {{ company_name }}
- {{ address }} -
-
-
-
- Invoice Month:
- {{ invoice.start_date | date:"M Y" }} -
-
- Invoice State:
- {{ invoice.state_str }} -
-
-
-
-
-

ORDER SUMMARY

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Simple Transactional Email + + + + +
#COMPONENTTOTAL COST
1Instance{{ invoice.instance_price }}
2Volume{{ invoice.volume_price }}
3Floating IP{{ invoice.fip_price }}
4Router{{ invoice.router_price }}
5Snapshot{{ invoice.snapshot_price }}
6Image{{ invoice.images_price }}
Subtotal{{ invoice.subtotal }}
Tax{{ invoice.tax }}
Total{{ invoice.total }}
+ + + + + + +