DmitrMakeev commited on
Commit
acfd0a9
·
verified ·
1 Parent(s): 3fe0e3f

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +9 -9
app.py CHANGED
@@ -105,7 +105,7 @@ def init_db(db_name):
105
  shop_status TEXT,
106
  answers TEXT,
107
  quiz TEXT,
108
- overall TEXT,
109
  gc_url TEXT,
110
  key_pr TEXT,
111
  n_con TEXT,
@@ -317,7 +317,7 @@ def add_or_update_contact(contact_data, db_name):
317
  fields = [
318
  'name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog',
319
  'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator',
320
- 'bonus', 'shop_status', 'answers', 'quiz', 'overall', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
321
  ]
322
 
323
  for field in fields:
@@ -964,7 +964,7 @@ def data_gc_tab_out():
964
  cursor.execute('''
965
  SELECT id, name, phone, email, vk_id, chat_id, ws_st, ws_stop, web_st, fin_prog,
966
  b_city, b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, orders, curator,
967
- bonus, shop_status, answers, quiz, overall, gc_url, key_pr, n_con, canal, data_on, data_t, utm_source, utm_medium, utm_campaign, utm_term, utm_content, gcpc
968
  FROM contacts
969
  ''')
970
  contacts = cursor.fetchall()
@@ -976,7 +976,7 @@ def data_gc_tab_out():
976
  'web_st': contact[8], 'fin_prog': contact[9], 'b_city': contact[10], 'b_fin': contact[11],
977
  'b_ban': contact[12], 'b_ign': contact[13], 'b_baners': contact[14], 'b_butt': contact[15],
978
  'b_mess': contact[16], 'orders': contact[17], 'curator': contact[18], 'bonus': contact[19],
979
- 'shop_status': contact[20], 'answers': contact[21], 'quiz': contact[22], 'overall': contact[23],
980
  'gc_url': contact[24], 'key_pr': contact[25], 'n_con': contact[26], 'canal': contact[27],'data_on': contact[28],
981
  'data_t': contact[29],'utm_source': contact[30], 'utm_medium': contact[31], 'utm_campaign': contact[32],
982
  'utm_term': contact[33], 'utm_content': contact[34], 'gcpc': contact[34]
@@ -1050,8 +1050,8 @@ def insert_data(data, verify_phone, add_curator):
1050
  else:
1051
  ws_st = row.get('ws_st', '')
1052
 
1053
- columns = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog', 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator', 'bonus', 'shop_status', 'answers', 'quiz', 'overall', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
1054
- values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), ws_st, row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('orders', ''), curator, row.get('bonus', ''), row.get('shop_status', ''), row.get('answers', ''), row.get('quiz', ''), row.get('overall', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
1055
 
1056
  placeholders = ', '.join(['?' for _ in columns])
1057
  columns_str = ', '.join(columns)
@@ -1128,8 +1128,8 @@ def insert_data_j(data):
1128
  print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
1129
  continue
1130
 
1131
- columns = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog', 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator', 'bonus', 'shop_status', 'answers', 'quiz', 'overall', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
1132
- values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), row.get('ws_st', ''), row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('orders', ''), row.get('curator', ''), row.get('bonus', ''), row.get('shop_status', ''), row.get('answers', ''), row.get('quiz', ''), row.get('overall', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
1133
 
1134
  placeholders = ', '.join(['?' for _ in columns])
1135
  columns_str = ', '.join(columns)
@@ -1234,7 +1234,7 @@ def update_or_insert_user(db_name, user_data, mapping_template):
1234
  required_fields = [
1235
  "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
1236
  "b_city", "b_fin", "b_ban", "b_ign", "b_baners", "b_butt", "b_mess",
1237
- "orders", "curator", "bonus", "shop_status", "answers", "quiz", "overall", "gc_url",
1238
  "key_pr", "n_con", "canal", "data_on", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
1239
  ]
1240
 
 
105
  shop_status TEXT,
106
  answers TEXT,
107
  quiz TEXT,
108
+ rkassa TEXT,
109
  gc_url TEXT,
110
  key_pr TEXT,
111
  n_con TEXT,
 
317
  fields = [
318
  'name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog',
319
  'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator',
320
+ 'bonus', 'shop_status', 'answers', 'quiz', 'rkassa', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
321
  ]
322
 
323
  for field in fields:
 
964
  cursor.execute('''
965
  SELECT id, name, phone, email, vk_id, chat_id, ws_st, ws_stop, web_st, fin_prog,
966
  b_city, b_fin, b_ban, b_ign, b_baners, b_butt, b_mess, orders, curator,
967
+ bonus, shop_status, answers, quiz, rkassa, gc_url, key_pr, n_con, canal, data_on, data_t, utm_source, utm_medium, utm_campaign, utm_term, utm_content, gcpc
968
  FROM contacts
969
  ''')
970
  contacts = cursor.fetchall()
 
976
  'web_st': contact[8], 'fin_prog': contact[9], 'b_city': contact[10], 'b_fin': contact[11],
977
  'b_ban': contact[12], 'b_ign': contact[13], 'b_baners': contact[14], 'b_butt': contact[15],
978
  'b_mess': contact[16], 'orders': contact[17], 'curator': contact[18], 'bonus': contact[19],
979
+ 'shop_status': contact[20], 'answers': contact[21], 'quiz': contact[22], 'rkassa': contact[23],
980
  'gc_url': contact[24], 'key_pr': contact[25], 'n_con': contact[26], 'canal': contact[27],'data_on': contact[28],
981
  'data_t': contact[29],'utm_source': contact[30], 'utm_medium': contact[31], 'utm_campaign': contact[32],
982
  'utm_term': contact[33], 'utm_content': contact[34], 'gcpc': contact[34]
 
1050
  else:
1051
  ws_st = row.get('ws_st', '')
1052
 
1053
+ columns = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog', 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator', 'bonus', 'shop_status', 'answers', 'quiz', 'rkassa', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
1054
+ values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), ws_st, row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('orders', ''), curator, row.get('bonus', ''), row.get('shop_status', ''), row.get('answers', ''), row.get('quiz', ''), row.get('rkassa', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
1055
 
1056
  placeholders = ', '.join(['?' for _ in columns])
1057
  columns_str = ', '.join(columns)
 
1128
  print(f"User with email {email} or phone {phone} already exists. Skipping insert.")
1129
  continue
1130
 
1131
+ columns = ['name', 'phone', 'email', 'vk_id', 'chat_id', 'ws_st', 'ws_stop', 'web_st', 'fin_prog', 'b_city', 'b_fin', 'b_ban', 'b_ign', 'b_baners', 'b_butt', 'b_mess', 'orders', 'curator', 'bonus', 'shop_status', 'answers', 'quiz', 'rkassa', 'gc_url', 'key_pr', 'n_con', 'canal', 'data_on', 'data_t', 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc']
1132
+ values = [name, phone, email, row.get('vk_id', ''), row.get('chat_id', ''), row.get('ws_st', ''), row.get('ws_stop', ''), row.get('web_st', 0), row.get('fin_prog', 0), row.get('b_city', ''), row.get('b_fin', ''), row.get('b_ban', ''), row.get('b_ign', ''), row.get('b_baners', ''), row.get('b_butt', ''), row.get('b_mess', ''), row.get('orders', ''), row.get('curator', ''), row.get('bonus', ''), row.get('shop_status', ''), row.get('answers', ''), row.get('quiz', ''), row.get('rkassa', ''), row.get('gc_url', ''), row.get('key_pr', ''), row.get('n_con', ''), row.get('canal', ''), row.get('data_on', ''), row.get('data_t', ''), row.get('utm_source', ''), row.get('utm_medium', ''), row.get('utm_campaign', ''), row.get('utm_term', ''), row.get('utm_content', ''), row.get('gcpc', '')]
1133
 
1134
  placeholders = ', '.join(['?' for _ in columns])
1135
  columns_str = ', '.join(columns)
 
1234
  required_fields = [
1235
  "vk_id", "chat_id", "ws_st", "ws_stop", "web_st", "fin_prog",
1236
  "b_city", "b_fin", "b_ban", "b_ign", "b_baners", "b_butt", "b_mess",
1237
+ "orders", "curator", "bonus", "shop_status", "answers", "quiz", "rkassa", "gc_url",
1238
  "key_pr", "n_con", "canal", "data_on", "data_t", 'utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'gcpc'
1239
  ]
1240