diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc index c7c0d551..1a834899 100644 Binary files a/osinaweb/billing/__pycache__/models.cpython-310.pyc and b/osinaweb/billing/__pycache__/models.cpython-310.pyc differ diff --git a/osinaweb/billing/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/__pycache__/urls.cpython-310.pyc index 50de5028..5855b97f 100644 Binary files a/osinaweb/billing/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/__pycache__/urls.cpython-310.pyc differ diff --git a/osinaweb/billing/__pycache__/views.cpython-310.pyc b/osinaweb/billing/__pycache__/views.cpython-310.pyc index 9d21722b..66fe0c6e 100644 Binary files a/osinaweb/billing/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc index 0092be93..22099650 100644 Binary files a/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/urls.cpython-310.pyc differ diff --git a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc index 2860681e..1900e620 100644 Binary files a/osinaweb/billing/add/__pycache__/views.cpython-310.pyc and b/osinaweb/billing/add/__pycache__/views.cpython-310.pyc differ diff --git a/osinaweb/billing/add/urls.py b/osinaweb/billing/add/urls.py index c29906c6..304ba24f 100644 --- a/osinaweb/billing/add/urls.py +++ b/osinaweb/billing/add/urls.py @@ -6,4 +6,5 @@ urlpatterns = [ path('product', views.add_product, name='addproduct'), path('service', views.add_service, name='addservice'), path('order', views.add_order, name='addorder'), + path('invoice//', views.add_invoice_pdf, name='addinvoice'), ] diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py index 48cff91f..29dfe06c 100644 --- a/osinaweb/billing/add/views.py +++ b/osinaweb/billing/add/views.py @@ -4,6 +4,8 @@ from billing.models import * from django.http import JsonResponse, HttpResponse from django.template.loader import get_template from weasyprint import HTML +from django.conf import settings +import os def add_product (request, *args, **kwargs): @@ -36,14 +38,61 @@ def add_product (request, *args, **kwargs): def add_service (request, *args, **kwargs): - context = { + item_types = ProjectType.objects.all().order_by('name') + customers = CustomerProfile.objects.all().order_by('user__first_name') + if request.method == 'POST': + title = request.POST.get('title') + description = request.POST.get('description') + customer_id = request.POST.get('customer') + customer = get_object_or_404(CustomerProfile, id=customer_id) + + item_type_id = request.POST.get('item_type') + item_type = get_object_or_404(ProjectType, id=item_type_id) + + amount = request.POST.get('amount') + recurring = request.POST.get('recurring') + + Item.objects.create( + type='Service', + title=title, + description = description, + customer = customer, + item_type = item_type, + amount = amount, + recurring = recurring, + ) + return redirect('items') + context = { + 'item_types' : item_types, + 'customers' : customers } return render(request, 'add_templates/add-service.html', context) def add_order (request, *args, **kwargs): customers = CustomerProfile.objects.all().order_by('-id') + if request.method == 'POST': + customer_id = request.POST.get('customer') + customer = get_object_or_404(CustomerProfile, id=customer_id) + + status = request.POST.get('status') + + customer_id = request.POST.get('customer') + customer = get_object_or_404(CustomerProfile, id=customer_id) + + selected_items = request.POST.getlist('items') + + order = Order.objects.create( + customer=customer, + status=status + ) + + for item_id in selected_items: + item = Item.objects.get(id=item_id) + OrderItem.objects.create(order=order, item=item, purchased_at=datetime.now()) + return redirect('orders') + context = { 'customers': customers, @@ -52,12 +101,35 @@ def add_order (request, *args, **kwargs): return render(request, 'add_templates/add-order.html', context) -def add_invoice_pdf(request): + +def add_invoice_pdf(request, order_id): + order = get_object_or_404(Order, id=order_id) + template = get_template('details_templates/invoice-details.html') - context = {} + context = {'order': order} html_string = template.render(context) + # Generate PDF pdf = HTML(string=html_string).write_pdf() + + invoice = Invoice.objects.create( + invoice_number='111', + order=order, + date_created=datetime.now(), + ) + + # Save PDF to a file + pdf_file_path = os.path.join(settings.MEDIA_ROOT, f'invoice_{invoice.id}.pdf') + with open(pdf_file_path, 'wb') as pdf_file: + pdf_file.write(pdf) + + # Associate PDF file path with the Invoice object + invoice.pdf = pdf_file_path + invoice.save() + + # Return PDF response = HttpResponse(pdf, content_type='application/pdf') response['Content-Disposition'] = 'attachment; filename="my_pdf.pdf"' - return response \ No newline at end of file + + return response + diff --git a/osinaweb/billing/migrations/0028_remove_order_due_date.py b/osinaweb/billing/migrations/0028_remove_order_due_date.py new file mode 100644 index 00000000..4dba5ca4 --- /dev/null +++ b/osinaweb/billing/migrations/0028_remove_order_due_date.py @@ -0,0 +1,17 @@ +# Generated by Django 4.2.5 on 2024-04-13 09:41 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0027_item_type'), + ] + + operations = [ + migrations.RemoveField( + model_name='order', + name='due_date', + ), + ] diff --git a/osinaweb/billing/migrations/0029_invoice_pdf.py b/osinaweb/billing/migrations/0029_invoice_pdf.py new file mode 100644 index 00000000..8850af53 --- /dev/null +++ b/osinaweb/billing/migrations/0029_invoice_pdf.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.5 on 2024-04-13 10:19 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0028_remove_order_due_date'), + ] + + operations = [ + migrations.AddField( + model_name='invoice', + name='pdf', + field=models.FileField(blank=True, null=True, upload_to=''), + ), + ] diff --git a/osinaweb/billing/migrations/0030_alter_invoice_order.py b/osinaweb/billing/migrations/0030_alter_invoice_order.py new file mode 100644 index 00000000..6af90a6a --- /dev/null +++ b/osinaweb/billing/migrations/0030_alter_invoice_order.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.5 on 2024-04-13 10:25 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0029_invoice_pdf'), + ] + + operations = [ + migrations.AlterField( + model_name='invoice', + name='order', + field=models.OneToOneField(null=True, on_delete=django.db.models.deletion.SET_NULL, to='billing.order'), + ), + ] diff --git a/osinaweb/billing/migrations/0031_alter_invoice_invoice_number.py b/osinaweb/billing/migrations/0031_alter_invoice_invoice_number.py new file mode 100644 index 00000000..3890eb47 --- /dev/null +++ b/osinaweb/billing/migrations/0031_alter_invoice_invoice_number.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.5 on 2024-04-13 10:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0030_alter_invoice_order'), + ] + + operations = [ + migrations.AlterField( + model_name='invoice', + name='invoice_number', + field=models.CharField(max_length=100, null=True), + ), + ] diff --git a/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc new file mode 100644 index 00000000..9010c15b Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0028_remove_order_due_date.cpython-310.pyc differ diff --git a/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc new file mode 100644 index 00000000..a7c3c738 Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0029_invoice_pdf.cpython-310.pyc differ diff --git a/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc new file mode 100644 index 00000000..a783736f Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0030_alter_invoice_order.cpython-310.pyc differ diff --git a/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc new file mode 100644 index 00000000..30963540 Binary files /dev/null and b/osinaweb/billing/migrations/__pycache__/0031_alter_invoice_invoice_number.cpython-310.pyc differ diff --git a/osinaweb/billing/models.py b/osinaweb/billing/models.py index 0df4aa70..47f5e312 100644 --- a/osinaweb/billing/models.py +++ b/osinaweb/billing/models.py @@ -38,7 +38,6 @@ class Order(models.Model): customer = models.ForeignKey(CustomerProfile, on_delete=models.CASCADE) status = models.CharField(max_length=200, choices=STATUS, default='None') order_id = models.CharField(max_length=100, null=True, blank=True) - due_date = models.DateField(null=True) @property def get_cart_total(self): orderitems = self.orderitem_set.all() @@ -88,9 +87,10 @@ class OrderItem(models.Model): class Invoice(models.Model): - invoice_number = models.CharField(max_length=100) - order = models.ForeignKey(Order, on_delete=models.SET_NULL, null=True) + invoice_number = models.CharField(max_length=100, null=True) + order = models.OneToOneField(Order, on_delete=models.SET_NULL, null=True) date_created = models.DateField() + pdf = models.FileField(null=True, blank=True) def __str__(self): return self.invoice_number diff --git a/osinaweb/billing/templates/add_templates/add-order.html b/osinaweb/billing/templates/add_templates/add-order.html index 313ee4c8..4016b0bc 100644 --- a/osinaweb/billing/templates/add_templates/add-order.html +++ b/osinaweb/billing/templates/add_templates/add-order.html @@ -13,16 +13,17 @@

Add Order

+ -
+ {% csrf_token %}
-
-
- - -
-
-
-
- - -
@@ -64,7 +50,7 @@
diff --git a/osinaweb/billing/templates/add_templates/add-product.html b/osinaweb/billing/templates/add_templates/add-product.html index 00551e91..aaaacfe8 100644 --- a/osinaweb/billing/templates/add_templates/add-product.html +++ b/osinaweb/billing/templates/add_templates/add-product.html @@ -49,7 +49,7 @@
diff --git a/osinaweb/billing/templates/add_templates/add-service.html b/osinaweb/billing/templates/add_templates/add-service.html index 8635a7e8..a05f106c 100644 --- a/osinaweb/billing/templates/add_templates/add-service.html +++ b/osinaweb/billing/templates/add_templates/add-service.html @@ -8,19 +8,19 @@ Add Service - + {% csrf_token %}
-
-
@@ -28,35 +28,39 @@
-
-
-
-
diff --git a/osinaweb/billing/templates/details_templates/invoice-details.html b/osinaweb/billing/templates/details_templates/invoice-details.html index 3d84361c..cd9c52f3 100644 --- a/osinaweb/billing/templates/details_templates/invoice-details.html +++ b/osinaweb/billing/templates/details_templates/invoice-details.html @@ -16,7 +16,7 @@
-

Bill To: Winabig

+

Bill To: {{order.customer}}

Customer Details: 036466464

diff --git a/osinaweb/billing/templates/listing_pages/invoices.html b/osinaweb/billing/templates/listing_pages/invoices.html index a628b223..8c2a6720 100644 --- a/osinaweb/billing/templates/listing_pages/invoices.html +++ b/osinaweb/billing/templates/listing_pages/invoices.html @@ -79,10 +79,10 @@
- + + + +
diff --git a/osinaweb/billing/templates/listing_pages/items.html b/osinaweb/billing/templates/listing_pages/items.html index 1c1cee9d..2b18a490 100644 --- a/osinaweb/billing/templates/listing_pages/items.html +++ b/osinaweb/billing/templates/listing_pages/items.html @@ -126,22 +126,24 @@ + {% for service in services %} -

Item 2

+

{{service.title}}

-

Salim

+

{{service.customer.user.first_name}} {{service.customer.user.last_name}}

-

Type

+

{{service.item_type}}

-

222

+

${{service.amount}}

+ @@ -162,6 +164,7 @@
+ {% endfor %} diff --git a/osinaweb/billing/templates/listing_pages/orders.html b/osinaweb/billing/templates/listing_pages/orders.html index d76197d9..128aba41 100644 --- a/osinaweb/billing/templates/listing_pages/orders.html +++ b/osinaweb/billing/templates/listing_pages/orders.html @@ -42,7 +42,7 @@ - Due Date + Cart Total @@ -56,28 +56,51 @@ + + {% for order in orders %} -

1

+

{{order.order_id}}

-

Nataly

+

{{order.customer.user.first_name}} {{order.customer.user.last_name}}

-

10-2-2014

+

${{order.get_cart_total}}

- -

Paid

+ +

{{order.status}}

- + + +
+ +
+ + + + {% if order.status == 'Completed' and not order.invoice %} + + + + + + + {% endif %} + + {% if order.invoice %} + + + + + {% endif %} +
@@ -90,6 +113,7 @@
+ {% endfor %}
diff --git a/osinaweb/billing/urls.py b/osinaweb/billing/urls.py index 36de696f..67d72391 100644 --- a/osinaweb/billing/urls.py +++ b/osinaweb/billing/urls.py @@ -12,7 +12,7 @@ urlpatterns = [ path('invoices', views.invoices, name='invoices'), # DETAILS - path('invoice-details//', views.invoice_details, name='invoicedetails'), + path('invoice-details//', views.invoice_details, name='invoicedetails'), path('fetch-customer-items//', views.fetch_customer_items, name='fetch_customer_items'), diff --git a/osinaweb/billing/views.py b/osinaweb/billing/views.py index 918ad6eb..7c9bfb66 100644 --- a/osinaweb/billing/views.py +++ b/osinaweb/billing/views.py @@ -8,23 +8,26 @@ from weasyprint import HTML # LISTING -def items (request, *args, **kwargs): +def items(request, *args, **kwargs): products = Item.objects.filter(type='Product').order_by('-id') + services = Item.objects.filter(type='Service').order_by('-id') context = { 'products': products, + 'services': services, } return render(request, 'listing_pages/items.html', context) -def orders (request, *args, **kwargs): +def orders(request, *args, **kwargs): + orders = Order.objects.all().order_by('-id') context = { - + 'orders': orders, } return render(request, 'listing_pages/orders.html', context) -def invoices (request, *args, **kwargs): +def invoices(request, *args, **kwargs): invoices = Invoice.objects.all().order_by('-id') context = { @@ -35,11 +38,11 @@ def invoices (request, *args, **kwargs): #DETAILS -def invoice_details (request, invoice_id): - invoice = get_object_or_404(Invoice, id=invoice_id) +def invoice_details(request, order_id): + order = get_object_or_404(Order, id=order_id) context = { - 'invoice' : invoice, + 'order' : order, } return render(request, 'invoice-details.html', context) diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 5cccc217..1f4e9d83 100644 Binary files a/osinaweb/db.sqlite3 and b/osinaweb/db.sqlite3 differ diff --git a/osinaweb/osinacore/templates/add-edit-main.html b/osinaweb/osinacore/templates/add-edit-main.html index 2433a634..d7543513 100644 --- a/osinaweb/osinacore/templates/add-edit-main.html +++ b/osinaweb/osinacore/templates/add-edit-main.html @@ -46,7 +46,9 @@ class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md" placeholder="Search...">
- + + +
@@ -60,7 +62,9 @@
- + + +

Accounts

@@ -100,7 +104,9 @@
- + + +

My Work

@@ -150,7 +156,9 @@
- + + +

Support

@@ -165,7 +173,9 @@
- + + +

Billing

@@ -213,7 +223,9 @@
- + + +

Utilities

@@ -271,7 +283,9 @@
- + + +

Activity

 @@ -332,7 +346,9 @@
- + + +

Accounts

@@ -372,7 +388,9 @@
- + + +

My Work

@@ -421,7 +439,9 @@
- + + +

Support

@@ -436,7 +456,9 @@
- + + +

Billing

@@ -484,7 +506,9 @@
- + + +

Utilities

@@ -542,7 +566,9 @@
- + + +

Activity

 diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index b4291890..90954663 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -33,7 +33,9 @@ class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md" placeholder="Search...">
- + + +
@@ -42,18 +44,24 @@ class="w-full flex flex-col items-center px-5 h-[400px] xxlg1:h-[500px] overflow-hidden overflow-y-auto mt-5">
- + + +

My Projects

- + + +

Tickets
- + + +

Invoices

 @@ -62,7 +70,9 @@
- + + +

Products

@@ -90,12 +100,17 @@
- + + + +

Knowledgebase

- + + +

Contact Us

@@ -152,7 +167,9 @@
- + + +

My Projects

@@ -162,7 +179,9 @@
- + + +

Tickets

@@ -172,7 +191,9 @@
- + + +

Invoices

@@ -181,7 +202,9 @@
- + + +

Products

@@ -191,7 +214,9 @@
- + + +

Knowledgebase

@@ -200,7 +225,9 @@
- + + +

Contact Us

diff --git a/osinaweb/osinacore/templates/main.html b/osinaweb/osinacore/templates/main.html index 32b210cd..bc95dcc5 100644 --- a/osinaweb/osinacore/templates/main.html +++ b/osinaweb/osinacore/templates/main.html @@ -74,7 +74,10 @@ class="w-full bg-transparent border border-white border-opacity-10 py-2 px-3 text-white outline-none rounded-md" placeholder="Search...">
- + + + +
@@ -88,7 +91,11 @@
- + + + + +

Accounts

@@ -128,7 +135,10 @@
- + + + +

My Work

@@ -178,7 +188,10 @@
- + + + +

Support

@@ -192,7 +205,10 @@
- + + + +

Billing

@@ -239,7 +255,10 @@
- + + + +

Utilities

@@ -297,7 +316,10 @@
- + + + +

Activity

 @@ -359,7 +381,9 @@
- + + +

Accounts

@@ -399,7 +423,9 @@
- + + +

My Work

@@ -448,7 +474,9 @@
- + + +

Support

@@ -463,7 +491,9 @@
- + + +

Billing

@@ -510,7 +540,9 @@
- + + +

Utilities

@@ -568,7 +600,9 @@
- + + +

Activity

 diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 0ecd12ef..7a9f86ef 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -1,5 +1,5 @@ /* -! tailwindcss v3.4.1 | MIT License | https://tailwindcss.com +! tailwindcss v3.3.3 | MIT License | https://tailwindcss.com */ /* @@ -32,11 +32,9 @@ 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, -:host { +html { line-height: 1.5; /* 1 */ -webkit-text-size-adjust: 100%; @@ -46,14 +44,12 @@ html, -o-tab-size: 4; tab-size: 4; /* 3 */ - font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; + 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"; /* 4 */ font-feature-settings: normal; /* 5 */ font-variation-settings: normal; /* 6 */ - -webkit-tap-highlight-color: transparent; - /* 7 */ } /* @@ -125,10 +121,8 @@ strong { } /* -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. +1. Use the user's configured `mono` font family by default. +2. Correct the odd `em` font sizing in all browsers. */ code, @@ -137,12 +131,8 @@ samp, pre { font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; /* 1 */ - font-feature-settings: normal; - /* 2 */ - font-variation-settings: normal; - /* 3 */ font-size: 1em; - /* 4 */ + /* 2 */ } /* @@ -1208,6 +1198,10 @@ video { width: 180px; } +.w-\[18px\] { + width: 18px; +} + .w-\[20px\] { width: 20px; } @@ -1284,10 +1278,6 @@ video { width: 55px; } -.w-\[60\%\] { - width: 60%; -} - .w-\[60px\] { width: 60px; } @@ -1326,7 +1316,7 @@ video { } .max-w-0 { - max-width: 0px; + max-width: 0rem; } .max-w-2xl { diff --git a/osinaweb/static/images/invoice_1.pdf b/osinaweb/static/images/invoice_1.pdf new file mode 100644 index 00000000..c64cc878 Binary files /dev/null and b/osinaweb/static/images/invoice_1.pdf differ diff --git a/osinaweb/static/images/invoice_111.pdf b/osinaweb/static/images/invoice_111.pdf new file mode 100644 index 00000000..897b984a Binary files /dev/null and b/osinaweb/static/images/invoice_111.pdf differ diff --git a/osinaweb/static/images/invoice_112.pdf b/osinaweb/static/images/invoice_112.pdf new file mode 100644 index 00000000..61b27d73 Binary files /dev/null and b/osinaweb/static/images/invoice_112.pdf differ diff --git a/osinaweb/static/images/invoice_113.pdf b/osinaweb/static/images/invoice_113.pdf new file mode 100644 index 00000000..f4a8fe6c Binary files /dev/null and b/osinaweb/static/images/invoice_113.pdf differ diff --git a/osinaweb/static/images/invoice_114.pdf b/osinaweb/static/images/invoice_114.pdf new file mode 100644 index 00000000..a83fbdb8 Binary files /dev/null and b/osinaweb/static/images/invoice_114.pdf differ diff --git a/osinaweb/static/images/invoice_2.pdf b/osinaweb/static/images/invoice_2.pdf new file mode 100644 index 00000000..b0f921d8 Binary files /dev/null and b/osinaweb/static/images/invoice_2.pdf differ diff --git a/osinaweb/static/images/invoice_3.pdf b/osinaweb/static/images/invoice_3.pdf new file mode 100644 index 00000000..097809fc Binary files /dev/null and b/osinaweb/static/images/invoice_3.pdf differ