From d007ab0997119ee93342b8955be932fbb2cf6c9c Mon Sep 17 00:00:00 2001
From: Yamozha <yyamozha@gmail.com>
Date: Mon, 15 Mar 2021 23:59:19 +0200
Subject: [PATCH] added groups will add a small file containing useful commands
 for adding users in it

---
 reValuate/db.sqlite3                          | Bin 159744 -> 159744 bytes
 .../home/__pycache__/views.cpython-38.pyc     | Bin 1048 -> 1210 bytes
 reValuate/home/views.py                       |  11 +-
 reValuate/templates/adminView.html            |   6 -
 reValuate/templates/home.html                 |  11 +-
 reValuate/templates/removeBalance.html        |  18 +--
 .../users/__pycache__/views.cpython-38.pyc    | Bin 3156 -> 3394 bytes
 reValuate/users/views.py                      | 106 ++++++++++--------
 8 files changed, 82 insertions(+), 70 deletions(-)

diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3
index 3c29c38de58585815562f78ad84f2fcc569081e4..1f439944d605114ce7dfbc8f2f43e9190586f8d5 100644
GIT binary patch
delta 454
zcmYjMJ4*vW5Z<}n<g%B<N$>%ZKyDimMYIvr!Ut+07DjtXqMUl7CfphjY+|XEl0vW+
z!7?6bVWB@Eh?N$mN>EWmMZpKSBq9z>Gv9o#T#4sOd^-X&JJDg7DJ1t}O+K6eyv0jA
zMGLoZ4-atyCkq?hINs1kJ0O)^T}Wi5<s{~vbT%Vdy_dGvt{KZ&wxzVwD}oRbQu{Y`
zK`LrbRhH)NbuOAz1lRI<ya(3Y{&-I?9AY3qw`F2BB^PYV5$@*n`jijwgWw0gxZ%tl
z8oJVCzzF9@=PX184&?P>9}KvI#qT<=hXUv#KYDZK)38kN8Ow@xg%LxeBr;sn4FDyv
zxRai>q)a=83nkj6Ts{eY;;S3Z-D6|bg>lXeWe500@C)A+^oU*$p_KFEL0}<8sv>U+
zc|hGuYETkbh6;alS1-bl=8qOOE{xU|;UOS;|J56lX3BJ|)RMVm&spYg>64LbIA<z-
ag<z#x`Wl=4Gy=cjwE&Irzwif7koy5Y;(z=A

delta 230
zcmZp8z}fJCbAmKu<U|=~#>kBcOXS7a`BNGBU-Dn!-_4)O-_1XZe<gngf8fSOD}Fak
z1~eed#;nblSXz=1Uyxdqn^|0(nV+WsR3nI@j+d8NkprwMy(qu5VDl{fECpr--p<MF
z0T!Db1I&3RP7vPQ8CxB+on-^#ANffaSeO;~T_>|&uwoDA59Igeciq_dmv6G`{r!ts
zJ{W9f`S3@7n*$?@z+#pLf#oa-j0MaJ+%D7EFEBc8Z2ZHu-Q_mp0haA70*p)o+u1%a
H{;CH6o-{)*

diff --git a/reValuate/home/__pycache__/views.cpython-38.pyc b/reValuate/home/__pycache__/views.cpython-38.pyc
index 865928869308b9c203c467c03622dc000ca62a42..6efcb6820dd536495189c35f6430b642dab9872b 100644
GIT binary patch
delta 602
zcmY*VPixdb6n}3fnIw}xyRH>%DYEvq_kvIq!K#P{SJ-Ong5b6jYNGDyB!ZNg_OR!Q
z5-36y67lL6@Zi@F_7iyYCiJ3{O{qAK_jtcQ@9~%q?l&)b5QZGg+xXFcQrhpMw+Ep?
zHMMRsTSEYW8h1exK{PdK?fuLl#gr&WX=(|2h}u?mX$z}D&4fMY*)a$<@0`-Dz#ymb
zo6c2C;35cX(eR&K-6&p4geUmHA(p%Xsf4fTcxgUVOM&30%8^m5G1Nzteg)c9?oD{y
z)}A6|pu9A!5aHFAJW}Ksrl!wZX*)ls$P_Pv=87syIf^&Tzf(l`k!e4F*ij%N<xlA*
z48Vf?{4@Rz<tl;>5cZZuO9crU<C%}aCOm@AWB|f=_Jb{h#$?N&0rcAUr1?U)U3|qm
zS7y%oD0`a3vWGKkJbDpt%)I+@vJ+?7ME2OwOR`hL&`+{6rTC54m~Xc97K$};tHpNZ
z<n_yJ#^N_gmS@F2xsGA+ophI_V_ecRW$0~>p7*!Ycqf-ZP4eOw>0!56qIYjxH3Xp5
y1R>Z#j;pwUtWL^_i;-a>qcp*gpD-TL4kbYTSX8bQN3?%orQX~9zg#X(=%v3?Cx~AF

delta 440
zcmY+Ay-Nc@5XEO^H+Op*bH<2ZFcI5;l~~wl;|F44iXcWo@MA?iMe)2U>>4n&f@~v1
zF=uTdmi`C+H)3TW=*AT4zzpyAc)Vg>f*TR8<Z=?+yxvzg>-;*rYGxgEty#BcAMPkL
zxCe$BPYFaAk%ovxT+t;OrdcPWSc--#{^NUXP?;a)cSH(~yk6cZUvq^;P^{?uJ7F^2
zzD|&W@w7Jw8+qevYIdadqil)@r~65trZ%*kPI6J0^lNJ2Fc_gTTJ-3*Qi)q`f+Vj&
z1v+T4Rj2`nWZ+Q7?+8XBG)hWpd4PXY9<0I|JWvgk%bd&lpu=OTJFGz^yBwqYfPKS7
zs&IQk)1Gi#DcEP4w?3P}tX*JZh4o;2>!`XN?d~LT-~zF4FIWXf>?2#67<UFBN6rWf
pC~*=c2@IVIiIC7k`RR#}<rx8eaTb^D6t51IyFDZSPs!f$(QoZoS+)QG

diff --git a/reValuate/home/views.py b/reValuate/home/views.py
index ff809b83..18728401 100644
--- a/reValuate/home/views.py
+++ b/reValuate/home/views.py
@@ -7,12 +7,19 @@ from django.conf import settings
 def homePage(request):
     iter_var = 0
     all_balance = []
-    
+    Cashier = False
+    Processor = False
 
     try:
         balObject = Balance.objects.filter(user=request.user.id)
         userBalance = balObject.values("balanceValue")
         userQR = f"Name = {request.user.username}, Date Joined = {request.user.date_joined.date()}, ID = {request.user.id}, Balance = {userBalance[0]['balanceValue']}"
+        if request.user.groups.filter(name='Cashier').exists():
+            Cashier = True
+        elif request.user.groups.filter(name='Processor').exists():
+            Processor = True
+        else:
+            pass
         a = Balance.objects.all()
 
         for user in a:
@@ -20,6 +27,8 @@ def homePage(request):
         print(f"{all_balance}")
         limited_coins = settings.ALL_COINS - sum(all_balance)
         context = {
+            "isCashier": Cashier,
+            "isProcessor": Processor,
             "userQR":userQR,
             "fullbalance": limited_coins,
             "currencyTotal": sum(all_balance),
diff --git a/reValuate/templates/adminView.html b/reValuate/templates/adminView.html
index 514385c3..f146ae04 100644
--- a/reValuate/templates/adminView.html
+++ b/reValuate/templates/adminView.html
@@ -42,7 +42,6 @@
 
 {% block content %}
 <div class="centered">
-{% if request.user.is_superuser %}
 
     {% if image %}
       <form method="post">
@@ -83,12 +82,7 @@
     </div>
 
 
-{% else %}
 
-  <h1>Unauthorized</h1>
-	</div>
-
-{% endif %}
 {% endblock %}
 
 
diff --git a/reValuate/templates/home.html b/reValuate/templates/home.html
index e1a7a36b..a0a90e67 100644
--- a/reValuate/templates/home.html
+++ b/reValuate/templates/home.html
@@ -34,13 +34,18 @@
 {% endif %}
 
                        </li>
+					   
+					   {% if isProcessor %}
 					   <li class="nav-item d-none d-md-block" >
-      
-						{% if user.is_superuser %}
 											  <a class="nav-link" href="/admin/">Админ</a>
+							</li>
 						{% endif %}
 						
-											   </li>
+						{% if isCashier %}
+						<li class="nav-item d-none d-md-block">
+							<a class="nav-link" href="/remove_balance/">Каса</a>
+						</li>
+						{% endif %}
      
                   </ul>
                   <ul class="navbar-nav ml-auto" style="right: 0; left: auto;">
diff --git a/reValuate/templates/removeBalance.html b/reValuate/templates/removeBalance.html
index 7c93d69d..f10159d1 100644
--- a/reValuate/templates/removeBalance.html
+++ b/reValuate/templates/removeBalance.html
@@ -4,26 +4,20 @@
 
 
 {% block content %}
-<div class="centered">
+<div class="centered" style="text-align: center;">
 
-{% if request.user.is_superuser %}
 
 	
-	<p>Hello, {{ user.username }} !</p>
+	<p>Hello, {{ user.username }} !</p><br>
 		
 		<form method="post" enctype="multipart/form-data">
 			{% csrf_token %}
-			<input name="user_instance" id="user_instance" placeholder="Pencho Slaveikov"><br>
-			<input name="tokens" id="tokens" placeholder="523...">
-			<button type="submit">Upload</button>
+			<input name="user_instance" id="user_instance" placeholder="Enter userID here"><br><br>
+
+			<input name="tokens" id="tokens" placeholder="Enter number of tokens to remove"><br><br>
+			<button type="submit" class="Buttons">Upload</button>
 		</form>
 		
 		
 	
-{% else %}
-
-		<h1>Unauthorized</h1>
-		</div>
-
-{% endif %}
 {% endblock %}
diff --git a/reValuate/users/__pycache__/views.cpython-38.pyc b/reValuate/users/__pycache__/views.cpython-38.pyc
index d736ad73150bbd70a4fd1ababb522840a8af433e..91dcb821e7e53bbca6ef21fe89fea00027fb0bd5 100644
GIT binary patch
delta 1843
zcmZuyOK)366rP#;@O{~FZO3*((-PiJLj{z!pgyRYB3Pvnr7sI8u4kHDKdZUdrHaNf
z!d<W_YIP+fP#1~B2DV775Q|FepsOs9*KGPL;GFSQ`cQ1$Z_b%B=P@(ixp$}fa6Wf2
zoAn6%sypYuJW{-$+fRSFf2e(q6Yg~i-D15+$w!3yJh(%6AgoqtY}99Ymgnw}dYRAg
zJd72-j~8I9@**$6ILBu%kXrfvqi;(!I?1mI*$ty8?Dx)zUMP5SiT-JqA*U=Si|o{F
z4#X@xkqzKblR8x9evQ}<lvb0hxt|_LmdxX4=D<4f29c20*27z(C+Bg(j|Saq*BhNi
zuPNj-C``)=+JXk>pZ3pAjfG^}JVck1zs-fwBd{vcA}!itoN{)TZW-G|KICLbVcz6M
zo5|lmvbZ@%hAg%f8&htTK-RN1%o>~T#hI4Va+Sd|cj?enX3JBoLWWkHQI;~fbC*Fp
zy5(;ZO5#A#F{R`(>5Z050<PJ%Cx4<~0%Jxo2=k1?RnlWuNSsrIyWCSWq+{d4RQJd1
z0_i#N3=hWi8_EeBcXqX&S!qNYp^!h*iP>v(g{<OH;JH2i4}SW<<O_rtL@p%1TSrHe
z;9{>ah&TE&+!VZ)m;3S9>~+~6+>9pnjj$67IkCm<Fp49&h|zS&mr%mnk}o5?f^Y!g
zRfN|NUPs6v;MLY_`34Mi8*b_o(bYA{rQ>METa<?op1ZxQ6y5$UkzQX7Rz#SH&{8t6
z51Ij!$CB^u&quJKH2Yg9y$w)vpQ`R%oYfm+A=kxC3?9O^ZZ$ds5$PgphOTeoLVf42
zw?s46ah@;9TNiO!&j%1SasWI+3pAjfDNiJ$%);njx)-<ZQTfk3y7?eBTNZGRa03{F
z+_1U14a}M&$TY3nsSX^|dM4E~sqUn@lj?4&yL04*_1VZ8(jglfLlbET$sEPF2gz(8
zuFL&4gHnD3+2a8u&1(HLP}xt{=3s4x&!|i*04h7NuN;-(d7!eZ+^wvpa!$D^m6w6Z
zeru-fLDUj5c?4wk!JR$pl9CyB?<fk^eGt&&1?64KD=!VZj~B=EGLU(<ypk^OJAG<T
z`^};sF9AY?)Vm0cQdT2V8JIxX%Hov=_SnFHF&e95wkwy_p6g&YCB2uOv@dngF|)~4
zh;jvcZkEsO_T2nx-CdLYrih}xly4&Q=IO+Z`)zp9K}Suju-jM{5-36B!Q^ZAMR=oa
zyQK<p_OXSt3+Tk;sp*Qp+$A5GB~K%qN~l-fI0NFuZSZc`yA+DA<U63(%9_#g2rknE
zKZ;U-pj+~Nl<>tqZO$jHtGjluUOkz#y~WYATm5ObW;=~oMDbeKj0aN46%3~f(<Pok
z^&G;J7RD~EJ9^X5M$fg6{1B`k!xLc;!ph8~Ir;_7v4G|&1KD$+lkh1dfq&2|FzvEh
zn@^7Te~ik!)#$DF4>$W#92U2m;${rrlt`C6@m8dOYV`@>2SqL;978yPfVrQlN55<I
iN5VPT?ejrLoW@Iva4P{6fd5iD24=x>DvnWh-2VY;xQ`70

delta 1655
zcmZ`(TW?!M5Z>K$KeiLcvE!s9G~5bK)D{U!!=>fY2UH$Xgi9|LD7cwzIKBm~PmC0;
zv4s1;OQeMJ0tlhDzW|9>grE}tfEUg`=mW1jAfz(0K59w?KJvFSJ3F(pv-9n}W53N$
zy<aGV41e{nE`4-y=3r`(e|NCjUVEEC2)SDfa?)v)##Un%@=&<N8fBP*X&ft1gc%&?
zpaioxR-s&HwaP*IMKa*Ox)ltmD#@GTT%~|w4*z`@!RI#jxhnjSh_5-XCMWGhzLdOU
zpM7H<t!cQ^muh1x8pxhnpov_6r@L{Z*=hDRrJ4lAX*EZ-d=udE_FEHUG5N(_<*Ugb
z_R{6=(F$zHHES{8ZK3X>#6c{up@@YRV-8jsWixBzthKuqTP?fgXbYS@KD4#na<!<k
zp%Yu$(KfhWTIJDI)?2X|t_<3t+UJZuv<vid_XO_8Z+mxe?mFv<Yb*{m0}p)7BR;n3
z6FnG<I_8F@3fEPYjzZ_Y{{VmH!0H&yEh79iy(Q!9aHl?wyPY&yc9%!BoLZ(O#`g)5
zsI2Nqf~N?U2%aW*hTsH&hfs6Xvp6(dtmb>NYxY$&vQnYd3c-;A7nJO74`h}EdH0=V
zM3(&N9vA9#vfzC<G6|baPohPgLZ}6YNu}=1s1r-29z#PaA~0#C7DOs_2hGlo>`&6O
zOnPa6>0P?flAEy!bu^{$uqdx!z`jr2#dwM5d1$LM$pdd`bdNK(&v(Cx@zPrYum$i+
z>2fR(ckt>L7`1}Y?M%leFuIfJPNut=?q<4|>D~gn>3rY}`A`h4p^a@~<6e#y;O~w2
z(8bPjA!v(zu0BWEgAg~(8T|zInx8GsV`3f@wATu-*ZkPmzV=`WdnwSt?T~sY&go#x
zIm>#_Z{@M~{?2;OM_=*p_1D?RG#{Pa(Hzaw7%qgO4mS!q%z{qA%$Q%rHhh>|$s{*0
zHG9-=mi(ZEIQ`JOh>cy=wzep~cC`bQZ{4v)@#3N$F_;^RO!?o1$fKEdi1qm~JBtZA
z7A~@<&aO>3QeCg{G>Es`vKQ@2NS&zL+>#3Km#N1QQX87FOzk-8%G8hg8-obsi`(cV
zK4}|@G`y&PrP+y~;h4ej>%Kz)h-5XP&YED!XW`1|WfIp2Xfk!_F}et;Ph+pym5N#}
z4Vuu6dRHR(X|1I4wAzsGd6Hfrp!amb#buHVQw>S~i<&Rd5+5OTlUH-qE#$YMX`zEB
z>&Nd#oAHj4>KrXIshK1x5p|y6ki5^K+VD+<kU&R>qh3er1^oBPmGR`~+&nKPzvqto
z#<X6WPelHw&G3SfxG|kh5w+AR!D)gs1Qh0x(B{D~kFoz+cN=y(@;qHmpB}Y5a+1FC
NWVA|-U-f7G;2)IvXBq$i

diff --git a/reValuate/users/views.py b/reValuate/users/views.py
index de61c19a..2bf762ce 100644
--- a/reValuate/users/views.py
+++ b/reValuate/users/views.py
@@ -6,6 +6,8 @@ from django.shortcuts import render, redirect, get_object_or_404
 from django.contrib.auth.models import User
 from django.contrib import messages
 from upload.models import Media
+from django.core.exceptions import PermissionDenied
+
 
 # need to make oauth facebook login
 class SignUpView(generic.CreateView):
@@ -37,23 +39,26 @@ def addToBalance(request):
         return render(request,"addBalance.html")
 
 def removeBalance(request):
-    balRem = None
-    if request.method == "POST":
-        tokens = request.POST["tokens"]
-        tokens = int(tokens) * -1
-        user_given = request.POST["user_instance"]
-        try:
-            user_instance = Balance.objects.get(user=user_given)
-            sum_balance = user_instance.balanceValue + tokens
-            balRem = Balance(balanceValue=sum_balance, user_id=user_instance)
-            balRem.save()
-            print(balRem)
-        except Balance.DoesNotExist:
-            balRem = Balance(balanceValue=tokens, user_id=user_given)
-            balRem.save()
-        return render(request,"getBalance.html", {"userBalance":balRem})
+    if request.user.groups.filter(name='Cashier').exists():
+        balRem = None
+        if request.method == "POST":
+            tokens = request.POST["tokens"]
+            tokens = int(tokens) * -1
+            user_given = request.POST["user_instance"]
+            try:
+                user_instance = Balance.objects.get(user=user_given)
+                sum_balance = user_instance.balanceValue + tokens
+                balRem = Balance(balanceValue=sum_balance, user_id=user_instance)
+                balRem.save()
+                print(balRem)
+            except Balance.DoesNotExist:
+                balRem = Balance(balanceValue=tokens, user_id=user_given)
+                balRem.save()
+            return render(request,"getBalance.html", {"userBalance":balRem})
+        else:
+            return render(request,"removeBalance.html")
     else:
-        return render(request,"removeBalance.html")
+        raise PermissionDenied("Unauthorized")
 
 def getBalance(request):
     balObject = Balance.objects.filter(user=request.user.id)
@@ -65,38 +70,43 @@ def getBalance(request):
     return render(request,"getBalance.html", {"userBalance":userBalance} )
     
 def adminView(request):
-    try:
-        latestPicture = Media.objects.filter(tokenized=None)
-        latestPicture, userId, date, time, is_video = latestPicture.values("image")[0]["image"], latestPicture.values("user_id")[0]["user_id"], latestPicture.values("date")[0]["date"], latestPicture.values("time")[0]["time"], latestPicture.values("is_video")[0]["is_video"]
-        username = User.objects.get(pk=userId)
+    
+    if request.user.groups.filter(name='Processor').exists():
 
-        if request.method == "POST":
-            if request.POST['isValid'] == "Valid":
-                try:
-                    user_instance = Balance.objects.get(user=userId)
-                    sum_balance = 5 + user_instance.balanceValue
-                    balAdd = Balance(balanceValue=sum_balance, user_id=user_instance)
-                    balAdd.save()
-                    print(balAdd)
-                except Balance.DoesNotExist:
-                    balAdd = Balance(balanceValue=5, user_id=userId)
-                    balAdd.save()
+        try:
+            latestPicture = Media.objects.filter(tokenized=None)
+            latestPicture, userId, date, time, is_video = latestPicture.values("image")[0]["image"], latestPicture.values("user_id")[0]["user_id"], latestPicture.values("date")[0]["date"], latestPicture.values("time")[0]["time"], latestPicture.values("is_video")[0]["is_video"]
+            username = User.objects.get(pk=userId)
+
+            if request.method == "POST":
+                if request.POST['isValid'] == "Valid":
+                    try:
+                        user_instance = Balance.objects.get(user=userId)
+                        sum_balance = 5 + user_instance.balanceValue
+                        balAdd = Balance(balanceValue=sum_balance, user_id=user_instance)
+                        balAdd.save()
+                        print(balAdd)
+                    except Balance.DoesNotExist:
+                        balAdd = Balance(balanceValue=5, user_id=userId)
+                        balAdd.save()
+                    
+                    imageObj = Media.objects.get(image=latestPicture, user_id=userId)
+                    imageObj.tokenized = True
+                    imageObj.save()
+
+                    return redirect("/admin/")
+                elif request.POST['isValid'] == "Invalid":
+                    imageObj = Media.objects.get(image=latestPicture, user_id=userId)
+                    imageObj.tokenized=False
+                    imageObj.reason="Invalid"
+                    imageObj.save()
+                    return render(request, "adminView.html", {"time":time, "date":date,"image":latestPicture, "userId":userId, "username":username, "is_video":is_video})
                 
-                imageObj = Media.objects.get(image=latestPicture, user_id=userId)
-                imageObj.tokenized = True
-                imageObj.save()
 
-                return redirect("/admin/")
-            elif request.POST['isValid'] == "Invalid":
-                imageObj = Media.objects.get(image=latestPicture, user_id=userId)
-                imageObj.tokenized=False
-                imageObj.reason="Invalid"
-                imageObj.save()
-                return render(request, "adminView.html", {"time":time, "date":date,"image":latestPicture, "userId":userId, "username":username, "is_video":is_video})
-            
-
-            else:
-                return render(request, "adminView")
-        return render(request, "adminView.html", {"time":time, "date":date,"image":latestPicture, "userId":userId, "username":username, "is_video":is_video})   
-    except IndexError:
-        return render(request, "adminView.html")   
+                else:
+                    return render(request, "adminView")
+            return render(request, "adminView.html", {"time":time, "date":date,"image":latestPicture, "userId":userId, "username":username, "is_video":is_video})   
+        except IndexError:
+            return render(request, "adminView.html")   
+    else:
+        raise PermissionDenied("Unauthorized")
\ No newline at end of file