Update app.py

app.py

@@ -2159,6 +2159,98 @@ def from_shop_st3():
     except Exception as e:
         return json.dumps({"error": str(e)}), 500
 
+
+
+
+
+
+
+@app.route('/order_new', methods=['GET'])
+def from_shop_st3():
+    try:
+        api_sys_control = request.args.get('api_sys')
+
+        if api_sys_control != api_key_sys:
+            return json.dumps({"error": "Unauthorized access"}), 403
+
+        name = request.args.get('name', '')
+        email = request.args.get('email', '')
+        phone = request.args.get('phone', '').lstrip('+')
+        order = request.args.get('order', '')
+        status = request.args.get('status', '')
+        del_flag = request.args.get('del', '')
+        n_con_flag = request.args.get('n_con', '')  # Добавлен параметр n_con
+
+        if not email or not phone:
+            return json.dumps({"error": "Email and phone are required"}), 400
+
+        # Очистка номера телефона
+        phone = clean_phone_number_ss(phone)
+
+        conn = sqlite3.connect(DATABASE6)
+        cursor = conn.cursor()
+
+        cursor.execute("SELECT * FROM contacts WHERE email = ? OR phone = ?", (email, phone))
+        result = cursor.fetchone()
+
+        if result:
+            shop_st = result[17] if result[17] else '{}'
+            shop_st_data = json.loads(shop_st)
+            print(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')
+
+        # Исключаем все столбцы, кроме name, phone, email, shop_st, n_con, data_on
+        columns_to_update = ['name', 'phone', 'email', 'shop_st', 'n_con', 'data_on']
+        values_to_update = [name, phone, email, shop_st_json, n_con_flag, data_on]
+
+        if result:
+            # Обновляем только те поля, которые переданы в запросе
+            set_clause = ', '.join([f"{col} = ?" for col in columns_to_update])
+            query = f"UPDATE contacts SET {set_clause} WHERE email = ? OR phone = ?"
+            cursor.execute(query, values_to_update + [email, phone])
+        else:
+            # Вставляем новые данные
+            query = f"INSERT INTO contacts ({', '.join(columns_to_update)}) VALUES ({', '.join(['?' for _ in columns_to_update])})"
+            cursor.execute(query, values_to_update)
+
+        conn.commit()
+
+        # Замена NULL на пустые строки
+        replace_null_with_empty_string(conn)
+
+        conn.close()
+
+        return json.dumps(shop_st_data), 200
+
+    except Exception as e:
+        return json.dumps({"error": str(e)}), 500
+
+
+
+
+
+
+
+
+
+
+
+
 @app.route('/allow', methods=['GET'])
 def from_allow():
     try: