New changes.

osinaweb/billing/add/urls.py

@@ -7,8 +7,7 @@ urlpatterns = [
     path('service', views.add_service, name='addservice'),
     path('order/<int:customer_id>/', views.add_order, name='addorder'),
 
-    path('invoice-pdf/<int:order_id>/', views.add_invoice_pdf, name='addinvoice'),
-    path('payment-pdf/<int:order_id>/', views.add_payment_pdf, name='addpayment'),
+
 
     path('service/<int:service_id>/<int:order_id>/', views.add_service_in_order, name='addserviceinorder'),
 

osinaweb/billing/add/views.py

@@ -8,7 +8,7 @@ import os
 from osinacore.decorators import *
 from django.core.files.base import ContentFile
 from django.db.models import Q
-from weasyprint import HTML, CSS
+
 
 
 @staff_login_required
@@ -211,116 +211,6 @@ def add_payment_comment_modal(request):
 
 
 
-def add_invoice_pdf(request, order_id):
-    order = get_object_or_404(Order, id=order_id)
-
-    current_year = str(timezone.now().year)[-2:]
-    last_invoice = Invoice.objects.all().last()
-    if last_invoice:
-        last_invoice_number = int(last_invoice.invoice_number.split('-')[1].split('+')[0])
-        new_invoice_number = f"$0{current_year}-{last_invoice_number + 1}"
-    else:
-        new_invoice_number = f"$0{current_year}-1425"
-
-
-
-    invoice = Invoice.objects.create(
-        invoice_number = new_invoice_number,
-        order=order,
-        date_created=datetime.now(),
-    )
-
-    template = get_template('details_templates/invoice-details.html')
-    context = {'order': order} 
-    html_string = template.render(context)
-
-    # Define the CSS string with Poppins font
-    css_string = '''
-        @font-face {
-            font-family: 'Poppins';
-            src: url('path_to_poppins_font_file.ttf') format('truetype');  /* Update the path to the font file */
-        }
-        
-        body {
-            font-family: 'Poppins', sans-serif;  /* Use Poppins font for the entire document */
-        }
-        
-        /* Your existing CSS styles */
-        /* Add or modify styles as needed */
-    '''
-
-    # Generate PDF
-    pdf = HTML(string=html_string).write_pdf(
-        stylesheets=[
-            CSS(string=css_string),
-            CSS(string='@page { margin: 30px; }')
-        ],
-        presentational_hints=True
-    )
-
-    filename = f'invoice_{invoice.invoice_number}.pdf'
-    pdf_content = ContentFile(pdf)
-    invoice.pdf.save(filename, pdf_content, save=True)
-
-
-    # Return PDF
-    response = HttpResponse(pdf, content_type='application/pdf')
-    response['Content-Disposition'] = 'attachment; filename="my_pdf.pdf"'
-    return response
-
-
-
-
-
-
-
-def add_payment_pdf(request, order_id):
-    order = get_object_or_404(Order, id=order_id)
-    payments = OrderPayment.objects.filter(order = order)
-    paid_amount = OrderPayment.objects.filter(order=order, date_paid__isnull=False).aggregate(total_paid=Sum('amount'))['total_paid'] or 0
-    cart_total = order.get_cart_total
-    remaining_amount = cart_total - paid_amount
-
-
-    invoice = order.invoice
-
-    # Render both invoice and payment details templates to HTML
-    invoice_template = get_template('details_templates/invoice-details.html')
-    payment_template = get_template('details_templates/payment-details.html')
-    invoice_html = invoice_template.render({'order': order})
-    payment_html = payment_template.render({'order': order, 'payments':payments, 'remaining_amount':remaining_amount,})
-
-    # Combine the HTML content of both templates
-    combined_html = f"{invoice_html}<div style='page-break-before: always;'></div>{payment_html}"
-
-    # Define CSS
-    css_string = '''
-        @font-face {
-            font-family: 'Poppins';
-            src: url('path_to_poppins_font_file.ttf') format('truetype');  /* Update the path to the font file */
-        }
-        
-        body {
-            font-family: 'Poppins', sans-serif;  /* Use Poppins font for the entire document */
-        }
-        
-        /* Your existing CSS styles */
-        /* Add or modify styles as needed */
-    '''
-
-    # Generate PDF
-    pdf = HTML(string=combined_html).write_pdf(
-        stylesheets=[
-            CSS(string=css_string),
-            CSS(string='@page { margin: 30px; }')
-        ],
-        presentational_hints=True
-    )
-
-    # Return PDF
-    response = HttpResponse(pdf, content_type='application/pdf')
-    response['Content-Disposition'] = 'attachment; filename="my_pdf.pdf"'
-    return response
 
 
 

osinaweb/billing/templates/details_templates/order-details.html

@@ -265,17 +265,7 @@
 </div>
 
 
-<!-- POPUP MODAL -->
-<div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden inset-0" id="popUpModal">
-    <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
-        <button class="absolute top-3 right-5 text-slate-800 text-xl cursor-pointer outline-none border-none"
-            id="closeModalButton">
-            <i class="fa fa-close"></i>
-        </button>
-        <iframe id="popupModalFrame" frameborder="0"></iframe>
-    </div>
-</div>
-<script type="text/javascript" src='{% static "js/pop-modals.js" %}'></script>
+
 
 
 {% endblock %}

osinaweb/billing/templates/listing_pages/payment-methods.html

@@ -88,18 +88,5 @@
 </div>
 
 
-<!-- POPUP MODAL -->
-<div class="w-full h-full bg-black bg-opacity-40 z-20 fixed justify-center items-center hidden inset-0" id="popUpModal">
-    <div class="w-[95%] md:w-fit h-fit bg-white rounded-md p-9 relative">
-        <button class="absolute top-3 right-5 text-slate-800 text-xl cursor-pointer outline-none border-none"
-            id="closeModalButton">
-            <i class="fa fa-close"></i>
-        </button>
-        <iframe id="popupModalFrame" frameborder="0"></iframe>
-    </div>
-</div>
-
-<script type="text/javascript" src='{% static "js/pop-modals.js" %}'></script>
-
 
 {% endblock content %}