From e35ccdc86ddf765342bce40974432be45248b5c5 Mon Sep 17 00:00:00 2001
From: Milad Barooni <milad.barooni99@gmail.com>
Date: Thu, 23 Jan 2020 18:34:59 +0330
Subject: [PATCH] Finilize 2

---
 Main.py                             |  11 ++++++-----
 __pycache__/snapFood.cpython-37.pyc | Bin 12006 -> 14130 bytes
 snapFood.py                         |   2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Main.py b/Main.py
index d3fc8bc..f0ee8ad 100644
--- a/Main.py
+++ b/Main.py
@@ -413,17 +413,18 @@ def make_address_str(address_id):
     def orderPage(self):
         def showHistoryOfOrders():
             print ("show history")
-        def finilizeCart():
+        def finilizeCart(discount_code):
             print (self.address_id)
             mydb.finalizeCart(self.user_id, self.address_id, discount_code.get())
         self.order_screen = Tk()
         self.order_screen.title("Orders Page")
-        Label(self.menu_screen, text="Finilize your Cart", bg="red", width="300", height="2", font=("Calibri", 13)).pack()
+        Label(self.order_screen, text="Finilize your Cart", bg="red", width="300", height="2", font=("Calibri", 13)).pack()
         Label(text="").pack()
         Label(self.order_screen, text="enter your discount code if you have one").pack()
-        discount_code = Entry(self.order_screen).pack()
-        Button(self.order_screen,text="Buy your Cart", height="2", width="30", command=finilizeCart).pack()
-        Label(self.menu_screen, text="Your Orders History", bg="red", width="300", height="2", font=("Calibri", 13)).pack()
+        discount_code = Entry(self.order_screen)
+        discount_code.pack()
+        Button(self.order_screen,text="Buy your Cart", height="2", width="30", command=partial(finilizeCart, discount_code)).pack()
+        Label(self.order_screen, text="Your Orders History", bg="red", width="300", height="2", font=("Calibri", 13)).pack()
         Label(text="").pack()
         Button(self.order_screen,text="history of orders", height="2", width="30", command=showHistoryOfOrders).pack()
 
diff --git a/__pycache__/snapFood.cpython-37.pyc b/__pycache__/snapFood.cpython-37.pyc
index cdd2bbf7500c60786727576e303cf300dac8454b..284d34373308f5fc2b5859b0adf299297e91220e 100644
GIT binary patch
delta 2817
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

delta 1075
zcmYjQ&2JM|5P!4ZUfUrhhR9A#mISlesEMHoPMelb#|9K**ZH7grGT7_TO8t8T|50q
z*KO5uK%8Q|E2`{MFP!iNRcfX7*aH$L{(wq_o;V<J;?Q})L3z^qz4`df?99BkkGB3@
zwJ(LkCZm=8(YZN4&DcLe*<T6?7iia)TXrVWfu8|bS#O&i1`J_|IeP1-#8FaMnYn<>
zl@L(6%Ul^hY5g9Bv#n<ioZ|pdIM0V5nz(?+ar7>@hj9!~5N`l4VggT+C4x4NljR6r
z;y2*<bQ(XvX|l&~9%t|jNkf>y6wZ<~j344h#Es(|eoW^vj8QGw?o+sZI9guH<TB}H
zD}8Y}bGfj1V`{?6E*7p?<GdI-dSu_aUTT!TsCnO3&^l}J`;k#TX%F%dP3!(0i7O`>
zT2n*0srzh$wE@)*H7?{0y=nAp8V^RtPU~&S*BY8{_>v#!9ORi4AN*$5SLWI3y=JHv
zW$;_kK?v}#qct%3^Qa9$eke8=4^f_=Z+4{KmyC8m4B0oSu`o}^o^`FEHHfYDnyXf}
zD%I`k<XUBObMmXw=60F?GW?P<T1KSbOVE{hDFRo?ujF$4VcZ&a!&s@W*S5DBx7KS|
zcGb^oHLQE@3l@J7&w|@c9(%1owtI5ydkM0<Xb*HBCnV{IU7{c~6_lE)PnUd0_C|dL
z<u>!71G9`g3VEbGPtI3Sxg&XV#88EgPK}t<*E^<+I_2<sOgz9eh$+8ik~OdwA7dLp
z!%=#JfwtUXG!!$xv%r(5<9v7A=6{UO#3D;q3ZG7Gm8xYccXc6S+21u2wpXCydBC{|
zF2C(K`Y5Rk6#l?TC+XF)H0`=UKn+p@lvm2{=)EC(VRAUK7ox)}^5%pcdL#JauMkNd
zPsF>wPU$donRHhzt<|<0UQx)#{;Xa8SMn4v{wnz!6varx!4hJ+_xN=F<dn^;GX?cC
ziVE>RXIlNDU<dLJc>O{e;a{HFS-C=@cU8cGfSiD90`dYD1uO|z5pZ3ANVr%30q7Gp
snLwjmpX1A^)O!P_V(NyvXZ}wNf<H{n2PXvcZ3<B|@0%S_gBtX~|Af8#dH?_b

diff --git a/snapFood.py b/snapFood.py
index 6ae91c3..2c83a95 100644
--- a/snapFood.py
+++ b/snapFood.py
@@ -165,7 +165,7 @@ def finalizeCart(self, user_id, address_id, discount_code = None): #NOT CHECKED
         for food in foods:
             self._mycursor.execute("INSERT INTO FOOD_INVOIC(FOODfoodid, INVOICinvoiceid) VALUES (\'{}\', \'{}\');"
             .format(food[0], invoic_id))
-            self._mycursor.execute("SELECT minimum-bill-value, price FROM SHOP JOIN FOOD ON shopid = SHOPshopid AND foodid = \'{}\'"
+            self._mycursor.execute("SELECT `minimum-bill-value`, price FROM SHOP JOIN FOOD ON shopid = SHOPshopid AND foodid = \'{}\'"
             .format(food[0]))
             data = self._mycursor.fetchall()
             price = int(data[0][1])