diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc
index a6f00b0d..9ee47939 100644
Binary files a/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc and b/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc b/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc
index 6785bf01..538307f9 100644
Binary files a/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc and b/osinaweb/addressbook/__pycache__/admin.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc b/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc
index 5ca891e4..028d810c 100644
Binary files a/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc and b/osinaweb/addressbook/__pycache__/apps.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/__pycache__/models.cpython-311.pyc b/osinaweb/addressbook/__pycache__/models.cpython-311.pyc
index 9626d220..5280f783 100644
Binary files a/osinaweb/addressbook/__pycache__/models.cpython-311.pyc and b/osinaweb/addressbook/__pycache__/models.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc
index 0341be68..0a4ddd07 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/0001_initial.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-311.pyc
index 2628b70d..02a82fa1 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/0002_country_addressbook.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc
index 7df64ce5..6c638fcc 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/0003_contact.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-311.pyc
index 666161fa..cd6b1628 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/0004_socialmedia.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-311.pyc
index 064ea3ec..1918accd 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/0005_socialmedia_addressbook.cpython-311.pyc differ
diff --git a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc
index 66ca948b..99b9d863 100644
Binary files a/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc and b/osinaweb/addressbook/migrations/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/__init__.cpython-311.pyc b/osinaweb/billing/__pycache__/__init__.cpython-311.pyc
index c6c8bee4..859a66ac 100644
Binary files a/osinaweb/billing/__pycache__/__init__.cpython-311.pyc and b/osinaweb/billing/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/admin.cpython-311.pyc b/osinaweb/billing/__pycache__/admin.cpython-311.pyc
index e92917e1..46b03094 100644
Binary files a/osinaweb/billing/__pycache__/admin.cpython-311.pyc and b/osinaweb/billing/__pycache__/admin.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/apps.cpython-311.pyc b/osinaweb/billing/__pycache__/apps.cpython-311.pyc
index da47cf9e..2bf29a0d 100644
Binary files a/osinaweb/billing/__pycache__/apps.cpython-311.pyc and b/osinaweb/billing/__pycache__/apps.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/models.cpython-311.pyc b/osinaweb/billing/__pycache__/models.cpython-311.pyc
index 46b64364..b5b4765a 100644
Binary files a/osinaweb/billing/__pycache__/models.cpython-311.pyc and b/osinaweb/billing/__pycache__/models.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/urls.cpython-311.pyc b/osinaweb/billing/__pycache__/urls.cpython-311.pyc
index b21a33dd..44d201c7 100644
Binary files a/osinaweb/billing/__pycache__/urls.cpython-311.pyc and b/osinaweb/billing/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/billing/__pycache__/views.cpython-311.pyc b/osinaweb/billing/__pycache__/views.cpython-311.pyc
index 0c781761..52915151 100644
Binary files a/osinaweb/billing/__pycache__/views.cpython-311.pyc and b/osinaweb/billing/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc
index da338331..4fdc067a 100644
Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/billing/add/__pycache__/views.cpython-311.pyc b/osinaweb/billing/add/__pycache__/views.cpython-311.pyc
index 40c8352e..07abf47b 100644
Binary files a/osinaweb/billing/add/__pycache__/views.cpython-311.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/billing/add/urls.py b/osinaweb/billing/add/urls.py
index 03d99eb7..aae47422 100644
--- a/osinaweb/billing/add/urls.py
+++ b/osinaweb/billing/add/urls.py
@@ -5,7 +5,6 @@ from billing.add import views
 urlpatterns = [
     path('product', views.add_product, name='addproduct'),
     path('service', views.add_service, name='addservice'),
-    path('order', views.add_order, name='addorder'),
-
+    path('order/<int:customer_id>/', views.add_order, name='addorder'),
     path('invoice/<int:order_id>/', views.add_invoice_pdf, name='addinvoice'),
 ]
diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py
index ca27fd2b..798ee4ff 100644
--- a/osinaweb/billing/add/views.py
+++ b/osinaweb/billing/add/views.py
@@ -5,8 +5,8 @@ from django.http import JsonResponse, HttpResponse
 from django.template.loader import get_template
 from django.conf import settings
 import os
-from weasyprint import HTML, CSS
 from django.core.files.base import ContentFile
+from weasyprint import HTML, CSS
 
 
 
@@ -72,8 +72,10 @@ def add_service (request, *args, **kwargs):
     return render(request, 'add_templates/add-service.html', context) 
 
 
-def add_order (request, *args, **kwargs):
-    customers = CustomerProfile.objects.all().order_by('-id')
+def add_order (request, customer_id):
+    customer= get_object_or_404(CustomerProfile, id=customer_id)
+    businesses = Business.objects.filter(customer=customer)
+
     if request.method == 'POST':
         customer_id = request.POST.get('customer')
         customer = get_object_or_404(CustomerProfile, id=customer_id)
@@ -104,7 +106,8 @@ def add_order (request, *args, **kwargs):
 
 
     context = {
-        'customers': customers,
+        'customer' : customer,
+        'businesses' : businesses,
     }
 
     return render(request, 'add_templates/add-order.html', context) 
@@ -176,5 +179,3 @@ def add_invoice_pdf(request, order_id):
 
 
 
-
-
diff --git a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-311.pyc
index a3635b91..e0b15e35 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc
index afaa850c..90b8a0f5 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0002_service_active_service_cancelled_at_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-311.pyc
index cbe7c524..b8cf0606 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0003_payment_servicepayment.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc
index f607baa1..d37197be 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0004_rename_payment_paymenttype.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-311.pyc
index 8f7115bd..f9ad1922 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0005_service_recurring_cycle.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-311.pyc
index 15c99721..6d275a6b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0006_alter_service_cancelled_at_alter_service_created_at_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc
index b5b13878..a0da3ae0 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0007_alter_service_recurring_cycle.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-311.pyc
index d78e04d8..4bde9f7e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0008_alter_service_type.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-311.pyc
index 3cdcbfdb..89977afa 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0009_remove_service_due_at_remove_servicepayment_service_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-311.pyc
index dbe2530a..481df9f8 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0010_charge_amount.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-311.pyc
index a3684bc3..24b54f33 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0011_invoice.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-311.pyc
index 7402bfc9..196b6f08 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0012_remove_servicepayment_charge_receipt_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc
index b35e48a6..1c002774 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0013_alter_invoice_date_created.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc
index 18d4bb6c..ccb4af67 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0014_servicepayment_comment.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc
index fec3ccac..62ed8bbd 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0015_order.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc
index 29cf3c6a..977c5323 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0016_alter_order_status.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc
index 758308bb..1cbb5065 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0017_service_order.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-311.pyc
index 2ec82cf4..9ce6d18b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0018_alter_order_status.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc
index 6f4e59e7..7b05856e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0019_item_orderpayment_remove_service_customer_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc
index cf443ec5..43a2392a 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0020_orderitem.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc
index 471edbe7..3bd02902 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0021_remove_item_recurring_cycle_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc
index e55365d6..6c9bdded 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0022_remove_item_cancelled_at_remove_item_created_at_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc
index 1223f6d1..3207657c 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0023_alter_item_project_alter_item_type.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-311.pyc
index a43b381a..62816809 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0024_remove_item_active.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-311.pyc
index 5ac4d01a..7fc2cc2b 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-311.pyc
index 6c726387..f0c1b734 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0026_rename_type_item_item_type_remove_order_paid.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-311.pyc
index fbdcc863..8e7638fd 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0027_item_type.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-311.pyc
index aabf880b..a8bfc290 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-311.pyc
index c0d3a5e3..708f9205 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-311.pyc
index be840df9..440ef361 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-311.pyc
index 29cf906a..bac0c533 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-311.pyc
index 585bad9c..2612511e 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0032_order_business.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-311.pyc
index 55c56f9c..71fa7228 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0033_alter_order_status.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-311.pyc
index f7872051..abb69ecc 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0034_alter_invoice_pdf.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-311.pyc
index 7fd7bd0c..70804af1 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0035_alter_invoice_pdf.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-311.pyc
index 4848ed5c..bedb6b8d 100644
Binary files a/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/0036_alter_invoice_invoice_number.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-311.pyc
new file mode 100644
index 00000000..84bd4a2d
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0037_recurringcycle_item.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-311.pyc
new file mode 100644
index 00000000..6d45f8b5
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0038_alter_invoice_pdf.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-311.pyc
new file mode 100644
index 00000000..f7bee54b
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-311.pyc
new file mode 100644
index 00000000..dd9ae374
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0040_rename_due_at_orderitem_end_at_and_more.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-311.pyc
new file mode 100644
index 00000000..54686552
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0041_orderitem_active.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-311.pyc
new file mode 100644
index 00000000..47e31bd5
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0042_order_due_date.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-311.pyc
new file mode 100644
index 00000000..9f3fe81e
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0043_alter_invoice_pdf.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-311.pyc
new file mode 100644
index 00000000..f3012ea1
Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0044_alter_orderitem_active.cpython-311.pyc differ
diff --git a/osinaweb/billing/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/__init__.cpython-311.pyc
index 1bb573bb..899f67d6 100644
Binary files a/osinaweb/billing/migrations/__pycache__/__init__.cpython-311.pyc and b/osinaweb/billing/migrations/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/billing/templates/add_templates/add-order.html b/osinaweb/billing/templates/add_templates/add-order.html
index c927ca21..579446ec 100644
--- a/osinaweb/billing/templates/add_templates/add-order.html
+++ b/osinaweb/billing/templates/add_templates/add-order.html
@@ -11,40 +11,21 @@
 <div class="w-full px-5 s:px-9 mb-5">
     <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
         <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Add Order
+            Add Order for {{customer.user.first_name}} {{customer.user.last_name}}
         </h1>
 
 
-        <form method="POST" action="{% url 'addorder' %}" enctype="multipart/form-data">
+        <form method="POST" action="{% url 'addorder' customer.id %}" enctype="multipart/form-data">
             {% csrf_token %}
             <div class="w-full flex flex-col gap-5">
-                <div class="w-full">
-                    <label class="text-gray-500">Customer:</label>
-                    <select name="customer" id="customersSelectTag"
-                        class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1"
-                        required>
-                        <option selected disabled>Select Customer</option>
-                        {% for customer in customers %}
-                        <option value="{{customer.id}}">{{customer.user.first_name}} {{customer.user.last_name}}
-                        </option>
-                        {% endfor %}
-                    </select>
-                </div>
-
                 <div class="w-full">
                     <label class="text-gray-500">Business:</label>
                     <select name="business" id="businessSelectTag"
                         class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md text-gray-500 mt-1">
-                        <option selected disabled>Select Customer First</option>
-                    </select>
-                </div>
-
-                <div class="w-full">
-                    <label class="text-gray-500">Items:</label>
-                    <select name="items" id="itemsSelectTag"
-                        class="border border-gray-300 p-3 rounded-md outline-none w-full text-gray-500 mt-1" multiple
-                        required>
-                        <option selected disabled>Select Customer First</option>
+                        <option selected disabled>Businesses</option>
+                        {% for business in businesses %}
+                        <option value="{{business.id}}">{{business.name}}</option>
+                        {% endfor %}
                     </select>
                 </div>
 
@@ -69,8 +50,7 @@
         </form>
     </div>
 </div>
-<!---------------------- JS SCRIPTS -------------------->
-<script src="{% static 'js/billing/add-order.js' %}"></script>
+
 
 
 
diff --git a/osinaweb/billing/templates/details_templates/order-details.html b/osinaweb/billing/templates/details_templates/order-details.html
new file mode 100644
index 00000000..9e38f3d6
--- /dev/null
+++ b/osinaweb/billing/templates/details_templates/order-details.html
@@ -0,0 +1,88 @@
+{% extends "main.html" %}
+{%load static%}
+{% block content %}
+
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
+
+
+<div class="w-full xxlg1:w-[75%]">
+    <div class="w-full h-fit bg-white rounded-md shadow-md p-5">
+        <div class="w-full bg-gray-50 px-3 py-3 border border-gray-100 shadow-md rounded-md flex flex-col s:flex-row justify-between items-start s:items-center gap-3">
+            <div>
+                <h1 class="text-secondosiblue text-xl">Order 234443</h1>
+                <p class="text-gray-500">Salim Elliye</p>
+            </div>
+
+            <p class="uppercase text-green-700 font-semibold">Completed</p>
+        </div>
+
+        <div class="w=full mt-5">
+            <p class="text-secondosiblue text-xl">Services</p>
+            <div class="w-full grid grid-cols-1 md:grid-cols-2 l:grid-cols-3 gap-5 mt-3">
+                <div class="w-full shadow-md">
+                    <div
+                        class="w-ful py-9 px-5 flex justify-center items-center text-center text-secondosiblue bg-gray-100 rounded-t-md">
+                        <p>Service Name</p>
+                    </div>
+                    <div
+                        class="w-ful px-3 py-2 text-white flex justify-center items-center gap-2 bg-osiblue rounded-b-md cursor-pointer">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                        </svg>
+                        <p>Add</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="w=full mt-10">
+            <p class="text-secondosiblue text-xl">Products</p>
+            <div class="w-full grid grid-cols-1 md:grid-cols-2 l:grid-cols-3 gap-5 mt-5">
+                <div>
+                    <div class="w-full p-9 border border-gray-200 flex flex-col items-center gap-5 rounded-t-md bg-white">
+                        <p class="text-secondosiblue uppercase font-poppinsBold text-xl text-center">Basic
+                        </p>
+
+                        <div class="w-full flex flex-col justify-center items-center text-center">
+                            <p class="text-osiblue font-poppinsLight text-[17px] font-semibold">$0</p>
+                            <p class="text-gray-500">monthly/restaurant</p>
+                        </div>
+                    </div>
+                    <div
+                        class="w-ful px-3 py-2 text-white flex justify-center items-center gap-2 bg-osiblue border border-osiblue rounded-b-md cursor-pointer">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                        </svg>
+                        <p>Add</p>
+                    </div>
+
+                </div>
+
+                <div>
+                    <div class="w-full p-9 border border-gray-200 flex flex-col items-center gap-5 rounded-t-md bg-white">
+                        <p class="text-secondosiblue uppercase font-poppinsBold text-xl text-center">Standard
+                        </p>
+
+                        <div class="w-full flex flex-col justify-center items-center text-center">
+                            <p class="text-osiblue font-poppinsLight text-[17px] font-semibold">$20</p>
+                            <p class="text-gray-500">monthly/restaurant</p>
+                        </div>
+                    </div>
+                    <div
+                        class="w-ful px-3 py-2 text-white flex justify-center items-center gap-2 bg-osiblue border border-osiblue rounded-b-md cursor-pointer">
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                        </svg>
+                        <p>Add</p>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/osinaweb/billing/templates/listing_pages/orders.html b/osinaweb/billing/templates/listing_pages/orders.html
index 0a993721..857ba323 100644
--- a/osinaweb/billing/templates/listing_pages/orders.html
+++ b/osinaweb/billing/templates/listing_pages/orders.html
@@ -18,13 +18,6 @@
                     </button>
                 </div>
             </div>
-            <div class="w-full s:w-fit">
-                <a href="{% url 'addorder' %}">
-                    <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Add
-                    Order</button>
-                </a>
-            </div>
         </div>
 
         <div class="overflow-x-auto border border-gray-300 rounded-md mt-4">
@@ -78,7 +71,7 @@
                         <td class="px-6 py-4">
                             <div class="w-full flex justify-center items-center gap-3">
 
-                                <a href="">
+                                <a href="{% url 'orderdetails' order.id %}">
                                     <div class="text-[15px] text-blue-500 cursor-pointer">
                                         <i class="fa fa-eye"></i>
                                     </div>
diff --git a/osinaweb/billing/urls.py b/osinaweb/billing/urls.py
index 83109ae9..98fcf974 100644
--- a/osinaweb/billing/urls.py
+++ b/osinaweb/billing/urls.py
@@ -13,7 +13,5 @@ urlpatterns = [
 
     # DETAILS
     path('invoice-details/<int:order_id>/', views.invoice_details, name='invoicedetails'),
-
-    path('fetch-customer-items/<int:customer_id>/', views.fetch_customer_items, name='fetch_customer_items'),
-    path('fetch-customer-businesses/<int:customer_id>/', views.fetch_customer_businesses, name='fetch_customer_businesses'),
+    path('order-details/<int:order_id>/', views.order_details, name='orderdetails'),
 ]
diff --git a/osinaweb/billing/views.py b/osinaweb/billing/views.py
index dd31953c..2cac222a 100644
--- a/osinaweb/billing/views.py
+++ b/osinaweb/billing/views.py
@@ -47,42 +47,15 @@ def invoice_details(request, order_id):
     return render(request, 'details_templates/invoice-details.html', context) 
 
 
+def order_details(request, order_id):
+    order = get_object_or_404(Order, id=order_id)
 
-
-
-# TO FETCH THE ITEMS RELATED TO TH SELECTED CUSTOMER AND THE ITEMS THAT ARE NOT RELATED TO A CUSTOMER
-def fetch_customer_items(request, customer_id):
-    customer = get_object_or_404(CustomerProfile, id=customer_id)
-    
-    items_related_to_customer = Item.objects.filter(customer=customer)
-    
-    items_without_customer = Item.objects.filter(customer__isnull=True)
-    
-    data = {
-        'items_related_to_customer': list(items_related_to_customer.values('id', 'title')),  
-        'items_without_customer': list(items_without_customer.values('id', 'title')),  
+    context = {
+        'order' : order,
     }
 
-    return JsonResponse(data)
-
+    return render(request, 'details_templates/order-details.html', context) 
 
-def fetch_customer_businesses(request, customer_id):
-    try:
-        customer_profile = CustomerProfile.objects.get(id=customer_id)
-    except CustomerProfile.DoesNotExist:
-        customer_profile = None
 
-    if customer_profile:
-        businesses = Business.objects.filter(customer=customer_profile)
-        # Create a list to hold dictionary representations of each business
-        business_data = []
-        for business in businesses:
-            business_data.append({
-                'id': business.id,
-                'name': business.name,
-            })
-    else:
-        business_data = None
 
-    return JsonResponse({'businesses': business_data})
 
diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc
index 53cf900f..9a32e553 100644
Binary files a/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc and b/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/admin.cpython-311.pyc b/osinaweb/customercore/__pycache__/admin.cpython-311.pyc
index 5ad19901..b50421ce 100644
Binary files a/osinaweb/customercore/__pycache__/admin.cpython-311.pyc and b/osinaweb/customercore/__pycache__/admin.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/apps.cpython-311.pyc b/osinaweb/customercore/__pycache__/apps.cpython-311.pyc
index 4500d1ae..069e6e05 100644
Binary files a/osinaweb/customercore/__pycache__/apps.cpython-311.pyc and b/osinaweb/customercore/__pycache__/apps.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/custom_context.cpython-311.pyc b/osinaweb/customercore/__pycache__/custom_context.cpython-311.pyc
new file mode 100644
index 00000000..28730c15
Binary files /dev/null and b/osinaweb/customercore/__pycache__/custom_context.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc
index 86a2e7e5..45bc7ddc 100644
Binary files a/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc and b/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/models.cpython-311.pyc b/osinaweb/customercore/__pycache__/models.cpython-311.pyc
index b3ffb484..f5e5952a 100644
Binary files a/osinaweb/customercore/__pycache__/models.cpython-311.pyc and b/osinaweb/customercore/__pycache__/models.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/urls.cpython-311.pyc b/osinaweb/customercore/__pycache__/urls.cpython-311.pyc
index 86d0f9de..07c1b40f 100644
Binary files a/osinaweb/customercore/__pycache__/urls.cpython-311.pyc and b/osinaweb/customercore/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/customercore/__pycache__/views.cpython-311.pyc b/osinaweb/customercore/__pycache__/views.cpython-311.pyc
index 8d637c0a..3eb76e67 100644
Binary files a/osinaweb/customercore/__pycache__/views.cpython-311.pyc and b/osinaweb/customercore/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-311.pyc
new file mode 100644
index 00000000..21e80e55
Binary files /dev/null and b/osinaweb/customercore/migrations/__pycache__/0001_initial.cpython-311.pyc differ
diff --git a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-311.pyc
index fd4b5170..099fcf07 100644
Binary files a/osinaweb/customercore/migrations/__pycache__/__init__.cpython-311.pyc and b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
index 9fcea554..3adf6554 100644
--- a/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
+++ b/osinaweb/customercore/templates/add_templates/customer-add-ticket.html
@@ -20,17 +20,30 @@
 
             <div class="w-full">
                 <label class="text-gray-500">What is this regarding?</label>
-                <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
+                <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1" id="regardingSelectTag">
                     <option value="General/Account/Billing">General/Account/Billing</option>
-                    {% for customer_product in customer_products %}
-                    <option value="">{{customer_product.item.title}}</option>
-                    {% endfor %}
-                    {% for customer_project in customer_projects %}
-                    <option value="">{{customer_project.title}}</option>
-                    {% endfor %}
+                    <option value="Product">Product</option>
+                    <option value="Project">Project</option>
                 </select>
             </div>
 
+            <!-- Projects Select Tag -->
+            <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md hidden" id="projectsSelectTag">
+                <option selected disabled>Choose one of your projects</option>
+                {% for customer_project in customer_projects %}
+                <option value="">{{customer_project.title}}</option>
+                {% endfor %}
+            </select>
+
+            <!-- Products Select Tag -->
+            <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md hidden" id="productsSelectTag">
+                <option selected disabled>Choose one of your products</option>
+                {% for customer_product in customer_products %}
+                <option value="">{{customer_product.item.title}}</option>
+                {% endfor %}
+            </select>
+
+
             <div class="w-full">
                 <label class="text-gray-500">Description:</label>
                 <textarea required name="description"
@@ -64,4 +77,8 @@
 <!-------------- JS SCRIPTS --------------->
 <script type="text/javascript" src='{% static "js/upload-input-tag.js" %}'></script>
 
+<!-- TO DISPLAY THE CHOSEN REGARDING OPTION SELECT TAG -->
+<script type="text/javascript" src='{% static "js/customer_dashboard/regarding-ticket.js" %}'></script>
+
+
 {% endblock %}
\ No newline at end of file
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index afc6de8d..3f261ca8 100644
Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ
diff --git a/osinaweb/input.css b/osinaweb/input.css
index 1fb3b402..fea2c10c 100644
--- a/osinaweb/input.css
+++ b/osinaweb/input.css
@@ -26,6 +26,12 @@
 }
 
 
+/* SCROLL BAR OF NOTIFICATIONS CONTAINER IN NOTIFICATIONS SIDE BAR */
+.notificationsContainer::-webkit-scrollbar {
+    width: 0px;
+}
+
+
 
 /* Website's font */
 @font-face {
diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc
index a2079bc0..c66f5fcc 100644
Binary files a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc
index ad86596f..ebeed458 100644
Binary files a/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/admin.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc b/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc
index d9350139..d2741d3c 100644
Binary files a/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/apps.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc b/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc
index eae6da6f..4d514790 100644
Binary files a/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/custom_context.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc b/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc
index bb84a596..2683eb7e 100644
Binary files a/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/decorators.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc b/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc
index 8031af19..506d32e5 100644
Binary files a/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/forms.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc
index 37eb8303..7edd5c94 100644
Binary files a/osinaweb/osinacore/__pycache__/models.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/models.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc
index 3b381159..17e923e2 100644
Binary files a/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc
index 146762b6..6da8af4b 100644
Binary files a/osinaweb/osinacore/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/add/__pycache__/urls.cpython-311.pyc
index 26823c27..d87afe02 100644
Binary files a/osinaweb/osinacore/add/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/add/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc
index ed2525ed..68e413bf 100644
Binary files a/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/add/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/add/urls.py b/osinaweb/osinacore/add/urls.py
index 1b3c12d1..ab4d9e11 100644
--- a/osinaweb/osinacore/add/urls.py
+++ b/osinaweb/osinacore/add/urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
     path('reference/', views.add_reference_modal, name='addreferencemodal'),
     path('tag/', views.add_tag_modal, name='addtagmodal'),
     path('reaction/<int:status_id>/<str:emoji>/', views.add_reaction, name='add_reaction'),
-    path('add-ticket/', views.add_ticket, name='addticket'),
+    path('add-ticket/<int:customer_id>/', views.add_ticket, name='addticket'),
 
 
 ]
\ No newline at end of file
diff --git a/osinaweb/osinacore/add/views.py b/osinaweb/osinacore/add/views.py
index 8b21c8a6..8791b06f 100644
--- a/osinaweb/osinacore/add/views.py
+++ b/osinaweb/osinacore/add/views.py
@@ -7,6 +7,8 @@ from django.http import HttpResponseRedirect
 from datetime import date
 from django.http import JsonResponse
 from osinacore.decorators import *
+from billing.models import *
+
 
 
 @staff_login_required
@@ -597,10 +599,14 @@ def add_reaction(request, status_id, emoji):
 
 
 @staff_login_required
-def add_ticket(request, *args, **kwargs):
-    
-    context = {
+def add_ticket(request, customer_id):
+    customer= get_object_or_404(CustomerProfile, id=customer_id)
+    customer_products = OrderItem.objects.filter(order__status='Completed', active__in=[True, None], item__type='Product', order__customer=customer).values()
+    customer_projects = Project.objects.filter(customer=customer)
 
+    context = {
+        'customer_products' : customer_products,
+        'customer_projects' : customer_projects,
     }
 
     return render(request, 'add_templates/add-ticket.html', context)
diff --git a/osinaweb/osinacore/api/__pycache__/serializers.cpython-311.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-311.pyc
index fba10504..0ffd849e 100644
Binary files a/osinaweb/osinacore/api/__pycache__/serializers.cpython-311.pyc and b/osinaweb/osinacore/api/__pycache__/serializers.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc
index 609bb21a..8bcfabf2 100644
Binary files a/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/api/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/api/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/api/__pycache__/views.cpython-311.pyc
index 84dd6a8a..b666bde8 100644
Binary files a/osinaweb/osinacore/api/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/api/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/delete/__pycache__/urls.cpython-311.pyc
index b77d10ef..dfb8fa01 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/delete/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc
index 22133a94..5a045e2d 100644
Binary files a/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/delete/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-311.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-311.pyc
index 0cb0be88..9d284dda 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinacore/edit/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc
index 06a4ee26..bf313955 100644
Binary files a/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc and b/osinaweb/osinacore/edit/__pycache__/views.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc
index d10d2fe5..aeada8fe 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0001_initial.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc
index 709c7142..1b9d98e7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0002_projecttype_alter_business_options_staffprofile_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc
index 716a2643..7fbb6d6c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0003_milestone.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc
index c7b610bc..f4bd93f3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0004_epic.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc
index 6c07f0f9..42756dd3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0005_staffprofile_image.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc
index c8b02781..57c2ced5 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0006_note.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc
index 41ae3516..8e3ef578 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0007_project_project_id_alter_project_status.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc
index 08d748ec..799daeba 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0008_alter_project_project_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc
index e030cb79..54aed85b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0009_alter_project_project_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc
index 54f1172b..2f61c3b9 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0010_remove_note_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc
index e8290c10..023030fc 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0011_note_date_alter_note_color_alter_note_text_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc
index 5a0359fa..480e0b63 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0012_projectrequirement.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc
index 78d6ed5a..683f2e36 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0013_projectfile.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc
index 131a2218..101e52a0 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0014_alter_projectfile_file.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc
index 285a7ee2..266e58ec 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0015_projectcredentials.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc
index 99b389f0..86e46167 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0016_rename_projectcredentials_projectcredential.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc
index caeb2e03..306269d3 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0017_alter_project_end_date_alter_project_start_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc
index 64faf76f..2b9c3784 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0018_epic_status.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc
index 6a31926a..0d3053c7 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0019_alter_epic_end_date_alter_epic_start_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc
index a3b86f24..ee41115f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0020_task.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc
index 4823051f..af580653 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0021_alter_customerprofile_business_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc
index 40d32f1d..5d94191b 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0022_customerprofile_customer_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc
index a6c4cb12..0e68d861 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0023_task_assigned_to.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc
index fa585053..b87f0460 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0024_task_task_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc
index 534572dc..90c43094 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0025_status.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc
index 7a108599..452084a4 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0026_remove_status_user_status_staff.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc
index af2f51d0..3a554bf1 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0027_alter_status_staff.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc
index d999af84..6ccfbd69 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0028_remove_projecttype_color.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc
index 2aa1ccc3..5aee830d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0029_alter_reference_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc
index 4518a204..43690b98 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0030_tag.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc
index 363d6bb5..295866bc 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0031_alter_staffprofile_image.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-311.pyc
index a2554ee1..fcdf5943 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0032_point.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-311.pyc
index 21b2a71e..88802a88 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0033_point_date_completed_point_date_workingon_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-311.pyc
index 21c761c3..bcf6ec7a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0034_alter_point_date_completed_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc
index 0fd78c2e..869c1184 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0035_business_business_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc
index 7bf5f905..9409c7d5 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0036_staffposition_alter_staffprofile_position.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-311.pyc
index 7e49b2db..2635f01f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0037_remove_staffprofile_position.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc
index 9e00c393..28f53fe5 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0038_staffprofile_staff_position.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-311.pyc
index 52cc7299..01be224a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0039_alter_staffprofile_staff_position.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-311.pyc
index aaeee6fb..d1743e09 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0040_staffprofile_staff_id.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc
index a639a4be..47cf7ea2 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0041_dailyreport.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-311.pyc
index 1d24c685..55201f63 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0042_remove_customerprofile_email_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-311.pyc
index 1b6d2354..4f0eff35 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0043_businesstype.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc
index 80ae04fd..ece9968d 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0044_remove_business_business_type.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-311.pyc
index d30e08cc..a4c69340 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0045_business_type.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc
index db643fe8..ecfd8759 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0046_task_requirement.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-311.pyc
index d886d816..a815041c 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0047_task_status_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc
index 23460613..22d8eb90 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0048_alter_customerprofile_business.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc
index 537ad25e..c0013311 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0049_alter_customerprofile_business.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-311.pyc
index 34dedb26..9eb4b7aa 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0050_projectrequirement_added_by_projectrequirement_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc
index b331cf61..fd4202cf 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0051_alter_task_requirement.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-311.pyc
index cd27bfdd..e7513f9a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0052_note_project.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc
index 01135bdf..896cf7ae 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0053_pointactivity.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-311.pyc
index d137e3ab..0a731295 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0054_remove_point_date_completed_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc
index e03fc088..d0202f3f 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0055_alter_point_status.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-311.pyc
index 958629e8..ade66eb6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0056_alter_pointactivity_end_time.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-311.pyc
index 03b394f7..5dc50677 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0057_point_total_time_hours_point_total_time_minutes_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc
index 9952ca84..57e8e5da 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0058_remove_point_total_time_hours_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-311.pyc
index 40a83ec3..10367ad6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0059_alter_task_requirement.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-311.pyc
index b9ea6a09..be235851 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0060_pointactivity_total_time.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-311.pyc
index bfcdbbb1..8af29816 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0061_alter_task_end_date_alter_task_start_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-311.pyc
index 0d50e352..2d0fc9e4 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0062_connection.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-311.pyc
index 03855f82..c3141a38 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0063_alter_connection_date.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-311.pyc
index 92f0c24f..aaad0a11 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0064_reaction.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-311.pyc
index 30603413..f3c07072 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0065_alter_customerprofile_status.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-311.pyc
index 2aba87d6..57df040a 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/0066_remove_customerprofile_business_business_customer.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-311.pyc
new file mode 100644
index 00000000..0da44e6f
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0067_customerprofile_confirmed.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-311.pyc
new file mode 100644
index 00000000..2c292c74
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0068_remove_customerprofile_confirmed_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-311.pyc
new file mode 100644
index 00000000..eb279376
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0069_alter_business_logo_alter_projectfile_file_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-311.pyc
new file mode 100644
index 00000000..a0298b6d
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0070_department_alter_staffprofile_staff_position_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-311.pyc
new file mode 100644
index 00000000..a2ba07e8
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0071_projecttype_department_ticket.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-311.pyc
new file mode 100644
index 00000000..0b8e30d1
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0072_ticketupdate_ticketreaction_ticketattachment.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-311.pyc
new file mode 100644
index 00000000..1ca7e91a
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0073_alter_ticket_regarding.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-311.pyc
new file mode 100644
index 00000000..1a21f081
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0074_rename_dare_added_ticketupdate_date_added.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-311.pyc
new file mode 100644
index 00000000..e453de60
Binary files /dev/null and b/osinaweb/osinacore/migrations/__pycache__/0075_remove_ticketattachment_ticket_and_more.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc
index d4ff1e36..aa12a8a6 100644
Binary files a/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html
index caff9e30..d7df6bca 100644
--- a/osinaweb/osinacore/templates/add-edit-main.html
+++ b/osinaweb/osinacore/templates/add-edit-main.html
@@ -131,7 +131,7 @@
                                 </div>
                             </a>
 
-                            <a>
+                            <a href="{% url 'tickets' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
                                     <p class="text-white">Tickets</p>
@@ -417,7 +417,7 @@
                                 </div>
                             </a>
 
-                            <a>
+                            <a href="{% url 'tickets' %}">
                                 <div
                                     class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2">
                                     <p class="text-white">My Tickets</p>
diff --git a/osinaweb/osinacore/templates/add_templates/add-ticket.html b/osinaweb/osinacore/templates/add_templates/add-ticket.html
index 2029ef5c..1c882ebc 100644
--- a/osinaweb/osinacore/templates/add_templates/add-ticket.html
+++ b/osinaweb/osinacore/templates/add_templates/add-ticket.html
@@ -5,7 +5,7 @@
 <div class="w-full px-5 s:px-9 mb-5">
     <div class="w-full h-full shadow-md rounded-md py-5 px-3 bg-white">
         <h1 class="text-3xl text-secondosiblue text-center font-semibold">
-            Add Ticket
+            Add Ticket for {{customer.user.first_name}} {{customer.user.last_name}}
         </h1>
 
         <form class="w-full flex flex-col gap-5 justify-center items-center mt-5" method="POST" action="">
@@ -19,11 +19,33 @@
 
             <div class="w-full">
                 <label class="text-gray-500">What is this regarding?</label>
-                <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1">
-                    <option value="">General Accounting</option>
+                <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md mt-1"
+                    id="regardingSelectTag">
+                    <option value="General/Account/Billing">General/Account/Billing</option>
+                    <option value="Product">Product</option>
+                    <option value="Project">Project</option>
                 </select>
             </div>
 
+            <!-- Projects Select Tag -->
+            <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md hidden"
+                id="projectsSelectTag">
+                <option selected disabled>Choose one of your projects</option>
+                {% for customer_project in customer_projects %}
+                <option value="">{{customer_project.title}}</option>
+                {% endfor %}
+            </select>
+
+            <!-- Products Select Tag -->
+            <select class="w-full h-[50px] py-1 px-3 border border-gray-300 outline-none rounded-md hidden"
+                id="productsSelectTag">
+                <option selected disabled>Choose one of your products</option>
+                {% for customer_product in customer_products %}
+                <option value="">{{customer_product.item.title}}</option>
+                {% endfor %}
+            </select>
+
+
             <div class="w-full">
                 <label class="text-gray-500">Desceription:</label>
                 <textarea required name="description"
@@ -59,4 +81,6 @@
 <!-------------- JS SCRIPTS --------------->
 <script type="text/javascript" src='{% static "js/upload-input-tag.js" %}'></script>
 
+<script type="text/javascript" src='{% static "js/add-ticket.js" %}'></script>
+
 {% endblock %}
\ No newline at end of file
diff --git a/osinaweb/osinacore/templates/details_templates/customer-details.html b/osinaweb/osinacore/templates/details_templates/customer-details.html
index e9c234d1..4debe8c8 100644
--- a/osinaweb/osinacore/templates/details_templates/customer-details.html
+++ b/osinaweb/osinacore/templates/details_templates/customer-details.html
@@ -25,14 +25,26 @@
     {% endif %}
 
     <div class="w-full h-fit flex justify-end items-center bg-gray-100 shadow-md rounded-md px-3 py-3 mt-3">
-        <div class="w-full s:w-fit flex flex-col s:flex-row justify-end items-center gap-3">
+        <div class="w-full md:w-fit flex flex-col md:flex-row justify-end items-center gap-3">
+            <a href="{% url 'addticket' customer.id %}">
+                <button
+                class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Open
+                Ticket</button>
+            </a>
+
+            <a href="{% url 'addorder' customer.id %}">
+                <button
+                class="w-full md:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300">Add
+                Order</button>
+            </a>
+
             <button
-                class="w-full s:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 deleteCustomerButton"
+                class="w-full md:w-fit text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 deleteCustomerButton"
                 data-modal-url="{% url 'deletecustomermodal' customer.id %}">Delete
                 Customer</button>
-            <a href="{% url 'editcustomer' customer.customer_id %}" class="w-full s:w-fit">
+            <a href="{% url 'editcustomer' customer.customer_id %}" class="w-full md:w-fit">
                 <button
-                    class="w-full s:w-fit text-base px-3 py-2 bg-fifthosiblue text-white outline-none border border-fifthosiblue rounded-md cursor-pointer hover:bg-white hover:text-fifthosiblue duration-300">Edit
+                    class="w-full md:w-fit text-base px-3 py-2 bg-fifthosiblue text-white outline-none border border-fifthosiblue rounded-md cursor-pointer hover:bg-white hover:text-fifthosiblue duration-300">Edit
                     Customer</button>
             </a>
         </div>
diff --git a/osinaweb/osinacore/templates/listing_pages/tickets.html b/osinaweb/osinacore/templates/listing_pages/tickets.html
index cc2d83d0..e9b9ff5d 100644
--- a/osinaweb/osinacore/templates/listing_pages/tickets.html
+++ b/osinaweb/osinacore/templates/listing_pages/tickets.html
@@ -20,14 +20,6 @@
                     </button>
                 </div>
             </div>
-            <div class="w-full s:w-fit">
-                <a href="{% url 'addticket' %}">
-                    <button
-                        class="w-full s:w-fit text-base px-3 py-2 bg-osiblue text-white outline-none border border-osiblue rounded-md cursor-pointer hover:bg-white hover:text-osiblue duration-300"
-                        data-modal-url="">Open
-                        Ticket</button>
-                </a>
-            </div>
         </div>
 
 
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html
index c7a00beb..9097fdc6 100644
--- a/osinaweb/osinacore/templates/main.html
+++ b/osinaweb/osinacore/templates/main.html
@@ -3,7 +3,7 @@
 <html lang="en">
 
 <head>
-    
+
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% block title %} Osina {% endblock %}</title>
@@ -35,7 +35,8 @@
 
     <!-- USERS ACTIVITIES BUTTON ON MOBILE -->
     <a href="{% url 'recentactivitiespage' %}">
-        <div class="w-[55px] h-[55px] bg-osiblue rounded-full fixed xxlg1:hidden bottom-3 right-3 p-2 flex justify-center items-center cursor-pointer z-20 zoom">
+        <div
+            class="w-[55px] h-[55px] bg-osiblue rounded-full fixed xxlg1:hidden bottom-3 right-3 p-2 flex justify-center items-center cursor-pointer z-20 zoom">
             <img src="{% static 'images/icons/useractivity.png' %}" alt="Users">
         </div>
     </a>
@@ -57,6 +58,120 @@
     </div>
 
 
+    <!-- NOTIFICATIONS SIDEBAR -->
+    <div class="w-full h-full fixed inset-0 bg-black bg-opacity-50 flex justify-end items-center z-40 hidden" id="notificationsSideBar">
+        <div class="w-[450px] h-[100vh] bg-white p-5">
+            <div class="w-full flex justify-between items-center">
+                <div class="flex justify-start items-center gap-2">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0M3.124 7.5A8.969 8.969 0 0 1 5.292 3m13.416 0a8.969 8.969 0 0 1 2.168 4.5" />
+                    </svg>
+                    <p class="text-secondosiblue font-poppinsBold text-xl">13 New Notifications</p>
+                </div>
+                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                    stroke="currentColor" class="w-8 h-8 text-secondosiblue cursor-pointer" id="closeNotificationsSideBar">
+                    <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                </svg>
+            </div>
+
+            <div class="w-full h-full flex flex-col gap-3 mt-5 overflow-y-auto notificationsContainer pb-[50px]">
+                <div
+                    class="w-full px-3 py-5 flex justify-between items-center gap-3 cursor-pointer rounded-md bg-osiblue bg-opacity-40">
+                    <div class="flex justify-start items-center gap-2">
+                        <div>
+                            <div class="w-[50px] h-[50px] rounded-full shadow-md">
+                                <img src="{% static 'images/uploaded_images/salimelliye.jpeg' %}"
+                                    class="w-full h-full object-cover rounded-full">
+                            </div>
+                        </div>
+                        <div>
+                            <p class="text-[13px] font-light text-white">Salim Elliye added a reaction on your
+                                status</p>
+                        </div>
+                    </div>
+
+                    <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                        </svg>
+                    </div>
+                </div>
+
+
+                <div
+                    class="w-full px-3 py-5 flex justify-between items-center gap-3 cursor-pointer rounded-md bg-gray-50">
+                    <div class="flex justify-start items-center gap-2">
+                        <div>
+                            <div class="w-[50px] h-[50px] rounded-full shadow-md">
+                                <img src="{% static 'images/uploaded_images/salimelliye.jpeg' %}"
+                                    class="w-full h-full object-cover rounded-full">
+                            </div>
+                        </div>
+                        <div>
+                            <p class="text-[13px] font-light text-secondosiblue">Salim Elliye added you into Osimenu
+                                Project</p>
+                        </div>
+                    </div>
+
+                    <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                        </svg>
+                    </div>
+                </div>
+
+                <div
+                    class="w-full px-3 py-5 flex justify-between items-center gap-3 cursor-pointer rounded-md bg-gray-50">
+                    <div class="flex justify-start items-center gap-2">
+                        <div>
+                            <p class="text-[13px] font-light text-secondosiblue">You are now offline!</p>
+                        </div>
+                    </div>
+
+                    <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                        </svg>
+                    </div>
+                </div>
+
+                <div
+                    class="w-full px-3 py-5 flex justify-between items-center gap-3 cursor-pointer rounded-md bg-gray-50">
+                    <div class="flex justify-start items-center gap-2">
+                        <div>
+                            <p class="text-[13px] font-light text-secondosiblue">Your Osimenu subscription expires in 3
+                                days. Save on your renewal now.</p>
+                        </div>
+                    </div>
+
+                    <div>
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-4 h-4 text-secondosiblue">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
+                        </svg>
+                    </div>
+                </div>
+
+                <!-- View All Notifications container -->
+                <button
+                    class="group bg-secondosiblue border border-secondosiblue text-white flex justify-center items-center gap-2 px-3 py-2 mt-10 rounded-md cursor-pointer hover:bg-white hover:text-secondosiblue duration-300">
+                    <span>View All Notifications</span>
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-5 h-5 text-white group-hover:text-secondosiblue">
+                        <path stroke-linecap="round" stroke-linejoin="round"
+                            d="m4.5 19.5 15-15m0 0H8.25m11.25 0v11.25" />
+                    </svg>
+                </button>
+            </div>
+        </div>
+    </div>
+
+
     <div class="w-full flex">
         <!-- FIXED SIDE NAVBAR -->
         <div class="fixed h-screen w-[300px] bg-osiblue pt-9 flex flex-col justify-between flex-grow overflow-y-auto fixedSideHeader"
@@ -74,10 +189,12 @@
                         class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md"
                         placeholder="Search...">
                     <div class="inset-y-0 absolute right-5 flex justify-center items-center text-white">
-                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[20px] text-white">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
+                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" class="w-[20px] text-white">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="m21 21-5.197-5.197m0 0A7.5 7.5 0 1 0 5.196 5.196a7.5 7.5 0 0 0 10.607 10.607Z" />
                         </svg>
-                          
+
                     </div>
                 </div>
 
@@ -91,11 +208,13 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
                                 </svg>
-                                  
-                                  
+
+
                                 <p class="text-white">Accounts</p>
                             </div>
                             <div>
@@ -135,10 +254,12 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
                                 </svg>
-                                  
+
                                 <p class="text-white">My Work</p>
                             </div>
                             <div>
@@ -188,10 +309,12 @@
                     <!-- SUPPORT DROPDOWN -->
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
                             </svg>
-                              
+
                             <p class="text-white">Support</p>
                         </div>
                         <div>
@@ -203,12 +326,15 @@
                     <!-- BILLING DROPDOWN -->
                     {% if user.is_superuser %}
                     <div class="w-full menu-container">
-                        <div class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
+                        <div
+                            class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
                                 </svg>
-                                  
+
                                 <p class="text-white">Billing</p>
                             </div>
                             <div>
@@ -255,10 +381,12 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
                                 </svg>
-                                  
+
                                 <p class="text-white">Utilities</p>
                             </div>
                             <div>
@@ -316,10 +444,12 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
                             </svg>
-                              
+
                             <p class="text-white">Activity</p>
                         </div>
                     </a>
@@ -331,7 +461,8 @@
                 class="w-full xlg1:w-[300px] h-fit bg-secondosiblue flex flex-col items-center absolute xlg1:fixed justify-center gap-2 py-2 bottom-0 inset-x-0 mt-[100px]">
                 <div class="w-full flex flex-col justify-center gap-1 items-center">
                     <div class="flex justify-center items-center gap-1">
-                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo" class="w-[30px] h-[25px]">
+                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo"
+                            class="w-[30px] h-[25px]">
                         <p class="text-gray-200 font-light text-xs">Powered By OSITCOM</p>
                     </div>
                     <p class="text-gray-200 font-light text-xs">Copyrights © 2024 All Rights Reserved</p>
@@ -365,9 +496,11 @@
                     <div class="w-full h-fit bg-secondosiblue px-5 flex flex-col hidden" id="mobileUserProfileDropdown">
                         <a href="{% url 'signout' %}" class="w-full">
                             <div class="w-full py-3 flex items-center gap-2 text-white text-[16px]">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
-                                </svg>    
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
+                                </svg>
                                 <p>Logout</p>
                             </div>
                         </a>
@@ -383,8 +516,10 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M18 18.72a9.094 9.094 0 0 0 3.741-.479 3 3 0 0 0-4.682-2.72m.94 3.198.001.031c0 .225-.012.447-.037.666A11.944 11.944 0 0 1 12 21c-2.17 0-4.207-.576-5.963-1.584A6.062 6.062 0 0 1 6 18.719m12 0a5.971 5.971 0 0 0-.941-3.197m0 0A5.995 5.995 0 0 0 12 12.75a5.995 5.995 0 0 0-5.058 2.772m0 0a3 3 0 0 0-4.681 2.72 8.986 8.986 0 0 0 3.74.477m.94-3.197a5.971 5.971 0 0 0-.94 3.197M15 6.75a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm6 3a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Zm-13.5 0a2.25 2.25 0 1 1-4.5 0 2.25 2.25 0 0 1 4.5 0Z" />
                                 </svg>
                                 <p class="text-white">Accounts</p>
                             </div>
@@ -425,8 +560,10 @@
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M3.75 9.776c.112-.017.227-.026.344-.026h15.812c.117 0 .232.009.344.026m-16.5 0a2.25 2.25 0 0 0-1.883 2.542l.857 6a2.25 2.25 0 0 0 2.227 1.932H19.05a2.25 2.25 0 0 0 2.227-1.932l.857-6a2.25 2.25 0 0 0-1.883-2.542m-16.5 0V6A2.25 2.25 0 0 1 6 3.75h3.879a1.5 1.5 0 0 1 1.06.44l2.122 2.12a1.5 1.5 0 0 0 1.06.44H18A2.25 2.25 0 0 1 20.25 9v.776" />
                                 </svg>
                                 <p class="text-white">My Work</p>
                             </div>
@@ -476,8 +613,10 @@
 
                     <div class="w-full flex justify-between items-center border-b border-slate-600 py-3">
                         <div class="w-full flex justify-start items-center gap-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M20.25 8.511c.884.284 1.5 1.128 1.5 2.097v4.286c0 1.136-.847 2.1-1.98 2.193-.34.027-.68.052-1.02.072v3.091l-3-3c-1.354 0-2.694-.055-4.02-.163a2.115 2.115 0 0 1-.825-.242m9.345-8.334a2.126 2.126 0 0 0-.476-.095 48.64 48.64 0 0 0-8.048 0c-1.131.094-1.976 1.057-1.976 2.192v4.286c0 .837.46 1.58 1.155 1.951m9.345-8.334V6.637c0-1.621-1.152-3.026-2.76-3.235A48.455 48.455 0 0 0 11.25 3c-2.115 0-4.198.137-6.24.402-1.608.209-2.76 1.614-2.76 3.235v6.226c0 1.621 1.152 3.026 2.76 3.235.577.075 1.157.14 1.74.194V21l4.155-4.155" />
                             </svg>
                             <p class="text-white">Support</p>
                         </div>
@@ -487,63 +626,67 @@
                         </div>
                     </div>
 
-                   <!-- BILLING DROPDOWN -->
-                   {% if user.is_superuser %}
-                   <div class="w-full menu-container">
-                       <div
-                           class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
-                           <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
+                    <!-- BILLING DROPDOWN -->
+                    {% if user.is_superuser %}
+                    <div class="w-full menu-container">
+                        <div
+                            class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
+                            <div class="w-full flex justify-start items-center gap-3">
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M2.25 18.75a60.07 60.07 0 0 1 15.797 2.101c.727.198 1.453-.342 1.453-1.096V18.75M3.75 4.5v.75A.75.75 0 0 1 3 6h-.75m0 0v-.375c0-.621.504-1.125 1.125-1.125H20.25M2.25 6v9m18-10.5v.75c0 .414.336.75.75.75h.75m-1.5-1.5h.375c.621 0 1.125.504 1.125 1.125v9.75c0 .621-.504 1.125-1.125 1.125h-.375m1.5-1.5H21a.75.75 0 0 0-.75.75v.75m0 0H3.75m0 0h-.375a1.125 1.125 0 0 1-1.125-1.125V15m1.5 1.5v-.75A.75.75 0 0 0 3 15h-.75M15 10.5a3 3 0 1 1-6 0 3 3 0 0 1 6 0Zm3 0h.008v.008H18V10.5Zm-12 0h.008v.008H6V10.5Z" />
                                 </svg>
-                               <p class="text-white">Billing</p>
-                           </div>
-                           <div>
-                               <i class="angleDown fa fa-angle-down" style="font-size: 18px; color: white;"></i>
-                               <i class="angleUp fa fa-angle-up"
-                                   style="font-size: 18px; color: white; display: none;"></i>
-                           </div>
-                       </div>
-
-                       <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
-                           <a href="{% url 'items' %}">
-                               <div
-                                   class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                   <p class="text-white">Items</p>
-                               </div>
-                           </a>
-
-                           <a href="{% url 'orders' %}">
-                               <div
-                                   class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                   <p class="text-white">Orders</p>
-                               </div>
-                           </a>
-
-                           <a href="{% url 'invoices' %}">
-                               <div
-                                   class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                   <p class="text-white">Invoices</p>
-                               </div>
-                           </a>
-
-                           <a href="">
-                               <div
-                                   class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
-                                   <p class="text-white">Receipts</p>
-                               </div>
-                           </a>
-                       </div>
-                   </div>
-                   {% endif %}
+                                <p class="text-white">Billing</p>
+                            </div>
+                            <div>
+                                <i class="angleDown fa fa-angle-down" style="font-size: 18px; color: white;"></i>
+                                <i class="angleUp fa fa-angle-up"
+                                    style="font-size: 18px; color: white; display: none;"></i>
+                            </div>
+                        </div>
+
+                        <div class="menuDropdownItems w-full h-fit p-3 hidden duration-300">
+                            <a href="{% url 'items' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Items</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'orders' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Orders</p>
+                                </div>
+                            </a>
+
+                            <a href="{% url 'invoices' %}">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Invoices</p>
+                                </div>
+                            </a>
+
+                            <a href="">
+                                <div
+                                    class="w-full flex justify-start items-center gap-3 text-white border-b border-slate-600 py-2 cursor-pointer">
+                                    <p class="text-white">Receipts</p>
+                                </div>
+                            </a>
+                        </div>
+                    </div>
+                    {% endif %}
 
                     <!-- UTILITIES -->
                     <div class="w-full menu-container">
                         <div
                             class="menuItem w-full flex justify-between items-center border-b border-slate-600 py-3 cursor-pointer">
                             <div class="w-full flex justify-start items-center gap-3">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"  class="w-[25px] text-white">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
+                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                    stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                    <path stroke-linecap="round" stroke-linejoin="round"
+                                        d="M4.5 12a7.5 7.5 0 0 0 15 0m-15 0a7.5 7.5 0 1 1 15 0m-15 0H3m16.5 0H21m-1.5 0H12m-8.457 3.077 1.41-.513m14.095-5.13 1.41-.513M5.106 17.785l1.15-.964m11.49-9.642 1.149-.964M7.501 19.795l.75-1.3m7.5-12.99.75-1.3m-6.063 16.658.26-1.477m2.605-14.772.26-1.477m0 17.726-.26-1.477M10.698 4.614l-.26-1.477M16.5 19.794l-.75-1.299M7.5 4.205 12 12m6.894 5.785-1.149-.964M6.256 7.178l-1.15-.964m15.352 8.864-1.41-.513M4.954 9.435l-1.41-.514M12.002 12l-3.75 6.495" />
                                 </svg>
                                 <p class="text-white">Utilities</p>
                             </div>
@@ -602,8 +745,10 @@
 
                     <a class="w-full">
                         <div class="w-full flex justify-start items-center gap-3 border-b border-slate-600 py-3">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-[25px] text-white">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M3.75 3v11.25A2.25 2.25 0 0 0 6 16.5h2.25M3.75 3h-1.5m1.5 0h16.5m0 0h1.5m-1.5 0v11.25A2.25 2.25 0 0 1 18 16.5h-2.25m-7.5 0h7.5m-7.5 0-1 3m8.5-3 1 3m0 0 .5 1.5m-.5-1.5h-9.5m0 0-.5 1.5m.75-9 3-3 2.148 2.148A12.061 12.061 0 0 1 16.5 7.605" />
                             </svg>
                             <p class="text-white">Activity</p>
                         </div>
@@ -640,13 +785,17 @@
 
                 <div class="flex justify-end items-center gap-5">
                     <!-- NOTIFICATION -->
-                    <div class="relative">
-                        <div class="w-[20px] h-[20px] rounded-full bg-secondosiblue text-white flex justify-center items-center text-sm p-1 absolute top-[-5px] right-[-5px]">
+                    <div class="relative cursor-pointer hover:scale-105 duration-300 transition-transform" id="openNotificationsSideBar">
+                        <div
+                            class="w-[20px] h-[20px] rounded-full bg-secondosiblue text-white flex justify-center items-center text-sm p-1 absolute top-[-5px] right-[-5px]">
                             <p>1</p>
                         </div>
-                        <div class="w-[40px] s:w-[45px] h-[40px] s:h-[45px] rounded-full shadow-md bg-gray-50 border border-gray-100 flex justify-center items-center cursor-pointer hover:scale-105 duration-300 transition-transform">
-                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6 text-secondosiblue">
-                                <path stroke-linecap="round" stroke-linejoin="round" d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0" />
+                        <div
+                            class="w-[40px] s:w-[45px] h-[40px] s:h-[45px] rounded-full shadow-md bg-gray-50 border border-gray-100 flex justify-center items-center">
+                            <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                                stroke="currentColor" class="w-6 h-6 text-secondosiblue">
+                                <path stroke-linecap="round" stroke-linejoin="round"
+                                    d="M14.857 17.082a23.848 23.848 0 0 0 5.454-1.31A8.967 8.967 0 0 1 18 9.75V9A6 6 0 0 0 6 9v.75a8.967 8.967 0 0 1-2.312 6.022c1.733.64 3.56 1.085 5.455 1.31m5.714 0a24.255 24.255 0 0 1-5.714 0m5.714 0a3 3 0 1 1-5.714 0" />
                             </svg>
                         </div>
                     </div>
@@ -661,23 +810,25 @@
                                         class="w-full h-full object-cover rounded-full">
                                 </div>
                             </div>
-    
+
                             <div class="flex justify-center items-center gap-2 text-gray-500">
                                 <p>{{request.user.first_name}} {{request.user.last_name}}</p>
                                 <i class="fa fa-angle-down" id="arrowDown"></i>
                                 <i class="fa fa-angle-up" style="display: none;" id="arrowUp"></i>
                             </div>
                         </div>
-    
+
                         <!-- USER PROFILE DROPDOWN -->
                         <div class="w-[250px] h-fit bg-osiblue bg-opacity-70 rounded-md shadow-md px-3 absolute right-0 mt-3 flex flex-col"
                             style="display: none;" id="userProfileDropdown">
                             <a href="{% url 'signout' %}" class="w-full">
                                 <div
                                     class="w-full py-3 flex items-center gap-2 text-white hover:text-osiblue duration-300 cursor-pointer">
-                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
-                                        <path stroke-linecap="round" stroke-linejoin="round" d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
-                                    </svg>    
+                                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                        stroke-width="1.5" stroke="currentColor" class="w-[25px] text-white">
+                                        <path stroke-linecap="round" stroke-linejoin="round"
+                                            d="M5.636 5.636a9 9 0 1 0 12.728 0M12 3v9" />
+                                    </svg>
                                     <p>Logout</p>
                                 </div>
                             </a>
@@ -701,14 +852,15 @@
                 </div>
 
                 <div class="w-fit cursor-pointer hidden" id="mobileCloseMenuButton">
-                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-[40px] text-white">
+                    <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                        stroke="currentColor" class="w-[40px] text-white">
                         <path stroke-linecap="round" stroke-linejoin="round" d="M6 18 18 6M6 6l12 12" />
-                      </svg>
-                      
+                    </svg>
+
                 </div>
             </div>
 
- 
+
             <!-- MODULES SECTION -->
             <div class="w-full h-fit grid grid-cols-1 xxlg1:grid-cols-3 gap-5 px-5 s:px-9 py-5">
                 <div class="h-[150px] bg-white shadow-md rounded-md block xxlg1:hidden">
@@ -768,7 +920,7 @@
                     </div>
                 </div>
             </div>
-      
+
 
             <!-- NOTES SECTION -->
             <div class="w-full px-5 s:px-9 pb-5">
@@ -863,7 +1015,8 @@
 
                         <a href="{% url 'recentactivitiespage' %}">
                             <div>
-                                <img src="{% static 'images/icons/expand.png' %}" class="absolute w-[25px] right-3 top-5 hover:scale-105 cursor-pointer duration-300">
+                                <img src="{% static 'images/icons/expand.png' %}"
+                                    class="absolute w-[25px] right-3 top-5 hover:scale-105 cursor-pointer duration-300">
                             </div>
                         </a>
 
@@ -908,7 +1061,8 @@
             <div class="bg-osiblue h-fit py-2 mobileFooter">
                 <div class="w-full flex flex-col justify-center items-center gap-1">
                     <div class="flex justify-center items-center gap-2">
-                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo" class="w-[30px] h-[25px]">
+                        <img src="{% static 'images/ositcom_logos/ositcomwhite(o).png' %}" alt="Ositcom Logo"
+                            class="w-[30px] h-[25px]">
                         <p class="text-gray-200 font-light text-xs">Powered By OSITCOM</p>
                     </div>
                     <p class="text-gray-200 font-light text-xs">Copyrights © 2024 All Rights Reserved</p>
@@ -945,7 +1099,10 @@
 
     <!-- TO RELOAD THE USERS ACTIVITY CONTAINER -->
     <script type="text/javascript" src='{% static "js/get-updated-user-activity.js" %}'></script>
-    
+
+    <!-- NOTIFICATIONS SIDE BAR -->
+    <script type="text/javascript" src='{% static "js/notifications-side-bar.js" %}'></script>
+
 </body>
 
 </html>
\ No newline at end of file
diff --git a/osinaweb/osinacore/urls.py b/osinaweb/osinacore/urls.py
index 114350c5..33811162 100644
--- a/osinaweb/osinacore/urls.py
+++ b/osinaweb/osinacore/urls.py
@@ -77,10 +77,6 @@ urlpatterns = [
     path('getupdatedactivities/', views.get_latest_activities, name='getupdatedactivities'),
     path('recent-activities-page/', views.recent_activities_page, name='recentactivitiespage'),
     path('fetch_epics/', views.fetch_epics, name='fetch_epics'),
-
-
-
-
 ]
 
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
\ No newline at end of file
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc
index 57b8decb..94f158d1 100644
Binary files a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc
index 490784ed..c817fe4a 100644
Binary files a/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/settings.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc
index b1458843..f276f633 100644
Binary files a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc differ
diff --git a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc
index 1611582e..35ee00f0 100644
Binary files a/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc and b/osinaweb/osinaweb/__pycache__/wsgi.cpython-311.pyc differ
diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css
index 81bf2392..217314b2 100644
--- a/osinaweb/static/dist/output.css
+++ b/osinaweb/static/dist/output.css
@@ -1,5 +1,5 @@
 /*
-! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com
+! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com
 */
 
 /*
@@ -32,9 +32,11 @@
 4. Use the user's configured `sans` font-family by default.
 5. Use the user's configured `sans` font-feature-settings by default.
 6. Use the user's configured `sans` font-variation-settings by default.
+7. Disable tap highlights on iOS
 */
 
-html {
+html,
+:host {
   line-height: 1.5;
   /* 1 */
   -webkit-text-size-adjust: 100%;
@@ -44,12 +46,14 @@ html {
   -o-tab-size: 4;
      tab-size: 4;
   /* 3 */
-  font-family: ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
+  font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
   /* 4 */
   font-feature-settings: normal;
   /* 5 */
   font-variation-settings: normal;
   /* 6 */
+  -webkit-tap-highlight-color: transparent;
+  /* 7 */
 }
 
 /*
@@ -121,8 +125,10 @@ strong {
 }
 
 /*
-1. Use the user's configured `mono` font family by default.
-2. Correct the odd `em` font sizing in all browsers.
+1. Use the user's configured `mono` font-family by default.
+2. Use the user's configured `mono` font-feature-settings by default.
+3. Use the user's configured `mono` font-variation-settings by default.
+4. Correct the odd `em` font sizing in all browsers.
 */
 
 code,
@@ -131,8 +137,12 @@ samp,
 pre {
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
   /* 1 */
-  font-size: 1em;
+  font-feature-settings: normal;
   /* 2 */
+  font-variation-settings: normal;
+  /* 3 */
+  font-size: 1em;
+  /* 4 */
 }
 
 /*
@@ -858,6 +868,10 @@ video {
   z-index: 30;
 }
 
+.z-40 {
+  z-index: 40;
+}
+
 .z-50 {
   z-index: 50;
 }
@@ -1326,6 +1340,10 @@ video {
   width: 40px;
 }
 
+.w-\[450px\] {
+  width: 450px;
+}
+
 .w-\[45px\] {
   width: 45px;
 }
@@ -1388,7 +1406,7 @@ video {
 }
 
 .max-w-0 {
-  max-width: 0rem;
+  max-width: 0px;
 }
 
 .max-w-2xl {
@@ -2529,6 +2547,10 @@ video {
   padding-bottom: 1.5rem;
 }
 
+.pb-\[50px\] {
+  padding-bottom: 50px;
+}
+
 .pl-5 {
   padding-left: 1.25rem;
 }
@@ -2596,6 +2618,10 @@ video {
   font-size: 12px;
 }
 
+.text-\[13px\] {
+  font-size: 13px;
+}
+
 .text-\[15px\] {
   font-size: 15px;
 }
@@ -2956,6 +2982,12 @@ video {
   background: #b9bfc58b;
 }
 
+/* SCROLL BAR OF NOTIFICATIONS CONTAINER IN NOTIFICATIONS SIDE BAR */
+
+.notificationsContainer::-webkit-scrollbar {
+  width: 0px;
+}
+
 /* Website's font */
 
 @font-face {
@@ -3280,16 +3312,14 @@ video {
   outline-offset: 2px;
 }
 
-.group:hover .group-hover\:text-white {
+.group:hover .group-hover\:text-secondosiblue {
   --tw-text-opacity: 1;
-  color: rgb(255 255 255 / var(--tw-text-opacity));
+  color: rgb(55 74 122 / var(--tw-text-opacity));
 }
 
-@media (prefers-color-scheme: dark) {
-  .dark\:text-gray-600 {
-    --tw-text-opacity: 1;
-    color: rgb(75 85 99 / var(--tw-text-opacity));
-  }
+.group:hover .group-hover\:text-white {
+  --tw-text-opacity: 1;
+  color: rgb(255 255 255 / var(--tw-text-opacity));
 }
 
 @media (min-width: 650px) {
@@ -3398,6 +3428,10 @@ video {
     flex-direction: row;
   }
 
+  .s\:items-center {
+    align-items: center;
+  }
+
   .s\:justify-end {
     justify-content: flex-end;
   }
@@ -3788,4 +3822,11 @@ video {
   .xll\:text-\[70px\] {
     font-size: 70px;
   }
+}
+
+@media (prefers-color-scheme: dark) {
+  .dark\:text-gray-600 {
+    --tw-text-opacity: 1;
+    color: rgb(75 85 99 / var(--tw-text-opacity));
+  }
 }
\ No newline at end of file
diff --git a/osinaweb/static/images/uploaded_images/Screenshot_146.png b/osinaweb/static/images/uploaded_images/Screenshot_146.png
new file mode 100644
index 00000000..fb2695f6
Binary files /dev/null and b/osinaweb/static/images/uploaded_images/Screenshot_146.png differ
diff --git a/osinaweb/static/js/add-ticket.js b/osinaweb/static/js/add-ticket.js
new file mode 100644
index 00000000..90a3f5b1
--- /dev/null
+++ b/osinaweb/static/js/add-ticket.js
@@ -0,0 +1,23 @@
+// TO DISPLAY THE CHOSEN REGARDING OPTION SELECT TAG
+
+const selectRegarding = document.getElementById('regardingSelectTag');
+const projectsSelectTag = document.getElementById('projectsSelectTag');
+const productsSelectTag = document.getElementById('productsSelectTag');
+
+selectRegarding.addEventListener('change', function() {
+    const selectedOption = this.value;
+
+    if (selectedOption === 'Product') {
+        productsSelectTag.classList.remove('hidden');
+        productsSelectTag.required = true;
+        
+        projectsSelectTag.required = false;
+        projectsSelectTag.classList.add('hidden');
+    } else if (selectedOption === 'Project') {
+        projectsSelectTag.classList.remove('hidden');
+        projectsSelectTag.required = true;
+
+        productsSelectTag.required = false;
+        productsSelectTag.classList.add('hidden');
+    }
+});
\ No newline at end of file
diff --git a/osinaweb/static/js/billing/add-order.js b/osinaweb/static/js/billing/add-order.js
deleted file mode 100644
index 8f5c6f58..00000000
--- a/osinaweb/static/js/billing/add-order.js
+++ /dev/null
@@ -1,56 +0,0 @@
-document.addEventListener('DOMContentLoaded', function () {
-    var itemsSelectTag = $('#itemsSelectTag').selectize()[0].selectize;
-
-    document.getElementById('customersSelectTag').addEventListener('change', function () {
-        var customerId = this.value;
-
-        // FETCH CUSTOMER ITEMS
-        fetch('/fetch-customer-items/' + customerId + '/')
-            .then(response => {
-                return response.json();
-            })
-            .then(data => {
-                itemsSelectTag.clearOptions();
-
-                // Remove the selected option "Select Customer First"
-                var selectCustomerOption = itemsSelectTag.options['Select Customer First'];
-                if (selectCustomerOption) {
-                    delete itemsSelectTag.options['Select Customer First'];
-                }
-
-                // Add items related to the customer
-                data.items_related_to_customer.forEach(function (item) {
-                    itemsSelectTag.addOption({value: item.id, text: item.title});
-                });
-
-                // Add items without a customer
-                data.items_without_customer.forEach(function (item) {
-                    itemsSelectTag.addOption({value: item.id, text: item.title});
-                });
-
-                itemsSelectTag.refreshOptions();
-            })
-            .catch(error => console.error('Error fetching customer items:', error));
-
-
-
-        // FETCH CUSTOMER BUSINESSES
-        $.ajax({
-            url: `/fetch-customer-businesses/${customerId}/`,
-            type: 'GET',
-            success: function (data) {
-                $('#businessSelectTag').empty();
-                if (data.businesses) { // Check if businesses exist in the response
-                    $('#businessSelectTag').append(`<option value="">Select Business</option>`);
-                    // Iterate over each business in the response
-                    data.businesses.forEach(function(business) {
-                        $('#businessSelectTag').append(`<option value="${business.id}">${business.name}</option>`);
-                    });
-                }
-            },
-            error: function (xhr, status, error) {
-                console.error(error);
-            }
-        });
-    });
-});
diff --git a/osinaweb/static/js/customer_dashboard/regarding-ticket.js b/osinaweb/static/js/customer_dashboard/regarding-ticket.js
new file mode 100644
index 00000000..90a3f5b1
--- /dev/null
+++ b/osinaweb/static/js/customer_dashboard/regarding-ticket.js
@@ -0,0 +1,23 @@
+// TO DISPLAY THE CHOSEN REGARDING OPTION SELECT TAG
+
+const selectRegarding = document.getElementById('regardingSelectTag');
+const projectsSelectTag = document.getElementById('projectsSelectTag');
+const productsSelectTag = document.getElementById('productsSelectTag');
+
+selectRegarding.addEventListener('change', function() {
+    const selectedOption = this.value;
+
+    if (selectedOption === 'Product') {
+        productsSelectTag.classList.remove('hidden');
+        productsSelectTag.required = true;
+        
+        projectsSelectTag.required = false;
+        projectsSelectTag.classList.add('hidden');
+    } else if (selectedOption === 'Project') {
+        projectsSelectTag.classList.remove('hidden');
+        projectsSelectTag.required = true;
+
+        productsSelectTag.required = false;
+        productsSelectTag.classList.add('hidden');
+    }
+});
\ No newline at end of file
diff --git a/osinaweb/static/js/notifications-side-bar.js b/osinaweb/static/js/notifications-side-bar.js
new file mode 100644
index 00000000..32f1f8dc
--- /dev/null
+++ b/osinaweb/static/js/notifications-side-bar.js
@@ -0,0 +1,25 @@
+
+document.addEventListener("DOMContentLoaded", function () {
+    const openNotificationsBtn = document.getElementById("openNotificationsSideBar");
+    const closeNotificationsBtn = document.getElementById("closeNotificationsSideBar");
+    const notificationsSideBar = document.getElementById("notificationsSideBar");
+
+    function openNotifications() {
+        notificationsSideBar.classList.remove("hidden");
+        document.body.classList.add("overflow-hidden");
+    }
+
+    function closeNotifications() {
+        notificationsSideBar.classList.add("hidden");
+        document.body.classList.remove("overflow-hidden");
+    }
+
+    openNotificationsBtn.addEventListener("click", function () {
+        openNotifications();
+    });
+
+    closeNotificationsBtn.addEventListener("click", function () {
+        closeNotifications();
+    });
+});
+