diff --git a/Server/DB/querys.py b/Server/DB/querys.py index f721dbf..9e9641b 100644 --- a/Server/DB/querys.py +++ b/Server/DB/querys.py @@ -39,17 +39,21 @@ class compare: OUT: True, False if succeded adding to db ''' - - if compare.verifie_order(ordered_list): #products = Product() - order = Order(desk) - session.add(order) - session.commit() + order = Order(desk) + if compare.verifie_order(ordered_list): + is_emtpy = True #check if nothing in prouduct if True dont commit. for product in ordered_list: if int(product[0]) > 0: #dont add not ordered to list + if is_emtpy: #first time enter in loop + session.add(order) + session.commit() productDB = Product(quantity=int(product[0]),name=product[1],order_id = order.id) - - session.add(productDB) + session.add(productDB) + is_emtpy = False + if is_emtpy: + return False + session.commit() logger.success("Order at desk "+ str(desk) +" resived") # add a new ordered_list to the database diff --git a/Server/Host/flaskApp.py b/Server/Host/flaskApp.py index acbc90a..afdbcc1 100644 --- a/Server/Host/flaskApp.py +++ b/Server/Host/flaskApp.py @@ -116,7 +116,6 @@ def orders(): #TODO on new orderGet refresh orders list @app.route("/order_get", methods=['GET','POST']) def order_get(): - desk= 1 global config #POST order if request.method == 'POST' and config['SETTINGS']['lockqrcode_whit_secret'] == 'True': @@ -132,8 +131,11 @@ def order_get(): # Adding order to DB if compare.process_main(ordered_list, desk): return '

your order got ressived!

' + else: + #TODO IF nothing ordered send back to main and say something in a txt box + return '

You have selected nothing try again

' return '

your order coudnt be ressived try again Error:SQL

' - + # Veriefie if auth or not from GET elif request.method == 'GET': desk = int(request.args['desk'])