Update app.py

app.py

@@ -564,7 +564,6 @@ def shop_order_new():
         order = request.args.get('order', '')
         status = request.args.get('status', '')
         del_flag = request.args.get('del', '')
-        n_con_flag = request.args.get('n_con', '')
 
         if not email or not phone:
             logging.error("Email and phone are required")
@@ -598,8 +597,8 @@ def shop_order_new():
         msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
         data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
 
-        columns_to_update = ['name', 'phone', 'email', 'orders', 'n_con', 'data_on']
-        values_to_update = [name, phone, email, shop_st_json, n_con_flag, data_on]
+        columns_to_update = ['name', 'phone', 'email', 'orders', 'data_on']
+        values_to_update = [name, phone, email, shop_st_json, data_on]
 
         if result:
             set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
@@ -623,11 +622,11 @@ def shop_order_new():
 
 
 
-# Работа из VK_ID_full
-@app.route('/wr_order_vk_full', methods=['POST'])
-def write_order_vk_full():
+# Данные формы из ВК
+@app.route('/wr_form_vk', methods=['POST'])
+def wr_form_vk():
     try:
-        logging.debug("Starting shop_order_new")
+        logging.debug("Starting wr_form_vk")
 
         # Читаем параметры из POST-запроса (формы)
         api_sys_control = request.form.get('api_sys')
@@ -637,12 +636,8 @@ def write_order_vk_full():
 
         name = request.form.get('name', '')
         email = request.form.get('email', '')
-        vkid = request.form.get('vk_id', '')
         phone = request.form.get('phone', '').lstrip('+')
-        order = request.form.get('order', '')
-        status = request.form.get('status', '')
-        del_flag = request.form.get('del', '')
-
+        vkid = request.form.get('vk_id', '')
 
         if not email or not phone:
             logging.error("Email and phone are required")
@@ -653,37 +648,17 @@ def write_order_vk_full():
         conn = sqlite3.connect(DATABASE_NEW)
         cursor = conn.cursor()
 
-        # Ищем по email, phone, vk_id или chat_id
-        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ? OR vk_id = ? OR chat_id = ?", (email, phone, vkid))
+        # Ищем по email, phone или vk_id
+        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ? OR vk_id = ?", (email, phone, vkid))
         result = cursor.fetchone()
 
-        if result:
-            shop_st = result[17] if result[17] else '{}'
-            shop_st_data = json.loads(shop_st)
-            logging.debug(f"Existing record found. Loaded JSON: {shop_st_data}")
-        else:
-            shop_st_data = {}
-
-        if del_flag == '1':
-            if order in shop_st_data:
-                del shop_st_data[order]
-        elif order and status:
-            shop_st_data[order] = status
-
-        shop_st_json = json.dumps(shop_st_data)
-
-        utc_now = datetime.utcnow()
-        msk_tz = pytz.timezone('Europe/Moscow')
-        msk_now = utc_now.replace(tzinfo=pytz.utc).astimezone(msk_tz)
-        data_on = msk_now.strftime('%Y-%m-%d %H:%M:%S')
-
-        columns_to_update = ['name', 'phone', 'email', 'vk_id', 'orders', 'data_on']
-        values_to_update = [name, phone, email, vkid, shop_st_json, data_on]
+        columns_to_update = ['name', 'phone', 'email', 'vk_id']
+        values_to_update = [name, phone, email, vkid]
 
         if result:
             set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
-            query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ? OR vk_id = ? OR chat_id = ?"
-            cursor.execute(query, values_to_update + [email, phone, vkid, chat_id])
+            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)
@@ -694,7 +669,7 @@ def write_order_vk_full():
 
         conn.close()
 
-        return json.dumps(shop_st_data), 200
+        return json.dumps({"success": True}), 200
 
     except Exception as e:
         logging.error(f"An error occurred: {str(e)}")
@@ -714,7 +689,6 @@ def write_order_vk_full():
 
 
 
-
 # Работа из VK_ID только по VK ID
 @app.route('/wr_order_vk', methods=['POST'])
 def wr_order_vk():