From 621306c28d39ae3791bb8c90c96b30999b0fa955 Mon Sep 17 00:00:00 2001
From: emile <e.emile@ositcom.netm>
Date: Mon, 10 Jun 2024 11:36:29 +0300
Subject: [PATCH] new

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 .../__pycache__/models.cpython-310.pyc        | Bin 6247 -> 6757 bytes
 osinaweb/billing/models.py                    |   9 +++++++++
 .../details_templates/order-details.html      |   2 +-
 .../payment/__pycache__/views.cpython-310.pyc | Bin 7822 -> 7838 bytes
 osinaweb/customercore/payment/views.py        |   2 +-
 .../inner-customer-order.html                 |   2 +-
 .../listing_pages/customer-invoices.html      |   2 +-
 osinaweb/db.sqlite3                           | Bin 1368064 -> 1368064 bytes
 9 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index a4f1c73ca9e0aecd3eb6499ba734998668ec78e4..ccbeaa6d3217cf194e616747856074be71018422 100644
GIT binary patch
delta 146
zcmZp1XmQxEMv(E)<h6ootfCT<QWBGI2;Py7$V|@93(l-cjThiA&d4wK1abq4Qp++^
z%O{@~vJl`5$;;16Rdxtq00Yj+3c`x!0*p$G+KeWQwv6_S9*mxhQH;@y35=N#B}|ME
bnn4CiLn+3r$yLHTHmmbIVBX9w@s}L{Z;K%@

delta 159
zcmZp1XmQxEMv(FB<h6ootP+w^k}{KT2;Py77vL|>$S?Oy&d&=dN-fJwEsw|qvV$|L
zQYW7mvXE4EaAN=i&XBzPyi`tQhX4qFvbeCKr6i*gqc)=nqb;L7qX(lWV-#aDV+vy?
kV-`dW6C;FXkcHAvim`ZdzVHqv28YSEGRm97Mb>fy0QWZ`_5c6?

diff --git a/osinaweb/billing/__pycache__/models.cpython-310.pyc b/osinaweb/billing/__pycache__/models.cpython-310.pyc
index 0f25db08414dc7ee322b77c442c0e2a067cb7983..6692b3d61af327d43a58565fa8b75d3a12d75250 100644
GIT binary patch
delta 1512
zcmZux-%lKM5Z_tu7x#<3W$%uoDoBa-Op8dXB1KvX5(rvqX-&A+Znw94=aRiU`0mzN
z0)iGHKH!f`{0Dr~n5b#ugFgD^TOVCxd@|~jCZ>t;$(iq=SoALQ`OeOKzB98kbNAEm
zkEgP&OeU$&NBgo?(+ZzwzmLK@cqToFT5NL2>9SLHdRw^-6`k~qot1j`u2KWL%ht9N
z6=PS4D3$!8QqEyL_8$C>f5a{l&d0yNk7Jq1L5jVuEGx@kgRSnt1_Y|zVMn%=b(p5W
zw_!tFSLu56{7e}tIok>xbH#FP({%mjP0zz$)A`LsiXxt7C=irEl<D|L70=KS##gLc
z4W}7MUmJ={9V2+0mD2=k<pp6oVyNx}?eJEkb+Z`^jeD)C<@pn&xPDM=HC86d9Tly`
z<o&p&zv%>Ftmb-wBg6y+D|d)I9bsah;a8GDE3iBn`A`{Q*P)ch>82ke$f`O-U@iZ@
zg;jwVe}Ax=&uwxSNuWnrRD@2hvMSEfA)aF}7`QnH4G43>X;^O4ZPv{jmS;7q&J#rN
zRf4p-R&3|}59hwj%w?HUFqJq4<9IT$2v6c};+v?LB0Da1ZbW%Hr}4YaJ}BU)nO@8%
zN8ov!P4?B#lBZqY3~O@?%nmcAS@kU6uR5M*n*S>NC8o&njgU4#;y*x;P&6<=gDj|!
z1U0fR9Z4{vVgz%M2l3nFmCGhk%W4?E;52P|ZE?N*9GkIR&#{Hoe(ap$UU+P|AuWHV
z=9>K%M5`_w-xpP~iIWU*hU@rtss>l^w^UE*8X2ZZeE!WOln7{X4bmX4-FY}Y52Z8A
zzkdi~lx$1*R_6SG&E5!u+{(vD3u9I_a9?#qh0U{gFVn9rvFb8hWf<keN9&}%NaFLH
zxf$Gw_Sc}6WI@!a2|agS%f<m-!L6=3*!XkTTvSZb1)S7+p@CPmVK8w|J9_E`GRpZ0
zS=6)iNZZ6aE%@~gzk@@zW&B0E3-kC@?x9$VIScqht~A<URfgjrVT6VngdJ`(2&4Xr
z=LX^;6L{w3css!*HeAMGea?`>mi>|wXVxn2>C=OpAj~W@ol7l(8Q1Y_!TTU&b7ajG
zyr&;KAzQ@d$rR#c)(!?B<IB)oW)<hUk5C(O5d&{^e*$mfBgPoKftE2=+9Ln!B>RI+
z%ihvpx8!QwHCDmLsr*7@g*cctO0b8Y<<IpVl=CP#<iApTl&hF7^uZP$FAPV0a_yj1
zC{YZ~{chny_y9+WPvv*{(l!Hg#5slvZWK?Hc1V4n<ez$ykl;nz!LN(6y}X8kS3=14
bZ?PsL?9j3lalEHLHK1p7T|c5H3aP&UDj`ch

delta 1037
zcmZ9K&rcIk5XU>UKbHQoEZc3jiV!u?f+$uaT9k+&frx-q1d3P+-Ii)w>T5-Q1ciiv
zi9dqQ!MkT;Vn|F(ym<8@#Dhr_j)p(L#Dgbi76S>JywA>?H*fa4GxO{GcB5y??RJ>x
z8TxW7^+WmS*|NekZm51dVCzv=O({q^ldfecCa;<-rdU<f6msKJ+Zq(nYwssc*gw5-
zoP`L69Z@)iD~@kc*_O&=OS-@T=YqAHa)<G!vj!C0^aruh6|Qe5U%8?^QPMjydNx_M
zB*`pG1u<37MQK*F(79-3bmNSxx}ld%KO;;yN~@?4B$F2u@PY@--~hA50g6?GvC>kF
z+pdv;AqokZ%l1A!pUmXbVt8k7>qum>dQ!x8wiRuO{Dhum&xqmq>+H(c_KB&q(2GTJ
zmwe(J!_FASx9$|&#w9hN4U(goR*~x`nJnP7d%*=_kQ6BEZJs93uJ9do7sf9%(Y6oq
zU{C)jA6OV?7<GiQEiqBbOzR@bo~wq3<i``Gn42n^%jBt2ycP8v(9alW3^1BlmvxNH
zPVDnm!x$+Etgm?O0C9X(nTApPQ`uD?GK-58Q??fpvpGFq+NZEwaXGE$^_hZbNn%`X
zgdtp$k6pUXU+7>My7|v3k&j+6>3^c)zD(jCohEQw-h?*%Ty?}Y$=5q^t4edG*ferB
zBPgo>2Jd-TLUtpmxXF$lJgsyoM*od68WrTINqnxf!z6Af0jE&~LsS%hD<`^)TJWch
zeBusUdrjCICYHccP?QNgOfpC`P7;{SG)gv+;zr_Q-+P$F<7x!vF|J0mISPKnw|3g@
zqVe-^+vkkI`>sBO9Jcy<A%m~|hhZ5%_^$=`6rQA;BE&E{d><Ww8kobnK%+HB-UW;Y
zG#vN&@MYi~yue27f^UhVpD;K=JYYm|UTe@6$$Um@SBitglaxjLs&xi=KE)Wrs5R@}
X$*@Rc;>Sp^)~U&ES(XpUlIr{i7oXlm

diff --git a/osinaweb/billing/models.py b/osinaweb/billing/models.py
index 1e3a4488..9f43a979 100644
--- a/osinaweb/billing/models.py
+++ b/osinaweb/billing/models.py
@@ -42,6 +42,15 @@ class Order(models.Model):
         total = sum([item.get_total for item in orderitems])
         return total   
     @property
+    def get_paid_amount(self):
+        payments = self.orderpayment_set.filter(date_paid__isnull=False)
+        total_paid = sum([payment.amount for payment in payments])
+        return total_paid
+    @property
+    def remaining_balance(self):
+        return self.get_cart_total - self.get_paid_amount
+
+    @property
     def get_purchased_date(self):
         first_orderitem = self.orderitem_set.first()
         if first_orderitem:
diff --git a/osinaweb/billing/templates/details_templates/order-details.html b/osinaweb/billing/templates/details_templates/order-details.html
index ea5710e0..7926fce4 100644
--- a/osinaweb/billing/templates/details_templates/order-details.html
+++ b/osinaweb/billing/templates/details_templates/order-details.html
@@ -26,7 +26,7 @@
 
             </div>
 
-            <p class="text-secondosiblue font-poppinsBold">Remaining Balance: $<span>12.00</span></p>
+            <p class="text-secondosiblue font-poppinsBold">Remaining Balance: $<span>{{order.remaining_balance}}</span></p>
         </div>
 
         <div
diff --git a/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc b/osinaweb/customercore/payment/__pycache__/views.cpython-310.pyc
index daf0e55faa468dfb33fff56a80ec8f994c26f858..6d6659ad9ca4ddee562d6000055ec03efe37fb1d 100644
GIT binary patch
delta 58
zcmeCPooCCN&&$ij00i^dlhQ&q^6JS5X)+hN00nNb7Zl~EW#*(7P2OxP!_COJbF!!G
K3m|DE7XtvYj1Y(b

delta 42
vcmbPd+h@z0&&$ij00fQqL()Pw^6JSj6;0agE5psmxMOmp><b|2Bo_k!`T`7|

diff --git a/osinaweb/customercore/payment/views.py b/osinaweb/customercore/payment/views.py
index bf874e15..f8233c76 100644
--- a/osinaweb/customercore/payment/views.py
+++ b/osinaweb/customercore/payment/views.py
@@ -318,7 +318,7 @@ def buy_free_osicard(request):
             'first_name': request.user.first_name,
             'last_name': request.user.last_name
         },
-        'customer': {
+        'profile': {
             'mobile_number': request.user.customerprofile.mobile_number
         },
         'subscription': {
diff --git a/osinaweb/customercore/templates/details_templates/inner-customer-order.html b/osinaweb/customercore/templates/details_templates/inner-customer-order.html
index 06c5439f..ec627e32 100644
--- a/osinaweb/customercore/templates/details_templates/inner-customer-order.html
+++ b/osinaweb/customercore/templates/details_templates/inner-customer-order.html
@@ -23,7 +23,7 @@
 
             </div>
 
-            <p class="text-secondosiblue font-poppinsBold">Remaining Balance: $<span>12.00</span></p>
+            <p class="text-secondosiblue font-poppinsBold">Remaining Balance: $<span>{{order.remaining_balance}}</span></p>
         </div>
 
         <div
diff --git a/osinaweb/customercore/templates/listing_pages/customer-invoices.html b/osinaweb/customercore/templates/listing_pages/customer-invoices.html
index 7ea4ce9c..29044a3e 100644
--- a/osinaweb/customercore/templates/listing_pages/customer-invoices.html
+++ b/osinaweb/customercore/templates/listing_pages/customer-invoices.html
@@ -5,7 +5,7 @@
 <div class="w-full px-5 s:px-9 flex flex-col gap-3">
     <!-- INVOICES -->
     <div class="w-full bg-white rounded-md h-fit shadow-md p-5">
-        <h1 class="text-secondosiblue text-[25px]">Invoices</h1>
+        <h1 class="text-secondosiblue text-[25px]">My Invoices</h1>
         <div class="overflow-x-auto border border-gray-300 rounded-md mt-4">
             <table class="min-w-full divide-y">
                 <!-- TABLE HEADER -->
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3
index 6a056e320e2b6949e058b8edd127408d4b23c72f..4788fd6d253cc123f4adbf0d7c6e46d36721f7dc 100644
GIT binary patch
delta 798
zcmZoT5ZrJec!D%z;Y1l{#=?yWbF>*VH~-bnwVbS<$sUuGVp<ed;aXgtmFb=8o|%&4
zZsw8Zu3}LfZfKm5X5d>ImK>Gj9BN`xYHk#mlxbk<rJdrO7?fgE;$dtVl2sMvYHMU*
zWTI<erfX=RU|?ZoY;0v}tY>IuVqvoRY-$ao5JcF>(#qIO&)Cw!z|4Gebb2VG2wa1S
zm7%4crHQ4XxkdAljP@fLj6lo;#LPg<0>rF9%m&2lK+FNeoIuRA{YVD4!*|A%>8uGn
zCz<#fwqHo#DdJ{yoZj+<F?l=NSH@e63i8a3Ofc6OnSfmfvCP!a$iRZ(Mf-w0p6v_r
zcvA|Q>)1lKvp?Wn&d9`;ynWq6USCG`P_}Be7`7>!1s?=5Pd;#ig~Np@lZ}~?$!+?t
zc2=qF)z5gnS23|f0p(2@mDP-mvvQ28(v1rZlFQ9f%#$)L^NR|zimR$plPWVx%FP&F
zY*(1X_k@=@iLrM&`vSgtCdS_FZ43BV8K(oqS(Hk$Q_53{a;nOTvr5x4iVM?Hi;L4s
z(@b-VOj0w`t8#&^-Mo+wi1~q7VEg8Uf`Rv#;}|ukvo{EBXJf2p3}V!rEchU`UacjQ
zl|hox(LXOIGcVNz=6`7HK>crEXlAI^l7Xbq4NW058cj`1ja6IHfeJaHCZei?$E%s4
zg=$M0E5q~)jY6{RM;nE<A8i!2pC`e^QqRD<g{Pl8gUg;%g6}5#C$=-J%UJ4x!IsRT
z*`(Z<!Rp%_>PX1@)9?54ZT2p9PYfxta!d<1@y*L{HZcy($x1DC@r<wtH8eEzD^96!
fEDg@iODYWXD)kQbN%9GWITkbaw=Yu_iP{AKZF~Kv

delta 330
zcmZoT5ZrJec!D%z(nJ|&#-xo2bF>-LHviSmwVb>=&r8zCz{o_`z)aV`Si#W9%D~LZ
z)LhTN#M0Dg^V!rI#_2m7h4@&^3{6ZnN2iA}ikRve8YvhWTNxQx85-yr85mny7&ITr
zXg`v{2*gZ4%nZaVK+FonY(UHo#2i4(3B+96k7RH=d}mCa&YHk;lF7(?`-KFaB5uaS
z=`CLvlee>dW&Fk1z95fh`+_{)ltSiew#@D94|ta|Zr|{b*Ow8<pR!r-K{oUD%xAo@
ztANZX#_bA|_@3}GCo*oH&c1-JetX9PK32xb0SOxIn-}r{F+UIsY~Q?4Fz_C8G~?pw
z><vQOCksA!%B<RwHvL?qkbL{mMxpIT8-?xXiE*+nW8mGw)6bp3WzQ+Wca!}S+Zonn
PKx=wfw=Yu_iP{AKa&UQg