From bfae98835f0387971a3ff462950a98780ccfb9b6 Mon Sep 17 00:00:00 2001 From: nataly Date: Tue, 30 Jul 2024 15:06:57 +0300 Subject: [PATCH] New changes. --- .../add/__pycache__/urls.cpython-312.pyc | Bin 1070 -> 1070 bytes .../add/__pycache__/views.cpython-312.pyc | Bin 12211 -> 10713 bytes osinaweb/billing/add/views.py | 50 ------- osinaweb/db.sqlite3 | Bin 1789952 -> 1789952 bytes .../__pycache__/consumers.cpython-312.pyc | Bin 7461 -> 8908 bytes .../__pycache__/models.cpython-312.pyc | Bin 5592 -> 6257 bytes .../__pycache__/serializers.cpython-312.pyc | Bin 723 -> 1176 bytes osinaweb/osichat/api/serializers.py | 6 + osinaweb/osichat/consumers.py | 31 +++-- ...tmessageattachment_message.cpython-312.pyc | Bin 0 -> 1030 bytes osinaweb/osichat/templates/chat-room.html | 4 +- .../osichat/templates/partials/message.html | 2 +- .../templates/chat_templates/chat-room.html | 124 +++++++++--------- .../templates/chat_templates/chat-widget.html | 124 ++++++------------ .../chat_templates/conversations.html | 33 +---- .../templates/chat_templates/message.html | 36 +++++ osinaweb/osinacore/templates/main.html | 4 - osinaweb/static/dist/output.css | 122 ++++++++--------- .../220805-domestic-cat-mjf-1540-382ba2.webp | Bin 0 -> 118076 bytes .../uploaded_chat_files/35_nkFyeSM_1.jpg | Bin 0 -> 129286 bytes .../uploaded_chat_files/35_nkFyeSM_2.jpg | Bin 0 -> 129286 bytes .../uploaded_chat_files/Artboard 3 (3)_2.png | Bin 0 -> 959737 bytes .../uploaded_chat_files/CPANEL - OSITCOM2.png | Bin 0 -> 33025 bytes .../Sahten - Final logo-01.jpg | Bin 0 -> 1132988 bytes .../Sahten - Final logo-01_1.jpg | Bin 0 -> 1132988 bytes .../uploaded_chat_files/black-dress-4_3.jpg | Bin 0 -> 58386 bytes .../static/js/osichat-admin/chat-toggle.js | 11 +- .../static/js/osichat-admin/conversation.js | 54 +++++--- osinaweb/static/js/osichat-admin/textarea.js | 37 ++++++ osinaweb/static/js/osichat/conversation.js | 4 +- osinaweb/static/js/osichat/textarea.js | 1 + osinaweb/static/js/osichat/upload-file.js | 2 +- 32 files changed, 298 insertions(+), 347 deletions(-) create mode 100644 osinaweb/osichat/migrations/__pycache__/0014_alter_chatmessageattachment_message.cpython-312.pyc create mode 100644 osinaweb/osinacore/templates/chat_templates/message.html create mode 100644 osinaweb/static/images/uploaded_chat_files/220805-domestic-cat-mjf-1540-382ba2.webp create mode 100644 osinaweb/static/images/uploaded_chat_files/35_nkFyeSM_1.jpg create mode 100644 osinaweb/static/images/uploaded_chat_files/35_nkFyeSM_2.jpg create mode 100644 osinaweb/static/images/uploaded_chat_files/Artboard 3 (3)_2.png create mode 100644 osinaweb/static/images/uploaded_chat_files/CPANEL - OSITCOM2.png create mode 100644 osinaweb/static/images/uploaded_chat_files/Sahten - Final logo-01.jpg create mode 100644 osinaweb/static/images/uploaded_chat_files/Sahten - Final logo-01_1.jpg create mode 100644 osinaweb/static/images/uploaded_chat_files/black-dress-4_3.jpg create mode 100644 osinaweb/static/js/osichat-admin/textarea.js diff --git a/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/add/__pycache__/urls.cpython-312.pyc index 52594b5a853d15223a2f3a46368d6a2200d838e7..25716f6e424a33e9706a2ae8d209495aa49958c1 100644 GIT binary patch delta 40 tcmZ3-v5tfHG%qg~0}#}fuSlD{k@pBQBgf=R%z@nEy!=d!+(qI*DFEIY38DZ1 delta 40 tcmZ3-v5tfHG%qg~0}wnnT%I;(BkvJrMy|=1m;<>b`S_U{xr@YsQUKy?3CjQg diff --git a/osinaweb/billing/add/__pycache__/views.cpython-312.pyc b/osinaweb/billing/add/__pycache__/views.cpython-312.pyc index c835632af97d4122ac567e08d6fa5d70221cfb75..66eb6500b65ed0c69fded49ad509201ef99800a9 100644 GIT binary patch delta 193 zcmdlSe>0fxG%qg~0}z;9Uy=4oZX%xqBg;m0Rz{XeHcg?;W{k{=j8&7Zlyn#qH>WGj zW#ramyv0^rQk0pOUNxCtMUqi-vZji)QWbw1%_~(j8G!~~Rt;cm+pMBChmlEBesj03I-_bE&BN=%eH1Dr8eNX#Wz7j~(O-EEx? zh2l0{Js&hCa_9PR$#FRoA3Opkm?l0MVN8c^~7rE!@2h0!AF2D%fr_}A?k}c+|UICVipsBw!avA(n zZR?@%#7L9n^ZBf_#3L!E zjOT@Aoa$Q2DM(aM8kO>5Q`f>HpjrJk90TBv{zv3(uvr}%-2(cLLw$6T*4h4d^nYC} zuV{;}IX zSME}~RO<#lb=juUE8df|^DK8GUwbY%+U3gjb1KtO9jbk$SHI`+-&Sb}bYw<#tn{{v zoQ*22T2!0h+Ol*aohtKy65Oiu0rk*Qb_t%c8wJ`Ks%w|s0s7Cw&sETcj_4-h$?QxO zyk}~L7J7EMc8kg$G}y`Y2)TT8?&Co9=cBMPP$iZU-L_>!f0Ik#F-(8gF&kcz7m#RLQmeA*$%rVu#6x_4$;shoB-BA*A#f9XLg3Mpk%0=-v28kAtt019 zkjb3O{+dLR5~f#DiaBXX>~zcYp7!EQakXPe-%MBA-Pi{g*vx(L{TL$ML)so zT&JI6R%U3dP17^9HgnL^*XW7VdLr8NLEz#yGqu3DVf7!`DAvCze=ch`j%`$b*a*+o z12?hbFc9k42fk3l7q9u^k8kYF82_$1$4rq?{90v*IND9#6@WEc~h4W50Tz_Pq@J&x&9S_*>!s118{s A_W%F@ diff --git a/osinaweb/billing/add/views.py b/osinaweb/billing/add/views.py index 5d552753..0e2d4384 100644 --- a/osinaweb/billing/add/views.py +++ b/osinaweb/billing/add/views.py @@ -272,56 +272,6 @@ def add_invoice_pdf(request, order_id): -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/db.sqlite3 b/osinaweb/db.sqlite3 index 7c5aca4cae782e8bb9873032cda90bae7d43d3cf..333d73ccb84d1e0893f22486b878cbe7d0f9aac6 100644 GIT binary patch delta 10741 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 diff --git a/osinaweb/osichat/__pycache__/consumers.cpython-312.pyc b/osinaweb/osichat/__pycache__/consumers.cpython-312.pyc index 20287640446bb190d97c6b28b1242e0cf7e572af..4523018be0fc5e144fd1b06f9a60280a03d4c776 100644 GIT binary patch delta 3626 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 delta 2422 zcmai0TWnNC7@pa4&YrWEv%B5x*=E3MIsK+jA&e+udf) zDW-LsK1dK_0ydL)NdVErC~03zeIP!d(HA4e)PxwaF;U;ulu};Q82^8EyDbIufB1Ih zzs#Kfn{TH5Zr?{w1#aoOmwvcF_VSB zciqJz{H7eE<@`sviH12Zp!e)T$ghg>&j(~g! z@bcfaDz^xDXLOJ1+Jj$|piKPedByI_4qIZzR4l?KSr7qRV`Tt&eb1Scb0nJ`>Kd_Z zhqdzKzJ^2uBf&n1BpHN~{UWv-yf%_8J{f+Q!7oJ&tuLF&Sba`2|H^k6K0oQdwodF+ zjVbsoh3#r!WV-;cVf5DW2ECSc@O}DLD0@|}bp0*ySCk%oiz%6MnvTmZ;;8&v|7t!T zE$2T|jplfFz=-DLDO?APlAL5JFRzEye&C0_?ULyhDg3Q~;=@gZ4aE4bo(PY-RAX9Q zEFD)IJR3CLEgL-RHK@Yp^q8bgQGPX47lecC&P2L?9o&M7&P)C)5Lddn#T z*zF24{g+*jYa+Cw37!8Itce8{w`6q=p1v?A&f}rlwWZi}u+)Q^ahYUXb?S?$i=8NH zjto@syGp_cEiUOif{&KzvQkr;8O~{sY$NjcHnuNsW0Z`NMEN0x;?8>pvnex)8p_Mg z=&+S9D>;&9QW`9=L6^uEB;k+@sPeKTB^YIi4i z?OXiQNOSO)pfMY3nv+~c;KIH+H}5oJ;ZXTI!O7q?V?lE1fjN!%qci_R25IqrgeX66 zY^E;$xxhb+M5~mMK>?@&Dd&RAAmLd#KG;Q=Dd*&ArKA^yZ}LVx4!!|sC>J+e8O2oj z_pyo%3C|&TKE#QffN;VkI?0EZUVZ>>XupoXX-<@aXc2IWjbCC)@>ElUODe=*5wVa2mkIGI)N#@C}g& z+s_YFu2V-a_8Q@5E01hl&`2mg8*jhSbvwBCf_z8wU-G=+xxDxNgYO-@Q`K;%yyC7R zt@qv|QjPC|=RT1=3|c#w4V4r(+Qwh6uc=>fSJCjSv2KCD T??NYKl=^3*jrR!-#5Vr|+-U<5 diff --git a/osinaweb/osichat/__pycache__/models.cpython-312.pyc b/osinaweb/osichat/__pycache__/models.cpython-312.pyc index 70b972c26cfd62b024f231a2e1c61a5dcda89aa1..57cef3289b67c50df704c4d9d1f8580aac36a7fe 100644 GIT binary patch delta 1121 zcmZvY&ubGw6vyZ7ZqnUNvYRzYW3_3MC~Azv>>RcClw=(` z49Iky(?`=FUVP@1oCuqyLbb^@i^!#ET(r52+%=6$Hg_ZUOyP>8AW^3fQFYl)FLG@f zciVgha^E!WvAG|4U@GU8VV*vPX6T_6t-1Ua`Z#DRZxz1r;4d#1g8<%guT%qwmKV6L z0xT>)cV7WWl+(&ffMs-{_Y9Qi1Mi_(S#Ff1WZjkJN68&FU0f;mun=?5cCB^I0i1AS z@fflFYY^oUu^PDnuHk6}BV<5eQ*N1b?Lp5eIK_>?aWFI>BS0h0z-hQMncqQTTu*!&Y53t&CxrLwPF~#@dD@@g=%QlhYl4Q)|&^CQwS`Loi$o#w)@2t@ZbN zZ}*M|SDka8l`bS}>dd!l=jGkiP_hzAKA1lq>U<-18m)Ng|Fhaj=qJYt8iv4zf1N@P zw#XeZ>%w5h%GJgF8B;%;DeA^ftP=yf8I##3KQHy?3woM4PPEgA7D#k7Ko`2q*(fFQ zMb*v^og1pE?G?5Cx^Pn+Q^(cB8!=(D(yyLyd@j0-H7NC_;zavKH$&`EV;7SZO!lJC zlUhsnY79(Pf0Wde=-K|N60IoF>nk74d)D!|DnB@IB!BULqw))FHo!jmdB!5S4@(+MHqjQ}cIcz8wHA8D_X5+~{2?{V(oA}A zn@eb$Zz;X&7o7~nRQkjpm5uGplR}{%{c&d>J7uX72({%fWP>xuP`>j3@R78BAZ_o7 e_dStlS75(agyiK7*SfEC|0WpzZl(_dbN&D#Itru! delta 520 zcmYk(u`dHr90&0CySCTfwRi2g-d%+@ss>e&4i>Qxf(U{RO)w}ugci|8(ow>$`AHBG z!9XOY`wOfjL?noiSWFBgVifOg(0ju-zkI&Gx4ie2d`yT}g1{4cj*=%cI$st;jaxv- zHp!AK3lvi3ks9`>BR%Z0zuiD`@r=hrj-C8{^YYEo6nZ`pc92%z;{X$aM jqw(ngfEQBxOd|NKO$8We*y%YK*d6#Lbo}OVC=~kxw9tKt diff --git a/osinaweb/osichat/api/__pycache__/serializers.cpython-312.pyc b/osinaweb/osichat/api/__pycache__/serializers.cpython-312.pyc index 79d700c4a7641d8bfb381508315ddf76b76f93be..6099e94f6a489a63c2039ff39d637bb0ee9559e8 100644 GIT binary patch delta 415 zcmcc2I)jt%G%qg~0}xzmS&>%4IFV0+F>j)}D;E=kJ3|U<3quOqL?3xp)=G9wj)?_f zeB#a-i6ue#`MK_;sl_D|&s+1!pomNsW^~}=MHPx+>}Qmn{Dv{XEg57H46r~MpY?!@ z=?tk1QH&`JQA|t>sm!aPQc)~mXD|Yt!L*tQA{fOw@nE7x5hsx6r^!|Xa(fXsh~NPd zw>V%{7x96__$Lc833Ca9nBqW!XYzeU1r>BnMQk9QyvabH6#;#g4)WP#ekM_4QII|m z0kWi61W2?n+!WEiETY@s`<;o2Rr(VHkSG#_DFeD^vOkjzqv+&zCRs;WpfDpyqdt)M zz|6?Vc!xpeE`!<^HfBcY8QIt6EHBDgeqjJ|zHqSsMWnAwnp~7L`N{y~fXxH|Jk43H delta 110 zcmbQid6|{(G%qg~0}w1SSe|x(VIrRdqsv5fSC&dvO}2@%!X{r}ikTe7XvoRooRL@( zl%JnFc`9T702R99Rl)}v+A2{+vml3`1=s}?c#r@O5!ivAh5*&i+lwF~{~6s2r%NeJ z&2Igy+O3|Wjh&;7pVf%IU)n=T-#12civFs-vTgFpqtS?B-g1%#?KMB+jhPwu4rVm= zBPy0vDqx%9%^(f3geiql#;?fih^DFEp?;S6?X`%;87~*otII{f=BYffPbG=5Fq3AK zqb#vCVYDWvZG$x|SfTm2I zCAV5(M%jX_!gMLr9>?@)B0{clgLM74lW;^5;^lpdqa+!I!k`$hduct_HV1YPE5CQUeFwG(G{5_&2UbxmLtr* zi+$NHKIPMipSZBIx!z-j=p+wi0n+CpY=fZzDzifkjTx^W4lPi*`OX@clYMjY;A->W z(zSznW2Z5wH~RI)$MG){pC$%wtM9f3?qc6v9JtGUclq0k@OwQvD(e+%s2O$R%_6%o z+Q>F|MGes;E4jDI&x!wHQ$3C5$VDcvq3ZOyM0u%6fsW04>Hufil%V1*gY=dNLk&Xs b#{kg&0j7?ODl~Si!NuwR#p&Nbki5V@PV){V literal 0 HcmV?d00001 diff --git a/osinaweb/osichat/templates/chat-room.html b/osinaweb/osichat/templates/chat-room.html index b4ab7ffc..d884682e 100644 --- a/osinaweb/osichat/templates/chat-room.html +++ b/osinaweb/osichat/templates/chat-room.html @@ -94,7 +94,7 @@ {% else %} {% if message.chatmessageattachment.is_image %}
- +
{% else %}
@@ -138,7 +138,7 @@
{% csrf_token %}
- diff --git a/osinaweb/osichat/templates/partials/message.html b/osinaweb/osichat/templates/partials/message.html index 5940bd70..31005e3f 100644 --- a/osinaweb/osichat/templates/partials/message.html +++ b/osinaweb/osichat/templates/partials/message.html @@ -7,7 +7,7 @@ {% else %} -

nn

+

{{chat_message.member.first_name.0}}{{chat_message.member.last_name.0}}

{% endif %}
diff --git a/osinaweb/osinacore/templates/chat_templates/chat-room.html b/osinaweb/osinacore/templates/chat_templates/chat-room.html index 5a10f7a4..2bda13f8 100644 --- a/osinaweb/osinacore/templates/chat_templates/chat-room.html +++ b/osinaweb/osinacore/templates/chat_templates/chat-room.html @@ -1,10 +1,12 @@ +{% load static %} + + + +
- -
-
+
+
{{chat_room.chatroomguest.name}}

- -
- + +
{% for message in chat_messages %} - - {% if message.member == request.user %} -
-
-

{{message.content}}

-
- -
-

nn

-
-
- {% else %} -
-
- - - -
-
-

{{message.content}}

-
+ {% if message.member == request.user %} +
+
+

{{message.content}}

- {% endif %} - - {% endfor %} - -
- - - - - -

nn

+
+ {% else %} +
-
-
-
-
+ class="w-[30px] h-[30px] rounded-full shadow-md text-white flex justify-center items-center bg-osiblue"> + + + +
+
+

{{message.content}}

- + {% endif %} + {% endfor %} + - + + + +
+ + + + + {% csrf_token %} +
+ +
-
- +
+ + +
-