From 4029aa5cd6183a07c6f7e915d7962f1f7a89a4c1 Mon Sep 17 00:00:00 2001 From: nataly Date: Thu, 30 May 2024 09:52:32 +0300 Subject: [PATCH] New changes. --- .../add/__pycache__/urls.cpython-312.pyc | Bin 1070 -> 1070 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 12211 -> 8335 bytes osinaweb/billing/add/urls.py | 3 +- osinaweb/billing/add/views.py | 112 +----- .../__pycache__/views.cpython-312.pyc | Bin 13609 -> 13609 bytes .../listing_pages/customer-projects.html | 11 +- .../templates/listing_pages/products.html | 334 ++++++++++-------- osinaweb/db.sqlite3 | Bin 1359872 -> 1359872 bytes .../__pycache__/views.cpython-312.pyc | Bin 41311 -> 41504 bytes .../osinacore/templates/customer_main.html | 39 +- .../details_templates/customer-details.html | 130 ++++++- osinaweb/osinacore/templates/index.html | 8 +- .../templates/listing_pages/projects.html | 8 +- .../templates/projects-by-status.html | 7 +- osinaweb/osinacore/views.py | 7 +- osinaweb/static/dist/output.css | 12 +- 16 files changed, 352 insertions(+), 319 deletions(-) diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 1928ca12f0db0556dc7a2a94ddf10971a6d03023..b201b65091639481463d8377cec81d577dc8c5c9 100644 GIT binary patch delta 20 acmZ3-v5tfLG%qg~0}#9yj@Zbp%mM&4Rs^H~ delta 20 acmZ3-v5tfLG%qg~0}vei6Sk3CnFRnjfCXIu diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index 78b9ab59d7c4a27386c23539a9ab76bbdf6a7ddb..4f79a25abea85b42256f2e7dab91a88f5ca79e9a 100644 GIT binary patch delta 1548 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 diff --git a/osinaweb/billing/add/urls.py b/osinaweb/billing/add/urls.py index e3be8608..97dc4702 100644 --- a/osinaweb/billing/add/urls.py +++ b/osinaweb/billing/add/urls.py @@ -7,8 +7,7 @@ urlpatterns = [ path('service', views.add_service, name='addservice'), path('order//', views.add_order, name='addorder'), - path('invoice-pdf//', views.add_invoice_pdf, name='addinvoice'), - path('payment-pdf//', views.add_payment_pdf, name='addpayment'), + path('service///', views.add_service_in_order, name='addserviceinorder'), diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py index 628aabe3..8bec9843 100644 --- a/osinaweb/billing/add/views.py +++ b/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 + @@ -213,116 +213,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}
{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 diff --git a/osinaweb/customercore/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/__pycache__/views.cpython-312.pyc index 3499ee7c051862c1bd878ae80cba3fdf6a018cee..49bcc8478505470ce4aa7174f4065d8e9923c023 100644 GIT binary patch delta 19 ZcmZ3PwK9wAG%qg~0}xorZsd|T1pqjZ1cm?r delta 19 ZcmZ3PwK9wAG%qg~0}woy+{h(w3IIHc1up;q diff --git a/osinaweb/customercore/templates/listing_pages/customer-projects.html b/osinaweb/customercore/templates/listing_pages/customer-projects.html index a08b985a..ccfa1251 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-projects.html +++ b/osinaweb/customercore/templates/listing_pages/customer-projects.html @@ -33,16 +33,14 @@
-

{{project.start_date}}

-

{{project.end_date}}

+

{{project.start_date}}

+

{{project.end_date}}

- -
-
+
@@ -53,6 +51,7 @@ - + + {% endblock content %} \ 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 1e37cd5c..28cd22b9 100644 --- a/osinaweb/customercore/templates/listing_pages/products.html +++ b/osinaweb/customercore/templates/listing_pages/products.html @@ -28,38 +28,44 @@
-
-

Basic -

- -
-

$0

-

monthly/restaurant

+ +
+

Basic +

+ +
+

$0

+

monthly/restaurant

+
-
+ -
-

Standard -

+ +
+

Standard +

-
-

$89

-

monthly/restaurant

+
+

$89

+

monthly/restaurant

+
-
+ -
-

Premium -

+ +
+

Premium +

-
-

$169

-

monthly/restaurant

+
+

$169

+

monthly/restaurant

+
-
+
@@ -76,15 +82,17 @@
-
-

Basic

- -
-

$0

-

monthly/restaurant

+ +
+

Basic

+ +
+

$0

+

monthly/restaurant

+
-
+
@@ -106,42 +114,48 @@
-
-

Shared - Basic

- -
-

80%

-

$2.40/month

-

Regular Price: $12.00/month

-
-
- -
-

Shared - Plus -

- -
-

80%

-

$3.50/month

-

Regular Price: $17.50/month

+ +
+

Shared + Basic

+ +
+

80%

+

$2.40/month

+

Regular Price: $12.00/month

+
-
+ + + +
+

Shared + Plus +

-
-

Shared - Power

+
+

80%

+

$3.50/month

+

Regular Price: $17.50/month

+
+
+ -
-

80%

-

$4.80/month

-

Regular Price: $24.00/month

+ +
+

Shared + Power

+ +
+

80%

+

$4.80/month

+

Regular Price: $24.00/month

+
-
+
@@ -160,55 +174,63 @@
-
-

- OSICLOUD 1

- -
-

30%

-

$46.16/month

-

Regular Price: $65.95/month

+ +
+

+ OSICLOUD 1

+ +
+

30%

+

$46.16/month

+

Regular Price: $65.95/month

+
-
- -
-

- OSICLOUD 2

+ -
-

30%

-

$53.86/month -

-

Regular Price: $76.95/month

+ +
+

+ OSICLOUD 2

+ +
+

30%

+

$53.86/month +

+

Regular Price: $76.95/month

+
-
- -
-

- OSICLOUD 3

+ -
-

30%

-

$69.26/month

-

Regular Price: $98.95/month

+ +
+

+ OSICLOUD 3

+ +
+

30%

+

$69.26/month

+

Regular Price: $98.95/month

+
-
- -
-

- OSICLOUD 4

+ -
-

30%

-

$107.76/month -

-

Regular Price: $153.95/month

+ +
+

+ OSICLOUD 4

+ +
+

30%

+

$107.76/month +

+

Regular Price: $153.95/month

+
-
+
@@ -226,58 +248,66 @@
-
-

- DEDICATED 1

- -
-

30%

-

$103.06/month -

-

Regular Price: $143.95/month

-
-
- -
-

- DEDICATED 2 -

- -
-

30%

-

- $127.16/month

-

Regular Price: $184.95/month

+ +
+

+ DEDICATED 1

+ +
+

30%

+

$103.06/month +

+

Regular Price: $143.95/month

+
-
- -
-

- DEDICATED 3

+ -
-

30%

-

$173.63/month + +

+

+ DEDICATED 2

-

Regular Price: $252.95/month

+ +
+

30%

+

+ $127.16/month

+

Regular Price: $184.95/month

+
-
+ -
-

- DEDICATED 4

+ +
+

+ DEDICATED 3

+ +
+

30%

+

$173.63/month +

+

Regular Price: $252.95/month

+
+
+ -
-

30%

-

$265.76/month -

-

Regular Price: $374.95/month

+ +
+

+ DEDICATED 4

+ +
+

30%

+

$265.76/month +

+

Regular Price: $374.95/month

+
-
+
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index bb6f86a79532224bc109e1c5e570b3f2f3c89c31..5bbbef82cb807e77da12322f701ecd5919977e41 100644 GIT binary patch delta 1230 zcmah|YfM{Z7(U-Qr!A%Qy!22Odr4PNNLWKXx1Lj)5Z6pI7lLRY4Dg5LQZ8X|I-0GP zKdY{xKaANJKTft^uoyQbE|_k7f6OFiF~h{IUZNyA#wEfw&2)(|Zp6%woA}3=d{6Ry z@9lfv=Y8Kyra6;oKI=i}$GwNp`Hy3#4xn^?>3|oZj{IMN0z&oqTeWT)x$^g)k7>Lt z_ysj0YY{~XhJ~;yX!+Osu2^>DiWm{YK~)x&P~B;dp7ZDkdvtm&W~C^~1S=Fg!Nmpo zH!zzRgnWV7B^vo1Te@`$9>E{54!^+0HJ-T-CYG_Hz-%eQPL{B6kGR6`@DT3d(ivu9 zJ3zo?Jp7c|N7RQYxCI|T3J&AaIYt8^=qjRIo(fc6@ls--+b<@2dN+?GNJ^~`s+Gk+ zQzAaR`;=syy3M>h$=KjJwj@}*9p6=N+&IM^bQ9@6-@|vX0zX0lzJMFV*q31^cakB- zXSR&zDcB&TJR+s66XQFu0N;@G=CSWAI}JwRI?`q*Symu%Z|<2clc?Xr*YG9Wgf;9d zupe$xK%si$E1$!aTf55=mu`zsK#dZ=i{4i7!OJ;wM)R&P)iT!9uz5d=}(C1bnAQYa#kR!VXx zw5Q2En6?rW;|J5WAFiT<`14rFDCghLMComBwN{ij2V{2;Lb4jBR&p`D1jlsydkIE2 zU&EFq`vhXm^X5-3U0Al0+h;_0VZ~m?PRuQ^`yzCQiLugjyO}|Bgl^k<9L2ZS>{HW~ zQu1V{RyUAHjdtoOrEX+YN+s37ROfJ?d`t`LUDOIbcaCd-$`eDHAc_5&67P@eb=t`B z(GfM3JT{;Vo`~yevYTY}bc!PYf>Qi+%3-=TKJ; zy=20)7F49LB&t=}qkCSVNJxqZQczaZI#sLAwi=ExzI>usx8ql`{M81&k1}yy3YuY@ z^Kz@)J6s=0tB5nai+lqMZt6K>aFO?$TLU)A)nE)Q@@}JW+4_v1%)j7!b+hY&y4!U@ z?27m5Bk^EjxG%T5$m7+;vic~EEEA5UpK9K&daKLSc)C6MfBYNml}>!5qoq00k{oVJ zDE+Msjm-n%8-p)~JLSRj$(PeZ{fCCyL$4*%t;fY^Yx2$Lz>)u+9V}Ejzing?Y>>5d g{s|~On{l#!(x@k7BT2Qtf}x*bO>|BA{TXNJ-?-3wj{pDw delta 969 zcmYL{UrbwN7{y2Z@T64Hz3BNHj^kmud3dN}?!Sc4tdfGYd|D^RAsA}Jrh#~FO7 z0k0x>$X2<>R=LCA+prF|*zYlTmMns~gAI?;)sIM2X3jU7@HX@P1%84XP=~LmuS&jX zgb?pEe)KtymFioB$;@P7veNoii*MQ8YTGlxg7}=cE8G^Q1m1oH`s}A{d%TnGL)jzkEl&q9#varccsZ5J z<^K;bl}=5jjp}E-tF*VsGquvaMcc1mV~u{V*{4OL{1^6@w7i{adEpbC8?oG^)|xPn zuY9;IVEXZn&_?D@Yr*;DbwY2|g%1{kgNfsc|3r54<8WH$xJfC9_b{z&?X%?_+D*RO1qm9-Q8?^wvP>Wn5Z0d{d|&R3$X)r c{SCOVRCEzPB{kc9F!W1=m_mh5uelum0iT^VRR910 diff --git a/osinaweb/osinacore/__pycache__/views.cpython-312.pyc b/osinaweb/osinacore/__pycache__/views.cpython-312.pyc index fd84b9448734fe0d316781232b580bba29574a17..ba9c0f8bc943df5c8a5b398db79108cd302d6be7 100644 GIT binary patch delta 1030 zcmX|AZD>=h|9at1?&>ZM;ctLo{u=_ug1p z#MT*BHIucxs1d(9KM)ZGIX_mA{SgsAKwB$lgW@02KmMppL?nA6trNAK05*S}yfTwd-Mxq@)gb`qTy1Y;4ufGCCFAc0?- zZEcH-^FVU4o?(Ol>&#ibehGdSz7YhID+QRvNwYaVj~`em5g496Vg$yF`bS3d zsL_0D`Ixa`WSVzEclpW+AD1tEE!`fyuklSjzG|;fb2dfXW#4fPMGRF0IX&4OF&zt* zu@ZOT-vi!RPAt5`a)MK}d{0)Dy1C`P&{uG(8vku6^?5=`JJw~{_Ec;oc@220{gqzJ zDKDpH7TS*4(J>WSMMkT79^54g>N)e24hL&6YF5f7`rf1l%?eRc$JS~F?mYY;u)WQP zxsXr)k;O)Q8(JiriAL4@@I6h`sR>Jp(iS#P@-N&3{*q74ugAh@?cAT(<3KLoNjPRa z=)`Eot*ov`D;kvTL~V6DTB8dK^{&3zCVPMJY8JB)Lzp3gLtWi+JJBP`n;6z)C(+wy zAN(pr0>{AA6P)VCYI}hMqT?!LzYxO2waIGfknmFNPX_*NhjvSEePTN zJC}UfL9*Zd=>U_t5Z3gR$z3GBQ^B71Zm|_Nr)tG-m`zoP6kba;=>230x60c+s*8g- z{`)_o2M71<5r?oi?ImSVx>jT`l3pnO!~^LTd6@DG)RXiTO~f(N|Ft|y!p~~Bf1g`q zu_j}Q<9H@hB~OqXQR5kN8p$gMg8C^E;4}^mRLV0%Q|it@Q=T}7GqW*yo`hp+Z?-`8 z@(l*QI=~kLc=W(S2A&*nzk!QnoOY===OeYNW)lh@@2tCvwZ2$lO delta 872 zcmX9+TSydP6rO+A8N>3P7bvxVrYwc#Fjr)ba)? zN3;~h&>kWXfci(tAt8o@=tG97)z|AT zQ*(O^Zb!i(9@loVgZWhRl?E+@l)5DOGUk<{qAr0&=aE!EVUYBTi13()Vage+Tq3#% zmYm6Q2|```bbhq3Jh50Wv$!iHPSZDgMnvu#kq;jl?8h9WQ9&TY^qQJSHQi`q8L?L( zxlxsC5VnfJ#vFy|@TSFoq?WY%^f#T5Mxl;^6EttD>_!M;-Meg&JqTaV0cWfQ#tcnq zp(-!@GZN)n2-iiT`HQhy2x-rj4J0;1NxRD8_8O>E`xLtbWYcYWTwH^f9qCanq*JZ? z2iU9AV5j4_+=29_uyt-(*$p`Av$HO!_9d{};PVwJcTwE6h_}8~g$=-D&k}2gir#KE z46D5{$o%fLvq4DeJIRKiw69Da!+M*T?pv_1CUEqp$m2+qi?042E1Q6wAs3qj=Wv!h zg|sFnhqWN2w?|ZE8VNoF+Gvve2w|rf8Z8cHbFlWn9Wjr@INEPCK%K$;mfPUU51yr=xM2m(z@Vf&z`jsXwQlPb8i} mcSYO1bs(qNtG9Vvx%?SQ_)3ODyr0=&usIvSqC{Y}i2VmbW%bqo diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index 533fde89..fb7deefd 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -188,17 +188,9 @@
@@ -392,18 +392,9 @@
diff --git a/osinaweb/osinacore/templates/details_templates/customer-details.html b/osinaweb/osinacore/templates/details_templates/customer-details.html index 8d442925..b501de57 100644 --- a/osinaweb/osinacore/templates/details_templates/customer-details.html +++ b/osinaweb/osinacore/templates/details_templates/customer-details.html @@ -27,7 +27,8 @@
@@ -117,7 +118,7 @@ -
+

Businesses

@@ -307,6 +308,126 @@
+ +
+
+
+

Projects

+
+ + + + +
+ +
+ {% for project in customer_projects %} + +
+
+
+

{{project.name}}

+ + +
+

{{project.start_date|date:'d-m-Y' }}

+

{{project.end_date|date:'d-m-Y' }}

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

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

+
+ +
+ + + + +

{{project.ticket_set.all.count}} Open + {% if project.ticket_set.all.count == 1 %} Ticket {% else %} Tickets {% endif %} +

+
+ + + +
+ + + + +

Total Time: {{total_time_worked.hours}}hr + {{total_time_worked.minutes}}min + {{total_time_worked.seconds}}sec +

+
+ +
+
+
+
+ + {% endfor %} +
+
+ + + +
+
+
+

Subscriptions

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

Expires:{% if subscription.end_at %} {{subscription.end_at}} {% else %} No + Expiry {% endif %} +

+
+
+
+
+ +
- - - - + + + {% endblock content %} \ No newline at end of file diff --git a/osinaweb/osinacore/templates/listing_pages/projects.html b/osinaweb/osinacore/templates/listing_pages/projects.html index a0039e76..245e21cb 100644 --- a/osinaweb/osinacore/templates/listing_pages/projects.html +++ b/osinaweb/osinacore/templates/listing_pages/projects.html @@ -78,18 +78,14 @@ class="w-full h-fit bg-white rounded-md shadow-md p-3 projectContainer"> - - - -

{{project.name}}

-

{{project.start_date}}

-

{{project.end_date}}

+

{{project.start_date}}

+

{{project.end_date}}

diff --git a/osinaweb/osinacore/templates/projects-by-status.html b/osinaweb/osinacore/templates/projects-by-status.html index 36e2f7a9..9115b1a2 100644 --- a/osinaweb/osinacore/templates/projects-by-status.html +++ b/osinaweb/osinacore/templates/projects-by-status.html @@ -4,9 +4,6 @@
- - -
-

{{project.start_date}}

-

{{project.end_date}}

+

{{project.start_date}}

+

{{project.end_date}}

diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index a5ccbdfe..f05f59f9 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -549,10 +549,13 @@ def tags(request): @staff_login_required def customerdetails(request, customer_id): customer = get_object_or_404(CustomerProfile, customer_id=customer_id) - context = { - 'customer' : customer, + customer_projects = Project.objects.filter(customer=customer).order_by('-id') + context = { + 'customer' : customer, + 'customer_projects' : customer_projects, } + return render(request, 'details_templates/customer-details.html', context) diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 35bd87d9..2ff1c91f 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -894,14 +894,14 @@ video { z-index: 50; } -.col-span-2 { - grid-column: span 2 / span 2; -} - .col-span-1 { grid-column: span 1 / span 1; } +.col-span-2 { + grid-column: span 2 / span 2; +} + .m-auto { margin: auto; } @@ -4054,10 +4054,6 @@ video { width: 300px; } - .xlg1\:w-\[70\%\] { - width: 70%; - } - .xlg1\:grid-cols-2 { grid-template-columns: repeat(2, minmax(0, 1fr)); }