fixed issues

Author: Systemaker

app/modules/auth/controllers/logout_controller.py

@@ -31,15 +31,17 @@ def logout():
  if 'email' in session:
  session.pop('email')
  session.pop('current_lang')
- session.pop('order_id')
+ if session.get('order_id') :
+ session.pop('order_id') 
  session.clear()
  return jsonify(data = {message:"You have successfully been logged out"}), 200, {'Content-Type': 'application/json'}
  else:
  # Remove flask login session
  logout_user()
  session.pop('email')
  session.pop('current_lang')
- session.pop('order_id')
+ if session.get('order_id') :
+ session.pop('order_id')
  session.clear()
  flash('You have successfully been logged out', 'info')
  return redirect(url_for('auth_page.login'))

app/modules/orders/controllers.py

@@ -227,7 +227,7 @@ def edit(id=1):
  orders.update_data(order.id, sanitize_form)
 
  # Remove current order
- if order.status != 'cart':
+ if order.status != 'cart' and session.get('order_id'):
  session.pop('order_id')
 
  logger.info("Editing a new record.")