sysadminix/tripwithbonus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
ArtemB
2023-11-19 18:12:24 +03:00
parent 06661cb187 fade021048
commit 1e9e2cb048
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
static/js/user_profile_2.js
View File

@@ -456,7 +456,12 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){
}
url = 'show_chat_w_user/'
}
let user_type = getInfoAboutUser()
if (user_type === 'mobile' || user_type === 'laptop') {
closeCurtain('left')
} else if (!window.location.href.includes('profile')){
closeCurtain()
}
$.ajax({
headers: { "X-CSRFToken": $('input[name=csrfmiddlewaretoken]').val() },
url: '/messages/' + url,
@@ -474,9 +479,9 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){
}
document.querySelector(".info_profile").innerHTML = data.html;
document.querySelector(".enter-message-inp").focus()
let user_type = getInfoAboutUser()
document.querySelector(".tab_user_messanger.select").scrollIntoView({behavior: "smooth",block:'nearest',inline:'nearest'});
if (document.querySelector('.support') && user_type !== 'mobile' && user_type !== 'laptop'){
if (window.location.host.includes('support') && user_type !== 'mobile' && user_type !== 'laptop'){
let menu = document.querySelector(".menu_buttons.curtain.left")
let container_user_messenger = document.querySelector(".container-messenger")
if (!container_user_messenger.classList.contains('margin') || !menu.classList.contains('margin')){
@@ -488,11 +493,7 @@ function selectedUserMessenger (ticket_id=null,user_id=null,el){
let curt_f_close = getCurtainWIncreaceZindex(document.querySelectorAll('.curtain'))
if (user_type === 'mobile' || user_type === 'laptop') {
closeCurtain('left')
} else if (!window.location.href.includes('profile')){
closeCurtain()
}
},
error: function (data){
@@ -732,18 +733,17 @@ function open_curtain (left=null,right=null,overlay=null,close=null){
let handler_text = curtain.querySelector('.text_f_curtain')
handler_text.innerHTML = curtain_name
curtain.classList.remove("open")
curtain.classList.add("close")
let user_type = getInfoAboutUser()
if (user_type === 'mobile') {
if (user_type === 'mobile' || user_type === 'laptop') {
curtain.classList.remove("open")
curtain.classList.add("close")
closeOverlay()
} else {
if (!window.location.href.includes('profile')){
} else if (!window.location.href.includes('profile')){
//
}
} else {
curtain.classList.remove("open")
curtain.classList.add("close")
}
} else {

2
templates/blocks/profile/b_chats.html
View File

@@ -1,6 +1,6 @@
{% load static %}
<div class="menu_buttons curtain left open" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="menu_buttons curtain left {% if not cur_receiver %}open{% else %}close{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="container_block_list_of_users">
{% include 'blocks/profile/b_list_of_users_messenger.html' %}
</div>

2
templates/blocks/profile/b_support_chat.html
View File

@@ -11,7 +11,7 @@
{# </div>#}
<img class="loader_chat_f_sw_chats support" src="{% static "/img/svg/loader.svg" %}" alt="loader">
{% if user.is_staff %}
<div class="menu_buttons curtain left open {% if name.ticket %}margin{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="menu_buttons curtain left {% if not ticket %}open{% else %}close{% endif %} {% if name.ticket %}margin{% endif %}" data-name="<img style='width: 25px;display: block;position: relative;bottom: 2px;' src='{% static "/img/svg/group.png" %}'>">
<div class="container_block_list_of_users">
{% include 'blocks/profile/b_list_of_tickets_support_chat.html' %}
</div>