From 146525ebdf8acfc2d0646ff3485d8f021775b22a Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Thu, 18 Jul 2024 10:06:08 +0300
Subject: [PATCH] new

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 osinaweb/db.sqlite3                           | Bin 1650688 -> 1650688 bytes
 .../__pycache__/views.cpython-310.pyc         | Bin 18071 -> 18220 bytes
 .../details_templates/customer-details.html   | 225 +++++++++---------
 osinaweb/osinacore/views.py                   |   3 +
 5 files changed, 120 insertions(+), 108 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index cf57988c8d52c7210075d37042ea2b09652fa323..be998a0d67daa99356f32428a17b86dddf78be96 100644
GIT binary patch
delta 87
zcmZp1XmQwZMUY8SX7V+`JJRt2{KXmh<(|p;c>zVKWtpkv5t%@CaAsBN<g-Fn;;9c9
kK!7tOFF!ApQ`sQ^%w?D?C#=XQIoUy2oH1*2gzy?302a*}8UO$Q

delta 87
zcmZp1XmQwZMUY8aa`H97JJJ!E$@zJ~nN_Lr0{q1p`Q@HKZa`6LS!Qba<g-Fn;%NsM
kK!7tOFF!9;*&zVTW8j=DC#=XQFxf#^oUv$ggzy?302b{T`2YX_

diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index e0b99ff8005fe885573fc71b44b65cd7de1e3499..56bab1e8aae1c84a0b0ac1cc9d6cd7fa61780fbb 100644
GIT binary patch
delta 449
zcmZp8kkarVWr7q_uGT~uCm^{oAv|BuLczey%GAKh$V|`3%+l1vwE0AS`-yx;AZ7w$
zW*}w(Vpbq#17da{<^W<&Am##MZXo8_ej=auM?Ksq6H7f~BTG{w^X(Vk^BQkpj%7-o
z&c1*zoC!$BE#OPues}@j0!A%WW?!Z(Q<I|fGSmEwwDKei6N4O6)1s_`GV{W+qRN!K
zToY49OOUGR8=i_Qw69&n2gLk9EC9rUKr95r!aytn#G*hfwtej)@o-&cH+F~V>=(ql
znb;jRHx{g6o1So8oJ-6?*T4|Tv*rfo7AB0A+ktXRIAnO3Oc?lX@^0qo;ZEan;FMzj
z%yyP_IZFd`6q5<i3=t;HCZ#4zR^R4eM?!9%e&MP37EkX=N2?6aA`^GBNRLS8D%ZlY
z^suZD3xjemH*=FhOAF_)@;t+=V9$tPmqbI)Y$F3B6I}yrPHc~QEWSPJvBWYT0GHI5
A_y7O^

delta 259
zcmZp8kkarVWr7q_&fAGHPC#;FLU_KQxq_jEm8pf5iHV+piMgSvN%M*P_7nMxK+FWh
z%s|Wn#H>Kf2E^<@%mKulK+FZi+(68;{X{<RkNWAedPR9yO-zkV47Oi<&uhGaIfkio
zI{N~?@aYK)_>vh@w;x)-w~%rAFHTW47FA|nrs*4=iYv6QUBm~({6H)K#DYL91jNEX
zECR%$KrFU>?IQ7TU1nGIgz4-T#Je{)7Mx?7?r>e4YkSsp@mU;_+{{r7d^dSF^Yn11
jaXD~Gv43Ve%etJUfqA=PfT%5Vd(>m`?NN^<miYhxK{I5;

diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc
index 46ec6fac917c839045c85210771cbcb1a6a0a5de..e73bf97e86184deddb205f461456ee05a085960b 100644
GIT binary patch
delta 954
zcmY+CO-NKx6vsX9&AaN%8+Al-@-s&*pE)y*<BVgD<F`_oN)cHt2JwxdX(M-DMK)rf
z6bJ@(7D*Ts1(}2&46UM-ix#chj37aa2wW6G5MgwW_JI%Xk9W_<|D1d8c{m5J?n6e@
zYBi^bZ{y9v(2%~KkzbL)#MUHMn^>`Ktg9%UGT4YbVv0+;X%3z!y8IL-#V#(#O}eru
zPbx-gJVj@5Wm-O$qNVm|khBb5j~UUi2oDeId|D{+xPS(iGNW7<*6?4yCi9Ero)Jje
z{#wK11GmN^*NoW2F+F17<BIarX`Gtk0m3Z7K`15M6-cVRB;2>3$0cFX7%wOHSHiy{
z{96jnJ9E*d<rKuSgiDojAV-p92_#^<D&srCI4I$k!;a^*HTaldmCq#jg3DF?=&J~!
z*_jUvk2=E^69{ESNJ9wNamlIXnnmfD`bU>k*)O4~V$fe`mqe(>dbms}3W08gr#^5w
zSvqYk=yjFn+7C!bdlCw_CZaA2fQ+}@K2d+&{fX_@$4Av&%tq<i___Kll;H`F4+;|F
zo+PkLvS(qRcLqxFgLgi!hz!rEY$^Q}6OIr{@J_889Jp3nDdab6hoB2veZAnq<Mjo&
z;+x8x5Pj{?E0|=}#65H*(Hvg(=Ybb*_y?GmbZY4;O46@HjIc2fyBeE4aGL!KQMez?
zb=#Kz&D4o3H!PqhPzV9+4P40G^A(cfk|>!}jA3Im!i({3penmen8oDmJ?~yzG5!n`
z+g?&BnqO5q1X;ivMC*m%#*_6LRAa2Z(vlDnyoN-BiKTi)f<|0vh(ZX9f=<}LZo#I+
zMDPU&ha(hb%@o>#_d*WX#O06|+7nx$Z2&92Z@vi`*w)eyhjFpx9dw}HdJ2BvYU>&3
wOzgIfO5HR_{5t_iMkQDY1q2ttL+}#<ga$&8&`4+^v=ch<b;l}XVx+U?H_sW{mjD0&

delta 847
zcmZ9JPe>GT6vy}dc6Qcw##LK&snyk#C1-Kg9c|oZUEOrmXz34l(o43iYb+VcZ#RU9
zIwW+6{`rWGAw_kNEJo<kLFmvSx^=LHf(SZ!C<VzN?f29Oo5P16@6Y#r-<$c{@Zc7B
zC(Fw{4)L9z$MNOtOK+eBPw4581|=nXsZgA}nB$}QF@9Z?@GAlu<0JH*5x@^EVQ}MC
zOAymBRpmb@v6IDU_yA@!pKnbSL6ublb25-ORTp2yo7#K$WRHX&G5ChRTZbk7U5MS$
z8^DDN`l#vzq2nUB0gbS~St(`;7shhMOn#!^W)4T;KT(-0Xz6u9(s5|=Y0juwB9Lb;
zi`V7DXw>*{E>a_xQNn|-BO!my9yPXWQMG?Y6aa=&)D)iL(XaB3Cu}y3%azn#g;T~5
z9Ktt-2?2Y<D1q#ycm;m!n1Lodd*t51dI~%y15NY_5*i4NxX)}8&6XJ!@?+*W^y548
z4CuII)nTmjTE(>RwI+#H$*D>_x_7%p+7e1qZYrPs`%~I+t25(nC-si)qv6$<N4X(n
z_!>Dd@nLL5{pYB2r|9`nf8%|+LA5CIG8t-tZOM#nGS}`cVt`Yjz^v8f-)^p>3C~1v
z$yLl3CvrT9LssklW)aq$JVc|m>w<XKYN&cb(y|DutQIPP$Hjv65W&xu25ndt4=XRo
zp+TZuc6VG1O<*c93EgNXbXdYKf<1Oc_frswS3RTdB$XZmoHKkFO?qJ&lgSQ9*@ff^
zfCta@PJ@EWy~9w8M&Da;*Nwh3tYd%b6b#t2sR?#+l{~H!fV32XN(c~iLX=<<VuU!M
Vi;y7n5K@EzOb;%AioXWi{{SS&#fJa@

diff --git a/osinaweb/osinacore/templates/details_templates/customer-details.html b/osinaweb/osinacore/templates/details_templates/customer-details.html
index 79da9a70..fac3c6fb 100644
--- a/osinaweb/osinacore/templates/details_templates/customer-details.html
+++ b/osinaweb/osinacore/templates/details_templates/customer-details.html
@@ -198,114 +198,6 @@
         </div>
     </div>
 
-    <!-- PAYMENTS -->
-    <div class="mt-10 relative">
-        <div class=" bg-gray-200 rounded-t-md flex justify-between items-center text-white text-xl font-bold h-[50px]">
-            <div class="px-3">
-                <p class="text-secondosiblue uppercase font-bold">Payment</p>
-            </div>
-
-            <!--   <button
-                class="h-full rounded-tr-md px-4 bg-secondosiblue text-gray-200 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addPaymentButton">
-                <i class="fa fa-plus"></i>
-            </button>  -->
-        </div>
-
-        <div class="overflow-x-auto border border-gray-300 rounded-b-md tableContainer">
-            <table class="min-w-full divide-y">
-                <!-- TABLE HEADER -->
-                <thead class="bg-gray-50">
-                    <tr>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
-                            Order
-                        </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
-                            Amount
-                        </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
-                            Date Paid
-                        </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap ">
-                            Date Due
-                        </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
-                            Payment Method
-                        </th>
-                        <th scope="col"
-                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
-                            Comment
-                        </th>
-                        <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
-                            Actions
-                        </th>
-                    </tr>
-                </thead>
-
-                <!-- TABLE BODY -->
-                <tbody class="bg-white divide-y divide-gray-200">
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <p class="text-secondosiblue">order 1</p>
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <p class="text-secondosiblue">$20.0</p>
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <p class="text-secondosiblue">02-12-2024</p>
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <p class="text-secondosiblue">02-12-2024</p>
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <p class="text-secondosiblue">Cash</p>
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
-                        <div class="w-full flex justify-center items-center">
-                            <div class="w-[30px] h-[30px] bg-gray-100 rounded-full flex justify-center items-center p-1 text-secondosiblue cursor-pointer hover:bg-secondosiblue hover:text-gray-100 duration-300 addPaymentCommentButton"
-                                title="Add Comment" data-modal-url="{% url 'add_payment_comment_modal' %}">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
-                                    <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
-                                </svg>
-                            </div>
-                        </div>
-                        <!-- <p class="text-secondosiblue">Comment</p> -->
-                    </td>
-
-                    <td class="px-6 py-4 text-center text-sm">
-                        <div class="flex justify-center items-center gap-3">
-                            <div data-modal-url="{% url 'edit_payment_modal' %}" class="editPaymentButton">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor"
-                                    class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform cursor-pointer">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
-                                </svg>
-                            </div>
-
-                            <div data-modal-url="{% url 'deletepaymentmodal' %}" class="deletePaymentButton">
-                                <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
-                                    stroke-width="1.5" stroke="currentColor"
-                                    class="w-[18px] text-red-500 hover:scale-110 duration-500 transition-transform cursor-pointer">
-                                    <path stroke-linecap="round" stroke-linejoin="round"
-                                        d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
-                                </svg>
-                            </div>
-                        </div>
-                    </td>
-                </tbody>
-            </table>
-        </div>
-    </div>
 
 
     <!-- PROJECTS -->
@@ -428,6 +320,123 @@
     </div>
 
 
+        <!-- PAYMENTS -->
+        <div class="mt-10 relative">
+            <div class=" bg-gray-200 rounded-t-md flex justify-between items-center text-white text-xl font-bold h-[50px]">
+                <div class="px-3">
+                    <p class="text-secondosiblue uppercase font-bold">Payments</p>
+                </div>
+    
+                <!--   <button
+                    class="h-full rounded-tr-md px-4 bg-secondosiblue text-gray-200 text-[18px] outline-none border-none cursor-pointer flex justify-center items-center addPaymentButton">
+                    <i class="fa fa-plus"></i>
+                </button>  -->
+            </div>
+    
+            <div class="overflow-x-auto border border-gray-300 rounded-b-md tableContainer">
+                <table class="min-w-full divide-y">
+                    <!-- TABLE HEADER -->
+                    <thead class="bg-gray-50">
+                        <tr>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Order
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Amount
+                            </th>
+                            <th scope="col"
+                            class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap ">
+                            Date Due
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Date Paid
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Payment Method
+                            </th>
+                            <th scope="col"
+                                class="px-6 py-3 text-sm font-medium text-gray-500 uppercase border-r border-gray-300 whitespace-nowrap">
+                                Comment
+                            </th>
+                            <th scope="col" class="px-6 py-3 text-sm font-medium text-gray-500 uppercase whitespace-nowrap">
+                                Actions
+                            </th>
+                        </tr>
+                    </thead>
+    
+                    <!-- TABLE BODY -->
+                    {% for payment in customer_payments %}
+                        <tbody class="bg-white divide-y divide-gray-200">
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{payment.order.order_id}}</p>
+                            </td>
+    
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">${{payment.order.get_cart_total}}</p>
+                            </td>
+
+                                
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{payment.date_due}}</p>
+                            </td>
+    
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                {% if payment.date_paid %}
+                                <p class="text-secondosiblue">{{payment.date_paid}}</p>
+                                {% else %}
+                                <p class="text-red-500">UNPAID</p>
+                                {% endif %}
+                            </td>
+    
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <p class="text-secondosiblue">{{payment.type.name}}</p>
+                            </td>
+    
+                            <td class="px-6 py-4 text-center text-sm border-r border-gray-300">
+                                <div class="w-full flex justify-center items-center">
+                                    <div class="w-[30px] h-[30px] bg-gray-100 rounded-full flex justify-center items-center p-1 text-secondosiblue cursor-pointer hover:bg-secondosiblue hover:text-gray-100 duration-300 addPaymentCommentButton"
+                                        title="Add Comment" data-modal-url="{% url 'add_payment_comment_modal' %}">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                            stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
+                                            <path stroke-linecap="round" stroke-linejoin="round" d="M12 4.5v15m7.5-7.5h-15" />
+                                        </svg>
+                                    </div>
+                                </div>
+                                <!-- <p class="text-secondosiblue">Comment</p> -->
+                            </td>
+    
+                            <td class="px-6 py-4 text-center text-sm">
+                                <div class="flex justify-center items-center gap-3">
+                                    <div data-modal-url="{% url 'edit_payment_modal' %}" class="editPaymentButton">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                            stroke-width="1.5" stroke="currentColor"
+                                            class="w-[18px] text-fifthosiblue hover:scale-110 duration-500 transition-transform cursor-pointer">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                d="m16.862 4.487 1.687-1.688a1.875 1.875 0 1 1 2.652 2.652L10.582 16.07a4.5 4.5 0 0 1-1.897 1.13L6 18l.8-2.685a4.5 4.5 0 0 1 1.13-1.897l8.932-8.931Zm0 0L19.5 7.125M18 14v4.75A2.25 2.25 0 0 1 15.75 21H5.25A2.25 2.25 0 0 1 3 18.75V8.25A2.25 2.25 0 0 1 5.25 6H10" />
+                                        </svg>
+                                    </div>
+    
+                                    <div data-modal-url="{% url 'deletepaymentmodal' %}" class="deletePaymentButton">
+                                        <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24"
+                                            stroke-width="1.5" stroke="currentColor"
+                                            class="w-[18px] text-red-500 hover:scale-110 duration-500 transition-transform cursor-pointer">
+                                            <path stroke-linecap="round" stroke-linejoin="round"
+                                                d="m14.74 9-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 0 1-2.244 2.077H8.084a2.25 2.25 0 0 1-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 0 0-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 0 1 3.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 0 0-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 0 0-7.5 0" />
+                                        </svg>
+                                    </div>
+                                </div>
+                            </td>
+                        </tbody>
+                    {% endfor %}
+                </table>
+            </div>
+        </div>
+
+
     <button
         class="w-full text-base px-3 py-2 bg-red-500 text-white outline-none border border-red-500 rounded-md cursor-pointer hover:bg-white hover:text-red-500 duration-300 mt-5 deleteCustomerButton"
         data-modal-url="{% url 'deletecustomermodal' customer.id %}">Delete
diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py
index d57c03a0..24c5ae08 100644
--- a/osinaweb/osinacore/views.py
+++ b/osinaweb/osinacore/views.py
@@ -466,9 +466,12 @@ def customerdetails(request, customer_id):
     customer = get_object_or_404(CustomerProfile, customer_id=customer_id)
     customer_projects = Project.objects.filter(customer=customer).order_by('-id')
 
+    customer_payments = OrderPayment.objects.filter(order__customer=customer).order_by('-id')
+
     context = {      
         'customer' : customer,
         'customer_projects'  : customer_projects,
+        'customer_payments': customer_payments
     }
 
     return render(request, 'details_templates/customer-details.html', context)