255: User's currency is not used in invoices

backend/api/invoices/manage.py

@@ -59,7 +59,7 @@ def preview_invoice(request: HttpRequest, invoice_id) -> SuccessResponse | Error
         if invoice.user != request.user:
             return ErrorResponse("You don't have access to this invoice")
     try:
-        currency_symbol = request.user.user_profile.get_currency_symbol
+        currency_symbol = request.user.user_profile.get_currency_symbol()
     except UserSettings.DoesNotExist:
         currency_symbol = "$"
 

backend/api/settings/currency.py

@@ -3,7 +3,7 @@
 from django.shortcuts import render
 from django.views.decorators.http import require_http_methods
 
-from backend.models import UserSettings  # Replace with your actual model
+from backend.models import UserSettings
 
 
 @require_http_methods(["POST"])

backend/migrations/0027_invoice_currency.py

@@ -0,0 +1,30 @@
+# Generated by Django 5.0.3 on 2024-03-31 23:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("backend", "0026_invoice_discount_amount_invoice_discount_percentage"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="invoice",
+            name="currency",
+            field=models.CharField(
+                choices=[
+                    ("GBP", "British Pound Sterling"),
+                    ("EUR", "Euro"),
+                    ("USD", "United States Dollar"),
+                    ("JPY", "Japanese Yen"),
+                    ("INR", "Indian Rupee"),
+                    ("AUD", "Australian Dollar"),
+                    ("CAD", "Canadian Dollar"),
+                ],
+                default="GBP",
+                max_length=3,
+            ),
+        ),
+    ]

backend/models.py

@@ -300,6 +300,11 @@ class Invoice(models.Model):
 
     payment_status = models.CharField(max_length=10, choices=STATUS_CHOICES, default="pending")
     items = models.ManyToManyField(InvoiceItem)
+    currency = models.CharField(
+        max_length=3,
+        default="GBP",
+        choices=[(code, info["name"]) for code, info in UserSettings.CURRENCIES.items()],
+    )
 
     date_created = models.DateTimeField(auto_now_add=True)
     date_due = models.DateField()
@@ -388,6 +393,9 @@ def has_access(self, user: User) -> bool:
         else:
             return self.user == user
 
+    def get_currency_symbol(self):
+        return UserSettings.CURRENCIES.get(self.currency, {}).get("symbol", "$")
+
 
 class InvoiceURL(models.Model):
     uuid = ShortUUIDField(length=8, primary_key=True)

backend/views/core/invoices/create.py

@@ -26,10 +26,12 @@ def invoice_page_post(request: HttpRequest):
             request.POST.getlist("price_per_hour[]"),
         )
     ]
+    currency = request.user.user_profile.currency
 
     invoice = Invoice(
         date_due=datetime.strptime(request.POST.get("date_due"), "%Y-%m-%d").date(),
         date_issued=request.POST.get("date_issued"),
+        currency=currency,
     )
 
     if request.user.logged_in_as_team:

backend/views/core/invoices/edit.py

@@ -26,6 +26,7 @@ def invoice_get_existing_data(invoice_obj):
         "og_issue_date": invoice_obj.date_issued,
         "og_due_date": invoice_obj.date_due,
         "invoice_object": invoice_obj,
+        "currency_symbol": invoice_obj.get_currency_symbol(),
         "rows": invoice_obj.items.all(),
     }
     if invoice_obj.client_to:

backend/views/core/invoices/view.py

@@ -22,7 +22,7 @@ def preview(request, invoice_id):
         return redirect("invoices:dashboard")
 
     try:
-        currency_symbol = request.user.user_profile.get_currency_symbol
+        currency_symbol = invoice.get_currency_symbol()
     except UserSettings.DoesNotExist:
         currency_symbol = "$"
 
@@ -49,7 +49,7 @@ def view(request, uuid):
         return redirect("index")
 
     try:
-        currency_symbol = request.user.user_profile.get_currency_symbol
+        currency_symbol = request.user.user_profile.get_currency_symbol()
     except UserSettings.DoesNotExist:
         currency_symbol = "$"
 

backend/views/core/settings/view.py

@@ -1,11 +1,12 @@
 from PIL import Image
 from django.contrib.auth import update_session_auth_hash
 from django.contrib.sessions.models import Session
+from django.contrib import messages
+from django.shortcuts import redirect
 from django.http import HttpRequest
 from django.shortcuts import render
 
-from backend.decorators import *
-from backend.models import *
+from backend.models import UserSettings
 
 
 def settings_page(request: HttpRequest):
@@ -27,9 +28,9 @@ def settings_page(request: HttpRequest):
 
     if request.method == "POST" and request.htmx:
         section = request.POST.get("section")
-        profile_picture = request.FILES.get("profile_image")
 
         if section == "profile_picture":
+            profile_picture = request.FILES.get("profile_image")
             if profile_picture:
                 try:
                     # Max file size is 10MB (Change the first number to determine the size in MB)

frontend/templates/pages/invoices/create/_services_table_body.html

@@ -28,17 +28,17 @@
             <input class="hidden"
                    name="price_per_hour[]"
                    value="{{ row.price_per_hour }}">
-            £{{ row.price_per_hour }}
+            {{ currency_symbol }}{{ row.price_per_hour }}
         </td>
         <td>
             {% if row.id %}
                 <input class="hidden"
                        name="total_price[]"
                        value="{{ row.hours|mul:row.price_per_hour|floatformat:2 }}">
-                £{{ row.hours|mul:row.price_per_hour|floatformat:2|intcomma }}
+                {{ currency_symbol }}{{ row.hours|mul:row.price_per_hour|floatformat:2|intcomma }}
             {% else %}
                 <input class="hidden" name="total_price[]" value="{{ row.total_price }}">
-                £{{ row.total_price|floatformat:2|intcomma }}
+                {{ currency_symbol }}{{ row.total_price|floatformat:2|intcomma }}
             {% endif %}
         </td>
         <td>

frontend/templates/pages/invoices/dashboard/_fetch_body.html

@@ -22,7 +22,7 @@
                     </div>
                 </div>
             </td>
-            <td>£{{ invoice.amount | default_if_none:0 | floatformat:2 | intcomma }}</td>
+            <td>{{ invoice.get_currency_symbol }}{{ invoice.amount | default_if_none:0 | floatformat:2 | intcomma }}</td>
             <td>
                 {% component "pages:invoices:dashboard:payment_status_badge" status=invoice.payment_status inv_id=invoice.id %}
             </td>

frontend/templates/pages/invoices/view/invoice.html

@@ -27,7 +27,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
             <p class="mt-2 text-gray-600">INV #{{ invoice.invoice_id|default:invoice.id }}</p>
             <p class="text-gray-600">Invoice date: {{ invoice.date_issued|date:"d/m/Y" }}</p>
             <p class="text-gray-600">Due date: {{ invoice.date_due|date:"d/m/Y" }}</p>
-            <p class="text-gray-600">Balance Due: {{ currency_symbol }}{{ invoice.get_total_price }}</p>
+            <p class="text-gray-600">Balance Due: {{ invoice.get_currency_symbol }}{{ invoice.get_total_price }}</p>
         </div>
     </div>
     <!-- Client info -->
@@ -75,7 +75,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                             <span class="text-sm text-gray-900">{{ item.price_per_hour }}</span>
                         </td>
                         <td class="px-6 py-4 text-right whitespace-nowrap">
-                            <span class="text-sm text-gray-900">{{ currency_symbol }}{{ item.get_total_price | floatformat:2 }}</span>
+                            <span class="text-sm text-gray-900">{{ invoice.get_currency_symbol }}{{ item.get_total_price | floatformat:2 }}</span>
                         </td>
                     </tr>
                 {% endfor %}
@@ -87,7 +87,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                         Subtotal
                     </th>
                     <td class="px-6 py-3 text-right text-sm font-medium text-gray-500 uppercase tracking-wider">
-                        {{ currency_symbol }}{{ invoice.get_subtotal }}
+                        {{ invoice.get_currency_symbol }}{{ invoice.get_subtotal }}
                     </td>
                 </tr>
                 {% if tax %}
@@ -98,7 +98,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                             Tax
                         </th>
                         <td class="px-6 py-3 text-right text-sm font-medium text-gray-500 uppercase tracking-wider">
-                            {{ currency_symbol }}0.00
+                            {{ invoice.get_currency_symbol }}0.00
                         </td>
                     </tr>
                 {% endif %}
@@ -109,7 +109,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                             Discount
                         </th>
                         <td class="px-6 py-3 text-right text-sm font-medium text-error uppercase tracking-wider text-balance">
-                            {{ invoice.discount_percentage }}% off (-{{ currency_symbol }}{{ invoice.get_percentage_amount }})
+                            {{ invoice.discount_percentage }}% off (-{{ invoice.get_currency_symbol }}{{ invoice.get_percentage_amount }})
                         </td>
                     </tr>
                 {% endif %}
@@ -120,7 +120,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                             {% if not invoice.discount_percentage %}Discount{% endif %}
                         </th>
                         <td class="px-6 py-3 text-right text-sm font-medium text-error uppercase tracking-wider">
-                            -{{ currency_symbol }}{{ invoice.discount_amount }}
+                            -{{ invoice.get_currency_symbol }}{{ invoice.discount_amount }}
                         </td>
                     </tr>
                 {% endif %}
@@ -130,7 +130,7 @@ <h2 class="text-2xl font-bold text-gray-800">INVOICE</h2>
                         Total
                     </th>
                     <td class="px-6 py-3 text-right text-sm font-bold text-gray-900 uppercase tracking-wider">
-                        {{ currency_symbol }}{{ invoice.get_total_price }}
+                        {{ invoice.get_currency_symbol }}{{ invoice.get_total_price }}
                     </td>
                 </tr>
             </tfoot>