DmitrMakeev commited on
Commit
8fa809b
·
verified ·
1 Parent(s): e76b673

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +29 -3
app.py CHANGED
@@ -644,6 +644,7 @@ def write_order_vk_full():
644
  status = request.form.get('status', '')
645
  del_flag = request.form.get('del', '')
646
  n_con_flag = request.form.get('n_con', '')
 
647
 
648
  if not email or not phone:
649
  logging.error("Email and phone are required")
@@ -654,7 +655,21 @@ def write_order_vk_full():
654
  conn = sqlite3.connect(DATABASE_NEW)
655
  cursor = conn.cursor()
656
 
657
- cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
 
 
 
 
 
 
 
 
 
 
 
 
 
 
658
  result = cursor.fetchone()
659
 
660
  if result:
@@ -682,8 +697,8 @@ def write_order_vk_full():
682
 
683
  if result:
684
  set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
685
- query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ?"
686
- cursor.execute(query, values_to_update + [email, phone])
687
  else:
688
  query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
689
  cursor.execute(query, values_to_update)
@@ -705,6 +720,17 @@ def write_order_vk_full():
705
 
706
 
707
 
 
 
 
 
 
 
 
 
 
 
 
708
  # Работа из VK_ID только по VK ID
709
  @app.route('/wr_order_vk', methods=['POST'])
710
  def wr_order_vk():
 
644
  status = request.form.get('status', '')
645
  del_flag = request.form.get('del', '')
646
  n_con_flag = request.form.get('n_con', '')
647
+ scan_flag = request.form.get('scan', 'email')
648
 
649
  if not email or not phone:
650
  logging.error("Email and phone are required")
 
655
  conn = sqlite3.connect(DATABASE_NEW)
656
  cursor = conn.cursor()
657
 
658
+ # Определяем, по какому полю искать
659
+ if scan_flag == 'email':
660
+ search_field = 'email'
661
+ search_value = email
662
+ elif scan_flag == 'phone':
663
+ search_field = 'phone'
664
+ search_value = phone
665
+ elif scan_flag == 'vk_id':
666
+ search_field = 'vk_id'
667
+ search_value = vkid
668
+ else:
669
+ logging.error("Invalid scan flag")
670
+ return json.dumps({"error": "Invalid scan flag"}), 400
671
+
672
+ cursor.execute(f"SELECT * FROM contacts WHERE {search_field} = ?", (search_value,))
673
  result = cursor.fetchone()
674
 
675
  if result:
 
697
 
698
  if result:
699
  set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
700
+ query = f"UPDATE contacts SET {set_clause} WHERE {search_field} = ?"
701
+ cursor.execute(query, values_to_update + [search_value])
702
  else:
703
  query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
704
  cursor.execute(query, values_to_update)
 
720
 
721
 
722
 
723
+
724
+
725
+
726
+
727
+
728
+
729
+
730
+
731
+
732
+
733
+
734
  # Работа из VK_ID только по VK ID
735
  @app.route('/wr_order_vk', methods=['POST'])
736
  def wr_order_vk():