Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
%}
{% if conversation.last_message or conversation['current'] %}
<li>
{% render 'modules/chat/conversation', id: conversation.id, current: conversation['current'], name: name, image_src: image_src, last_message: last_message, timezone: current_profile.timezone, unread: unread %}
{% render 'modules/chat/conversation', id: conversation.id, current: conversation['current'], name: name, image_src: image_src, last_message: last_message, timezone: current_profile.properties.timezone, unread: unread %}
</li>
{% endif %}
{% endfor %}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
window.pos.profile = {{ current_profile }};
}

window.pos.profile.timezone = {% if current_profile.timezone %} '{{ current_profile.timezone }}' {% else %} null {% endif %};
window.pos.profile.timezone = {% if current_profile.properties.timezone %} '{{ current_profile.properties.timezone }}' {% else %} null {% endif %};

/* translations used in module */
window.pos.translations = {
Expand Down Expand Up @@ -124,7 +124,7 @@
assign authored = false
endif

render 'modules/chat/message', message: message, authored: authored, timezone: current_profile.timezone
render 'modules/chat/message', message: message, authored: authored, timezone: current_profile.properties.timezone
endfor
%}
</ul>
Expand Down Expand Up @@ -166,7 +166,7 @@
]
%}
{% for message in messages %}
{% render 'modules/chat/message', message: message, authored: false, timezone: current_profile.timezone %}
{% render 'modules/chat/message', message: message, authored: false, timezone: current_profile.properties.timezone %}
{% endfor %}
{% endif %}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion pos-module-chat/modules/chat/template-values.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "Pos Module Chat",
"machine_name": "chat",
"type": "module",
"version": "2.1.1",
"version": "2.1.2",
"dependencies": {
"core": "^2.1.9",
"user": "^5.2.10",
Expand Down
2 changes: 1 addition & 1 deletion pos-module-chat/pos-module.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
},
"machine_name": "chat",
"name": "Pos Module Chat",
"version": "2.1.1"
"version": "2.1.2"
}
Loading