diff --git a/osinaweb/billing/__pycache__/models.cpython-312.pyc b/osinaweb/billing/__pycache__/models.cpython-312.pyc index fc7268cb..b6f46204 100644 Binary files a/osinaweb/billing/__pycache__/models.cpython-312.pyc and b/osinaweb/billing/__pycache__/models.cpython-312.pyc differ diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 4dc84b6f..d7cad773 100644 Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index 19d22306..a574f346 100644 Binary files a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py index 56a41bd9..8d79df71 100644 --- a/osinaweb/billing/add/views.py +++ b/osinaweb/billing/add/views.py @@ -12,7 +12,6 @@ from weasyprint import HTML, CSS - @staff_login_required def add_product(request, *args, **kwargs): item_types = ProjectType.objects.all().order_by('name') @@ -214,6 +213,7 @@ def add_payment_comment_modal(request): + def add_invoice_pdf(request, order_id): order = get_object_or_404(Order, id=order_id) @@ -334,3 +334,8 @@ def add_payment_pdf(request, order_id): + + + + + diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc index 6b2660dc..f249446f 100644 Binary files a/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc and b/osinaweb/customercore/__pycache__/custom_context.cpython-312.pyc differ diff --git a/osinaweb/customercore/__pycache__/urls.cpython-312.pyc b/osinaweb/customercore/__pycache__/urls.cpython-312.pyc index 8fe053fe..039699ea 100644 Binary files a/osinaweb/customercore/__pycache__/urls.cpython-312.pyc and b/osinaweb/customercore/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/customercore/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/__pycache__/views.cpython-312.pyc index 7da9af1b..20d5b20d 100644 Binary files a/osinaweb/customercore/__pycache__/views.cpython-312.pyc and b/osinaweb/customercore/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 09d72e8d..c5cd59b4 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc index 4ebd5ab0..4483a657 100644 Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-312.pyc differ diff --git a/osinaweb/osinacore/__pycache__/models.cpython-312.pyc b/osinaweb/osinacore/__pycache__/models.cpython-312.pyc index fa3276f7..1c3e695e 100644 Binary files a/osinaweb/osinacore/__pycache__/models.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-312.pyc differ diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc index ca1b0ad0..805e79b8 100644 Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc index 0f36a300..560478a6 100644 Binary files a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc index 5c74d75a..794d0cfc 100644 Binary files a/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc and b/osinaweb/osinacore/edit/__pycache__/urls.cpython-312.pyc differ diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc index 6738ce99..ca2065a2 100644 Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-312.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-312.pyc new file mode 100644 index 00000000..1601c441 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0077_remove_project_status_project_active_projectstatus.cpython-312.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-312.pyc new file mode 100644 index 00000000..a06defb7 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0078_alter_projectstatus_status.cpython-312.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-312.pyc new file mode 100644 index 00000000..cb7d5b07 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0079_alter_project_end_date_alter_project_start_date.cpython-312.pyc differ diff --git a/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-312.pyc b/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-312.pyc new file mode 100644 index 00000000..3d2c2879 Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0080_project_logo.cpython-312.pyc differ diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index f1a315dc..c7b196e5 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -456,7 +456,7 @@

Projects

- +

Tickets

- +
@@ -89,15 +89,12 @@

Project Manager:

-
+
{% if project.manager.image %} - + {% else %} - + {% endif %}
@@ -116,11 +113,10 @@
{% if member.image %} - + {% else %} + class="w-full h-full rounded-full object-cover"> {% endif %}
@@ -421,6 +417,7 @@
+
+ +
diff --git a/osinaweb/osinacore/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html index edf67577..40ebf4b7 100644 --- a/osinaweb/osinacore/templates/listing_pages/projects.html +++ b/osinaweb/osinacore/templates/listing_pages/projects.html @@ -21,12 +21,13 @@
- + + + + +
@@ -40,8 +41,22 @@
+ -
+ + +
+ {% if project.note_set.exists %} + {% with last_note=project.note_set.last %} +
+

{{ last_note.text }}

+
+ + + +
+
+ {% endwith %} + {% else %} +
+

No Recent Note

+
+ + + +
+
+ + {% endif %} +
+
+
+
+ {% endfor %} +
+ + +
+ {% for project in in_progress_projects %} +
+ + + + + + +
+
+

{{project.name}}

+
+ + +
+
+
+
+ + + +
+ +
+ +
+
+ + + + +

{{project.open_user_tasks_count}} Open {% if project.open_user_tasks_count == 1 %} Task {% else %} Tasks {% endif %}

@@ -100,15 +222,15 @@
-
+
View Edit -
@@ -119,8 +241,8 @@ {% with last_note=project.note_set.last %}

{{ last_note.text }}

-
+
@@ -131,8 +253,8 @@ {% else %}

No Recent Note

-
+
@@ -147,9 +269,16 @@
{% endfor %}
+ + + +
+
+ +