Update app.py

app.py

@@ -1773,6 +1773,7 @@ DATABASE6 = 'data_gc.db'
 def clean_phone_number_ss(phone_number):
     return re.sub(r'\D', '', phone_number)
 
+# Маршрут для приема GET запроса 
 @app.route('/order', methods=['GET'])
 def from_shop_st():
     try:
@@ -1797,11 +1798,11 @@ def from_shop_st():
         conn = sqlite3.connect(DATABASE6)
         cursor = conn.cursor()
 
-        cursor.execute("SELECT shop_st FROM contacts WHERE email = ? OR phone = ?", (email, phone))
+        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
         result = cursor.fetchone()
 
         if result:
-            shop_st = result[0] if result[0] else '{}'
+            shop_st = result[17] if result[17] else '{}'
             shop_st_data = json.loads(shop_st)
         else:
             shop_st_data = {}
@@ -1814,20 +1815,27 @@ def from_shop_st():
         shop_st_json = json.dumps(shop_st_data)
 
         if result:
-            # Получаем текущие значения
-            cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
-            current_data = cursor.fetchone()
+            # Создаем словарь текущих данных
+            current_data = {
+                'name': result[1],
+                'phone': result[2],
+                'email': result[3],
+                'shop_st': shop_st_json
+            }
 
-            # Сохраняем старые значения
-            name = name or current_data[1]
-            phone = phone or current_data[2]
-            email = email or current_data[3]
+            # Обновляем только те поля, которые переданы в запросе
+            if name:
+                current_data['name'] = name
+            if phone:
+                current_data['phone'] = phone
+            if email:
+                current_data['email'] = email
 
             cursor.execute("""
                 UPDATE contacts
                 SET name = ?, phone = ?, email = ?, shop_st = ?
                 WHERE email = ? OR phone = ?
-            """, (name, phone, email, shop_st_json, email, phone))
+            """, (current_data['name'], current_data['phone'], current_data['email'], current_data['shop_st'], email, phone))
         else:
             cursor.execute("""
                 INSERT INTO contacts (name, phone, email, shop_st)
@@ -1886,8 +1894,6 @@ def from_shop_st():
 
 
 
-
-