Update app.py

app.py

@@ -1823,8 +1823,6 @@ def insert_data_ss(data):
 
 
 
-# Маршрут для приема GET запроса
-# Маршрут для приема GET запроса
 @app.route('/order', methods=['GET'])
 def from_shop_st():
     try:
@@ -1849,11 +1847,13 @@ 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 '{}'
+            columns = [desc[0] for desc in cursor.description]
+            shop_st_index = columns.index('shop_st')
+            shop_st = result[shop_st_index] if result[shop_st_index] else '{}'
             shop_st_data = json.loads(shop_st)
         else:
             shop_st_data = {}
@@ -1870,10 +1870,36 @@ def from_shop_st():
 
         shop_st_json = json.dumps(shop_st_data)
 
+        # Исключение столбцов
+        excluded_columns = ['b_ban', 'b_baners', 'b_butt', 'b_city', 'b_fin', 'b_ign', 'b_mess', 'canal', 'chat_id', 'curator', 'data_on', 'data_t', 'fin_prog', 'gc_url', 'gcpc', 'key_pr', 'n_con', 'pr1', 'pr2', 'pr3', 'pr4', 'pr5', 'utm_campaign', 'utm_content', 'utm_medium', 'utm_source', 'utm_term', 'vk_id', 'web_st', 'ws_st', 'ws_stop']
+        update_values = [name, phone, email, shop_st_json]
+        update_columns = ['name', 'phone', 'email', 'shop_st']
+
+        for col in columns:
+            if col not in excluded_columns and col not in update_columns:
+                value = request.args.get(col, None)
+                if value is not None:
+                    update_values.append(value)
+                    update_columns.append(col)
+
+        placeholders = ', '.join([f"{col} = ?" for col in update_columns])
+        query = f"UPDATE contacts SET {placeholders} WHERE email = ? OR phone = ?"
+        update_values.extend([email, phone])
+
         if result:
-            cursor.execute("UPDATE contacts SET name = ?, phone = ?, email = ?, shop_st = ? WHERE email = ? OR phone = ?", (name, phone, email, shop_st_json, email, phone))
+            cursor.execute(query, update_values)
         else:
-            cursor.execute("INSERT INTO contacts (name, phone, email, shop_st) VALUES (?, ?, ?, ?)", (name, phone, email, shop_st_json))
+            insert_columns = ['name', 'phone', 'email', 'shop_st']
+            insert_values = [name, phone, email, shop_st_json]
+            for col in columns:
+                if col not in excluded_columns and col not in insert_columns:
+                    value = request.args.get(col, None)
+                    if value is not None:
+                        insert_values.append(value)
+                        insert_columns.append(col)
+            insert_placeholders = ', '.join(['?' for _ in insert_columns])
+            insert_query = f"INSERT INTO contacts ({', '.join(insert_columns)}) VALUES ({insert_placeholders})"
+            cursor.execute(insert_query, insert_values)
 
         conn.commit()
         conn.close()