34 Commits
dev ... main

Author SHA1 Message Date
379db1cb39 Merge pull request '1.2.2 upd mover search card TRI-246' (#12) from dev into main
Reviewed-on: sysadminix/tripwithbonus#12
2024-08-19 18:03:25 +03:00
e824a258ea Merge pull request 'dev' (#11) from dev into main
Reviewed-on: sysadminix/tripwithbonus#11
2024-08-18 17:48:09 +03:00
cd2985a170 Merge pull request 'Add text if email in spam and translate it' (#10) from dev into main
Reviewed-on: sysadminix/tripwithbonus#10
2024-08-09 23:50:40 +03:00
a19b4fe212 Merge pull request 'dev' (#9) from dev into main
Reviewed-on: sysadminix/tripwithbonus#9
2024-08-09 22:44:34 +03:00
3bfb7d040d Merge pull request 'replace tb_base.html' (#8) from dev into main
Reviewed-on: sysadminix/tripwithbonus#8
2024-08-09 21:08:58 +03:00
7dab17905b Merge pull request 'dev' (#7) from dev into main
Reviewed-on: sysadminix/tripwithbonus#7
2024-08-09 18:55:31 +03:00
a3a3565189 add rightpaneluser from dev 2024-08-09 18:53:53 +03:00
3f82f42e1e add chatsocketfunctions from dev 2024-08-09 18:52:23 +03:00
0de00c5a34 add chatsocketfunctions from dev 2024-08-09 18:51:14 +03:00
0daee07086 add models.py from dev 2024-08-09 18:49:10 +03:00
2619539415 add django.po from dev 2024-08-09 18:46:00 +03:00
9b01d79955 1.0.25 password text in registration mail 2024-08-09 18:30:03 +03:00
17f21a25bb 1.0.26 translate 2024-08-09 18:29:41 +03:00
8c523e8c65 1.6.3 parsing timezones 2024-08-09 18:25:07 +03:00
d7956e24a6 1.6.2 parsing timezones 2024-08-09 18:23:52 +03:00
eaafbec1ea 1.6.1 parsing timezones 2024-08-09 18:23:29 +03:00
4ba5f6492f 1.6.0 parsing timezones 2024-08-09 18:21:12 +03:00
a8c4d22b51 1.2.1 add Telegram icon 2024-08-08 08:52:08 +03:00
92f08b5174 1.1.60 add Meta Pixel Code 2024-08-06 21:22:24 +03:00
d86a531495 1.1.58 add TikTok Pixel Code to registration.js 2024-08-02 15:55:28 +03:00
f894cec38b 1.1.57 add TikTok Pixel Code 2024-08-01 17:26:14 +03:00
3b10299249 1.1.49 add new gtag to MAIN branch 2024-07-29 14:43:19 +03:00
2098032d81 1.1.48 add new gtag to MAIN branch 2024-07-29 13:20:44 +03:00
61161e6335 1.0.26 translate 2024-07-25 01:22:12 +03:00
327681d3db 1.0.26 translate 2024-07-25 01:17:57 +03:00
68c5bfe275 1.0.26 translate 2024-07-25 01:08:27 +03:00
c3f116fbc3 1.1.36 show/hide unanswered_msgs_count 2024-07-17 13:58:21 +03:00
b8b3c19bfc 1.1.33 upd chat_socket 2024-07-16 09:47:58 +03:00
e95062c6eb Merge remote-tracking branch 'origin/main' 2024-07-16 09:34:37 +03:00
2f4c472a41 1.1.32 upd chat_socket 2024-07-16 09:34:13 +03:00
3f0f1d4408 1.0.25 password text in registration mail 2024-07-15 23:55:17 +03:00
225a958cb4 1.0.24 robots 2024-07-10 17:58:30 +03:00
a42f3c7e71 1.0.24 robots 2024-07-10 17:38:02 +03:00
ddf8428884 Merge pull request 'dev в main' (#1) from dev into main
Reviewed-on: sysadminix/tripwithbonus#1
2024-07-10 17:34:03 +03:00
4 changed files with 27 additions and 4 deletions

View File

@@ -1,4 +1,5 @@
User-agent: * User-agent: *
Disallow: / Allow: /
Disallow: */admin/*
Host: dev.tripwb.com Host: tripwb.com

View File

@@ -21,6 +21,27 @@ function SendRegistrationForm(el){
window.sessionStorage.removeItem('mailingSubscribeRequired') window.sessionStorage.removeItem('mailingSubscribeRequired')
window.sessionStorage.removeItem('email') window.sessionStorage.removeItem('email')
fbq('track', 'Contact');
ttq.identify({
"email": "<hashed_email_address>", // string. The email of the customer if available. It must be hashed with SHA-256 on the client side.
"phone_number": "<hashed_phone_number>", // string. The phone number of the customer if available. It must be hashed with SHA-256 on the client side.
"external_id": "<hashed_extenal_id>" // string. Any unique identifier, such as loyalty membership IDs, user IDs, and external cookie IDs.It must be hashed with SHA-256 on the client side.
});
ttq.track('CompleteRegistration', {
"contents": [
{
"content_id": "<content_identifier>", // string. ID of the product. Example: "1077218".
"content_type": "<content_type>", // string. Either product or product_group.
"content_name": "<content_name>" // string. The name of the page or product. Example: "shirt".
}
],
"value": "<content_value>", // number. Value of the order or items sold. Example: 100.
"currency": "<content_currency>" // string. The 4217 currency code. Example: "USD".
});
if(typeof ym === 'function'){ if(typeof ym === 'function'){
ym(97070898,'reachGoal','Registration') ym(97070898,'reachGoal','Registration')
@@ -29,7 +50,6 @@ function SendRegistrationForm(el){
console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.'); console.log('Скрипт Яндекс.Метрики не найден. Статистика не будет отправлена.');
} }
}, },
error: function (data, exception){ error: function (data, exception){
document.querySelector(".register").innerHTML = data.responseJSON.html document.querySelector(".register").innerHTML = data.responseJSON.html

View File

@@ -22,6 +22,7 @@
<a href="https://vk.com/club226251027" target="_blank"><img class="svg" src="/static/img/svg/vk.svg"></a> <a href="https://vk.com/club226251027" target="_blank"><img class="svg" src="/static/img/svg/vk.svg"></a>
<a href="https://www.tiktok.com/@.tripwithbonus?_t=8njaU5JVCBK&_r=1" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a> <a href="https://www.tiktok.com/@.tripwithbonus?_t=8njaU5JVCBK&_r=1" target="_blank"><img class="svg" src="/static/img/svg/tiktok.svg"></a>
<a href="https://youtube.com/@twb-bonus?si=k_YFiY86vBdvvHFN" target="_blank"><img class="svg" src="/static/img/svg/Youtube.svg"></a> <a href="https://youtube.com/@twb-bonus?si=k_YFiY86vBdvvHFN" target="_blank"><img class="svg" src="/static/img/svg/Youtube.svg"></a>
<a href="https://t.me/+XA6A8Ls7fYw2Yzli" target="_blank"><img class="svg" src="/static/img/svg/Telegram.svg"></a>
</div> </div>
</div> </div>
<div class="second-column"> <div class="second-column">

View File

@@ -9,7 +9,8 @@
<span class="user_name_messenger">{{ item.owner.last_name }} {{ item.owner.first_name }}</span> <span class="user_name_messenger">{{ item.owner.last_name }} {{ item.owner.first_name }}</span>
<span class="last-message-messenger-user-tab">{{ item.name }}</span> <span class="last-message-messenger-user-tab">{{ item.name }}</span>
</div> </div>
{% if item.unread_msgs_count %} {# {% if item.unread_msgs_count %}#}
{% if unanswered_msgs_count > 0 %}
<div class="right-part-tab-user"> <div class="right-part-tab-user">
<div class="cost-messages-in-user-tab-messenger"> <div class="cost-messages-in-user-tab-messenger">
{# <span>{{ item.unread_msgs_count }}</span>#} {# <span>{{ item.unread_msgs_count }}</span>#}