DmitrMakeev commited on
Commit
c011b7e
·
verified ·
1 Parent(s): d6170ab

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +13 -8
app.py CHANGED
@@ -1821,14 +1821,16 @@ def insert_data_ss(data):
1821
 
1822
 
1823
 
1824
- # Маршрут для приема GET запроса
 
 
1825
  @app.route('/order', methods=['GET'])
1826
  def from_shop_st():
1827
  try:
1828
  api_sys_control = request.args.get('api_sys')
1829
 
1830
  if api_sys_control != api_key_sys:
1831
- return json.dumps({"error": "Unauthorized access"}), 403
1832
 
1833
  name = request.args.get('name', '')
1834
  email = request.args.get('email', '')
@@ -1838,7 +1840,7 @@ def from_shop_st():
1838
  del_flag = request.args.get('del', '')
1839
 
1840
  if not email or not phone:
1841
- return json.dumps({"error": "Email and phone are required"}), 400
1842
 
1843
  # Очистка номера телефона
1844
  phone = clean_phone_number_ss(phone)
@@ -1856,9 +1858,14 @@ def from_shop_st():
1856
  shop_st_data = {}
1857
 
1858
  if del_flag == '1':
1859
- shop_st_data = {}
 
 
 
1860
  elif order and status:
1861
  shop_st_data[order] = status
 
 
1862
 
1863
  shop_st_json = json.dumps(shop_st_data)
1864
 
@@ -1870,12 +1877,10 @@ def from_shop_st():
1870
  conn.commit()
1871
  conn.close()
1872
 
1873
- return json.dumps(shop_st_data), 200
1874
 
1875
  except Exception as e:
1876
- return json.dumps({"error": str(e)}), 500
1877
-
1878
-
1879
 
1880
 
1881
 
 
1821
 
1822
 
1823
 
1824
+
1825
+
1826
+ # Маршрут для приема GET запроса
1827
  @app.route('/order', methods=['GET'])
1828
  def from_shop_st():
1829
  try:
1830
  api_sys_control = request.args.get('api_sys')
1831
 
1832
  if api_sys_control != api_key_sys:
1833
+ return jsonify({"error": "Unauthorized access"}), 403
1834
 
1835
  name = request.args.get('name', '')
1836
  email = request.args.get('email', '')
 
1840
  del_flag = request.args.get('del', '')
1841
 
1842
  if not email or not phone:
1843
+ return jsonify({"error": "Email and phone are required"}), 400
1844
 
1845
  # Очистка номера телефона
1846
  phone = clean_phone_number_ss(phone)
 
1858
  shop_st_data = {}
1859
 
1860
  if del_flag == '1':
1861
+ if order in shop_st_data:
1862
+ del shop_st_data[order]
1863
+ else:
1864
+ return jsonify({"error": f"Order {order} not found"}), 404
1865
  elif order and status:
1866
  shop_st_data[order] = status
1867
+ elif not order:
1868
+ return jsonify({"error": "Order is required"}), 400
1869
 
1870
  shop_st_json = json.dumps(shop_st_data)
1871
 
 
1877
  conn.commit()
1878
  conn.close()
1879
 
1880
+ return jsonify(shop_st_data), 200
1881
 
1882
  except Exception as e:
1883
+ return jsonify({"error": str(e)}), 500
 
 
1884
 
1885
 
1886