Update app.py

app.py

@@ -644,7 +644,6 @@ def write_order_vk_full():
         status = request.form.get('status', '')
         del_flag = request.form.get('del', '')
         n_con_flag = request.form.get('n_con', '')
-        scan_flag = request.form.get('scan', 'email')
 
         if not email or not phone:
             logging.error("Email and phone are required")
@@ -655,23 +654,15 @@ def write_order_vk_full():
         conn = sqlite3.connect(DATABASE_NEW)
         cursor = conn.cursor()
 
-        # Определяем, по какому полю искать
-        if scan_flag == 'email':
-            search_field = 'email'
-            search_value = email
-        elif scan_flag == 'phone':
-            search_field = 'phone'
-            search_value = phone
-        elif scan_flag == 'vk_id':
-            search_field = 'vk_id'
-            search_value = vkid
-        else:
-            logging.error("Invalid scan flag")
-            return json.dumps({"error": "Invalid scan flag"}), 400
-
-        cursor.execute(f"SELECT * FROM contacts WHERE {search_field} = ?", (search_value,))
+        # Сначала ищем по email и phone
+        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         result = cursor.fetchone()
 
+        # Если не найдено, ищем по vk_id
+        if not result:
+            cursor.execute("SELECT * FROM contacts WHERE vk_id = ?", (vkid,))
+            result = cursor.fetchone()
+
         if result:
             shop_st = result[17] if result[17] else '{}'
             shop_st_data = json.loads(shop_st)
@@ -697,8 +688,8 @@ def write_order_vk_full():
 
         if result:
             set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
-            query = f"UPDATE contacts SET {set_clause} WHERE {search_field} = ?"
-            cursor.execute(query, values_to_update + [search_value])
+            query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ? OR vk_id = ?"
+            cursor.execute(query, values_to_update + [email, phone, vkid])
         else:
             query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
             cursor.execute(query, values_to_update)
@@ -730,7 +721,6 @@ def write_order_vk_full():
 
 
 
-
 # Работа из VK_ID только по VK ID
 @app.route('/wr_order_vk', methods=['POST'])
 def wr_order_vk():