Update app.py

app.py

@@ -1775,155 +1775,6 @@ 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:
-        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)
-        else:
-            shop_st_data = {}
-
-        if del_flag == '1':
-            shop_st_data = {}
-        elif order and status:
-            shop_st_data[order] = status
-
-        shop_st_json = json.dumps(shop_st_data)
-
-        if result:
-            # Создаем словарь текущих данных
-            current_data = {
-                'name': result[1],
-                'phone': result[2],
-                'email': result[3],
-                'shop_st': shop_st_json
-            }
-
-            # Обновляем только те поля, которые переданы в запросе
-            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 = ?
-            """, (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)
-                VALUES (?, ?, ?, ?)
-            """, (name, phone, email, shop_st_json))
-
-        conn.commit()
-        conn.close()
-
-        return json.dumps(shop_st_data), 200
-
-    except Exception as e:
-        return json.dumps({"error": str(e)}), 500
-
-
-
-
-
-
-
-
-# Маршрут для приема GET запроса 
-@app.route('/order2', methods=['GET'])
-def from_shop_st2():
-    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)
-        else:
-            shop_st_data = {}
-
-        if del_flag == '1':
-            shop_st_data = {}
-        elif order and status:
-            shop_st_data[order] = status
-
-        shop_st_json = json.dumps(shop_st_data)
-
-        # Исключаем все столбцы, кроме name, phone, email, shop_st, n_con
-        columns_to_update = ['name', 'phone', 'email', 'shop_st', 'n_con']
-        values_to_update = [name, phone, email, shop_st_json, n_con_flag]
-
-        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()
-        conn.close()
-
-        return json.dumps(shop_st_data), 200
-
-    except Exception as e:
-        return json.dumps({"error": str(e)}), 500
-
 
 
 
@@ -1970,9 +1821,15 @@ def from_shop_st3():
 
         shop_st_json = json.dumps(shop_st_data)
 
-        # Исключаем все столбцы, кроме name, phone, email, shop_st, n_con
-        columns_to_update = ['name', 'phone', 'email', 'shop_st', 'n_con']
-        values_to_update = [name, phone, email, shop_st_json, n_con_flag]
+        # Получение текущей даты и времени в Московском часовом поясе
+        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:
             # Обновляем только те поля, которые переданы в запросе
@@ -2027,6 +1884,7 @@ def from_shop_st3():
 
 
 
+
 
 
 @app.route('/gc_in', methods=['GET'])