From ee90ac6b1effe49a6822211f3119b9c4ea282cd3 Mon Sep 17 00:00:00 2001
From: Milad Barooni <milad.barooni99@gmail.com>
Date: Thu, 23 Jan 2020 20:16:35 +0330
Subject: [PATCH] Waiting for history

---
 Main.py                             |   3 ++-
 __pycache__/snapFood.cpython-37.pyc | Bin 14289 -> 14554 bytes
 snapFood.py                         |   7 -------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Main.py b/Main.py
index f0ee8ad..fa167df 100644
--- a/Main.py
+++ b/Main.py
@@ -412,7 +412,8 @@ def make_address_str(address_id):
     
     def orderPage(self):
         def showHistoryOfOrders():
-            print ("show history")
+            history_of_orders = mydb.showBuyHistory(self.user_id)
+            print (history_of_orders)
         def finilizeCart(discount_code):
             print (self.address_id)
             mydb.finalizeCart(self.user_id, self.address_id, discount_code.get())
diff --git a/__pycache__/snapFood.cpython-37.pyc b/__pycache__/snapFood.cpython-37.pyc
index 49cc09ca01edc23485dc97189dd66bacc3e09bc6..8b9287e834965542a17ac489fc50c7fa032bc40c 100644
GIT binary patch
delta 1577
zcmai!|4&<06u{r<Hy)2d`PQ}N+a3khK7=whzE1|FEs<~SpujfV#%k}YAe6%G!!blb
zU1DO4hMf6>i9bN1+0-SPJY%BMKfw4c?gyhw++s|e{vgYe{jkKCc<*Clx?j9WKRxf<
zbI&>V+;i{und?iwzWjViU}NWN<;-MI5Psz!4~B&az3i9m*z~pA2*d@&w)s*W)Nfv<
zp)yi_L6~xoK~hPoF2GbF*-vDqDI(Rx%l?bW5UC-xY^H?NkpoOqN`{G#_?gB@6jFad
zz-cJoKSB<X!%SC3qNIhiGO3)zNE>NqQUy7NZ$UMT;#KfiD_Hz7{U`X*jvrZ_CRxB2
z-L4w*mStN2fe38Y6kUBR92t&`N96vo*oYhqhsPrEIKCmd%tsU}{^|1MDkf@Yd!h>7
zDJp5O6LntIf`m{tn;qwS<(n3u7*<{Jg~VciCPTt~0mDjvuOMuK6Z%e}4<L>EithnM
zN680p6pLJ?c+6+9bMtI06`#p0uHwy-yKIU@!CR#z@PhtVsncZG*1*ept1B1ab?kBX
z!VTPT|B!Qe%@P()Z{cZAofFpV#Ox8aP1^v%n(&OU1tbsGJp(X<UwZ1mj<-ENPyUu^
z&9Ro}7S?kAV_ASrW#!<|hsy2(3}SDEyUgDoi-l7xxmnU64@4(p1EJZ4XEU=&6%+gR
zNy?Gcp540PbeR|bK9HNgYb<xmzUQ9z;atVHEc33)!}zn;jw_Yr(2f@?5&F<yrPwa=
zx((v-s%CKGD^<Zp8&ib1(#vo^f7mi<X3esfsddZ7&rLJq?WzsacV>NQe}`#Z4o1Ur
zd^|Wl5f3aR(kf3Nlu0kLLsE&)8%SknI-&WOvnrjQC5j@+_XkzAWx60|)%jFlI(<I5
zOtTppNU2(KCNV$nS0uxds3|!?2=ka$7c@V&Zjg5?!Q3^-L7LFi23b>AG!{9USx}WO
zxh5JLmqSlPLPL@8Uc5&FsVi!7SyTO9T=KS%y*wYf`&X*T-RLYJi}8q``9xNunRBz`
z{{vm}_W5&Y9;+}d;wWL5k{&vzgIvpRH!a1_s{@5!Ffl7K2o_s@0Z4eSx)N#4E$G0h
z+S<HMZrQ~VF`D-6S_!V<rP|+F53we;ORTHU#kGXCoc%@ru<kY3>w5?Mrl0kN0LJhg
z|NGF1F~tu%xT1UmaqO?Jw(*NaI}NWJ^$wF6^v(KOGn@RRu?xoWPNUmqM4#9VlvNWn
zIm7Q#o*oFyfp?g%Kfz&mI?1H#c}aFuPiN?PR!4diuQqw18E-Uw#{ID?cjcfRI`mHu
z76EkQSIr;8DW-Pfn};0Gr@wn>6kx!xlUiKRkKUHPN?=}%rsXey@ti=E<}+CVYUj2#
zi>9U*NAQo9IctjPC-7wJt5xP`l#UrzQN<QD23t_LyY4Bpw4GXSV;}T!j&6<~j$RJ-
z;0iR%(a$l$5#@++9OD?}nB+Ll@g&C?j%kjw90?A>p>puljJzKJZ?-i!EuvGjN}^~H
qtpZ4rXp<DtiE_J36sei5P;zjjy$!FmmEx6lhn=^H2qF}KX!-{~f1dXM

delta 1293
zcmYk6O-vg{6oB`w|CY6}G2j|(j13t7fGGlu?b49oA0i0E{Me+eMH(E>Lfi=3U7NN+
zmN>wnLOleYBDIPlL8V^kp@*$d(_SJ~%Asm1<&?;34{a~x+#DKJtvX{s?X2dTnfK<s
znR)MNYwtfTdSi`^B1fC+*#GXxMUMNOEzX;UP9|tCU)%GB-I8{j%jhIQ(j7DqEzuqF
z+W;J0iH96;1X7$|*dx6V*xQvSuMj)w*ny0RI7sIXmuVtS;-aIO%#be9O*PG=hq$Sv
zh0Ky(;-QjO;w3&Rv5>38Px^KMFM-{eB*SEcYHehW1j#6!*~vT!kuaTgkOjO0U9gDv
zp<QF6H%KWD;kiMPOc!`aE1#Ra0D1hO`A;a|_bp$-I6iG_F`LS_iXUDs7D;(-HFc|4
z`T()@<*5$uTUuaK`O0G9&jin{O|YfBur>hf;va1j{A0ka;SOAAf2g}#RVTRXAEVjU
zi%HvMn8$mzUeM!rHgCJ(fUlaW`ZliGaL6ChNL9J_xC0=K_?OKNM#XA>2@pVoqYYyY
z3x4YOksc^@j^JmV9th#1PJ}3?oqp|ImVqhUb`IgOa{?b28}?hf(d(-6Azt~y72)xf
zrxTCdJ;ra?PAvte*6IxSi`#+ALAQ#ps&G3PgdjfX3G$m!9CgPqKI+X*)14W$oUKST
zbw&E9k`Z&o^>wLGxsfMwBUPTlNM|)MOGx}w`<SlF^{RnZ5NH=+(~>G=ODv>`*z5o8
z#8>VU2;*<PZheHgdxIf?W{(4&;GpLOrdd9)->Zk8m9X~{IE(o+UlaVQocQ7ZDGc--
zK?I-m`QXKV{}V{#PyJomCFUtow-y2>{vS?h54crSd2w*e$&@vL<jc9@Mxjy@a`c63
zMfr|gzr?k=)zP3Hw94_|Z3xUTU+*x~y=IuT{@jLzVw_1d`St9Yge60(hP^X@t3%(y
z5_SzcVMK`zn}J?3HS#rFue-Mg%`mPE1Q!6N>Vo}IE6wN8Xbk@r8*)w5<5@ibs|~`@
z+U1j*W6|04<f1Dbjm=KFRua>x_}o%5J+PFTTwHNQ6A9PK`Ktyt%95NXE3SN@;u{+B
zyZpSYXKyf5_(3+XQ?)d$>!m5|4&BzQQTYt+hjs->`c=uKoWibf8{}{-yu9@$v%J7S
z{{ftQiD7~v&M?U^%W#!pj$xi*fnky1Erz!lmKkm^tT1F5ZZb#=s|@Ta|EsS?4lR*D
z%pzz+K~M`C4n$GViax<8>I9RZ5d_g93ZjRuH1t!`Q6;OGj~<GQu2_-^`NEoCj~kJY
qHN%seHBCvTaXCHm^t5^s9z~3=HB%dbmaP#4-nhkWaaXj^1pflh`bZG~

diff --git a/snapFood.py b/snapFood.py
index 381a800..92e6775 100644
--- a/snapFood.py
+++ b/snapFood.py
@@ -167,11 +167,7 @@ def finalizeCart(self, user_id, address_id, discount_code = None): #NOT CHECKED
         invoic_id = self._mycursor.lastrowid
         total_price = 0
         for food in foods:
-<<<<<<< HEAD
-            self._mycursor.execute("INSERT INTO FOOD_INVOIC(FOODfoodid, INVOICinvoiceid) VALUES (\'{}\', \'{}\');"
-=======
             self._mycursor.execute("INSERT INTO FOOD_INVOIC (FOODfoodid, INVOICinvoiceid) VALUES (\'{}\', \'{}\');"
->>>>>>> bc279458a0ea8c7cacef0b0095a7b4fbacce9647
             .format(food[0], invoic_id))
             self._mycursor.execute("DELETE FROM CART WHERE USERuserid = \'{}\' AND FOODfoodid = \'{}\';".format(user_id,food[0]))
             self._mycursor.execute("SELECT `minimum-bill-value`, price FROM SHOP JOIN FOOD ON shopid = SHOPshopid AND foodid = \'{}\'"
@@ -334,8 +330,6 @@ def addDiscountCodeForUser(self, user_id, code, percent=50):
         self._mydb.commit()
         return discount_id
 
-<<<<<<< HEAD
-=======
     def temp(self):
         return
         #self._mycursor.execute("ALTER TABLE `FOOD_INVOIC` ADD `food-invoicid` int(11)")
@@ -344,6 +338,5 @@ def temp(self):
         #self._mycursor.execute("ALTER TABLE FOOD_INVOIC ADD CONSTRAINT `is in` FOREIGN KEY (FOODfoodid) REFERENCES FOOD (foodid);")
         #self._mycursor.execute("ALTER TABLE FOOD_INVOIC ADD CONSTRAINT `is in` FOREIGN KEY (INVOICinvoiceid) REFERENCES INVOIC (invoiceid);")
 
->>>>>>> bc279458a0ea8c7cacef0b0095a7b4fbacce9647
     def close(self):
         self._mydb.close()