diff --git a/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc b/osinaweb/addressbook/__pycache__/__init__.cpython-311.pyc index 8498d178..5341eae0 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 9a48f802..2c0c3652 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 7caee707..4f9f6300 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 838ec8e9..fdf12223 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 0cf54e78..de3f1719 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 7785645c..a1b27aeb 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 63e84b33..aa566498 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 8beae47b..3c003bd8 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 ac9a247d..f03e4765 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 d5b0dd36..b8e81f97 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 47b48e1e..fcaca624 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 6d3f67d6..426b97b2 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 9fe23fee..f9c7227d 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 635a7dca..26944897 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 2c91699e..92be0801 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 48d7e8e0..50acd838 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/migrations/__pycache__/0001_initial.cpython-311.pyc b/osinaweb/billing/migrations/__pycache__/0001_initial.cpython-311.pyc index cf63e855..44e4d619 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 c07e1072..c86fc146 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 06f2a1e8..fc746b84 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 6c399848..585a65d4 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 156d0590..ddb14da2 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 a02e3007..4f115707 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 2fda5ab2..5d3d0a2b 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 3dbc46fc..97b0dda8 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 98bba9a7..9c330521 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 70363ed9..85ef2d0b 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 2f2bc39c..90fbef57 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 8103d5d5..4b34aff2 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 c452c292..23bb2197 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 9e138df4..e48455fd 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 11c23f77..7cfcfaef 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 88e88c1d..90c57d86 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 a7c5cd4a..b0e5d054 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 4a6c23a5..f302dea4 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 23bc35e4..21f19f13 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 2ded1aa8..23ce0c80 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 bf748626..a0c53c30 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 83d02ab5..01325b47 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 8020d6c0..c5fa9397 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 7767125b..e8873df2 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 new file mode 100644 index 00000000..c379d880 Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0025_remove_item_project_item_customer.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 a13ec0d3..c21046f3 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 new file mode 100644 index 00000000..313ee4c8 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-order.html @@ -0,0 +1,85 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + + + + + + + +
+
+

+ Add Order +

+ +
+ {% csrf_token %} +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ + + + + + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/add_templates/add-product.html b/osinaweb/billing/templates/add_templates/add-product.html new file mode 100644 index 00000000..23c71010 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-product.html @@ -0,0 +1,72 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Add Product +

+ +
+ {% csrf_token %} +
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/add_templates/add-service.html b/osinaweb/billing/templates/add_templates/add-service.html new file mode 100644 index 00000000..8635a7e8 --- /dev/null +++ b/osinaweb/billing/templates/add_templates/add-service.html @@ -0,0 +1,72 @@ +{% extends "add-edit-main.html" %} +{%load static%} +{% block content %} + +
+
+

+ Add Service +

+ +
+ {% csrf_token %} +
+
+ + +
+ + +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ + +
+ + +
+ +
+ +
+
+
+
+
+ +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/invoice-details.html b/osinaweb/billing/templates/invoice-details.html new file mode 100644 index 00000000..5ae80e2f --- /dev/null +++ b/osinaweb/billing/templates/invoice-details.html @@ -0,0 +1,30 @@ +{% load static %} + + + + + + + + + Invoice Details + + + + +
+ + +
+

Bill To: Winabig

+

Customer Details: 036466464

+
+ + +
+ +
+
+ + + \ No newline at end of file diff --git a/osinaweb/billing/templates/listing_pages/invoices.html b/osinaweb/billing/templates/listing_pages/invoices.html new file mode 100644 index 00000000..a628b223 --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/invoices.html @@ -0,0 +1,97 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + + + +
+
+

Invoices

+ +
+
+
+ + +
+
+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + {% for invoice in invoices %} + + + + + + + + + + + + {% endfor %} + +
+ Invoice Number + + Customer + + Order + + Date Created + + Actions +
+

{{invoice.invoice_number}}

+ 		+

{{invoice.order.customer}}

+ 		+

{{invoice.order.id}}

+ 		+

{{invoice.date_created}}

+ 		+
+ +
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/templates/listing_pages/items.html b/osinaweb/billing/templates/listing_pages/items.html new file mode 100644 index 00000000..981e953c --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/items.html @@ -0,0 +1,183 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + + +
+
+
+ +
+

Products

+

Services

+
+ +
+ + + + + + + +
+
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Title + + Customer + + Type + + Amount + + Actions +
+

Item 1

+ 		+

Nataly

+ 		+

Type

+ 		+

222

+ 		+
+ +
+ +
+ + +
+ +
+ +
+ +
+
+
+
+ + + + +
+
+ + + + + + + +{% 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 new file mode 100644 index 00000000..d76197d9 --- /dev/null +++ b/osinaweb/billing/templates/listing_pages/orders.html @@ -0,0 +1,100 @@ + +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+

Orders

+
+
+
+ + +
+
+
+ + + +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ Order ID + + Customer + + Due Date + + Status + + Actions +
+

1

+ 		+

Nataly

+ 		+

10-2-2014

+ 		+

Paid

+ 		+
+ + + +
+ +
+ +
+ +
+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/osinaweb/billing/urls.py b/osinaweb/billing/urls.py index 1d9f7d1e..44891bcc 100644 --- a/osinaweb/billing/urls.py +++ b/osinaweb/billing/urls.py @@ -10,4 +10,22 @@ urlpatterns = [ path('check', views.create_charges_for_recurring_services, name='check'), + # LISTING + path('items', views.items, name='items'), + path('orders', views.orders, name='orders'), + path('invoices', views.invoices, name='invoices'), + + + # ADD + path('add-product', views.add_product, name='addproduct'), + path('add-service', views.add_service, name='addservice'), + path('add-order', views.add_order, name='addorder'), + + + path('fetch-customer-items//', views.fetch_customer_items, name='fetch_customer_items'), + path('fetch-invoice-details//', views.fetch_invoice_details, name='fetchinvoicedetails'), + + + path('invoice-details//', views.invoice_details, name='invoicedetails'), + ] diff --git a/osinaweb/billing/views.py b/osinaweb/billing/views.py index 2b68868d..518dcc22 100644 --- a/osinaweb/billing/views.py +++ b/osinaweb/billing/views.py @@ -1,12 +1,9 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 from django.utils import timezone from datetime import timedelta from .models import * from django.http import JsonResponse -# Create your views here. - -# Create your tests here. def create_charges_for_recurring_services(request): today = timezone.now().date() @@ -26,4 +23,108 @@ def create_charges_for_recurring_services(request): amount=service.amount, due_date=new_due_date ) - return JsonResponse({'status': 'success'}) \ No newline at end of file + return JsonResponse({'status': 'success'}) + +# LISTING +def items (request, *args, **kwargs): + context = { + + } + return render(request, 'listing_pages/items.html', context) + + +def orders (request, *args, **kwargs): + context = { + + } + return render(request, 'listing_pages/orders.html', context) + + +def invoices (request, *args, **kwargs): + invoices = Invoice.objects.all().order_by('-id') + + context = { + 'invoices': invoices, + } + + return render(request, 'listing_pages/invoices.html', context) + + + + +# ADD +def add_product (request, *args, **kwargs): + context = { + + } + return render(request, 'add_templates/add-product.html', context) + + +def add_service (request, *args, **kwargs): + context = { + + } + return render(request, 'add_templates/add-service.html', context) + + +def add_order (request, *args, **kwargs): + customers = CustomerProfile.objects.all().order_by('-id') + + context = { + 'customers': customers, + } + + return render(request, 'add_templates/add-order.html', context) + + + +# 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')), + } + + return JsonResponse(data) + + + + +def fetch_invoice_details(request, invoice_id): + invoice = get_object_or_404(Invoice, id=invoice_id) + order = invoice.order + order_items = OrderItem.objects.filter(order=order) + + order_total = order.get_cart_total + + data = { + 'invoice_number': invoice.invoice_number, + 'order_id': order.order_id, + 'order_total' : order_total, + 'date_created': invoice.date_created, + 'customer_first_name': order.customer.user.first_name, + 'customer_last_name': order.customer.user.last_name, + 'customer_email': order.customer.user.email, + 'order_items': list(order_items.values()), # Convert QuerySet to list of dictionaries + } + + return JsonResponse(data) + + + +def invoice_details (request, invoice_id): + invoice = get_object_or_404(Invoice, id=invoice_id) + + context = { + 'invoice' : invoice, + } + + return render(request, 'invoice-details.html', context) + + diff --git a/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc b/osinaweb/customercore/__pycache__/__init__.cpython-311.pyc index dfc13ddb..ee0c689f 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 2864654e..17afba64 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 facad0ab..5293bac7 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__/decorators.cpython-311.pyc b/osinaweb/customercore/__pycache__/decorators.cpython-311.pyc index 755ef7d6..cf25e39b 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 f9ad7a84..46c9c4b8 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 808ab60f..9ff4c1d0 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 9ff2c769..46870cce 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__/__init__.cpython-311.pyc b/osinaweb/customercore/migrations/__pycache__/__init__.cpython-311.pyc index b4f8432f..e89cb477 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/listing_pages/customer-invoices.html b/osinaweb/customercore/templates/listing_pages/customer-invoices.html index 12785a86..50332692 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-invoices.html +++ b/osinaweb/customercore/templates/listing_pages/customer-invoices.html @@ -71,7 +71,6 @@ - {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/templates/listing_pages/products.html b/osinaweb/customercore/templates/listing_pages/products.html index 495108a7..8b316428 100644 --- a/osinaweb/customercore/templates/listing_pages/products.html +++ b/osinaweb/customercore/templates/listing_pages/products.html @@ -3,19 +3,10 @@ {% block content %} - - - -
+ class="w-full bg-secondosiblue shadow-md rounded-md px-5 py-5 flex flex-wrap items-center gap-8 text-fifthosiblue text-base xl:text-xl uppercase">

Solutions

Cloud Hosting

@@ -24,7 +15,7 @@
- +
-
+
-

Shared Basic

+

Shared + Basic

-
-

80%

-

$2.40/month

+
+

80%

+

$2.40/month

Regular Price: $12.00/month

-
- -
-

Shared Plus -

- -
-

80%

-

$3.50/month

-

Regular Price: $17.50/month

-
+
+

Shared + Plus +

+ +
+

80%

+

$3.50/month

+

Regular Price: $17.50/month

-

Shared Power

+

Shared + Power

-
-

80%

-

$4.80/month

+
+

80%

+

$4.80/month

Regular Price: $24.00/month

@@ -175,7 +167,7 @@
-

Cloud VPS Hosting

+

Cloud VPS Hosting

-
+
-

OSICLOUD 1

+

+ OSICLOUD 1

-
-

30%

-

$46.16/month

+
+

30%

+

$46.16/month

Regular Price: $65.95/month

-
- -
-

OSICLOUD 2

+
+

+ OSICLOUD 2

-
-

30%

-

$53.86/month

-

Regular Price: $76.95/month

-
+
+

30%

+

$53.86/month +

+

Regular Price: $76.95/month

-

OSICLOUD 3

+

+ OSICLOUD 3

-
-

30%

-

$69.26/month

+
+

30%

+

$69.26/month

Regular Price: $98.95/month

-

OSICLOUD 4

+

+ OSICLOUD 4

-
-

30%

-

$107.76/month

+
+

30%

+

$107.76/month +

Regular Price: $153.95/month

@@ -236,7 +231,7 @@
-

Dedicated CPU Servers

+

Dedicated CPU Servers

-
+
-

DEDICATED 1

+

+ DEDICATED 1

-
-

30%

-

$103.06/month

+
+

30%

+

$103.06/month +

Regular Price: $143.95/month

-
- -
-

DEDICATED 2 -

- -
-

30%

-

$127.16/month

-

Regular Price: $184.95/month

-
+
+

+ DEDICATED 2 +

+ +
+

30%

+

+ $127.16/month

+

Regular Price: $184.95/month

-

DEDICATED 3

+

+ DEDICATED 3

-
-

30%

-

$173.63/month

+
+

30%

+

$173.63/month +

Regular Price: $252.95/month

-

DEDICATED 4

+

+ DEDICATED 4

-
-

30%

-

$265.76/month

+
+

30%

+

$265.76/month +

Regular Price: $374.95/month

@@ -298,26 +298,8 @@
- + + + {% endblock %} \ No newline at end of file diff --git a/osinaweb/customercore/urls.py b/osinaweb/customercore/urls.py index 6329673c..1942a491 100644 --- a/osinaweb/customercore/urls.py +++ b/osinaweb/customercore/urls.py @@ -5,7 +5,7 @@ from . import views urlpatterns = [ # LISTING - path('invoices/', views.customer_invoices, name='customerinvoices'), + path('customer-invoices/', views.customer_invoices, name='customerinvoices'), path('products/', views.all_products, name='products'), path('orders/', views.customer_orders, name='orders'), diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 73087dbb..dbd97d24 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/input.css b/osinaweb/input.css index b8027e9e..2d36a1b7 100644 --- a/osinaweb/input.css +++ b/osinaweb/input.css @@ -226,4 +226,19 @@ /* CUSTOMER DASHBOARD PAYMENT */ #paymentContent iframe { min-height: fit-content !important; +} + + +/* CUSTOMER DASHBOARD PRODUCTS PAGE */ +.selectedProductCategory { + color: white; + font-weight: bolder; +} + + + +/* IN BILLING ITEMS */ +.selectedItemType { + color: white; + font-weight: bolder; } \ No newline at end of file diff --git a/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinacore/__pycache__/__init__.cpython-311.pyc index 91d0d094..166645a7 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 1a63ee5d..39d76076 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 dbea131c..049c93d1 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 4e7e6d9a..f3c08394 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 f6e6e037..e4c6d2a5 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 036921eb..6491adf0 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 893a7db6..3bb5fd90 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 46871486..0e41a538 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 0412cbfc..56bb59cb 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 df5c083d..dce1a661 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 bb242122..7128939f 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/api/__pycache__/serializers.cpython-311.pyc b/osinaweb/osinacore/api/__pycache__/serializers.cpython-311.pyc index 16ccec3e..22b384f5 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 368a9f9e..c1b606a4 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 2016afeb..47c91480 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 16d77c7d..f56f401b 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 e87003b5..0f3fb2ae 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 18c88ab2..b17be917 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 69861b1e..2ed867bb 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 53104b83..a94252be 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 1f0077eb..998a55de 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 46b048b4..97072811 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 cacc6642..a7865b6b 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 51fd4b00..566eb74f 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 94e2eae7..ec4215cb 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 8f91cee6..cbe73323 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 0799df12..f441a261 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 e672c207..1a52fc11 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 93ab155b..9684ca65 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 1aa7459c..fd233dd1 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 971c31da..e8a49161 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 d8ab8f28..5089e74b 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 86fccf1e..0b3213ad 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 b38e5bf0..e6b96180 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 9ce2d0b6..3a683ccf 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 9a5126a9..2ac22d5d 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 dac84b1a..3fb317bc 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 7a6e328b..55bf6dfd 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 cf09892b..1b57b6dd 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 2c0cd39e..ab089998 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 f58bf990..0ef74c51 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 736f941f..78169225 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 925b598f..df59cc7a 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 9f1f5fb6..53742062 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 6c2cc918..1e0a67b7 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 02b320fe..8199a6fc 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 f9b398d8..dc2a23b8 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 6ada9f32..50de412d 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 2375749d..22352814 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 8af27b89..6be65766 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 8ce37605..dba447ee 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 96bfd0a4..84e787f3 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 f0de662b..c3520a3b 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 767b61fb..41f66ae3 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 153aa3a8..6bfa577d 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 c791469b..2ea1a293 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 b1e2f329..74faa2f8 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 fc4598f9..ebf24b25 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 a3b8c8ec..11d6ff4a 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 e5b689ff..43a3defc 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 738214d3..1ebe9fc7 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 ecb90ae3..6bbcfe3c 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 2706416d..05d9e117 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 3e4c5c53..397a854b 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 7932d60b..a4d0a73e 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 e4f28141..b061ae48 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 5caeabf1..bf9cbf18 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 b136e7d9..8ffffbf8 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 5a4042d3..96ce830a 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 292f0292..010920d4 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 57dd2c64..6d11e75b 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 93647173..3c4e0d16 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 8e3daea4..bb20b327 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 2c1aaadd..d22abd1e 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 077914a3..128f5756 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 59415fa7..3efe75b5 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 ca982df8..4412c12b 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 27482516..814608ae 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 dc794079..ae84f637 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 1a4147b2..561bba15 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 c40dfce2..c243e5ee 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 a3fc7099..407ca077 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 e1f9ad77..cbb22858 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 e1e58cb0..cdc3535d 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__/__init__.cpython-311.pyc b/osinaweb/osinacore/migrations/__pycache__/__init__.cpython-311.pyc index b6115eb3..ec4e2e02 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 f21b2bcd..2433a634 100644 --- a/osinaweb/osinacore/templates/add-edit-main.html +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -161,8 +161,9 @@ {% if user.is_superuser %} -
-
+
+

Billing

@@ -173,9 +174,40 @@ style="font-size: 18px; color: white; display: none;">
+ +
{% endif %} +
+ {% if user.is_superuser %} -
-
+
+

Billing

@@ -411,10 +445,40 @@ style="font-size: 18px; color: white; display: none;">
-
+ +
{% endif %} +
-
+
diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 6a78928f..32b210cd 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -189,8 +189,8 @@ {% if user.is_superuser %} -
-
+
+

Billing

@@ -201,6 +201,36 @@ style="font-size: 18px; color: white; display: none;">
+ +
{% endif %} @@ -427,22 +457,53 @@
- {% if user.is_superuser %} -
-
-
- -

Billing

-
-
- - -
-
-
- - {% endif %} + + {% if user.is_superuser %} +
+
+
+ +

Billing

+
+
+ + +
+
+ + +
+ {% endif %}
diff --git a/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/__init__.cpython-311.pyc index 78855eab..2e940e92 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 eec184b2..ce85a13d 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 6baf9b7e..ccf82853 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 0e86673c..9f59eb77 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 d8d6bcfa..0ecd12ef 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 */ } /* @@ -854,6 +864,11 @@ video { margin: auto; } +.mx-0 { + margin-left: 0px; + margin-right: 0px; +} + .mx-auto { margin-left: auto; margin-right: auto; @@ -1181,6 +1196,14 @@ video { width: 13px; } +.w-\[140px\] { + width: 140px; +} + +.w-\[150px\] { + width: 150px; +} + .w-\[180px\] { width: 180px; } @@ -1261,6 +1284,10 @@ video { width: 55px; } +.w-\[60\%\] { + width: 60%; +} + .w-\[60px\] { width: 60px; } @@ -1299,7 +1326,7 @@ video { } .max-w-0 { - max-width: 0rem; + max-width: 0px; } .max-w-2xl { @@ -2935,6 +2962,20 @@ video { min-height: fit-content !important; } +/* CUSTOMER DASHBOARD PRODUCTS PAGE */ + +.selectedProductCategory { + color: white; + font-weight: bolder; +} + +/* IN BILLING ITEMS */ + +.selectedItemType { + color: white; + font-weight: bolder; +} + .hover\:scale-105:hover { --tw-scale-x: 1.05; --tw-scale-y: 1.05; @@ -3056,6 +3097,10 @@ video { width: 100px; } + .s\:w-\[180px\] { + width: 180px; + } + .s\:w-\[300px\] { width: 300px; } @@ -3125,6 +3170,11 @@ video { padding-right: 2.25rem; } + .s\:py-5 { + padding-top: 1.25rem; + padding-bottom: 1.25rem; + } + .s\:text-2xl { font-size: 1.5rem; line-height: 2rem; @@ -3224,6 +3274,14 @@ video { max-width: 36rem; } + .l\:grid-cols-2 { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + + .l\:grid-cols-3 { + grid-template-columns: repeat(3, minmax(0, 1fr)); + } + .l\:flex-row { flex-direction: row; } @@ -3335,10 +3393,21 @@ video { } } +@media (min-width: 1390px) { + .xxlg\:grid-cols-4 { + grid-template-columns: repeat(4, minmax(0, 1fr)); + } +} + @media (min-width: 1536px) { .xl\:grid-cols-4 { grid-template-columns: repeat(4, minmax(0, 1fr)); } + + .xl\:text-xl { + font-size: 1.25rem; + line-height: 1.75rem; + } } @media (min-width: 1600px) { @@ -3362,6 +3431,11 @@ video { border-radius: 0px; } + .xll\:text-2xl { + font-size: 1.5rem; + line-height: 2rem; + } + .xll\:text-\[70px\] { font-size: 70px; } diff --git a/osinaweb/static/images/ositcom_logos/full-logo.jpg b/osinaweb/static/images/ositcom_logos/full-logo.jpg new file mode 100644 index 00000000..1e9406c8 Binary files /dev/null and b/osinaweb/static/images/ositcom_logos/full-logo.jpg differ diff --git a/osinaweb/static/js/billing/add-order.js b/osinaweb/static/js/billing/add-order.js new file mode 100644 index 00000000..395bd9da --- /dev/null +++ b/osinaweb/static/js/billing/add-order.js @@ -0,0 +1,42 @@ +// WHEN SELECTING A CUSTOMER FETCH AND DISPALY ITS RELATED ITEMS AND THE ITEMS THAT ARE NOT RELATED TO A CUSTOMER + +document.addEventListener('DOMContentLoaded', function () { + document.getElementById('customersSelectTag').addEventListener('change', function () { + var customerId = this.value; + + fetch('/fetch-customer-items/' + customerId + '/') + .then(response => { + return response.json(); + }) + .then(data => { + var itemsSelectTag = document.getElementById('itemsSelectTag'); + itemsSelectTag.innerHTML = ''; + + console.log('Items related to customer:', data.items_related_to_customer); + data.items_related_to_customer.forEach(function (item) { + console.log('Item:', item); + var option = document.createElement('option'); + option.value = item.id; + option.text = item.title; + itemsSelectTag.appendChild(option); + }); + + console.log('Items without customer:', data.items_without_customer); + data.items_without_customer.forEach(function (item) { + console.log('Item:', item); + var option = document.createElement('option'); + option.value = item.id; + option.text = item.title; + itemsSelectTag.appendChild(option); + }); + + + // To make the select tag searchable + $(document).ready(function () { + $('#itemsSelectTag').selectize(); + }); + }) + .catch(error => console.error('Error fetching customer items:', error)); + }); +}); + diff --git a/osinaweb/static/js/billing/items.js b/osinaweb/static/js/billing/items.js new file mode 100644 index 00000000..78bf8c08 --- /dev/null +++ b/osinaweb/static/js/billing/items.js @@ -0,0 +1,30 @@ +const products = document.getElementById('products'); +const services = document.getElementById('services'); + +const productsContainer = document.getElementById('productsContainer'); +const servicesContainer = document.getElementById('servicesContainer'); + +const addProductButton = document.getElementById('addProductButton'); +const addServiceButton = document.getElementById('addServiceButton'); + +products.addEventListener('click', () => { + productsContainer.classList.remove('hidden'); + servicesContainer.classList.add('hidden'); + + products.classList.add('selectedItemType'); + services.classList.remove('selectedItemType'); + + addProductButton.classList.remove('hidden'); + addServiceButton.classList.add('hidden'); +}); + +services.addEventListener('click', () => { + productsContainer.classList.add('hidden'); + servicesContainer.classList.remove('hidden'); + + products.classList.remove('selectedItemType'); + services.classList.add('selectedItemType'); + + addProductButton.classList.add('hidden'); + addServiceButton.classList.remove('hidden'); +}); \ No newline at end of file diff --git a/osinaweb/static/js/customer_dashboard/products.js b/osinaweb/static/js/customer_dashboard/products.js new file mode 100644 index 00000000..0e8aaf3a --- /dev/null +++ b/osinaweb/static/js/customer_dashboard/products.js @@ -0,0 +1,19 @@ +const solutionsBtn = document.getElementById('solutions'); +const hostingBtn = document.getElementById('hostingSolutions'); + +const solutionsContainer = document.getElementById('solutionsContainer'); +const hostingContainer = document.getElementById('hostingSolutionsContainer'); + +solutionsBtn.addEventListener('click', () => { + solutionsContainer.classList.remove('hidden'); + hostingContainer.classList.add('hidden'); + hostingBtn.classList.remove('selectedProductCategory'); + solutions.classList.add('selectedProductCategory'); +}); + +hostingBtn.addEventListener('click', () => { + solutionsContainer.classList.add('hidden'); + hostingContainer.classList.remove('hidden'); + solutions.classList.remove('selectedProductCategory'); + hostingBtn.classList.add('selectedProductCategory'); +}); \ No newline at end of file diff --git a/osinaweb/static/js/get-updated-user-activity.js b/osinaweb/static/js/get-updated-user-activity.js index 8f312e53..e6e6324d 100644 --- a/osinaweb/static/js/get-updated-user-activity.js +++ b/osinaweb/static/js/get-updated-user-activity.js @@ -1,13 +1,13 @@ -function refreshUserActivityContainer() { +// function refreshUserActivityContainer() { - $.ajax({ - url: '/getupdatedactivities/', - method: 'GET', - dataType: 'html', - success: function(data) { - $('#activitiesContainer').html(data); - } - }); -} +// $.ajax({ +// url: '/getupdatedactivities/', +// method: 'GET', +// dataType: 'html', +// success: function(data) { +// $('#activitiesContainer').html(data); +// } +// }); +// } -setInterval(refreshUserActivityContainer, 60000); \ No newline at end of file +// setInterval(refreshUserActivityContainer, 60000); \ No newline at end of file diff --git a/osinaweb/tailwind.config.js b/osinaweb/tailwind.config.js index 81d273d9..02325896 100644 --- a/osinaweb/tailwind.config.js +++ b/osinaweb/tailwind.config.js @@ -5,6 +5,7 @@ module.exports = { "./static/dist/output.css", "./osinacore/templates/**/*.html", "./customercore/templates/**/*.html", + "./billing/templates/**/*.html", ], theme: { screens: {