From cd3efc29b789bea947f03062b180b306277290d6 Mon Sep 17 00:00:00 2001 From: emile Date: Thu, 30 May 2024 22:28:00 +0300 Subject: [PATCH] new --- .../edit/__pycache__/urls.cpython-310.pyc | Bin 503 -> 511 bytes .../edit/__pycache__/views.cpython-310.pyc | Bin 1178 -> 1513 bytes osinaweb/billing/edit/urls.py | 2 +- osinaweb/billing/edit/views.py | 15 ++++++++++++--- .../details_templates/order-details.html | 9 +++++---- .../update-order-status-modal.html | 9 +++++++-- .../user_profile_pages/user-settings.html | 2 +- osinaweb/db.sqlite3 | Bin 1368064 -> 1368064 bytes .../__pycache__/views.cpython-310.pyc | Bin 20739 -> 20835 bytes .../edit/__pycache__/urls.cpython-310.pyc | Bin 2139 -> 2159 bytes .../edit/__pycache__/views.cpython-310.pyc | Bin 12444 -> 12520 bytes osinaweb/osinacore/edit/urls.py | 2 +- osinaweb/osinacore/edit/views.py | 9 +++++++-- .../details_templates/customer-details.html | 2 +- .../edit-customer-status-modal.html | 3 ++- .../account_activation_email.html | 2 +- .../templates/listing_pages/customers.html | 4 ++-- osinaweb/osinacore/views.py | 11 +++++++---- osinaweb/static/js/pop-modals.js | 2 +- 19 files changed, 48 insertions(+), 24 deletions(-) diff --git a/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/billing/edit/__pycache__/urls.cpython-310.pyc index 7a71c554b21ba9b10c2374d661c8385588e8e697..1187cf72dd9b7f4cd7c71c822c1d9443b84ecdf0 100644 GIT binary patch delta 47 ycmey){GXXOpO=@50SMYJMx@0~fubGZzdK5XLxUZGxNT9zxToY>D7~3t%6{E{nW%YrS=@Xu% zNu2Td$2mSNZs9juHAo{IP$eC4DO`0`xl8l@!$*#O$1ecxp%|KSIpOjTwbry1PPUTK3DzWM59Q(qMhb zeJU=(PiZECaUm`NejT*4fe2ICISgZ#90oE;gD4sFWthZ);8D_N+y3o#>#vn)DyJKq zg|a94IE^4|)|#Znd)nl_E2xhDSjX3Vcp7(g6}lvG4ot+VQmQG-&YHTjrK1b$g-oZ> z#s1&zFLcx22G2|}r${AuDb_E?1X_uv^(uVs`qknGeVTdfpdXKt;5iJJPFkLawhV{8 zC>e!uPwpx&%;~8mMeHCh2Z+n+=IP@aT*Nu~ zBcr|`NYyR&JN>?%! z34#m~1`#4~LKMilC6tHGR04mYqBD1XuL>qNn%=Bd`^CPW?p/', views.edit_payment_method, name='editpaymentmethod'), path('payment/', views.edit_payment_modal, name='edit_payment_modal'), - path('update_order_status/', views.update_order_status, name='update_order_status'), + path('order//status/', views.update_order_status, name='update_order_status'), ] diff --git a/osinaweb/billing/edit/views.py b/osinaweb/billing/edit/views.py index 7c6991d7..1feb2168 100644 --- a/osinaweb/billing/edit/views.py +++ b/osinaweb/billing/edit/views.py @@ -2,6 +2,7 @@ from django.shortcuts import render, get_object_or_404 from osinacore.models import * from billing.models import * from osinacore.decorators import * +from django.http import HttpResponse @@ -37,10 +38,18 @@ def edit_payment_modal(request): @staff_login_required -def update_order_status(request): - +def update_order_status(request, order_id): + order = get_object_or_404(Order, id=order_id) + if request.method == 'POST': + status = OrderStatus( + status = request.POST.get('status'), + order = order, + date = request.POST.get('date'), + ) + status.save() + return HttpResponse('') context = { - + 'order': order } return render(request, 'edit_templates/update-order-status-modal.html', context) \ No newline at end of file diff --git a/osinaweb/billing/templates/details_templates/order-details.html b/osinaweb/billing/templates/details_templates/order-details.html index 86175003..ea5710e0 100644 --- a/osinaweb/billing/templates/details_templates/order-details.html +++ b/osinaweb/billing/templates/details_templates/order-details.html @@ -31,6 +31,11 @@
+ + diff --git a/osinaweb/customercore/templates/user_profile_pages/user-settings.html b/osinaweb/customercore/templates/user_profile_pages/user-settings.html index 5bb372f7..e84f809e 100644 --- a/osinaweb/customercore/templates/user_profile_pages/user-settings.html +++ b/osinaweb/customercore/templates/user_profile_pages/user-settings.html @@ -6,7 +6,7 @@
- +
diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index 7ec2aab6c16b762663d62e2f01bd93803809a5e8..d89a70ca5ebe2c160734fc2c8c8e7eb7ee4386b3 100644 GIT binary patch delta 2102 zcmah~Yit`;7M?pZcKn=cC#EHv0B(~;rP(-l9=6A`&2F5RLz-9Xq}ybH#&&FHQfK1E zcI-GCxoN|OMFIjY9aX61^#k$vQLyL$f~p`S&}t-3!RW6lz7@TtprBF38%l%&2Ll23P**k=7qfwV z_2Rz#;P8~t(H))Lg;;rbM(AkYmF;i#d)>22Fqrhu^>oB@;UH@Bw{VCPnvlDRM^09h z+^ppGx&%(-Sx+jIkf)-Fggh6WXpK*Wi5FcyFYon;_> z-P4irjN(i2(RgotV8GwjnIH1Yp?p`or(?k5;f93NZ@alrzHu&)&dvlH1HsvbZZG#Qp8SWR953EGV2m_T z>ahqJvsp}f3XmrK*0Q5bCzdVaBsK~gjZKG5kF5fm0hZoU~b&K#jGQ0cychRjLS;=2Lh1S$#D|rmJlM*b`!qhzy3;Dr9O${CB(Z} z0f}yoL_3T+LcOP8uF?KoFxzdo=9dJ#0>6S^!q0Hck6>jj>8dFANh0%xGig_zFmHbU z8bt~M$1dMKZP9L@wq8h5v-z57WhL_;ynD9?9=J%kQe3+&UfqESUKv$ji z`5mzK6x2f+z(2zmU>5F#cR+QwjV_g(Yrkg1>UslVC#p$M&2j!nTAqypYk(6FV%eHH z15riPltVmsl|W$aS`Q*^=ilLbEA(@;o>2cZSoMKgb3}JQ>o{n0kR&{#)~0PQYWlQI zGXh#WvtXl1607N*f=zp;U~m14frMWXn71n!@&(A~@-zXA4Z8WV+kSeil6F#i%L6`C z`K+FNgFH$m@WodFwQVV++K*Ijw*RzXc%E}_TN+zGmhdqa4Bk5;>v4M`^sb2lvAtDb+_?pXf*aHaPB;VRRE^eVxu;+pR>+Yi?*j_dl44Et}w ztIBS1oWAQo&Lj2j?e5vnb@vLx;$1@m3h$qs9_fv7dlVtoF%lUX7!V`gIAYQ6zTpi_ zo+g%G-^o{(W?7=goQ~s#o0Oc5@Va(Zq}!$&-_&k5$E>dUL)(hPNGaAme6k9;`m2DChHplegnVLEJ?=~&_q*4 zkS{;xPaks7P8|N4z#{xsvkz8YgtuVbHRQ|c+dgl_yAUuxj`GeQM|m@Ws~^AVcxCWF zdPGX?n?BIxi70$L(Ka!1yrBmH?u(H;< np&tD2U^$oIMItZuJyweowHO<5B0*69^+nYt?GJA|^0)mD3KnJ? delta 1956 zcmah~d2HL(87HaBl0`k)R+nUP6U9r@#s*~`q9_RwYQ>gi%eoxdsg-uEDT$IOk&<;; z7P~+>x@HAh)QhkPL5H+k(PP+wHp0qn7&dPxc45F;v_PBwu_eJ4q{Yx}=zuJ32kgm4 z3KSSneEhw~hwr`b`+W!bPHiPlZ6!AMqWiu%I*smob#-(cHFi#pr_fgK>i8&%KHU57 z#LrRm+r6I=O%xsL(39WL2X<*R4BGjXd8GH&Bt?$l`YVY3isd5yXMDdb8 zjn5m0296p!m=E*y4z1qM<*T9?5u$-?^LTR6SK{lu)Z$a3y~!7ZJng^pwxe+H&8eKs zi;|-x)M=7-5+p@XoSpP|Y1+#;9juGyT-;};5MQ^C7<{ED7u}Ij|ro z#k`O_5ic#~o26jpAj3r!sUCKU%Pv}4sVpTGzYyk^-OOy1Ocnz1kQ|_D>&HojDf()> zB+7y$iJdFix`pvF(6`6oa*~XP={=ZxUW5$~Cc`F3bHuIno8wTZxqgiEX%+ z!)-GOz))HO+{6&1hall5m)FU9ophfOA)6p49QY8B06y?2sDqz?--27< z8h8x61TFv>JY{~OFZd<=Qiog%cc#{~y|1l3ZJ}E{KLiio-1Z_gWl<8WaQ!Zy{DNp@Gms=pghE z28aO&BZNscX9oW>Xhy-?2zVPL`_db_8V22m+Jh51- zDb9ltkWg$dgT;kXMl9t%%Q|T%U0#Os(hN2+Zqy;&ueJyGsvornhpf=aZ3Nr~f9(r& z@(vgt#T*7`=q`-V!^wh8=+xWK4(|FBY&0k7Wmwol9PRX++gCQL`^xx@HBC+bjB2=w zKZB|-UcoP( z8y;DyDV0=nqeV6ZCch>)8%mWIk?ZRD^Oh>E;n7~#@SG)q!TH2iY-p(L}H{ zs>!!nlGG@;g)Et>7797On(|Z_I1tdD@96>nWab~Udy!-T$@`;%MG4R#TseP>Y7lj)B}neLC*~?F zyO?af`xlGHg3Iw#D4v`R_~pz|F;XZVttq+rd}t{kY~*21w+ z+Dp}@bJUD?#g(hhDIAe*)rvC_CPpPZGaiZ!&`Yjb`aZeA9B1O}hQJc^Bek7ob`ca~ zr#|0^7woo+?Jvraz>s&mCW`BdKTyjtu>_w9F9fA!HaXv%3kuEYgcK+Ip=45!Bh#69 zWAXnxby7~|%vVmQVR4rI1+pP!C3W`!+ux%DDEI{aEzkwkyk`3Vn0P`e=d>Cl+IsDj zO>2i;@iFYf?XKvSpVsOuhg&%O5HS2QV!47}hKd*Q!_acS?92X2PH|U?g*?|%)^i-2 zU$3QQMwF>M$9R;KEOfE`wja;u;Kfr2G=g(ZsvgLD8o@N1;^Gy0F`yLY+?-O%RnvmFKXx$@?xp3VawKlgl?dg$hSs~$dJ!Cfg1fzXZK$p OjC@Ib{MR<+?*9Q*eqNsd diff --git a/osinaweb/osinacore/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/__pycache__/views.cpython-310.pyc index d7a366839d9a33cac5227bc0d44a97fcc3b1c10a..62c3c292602a2cc359338bb35e4cd7f9352c659e 100644 GIT binary patch delta 5075 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 NRibmjc5|jH|KDv2t^EK1 delta 4994 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 P+t?&=eDMxzj;H89A_S2v diff --git a/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/urls.cpython-310.pyc index cb26155a195a46cd96eba711cba6b1321883702a..3e2ef7e9a791cdcde885fe8fe17b0fa996166c5f 100644 GIT binary patch delta 42 xcmcaD@Lqs7pO=@50SFeKk4XEzk@qMgQg^bed#U+U)rN#Q2A2C+40RSL_4if+X delta 44 ycmaDaa9e;kpO=@50SH!~3rl;vk@qO0KonncX>mz@Zfa3+Nn%N9@#b%gm23b=91q?A diff --git a/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc b/osinaweb/osinacore/edit/__pycache__/views.cpython-310.pyc index 87487f1bab853abe6e0c025e9311ca967fb00efc..439d4f2f4166dc2c24856e6cb67b42f109451c72 100644 GIT binary patch delta 5169 zcmb_fYj9L&8Q!zE>}EHc-OVQ1Tz9icAWKNNl%YZ+6=@)Vq=BRrBh0$woP>q!rQeSMxE(s|HycIpZ8?hWnHE+ z3X><#`L6H#e9w2uGs!W#b3bvv8ekqE9#k8c2Z@K&M&=E~ zo786JA>!eJ+QJ`=^wFxeF>fN?u68hQCf=z=n1_i+)h^~O#A9kV^H$eHN-#NA`O08U7 zvquTaGc~6QE$G}zV7RhE)kI?7eARIJ&~6!^AFv#NiNqj*Vb|w#n&H^I^<%^1VkL?> za#nsRJ~@2189o=RM(JIadkNQot^j<9VA7S*4ku=_Gg(oY9n~6jnwruR`{wegjF!)D zkng(gRn{*A+*_1&93l%?VG?I@N>3fqCN{G@3}0SPPERLt*?dY*Wiuiu&(@wU2_f!A zC?5t?EJ+8-D#muF@(FWzGi5g55E`xnYyeP_i!QtejJ5EXT5!QeD)owwq7L2?L-Kjg zU@!NoCP6Jrz)2jCfAefnwk&M)&MS>^^yU0n3ATAqzEgL+2?`s&sW~CEjGma9P0=s0 zLneJ|AG{BpZkoW%eH+TylNiJBjEU?4ZAzb@HLjEdGZ{6sJ!eyS-EdB)W_8-6+vT5q z&4p16b3b4VP;$gpe6k9DQw1*Ah0<}r1b|)f0N4(K$$GeAYA&y5(`3?=%DZ^dhthO1 zlbkUN5&5Jit)=&ALY}OT#j5G&W&LtyQqRga>bEOVk&)GaDDt|#@meA%Y1rh%hEgGt|FXbDFOg z>4jehPbsY>qq4NDC0jNqkA*rFzkE8>=`@WauZPy#VG0=uH_2dQv#D~0VcEnLo0W%d zpq_?(IG36doD0vAqC#;1a1g*NI}4TuR5R>;RIp)vO=jL)l0|V2FfOk*wzND1dQ%aj zMx%LQ)dTXq#!wGWQEe^Vyq0=0fAF8OuW490Br{EOtuq)5`k4Xtf?>j=aW>pgbH{Fh zvWm1h8@8DXwH&mwGG;U~Ttds|vKhKRD}$1ko7m!kKP#DObPklr;rVB57=#9n>a?sY?l|pJ3K)|$LaOS8{r2E6>0E7m39lK zVOq|pQ?*=D=xH2fB<=|eRAxR*U(bq`+Ko~Wf5oH0Ypb>LjcD~-#iLYEyx`^AEsyy* zCZ3rCJ0aE9k;22&D(*8k%EyU|0-(Zx)uQLXDpFV!u(-oV<&1pOt42c(T_Mu5O*y;LCO>QT-)d^2@Rw5|DMpKpKqh$jf#|> zz{u57YHZ-e;SM+N;8~e&Z&6Oe9U*ZX(ckib>XTR7#|mpPWHqHLL^gdgSzml46jgo_ z{VSXjb{=8jckH@rfd*66aHVtZh;%D{ab_|0ZdVw>UZL2o{*Prle$tDL#Ln!oQ{H&!j8 zs=-V;_2dke^lX(dTpR{9I4^UNMnx_>7V#+bwERMJsd7$Ui>?YFOL`xs=-S?h0kZP% z(Y}FsqVYykARJ?cV=SAZM~Qhd;o?OP!sa(_muvh5*i_$N{mBZXfk?Z+bKZgo`@yVnn z2RJ$pPHJjQx2~YKz`pq+jVrzc_%h%t zfTscH0nY%Q1!MrY1LC2QO5y@a`H25I*f#*YXx{|mLkSXz=K&B%d*#NEoujJ*gmbHwRWse!EC12r;`VZIyuga1B z(RC#Wsu_a)5GwP-R8fR>`A+{m%9{(G<)2g{d>XutxY!Rr1T)nEyDlFYSY9YeRPx82 z?h%Z3TYtQP+S|%hsCG`&eUL;L^2dOm0DcPi8K9(EY4fmFoz=8T&?ze~4LX%!d1dhK znzv|#(RfV0Ke(pXqaH|RX0n6(bv?)DxKS*j6F6@k?=C4;tSt0k-X(zbfGvPMfCOL~ za0qY&a18J$;Bmldz*B%T010>*a2aq7@EYJv0KzLf6F9+cOF!$TAo7Fa8ZSyLD Y%Mwz&{NJTmZMBNEn|}Oqbmi#30ooNmDF6Tf delta 5110 zcmbtYeQZntz~UCsV&{KO_Mgdwf{|%-c)J(quR7h`+HRCwDUX9iGyo2 z*n;?R-nsXk`#ZmL?z=bqHU4rukg2JucF>RY#|P%$pL#CPA&xvZyd&>jtd3R-hvv}S zsj5X^)W^0+`R5#ZjaH?3&NW}1-QrDJ$A_km!A9Sr)&`rygGju8a^ek%t0gQOyOve{> z%VoqL)nzS4>HzhCAixDcfn)_iq{^zo61rj9&L)gB6GVfFoMC1bbx9oNb*ZNldXPg{ zRf$a6)E_f1Ib@$Y;aU>a>SNdV)&Y7eAqZA}oMd3RyXmh18cE0F!gQQ=XyUXuTS2Kh zr%#Qld_{-)xH8y%N!XN}vWMo%UO?X}^s7mCckL)W8;I$u@Vn&T@)`GjA$;n?s)s~_ z8upxvwBdzz0?U(;8j(M`BwOI?06;(435ckVJk5DIMz-ZLm$JH5xp(T`iCH<0(J+9O zS`Ukr^4hf6aT~mw0iOeG1Z*RSdeZvI7*#Iw8TvG8)#zH%j2+Dx$+T`5+Z-zG-6?Kg ze%-rIY>OZU^D8N;JDxC;kLq)KxtvzOFyr&{v24ajn#oLBHmDKb)A`l3<>wJ+C!i$b zF8E4fdy_`Y4sWN-4RZ%3ZU@{6*acuMcEDmSe6|+s*iBx)M2+Phz#VG0e{^6M%+eB) z&#Gn(I0;?7;NK@Emp}3^iO>*U;QUz$?!yLkB5=A15?g^pPErq=u|z6K|Hx_eX<$o! z0xy;1z8^j=IbvA88JRh*C(Jpjaj7I&$*Q95lu8<=<(^NbOxjfU!dqd`Ci7?QcVlP} zc^?AL0KNbSI~+#~!rX&r7N*V?h8?r;&H?TRaHl)~YnmWhi%wbHVo6PcZ8QMyVmuvR zpw=ble$`kv(pyePKkHZ^cu^(l_KSzr<+`(58n6TliA`_0w7989DkQVv&%j|!I0%>m zVBpk<`deFvI#=Ji=Rx?;I#x|Vxmh!A=8QFaCyXiF5yiwS*Cww1T;DiWj&$o<(lKfR z3LIO^Xz|qVRe!KY98v%1>{N;1(LAzeZG|m)q_d6%B27 zp&``ymL~N^s5#GKm-H|9bjjZ3(2ew_<(kMQ6Owb|RgPn+6Mz(e3%m#`4Y;mb3pGn( zfSWatw-aYi7Vbv?U>I#MNV9~gYq6C*K;0-YyegAbr4tu)Db}|Fal=S1P!(ck22N&C zt_i%{1ZLbgA+D)kHBE?dkn!@NF;GesmhHat1dKe$r~6cQG^o>W55gGeB7n! zV3OsLx{=MK>0~TNrfHSTb?rDr=a>P({myDN)e;m->Y}0KMDB1h)3)AoLV_+LH%h2Ek`}nz-sdgtEcmV`cp@%cn0Ne zl#kP^k*WfFRy?AHI%o1*5we`3VGI<-v6pOZ=GvE^e;SnBZol~B_v5e8~ZS&=Lm8BGQoACvZc^-sI$at6xO?VMB za9v^=D;zE?U+eY>x@%VU42qZ3NY8jZa;Ga~l5Wbo5iqMVJ?rzQ$c%(+*$m96oXI5V z-eP}}a3OjQQXgr0eHhk zVSOKfwB@S+#t4pm;L?jtEhRu z`bF=6D^MZdQrEgW)uw^B`ow$7n<7ck$(8rsomtG{25A@Ha!BeEYJ2te(DpsW)QjbB`yWyl@2LBRTW4<~ z_mU>4wQoH)Y6AJLx-vYyv#3D1+OrmoYqUtLWZX>Wgt1ADj*WTT&VbV+S`{X6#p$V|`+mii~Zo`jBQ#NBY&m*yek>wBzygLS_{IDs3*r=u_GBR#v zq#@lj*YXu69W%|W{R_y7Cnr;e<54QTPjgJi=K~ OEu4Myw_07?IQ<`hqf;mV diff --git a/osinaweb/osinacore/edit/urls.py b/osinaweb/osinacore/edit/urls.py index a622f9cf..5ea68a94 100644 --- a/osinaweb/osinacore/edit/urls.py +++ b/osinaweb/osinacore/edit/urls.py @@ -5,7 +5,7 @@ from . import views urlpatterns = [ path('customer//', views.edit_customer, name='editcustomer'), - path('customerstatus', views.edit_customer_status_modal, name='editcustomerstatusmodal'), + path('customer//status/', views.edit_customer_status_modal, name='editcustomerstatusmodal'), path('business//', views.edit_business, name='editbusiness'), path('staff//', views.edit_staff, name='editstaff'), path('project//', views.edit_project, name='editproject'), diff --git a/osinaweb/osinacore/edit/views.py b/osinaweb/osinacore/edit/views.py index 47fee5f8..dd3b4515 100644 --- a/osinaweb/osinacore/edit/views.py +++ b/osinaweb/osinacore/edit/views.py @@ -1,6 +1,5 @@ from osinacore.models import * from django.shortcuts import render, redirect, get_object_or_404 -from django.contrib.auth.decorators import login_required from django.http import HttpResponseRedirect from django.urls import reverse from django.http import HttpResponse @@ -44,9 +43,15 @@ def edit_customer(request, customer_id): return render(request, 'edit_templates/edit-customer.html', context) @staff_login_required -def edit_customer_status_modal(request): +def edit_customer_status_modal(request, customer_id): + customer = get_object_or_404(CustomerProfile, id=customer_id) + if request.method == 'POST': + customer.status = request.POST.get('status') + customer.save() + return HttpResponse('') context = { + 'customer': customer, } diff --git a/osinaweb/osinacore/templates/details_templates/customer-details.html b/osinaweb/osinacore/templates/details_templates/customer-details.html index b501de57..32c26478 100644 --- a/osinaweb/osinacore/templates/details_templates/customer-details.html +++ b/osinaweb/osinacore/templates/details_templates/customer-details.html @@ -28,7 +28,7 @@
diff --git a/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html b/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html index 53a4265b..eb570a13 100644 --- a/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html +++ b/osinaweb/osinacore/templates/edit_templates/edit-customer-status-modal.html @@ -14,7 +14,7 @@ - + {% csrf_token %}

Update Customer Status

@@ -26,6 +26,7 @@ +
diff --git a/osinaweb/osinacore/templates/email_templates/account_activation_email.html b/osinaweb/osinacore/templates/email_templates/account_activation_email.html index ea0a95a2..d05a5752 100644 --- a/osinaweb/osinacore/templates/email_templates/account_activation_email.html +++ b/osinaweb/osinacore/templates/email_templates/account_activation_email.html @@ -46,7 +46,7 @@

Activate your account at Ositcom

Hello {{ user.first_name }},

Thank you for signing up! To help us confirm your identity, please click the button below to activate your account and verify your email address:

-

Activate Account

+

Activate Account

If you didn't request this, you can safely ignore this email.

Regards,
The Ositcom Team

diff --git a/osinaweb/osinacore/templates/listing_pages/customers.html b/osinaweb/osinacore/templates/listing_pages/customers.html index 8f5062de..57113d3b 100644 --- a/osinaweb/osinacore/templates/listing_pages/customers.html +++ b/osinaweb/osinacore/templates/listing_pages/customers.html @@ -69,8 +69,8 @@

{{customer.user.username}}

- +

{{customer.status}}

diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index f05f59f9..4a9d6ce6 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -100,12 +100,14 @@ def signup(request): token = default_token_generator.make_token(user) current_site = get_current_site(request) + uid = urlsafe_base64_encode(force_bytes(user.pk)) #Encode the user id + token = token + activate_link = f"https://{current_site.domain}/activate/{uid}/{token}/" mail_subject = 'Activate your account' message = render_to_string('email_templates/account_activation_email.html', { 'user': user, - 'domain': current_site.domain, - 'uid': urlsafe_base64_encode(force_bytes(user.pk)), #Encode the user id - 'token': token, + 'activate_link': activate_link, + }) send_mail(mail_subject, message, settings.EMAIL_HOST_USER, [user.email], html_message=message) @@ -874,13 +876,14 @@ def forgot_password(request): current_site = get_current_site(request) uid = urlsafe_base64_encode(force_bytes(user.pk)) - reset_link = f"{current_site}/reset-password/{uid}/{token}/" + reset_link = f"https://{current_site.domain}/reset-password/{uid}/{token}/" mail_subject = 'Reset your password' message = render_to_string('email_templates/forgot_password_email.html', { 'user': user, 'reset_link': reset_link, }) + print(reset_link) send_mail(mail_subject, message, settings.EMAIL_HOST_USER, [user.email], html_message=message) return render(request, 'forgot-password-sent.html') else: diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index c49b68cd..04c348b8 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -78,7 +78,7 @@ function initializeModalButtons() { addButtonClickListener("editPaymentButton", "500px", "400px"); addButtonClickListener("addPaymentMethodButton", "500px", "400px"); - addButtonClickListener("updateOrderStatusButton", "400px", "160px"); + addButtonClickListener("updateOrderStatusButton", "400px", "240px"); addButtonClickListener("editProjectStatusButton", "400px", "220px"); addButtonClickListener("editCustomerStatusButton", "400px", "160px"); addButtonClickListener("addProjectMemberModal", "400px", "280px");