Update app.py
Browse files
app.py
CHANGED
|
@@ -1490,9 +1490,9 @@ def gc_forms():
|
|
| 1490 |
|
| 1491 |
|
| 1492 |
|
| 1493 |
-
# Глобальная переменная для управления верификацией
|
| 1494 |
curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
|
| 1495 |
-
|
| 1496 |
|
| 1497 |
mt_avp = {
|
| 1498 |
'name': 'name',
|
|
@@ -1538,7 +1538,8 @@ mt_tl = {
|
|
| 1538 |
'phone': 'phone',
|
| 1539 |
'email': 'email',
|
| 1540 |
'kol': 'pr1',
|
| 1541 |
-
'pr2': 'pr2',
|
|
|
|
| 1542 |
'utm_campaign': 'utm_campaign',
|
| 1543 |
'utm_content': 'utm_content',
|
| 1544 |
'utm_medium': 'utm_medium',
|
|
@@ -1560,8 +1561,6 @@ tl_quest = {
|
|
| 1560 |
'gcpc': 'gcpc'
|
| 1561 |
}
|
| 1562 |
|
| 1563 |
-
|
| 1564 |
-
|
| 1565 |
mapp_templates = {
|
| 1566 |
'avp': mt_avp,
|
| 1567 |
'bhelp': mt_bhelp,
|
|
@@ -1612,12 +1611,16 @@ def add_or_update_contact(contact_data, db_name):
|
|
| 1612 |
conn.commit()
|
| 1613 |
conn.close()
|
| 1614 |
|
|
|
|
|
|
|
|
|
|
| 1615 |
@app.route('/ver_cur', methods=['GET'])
|
| 1616 |
def add_data_ver_cur():
|
| 1617 |
global current_curator_index
|
| 1618 |
|
| 1619 |
veref_on_off = request.args.get('ver', '0')
|
| 1620 |
curator_on_off = request.args.get('cur', '0')
|
|
|
|
| 1621 |
db_name = request.args.get('db', 'data_gc.db') # Получаем имя базы данных из запроса
|
| 1622 |
|
| 1623 |
template_key = request.args.get('template_key', 'avp')
|
|
@@ -1645,9 +1648,23 @@ def add_data_ver_cur():
|
|
| 1645 |
else:
|
| 1646 |
user_data['ws_st'] = user_data.get('ws_st', '')
|
| 1647 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1648 |
try:
|
| 1649 |
add_or_update_contact(user_data, db_name)
|
| 1650 |
-
return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}'})
|
| 1651 |
except Exception as e:
|
| 1652 |
logging.error(f"Error adding user: {e}")
|
| 1653 |
return jsonify({'status': 'error', 'message': str(e)}), 500
|
|
@@ -1658,6 +1675,7 @@ def add_data_ver_bonus():
|
|
| 1658 |
|
| 1659 |
veref_on_off = request.args.get('ver', '0')
|
| 1660 |
curator_on_off = request.args.get('cur', '0')
|
|
|
|
| 1661 |
db_name = request.args.get('db', 'data_gc.db') # Получаем имя базы данных из запроса
|
| 1662 |
|
| 1663 |
template_key = request.args.get('template_key', 'avp')
|
|
@@ -1698,9 +1716,23 @@ def add_data_ver_bonus():
|
|
| 1698 |
user_data['pr1'] = new_pr1
|
| 1699 |
conn.close()
|
| 1700 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1701 |
try:
|
| 1702 |
add_or_update_contact(user_data, db_name)
|
| 1703 |
-
return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}'})
|
| 1704 |
except Exception as e:
|
| 1705 |
logging.error(f"Error adding user: {e}")
|
| 1706 |
return jsonify({'status': 'error', 'message': str(e)}), 500
|
|
@@ -1719,11 +1751,6 @@ def add_data_ver_bonus():
|
|
| 1719 |
|
| 1720 |
|
| 1721 |
|
| 1722 |
-
|
| 1723 |
-
|
| 1724 |
-
|
| 1725 |
-
|
| 1726 |
-
|
| 1727 |
|
| 1728 |
|
| 1729 |
|
|
|
|
| 1490 |
|
| 1491 |
|
| 1492 |
|
| 1493 |
+
# Глобальная переменная для управления верификацией
|
| 1494 |
curators = ["Anna", "Ekaterina", "Ivan", "Maria", "Sergey", "Olga", "Alex", "Natalia", "Dmitry", "Elena"]
|
| 1495 |
+
current_curator_index = 0
|
| 1496 |
|
| 1497 |
mt_avp = {
|
| 1498 |
'name': 'name',
|
|
|
|
| 1538 |
'phone': 'phone',
|
| 1539 |
'email': 'email',
|
| 1540 |
'kol': 'pr1',
|
| 1541 |
+
'pr2': 'pr2',
|
| 1542 |
+
'gen_pass': 'pr5',
|
| 1543 |
'utm_campaign': 'utm_campaign',
|
| 1544 |
'utm_content': 'utm_content',
|
| 1545 |
'utm_medium': 'utm_medium',
|
|
|
|
| 1561 |
'gcpc': 'gcpc'
|
| 1562 |
}
|
| 1563 |
|
|
|
|
|
|
|
| 1564 |
mapp_templates = {
|
| 1565 |
'avp': mt_avp,
|
| 1566 |
'bhelp': mt_bhelp,
|
|
|
|
| 1611 |
conn.commit()
|
| 1612 |
conn.close()
|
| 1613 |
|
| 1614 |
+
def generate_password():
|
| 1615 |
+
return ''.join(random.choice(string.ascii_letters + string.digits) for _ in range(8))
|
| 1616 |
+
|
| 1617 |
@app.route('/ver_cur', methods=['GET'])
|
| 1618 |
def add_data_ver_cur():
|
| 1619 |
global current_curator_index
|
| 1620 |
|
| 1621 |
veref_on_off = request.args.get('ver', '0')
|
| 1622 |
curator_on_off = request.args.get('cur', '0')
|
| 1623 |
+
gen_pass_start = request.args.get('pass', '0')
|
| 1624 |
db_name = request.args.get('db', 'data_gc.db') # Получаем имя базы данных из запроса
|
| 1625 |
|
| 1626 |
template_key = request.args.get('template_key', 'avp')
|
|
|
|
| 1648 |
else:
|
| 1649 |
user_data['ws_st'] = user_data.get('ws_st', '')
|
| 1650 |
|
| 1651 |
+
if gen_pass_start == "1":
|
| 1652 |
+
conn = sqlite3.connect(db_name)
|
| 1653 |
+
cursor = conn.cursor()
|
| 1654 |
+
cursor.execute("SELECT pr5 FROM contacts WHERE email = ?", (user_data['email'],))
|
| 1655 |
+
result = cursor.fetchone()
|
| 1656 |
+
if result and result[0]:
|
| 1657 |
+
password = result[0]
|
| 1658 |
+
else:
|
| 1659 |
+
password = generate_password()
|
| 1660 |
+
user_data['pr5'] = password
|
| 1661 |
+
conn.close()
|
| 1662 |
+
else:
|
| 1663 |
+
password = None
|
| 1664 |
+
|
| 1665 |
try:
|
| 1666 |
add_or_update_contact(user_data, db_name)
|
| 1667 |
+
return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': password})
|
| 1668 |
except Exception as e:
|
| 1669 |
logging.error(f"Error adding user: {e}")
|
| 1670 |
return jsonify({'status': 'error', 'message': str(e)}), 500
|
|
|
|
| 1675 |
|
| 1676 |
veref_on_off = request.args.get('ver', '0')
|
| 1677 |
curator_on_off = request.args.get('cur', '0')
|
| 1678 |
+
gen_pass_start = request.args.get('pass', '0')
|
| 1679 |
db_name = request.args.get('db', 'data_gc.db') # Получаем имя базы данных из запроса
|
| 1680 |
|
| 1681 |
template_key = request.args.get('template_key', 'avp')
|
|
|
|
| 1716 |
user_data['pr1'] = new_pr1
|
| 1717 |
conn.close()
|
| 1718 |
|
| 1719 |
+
if gen_pass_start == "1":
|
| 1720 |
+
conn = sqlite3.connect(db_name)
|
| 1721 |
+
cursor = conn.cursor()
|
| 1722 |
+
cursor.execute("SELECT pr5 FROM contacts WHERE email = ?", (user_data['email'],))
|
| 1723 |
+
result = cursor.fetchone()
|
| 1724 |
+
if result and result[0]:
|
| 1725 |
+
password = result[0]
|
| 1726 |
+
else:
|
| 1727 |
+
password = generate_password()
|
| 1728 |
+
user_data['pr5'] = password
|
| 1729 |
+
conn.close()
|
| 1730 |
+
else:
|
| 1731 |
+
password = None
|
| 1732 |
+
|
| 1733 |
try:
|
| 1734 |
add_or_update_contact(user_data, db_name)
|
| 1735 |
+
return jsonify({'status': 'success', 'message': f'User added with curator {user_data.get("curator", "not assigned")}', 'password': password})
|
| 1736 |
except Exception as e:
|
| 1737 |
logging.error(f"Error adding user: {e}")
|
| 1738 |
return jsonify({'status': 'error', 'message': str(e)}), 500
|
|
|
|
| 1751 |
|
| 1752 |
|
| 1753 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1754 |
|
| 1755 |
|
| 1756 |
|