-
Notifications
You must be signed in to change notification settings - Fork 11.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into localguru-email_header_fix
- Loading branch information
Showing
47 changed files
with
945 additions
and
228 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,39 +1,7 @@ | ||
| import '../lib/messageTypes'; | ||
| import '../lib/LivechatExternalMessage'; | ||
| import './roomType'; | ||
| import './route'; | ||
| import './ui'; | ||
| import './startup/notifyUnreadRooms'; | ||
| import './views/app/analytics/livechatAnalytics'; | ||
| import './views/app/analytics/livechatAnalyticsCustomDaterange'; | ||
| import './views/app/analytics/livechatAnalyticsDaterange'; | ||
| import './views/app/analytics/livechatRealTimeMonitoring'; | ||
| import './views/app/livechatAgents'; | ||
| import './views/app/livechatAppearance'; | ||
| import './views/app/livechatAutocompleteUser'; | ||
| import './views/app/livechatCurrentChats'; | ||
| import './views/app/livechatCustomFields'; | ||
| import './views/app/livechatCustomFieldForm'; | ||
| import './views/app/livechatDepartmentForm'; | ||
| import './views/app/livechatDepartments'; | ||
| import './views/app/livechatInstallation'; | ||
| import './views/app/livechatOfficeHours'; | ||
| import './views/app/livechatQueue'; | ||
| import './views/app/livechatReadOnly'; | ||
| import './views/app/livechatTriggers'; | ||
| import './views/app/livechatTriggersForm'; | ||
| import './views/app/livechatManagers'; | ||
| import './views/app/livechatNotSubscribed.html'; | ||
| import './views/app/livechatRoomTagSelector.html'; | ||
| import './views/app/integrations/livechatIntegrationWebhook'; | ||
| import './views/app/integrations/livechatIntegrationFacebook'; | ||
| import './views/app/tabbar/externalSearch'; | ||
| import './views/app/tabbar/visitorEdit'; | ||
| import './views/app/tabbar/visitorForward'; | ||
| import './views/app/tabbar/visitorInfo'; | ||
| import './views/app/tabbar/visitorHistory'; | ||
| import './views/app/tabbar/visitorNavigation'; | ||
| import './views/app/triggers/livechatTriggerAction'; | ||
| import './views/app/triggers/livechatTriggerCondition'; | ||
| import './views/sideNav/livechat'; | ||
| import './views/sideNav/livechatFlex'; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,176 +1,177 @@ | ||
| import { FlowRouter } from 'meteor/kadira:flow-router'; | ||
|
|
||
| import { AccountBox } from '../../ui-utils'; | ||
| import './views/app/livechatDashboard.html'; | ||
|
|
||
| export const livechatManagerRoutes = FlowRouter.group({ | ||
| prefix: '/livechat-manager', | ||
| name: 'livechat-manager', | ||
| }); | ||
|
|
||
| const load = () => import('./views'); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-dashboard', | ||
| path: '/dashboard', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Livechat_Dashboard', | ||
| pageTemplate: 'livechatDashboard', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-current-chats', | ||
| path: '/current', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Current_Chats', | ||
| pageTemplate: 'livechatCurrentChats', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-analytics', | ||
| path: '/analytics', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Analytics', | ||
| pageTemplate: 'livechatAnalytics', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-real-time-monitoring', | ||
| path: '/real-time-monitoring', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Real_Time_Monitoring', | ||
| pageTemplate: 'livechatRealTimeMonitoring', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-managers', | ||
| path: '/managers', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Livechat_managers', | ||
| pageTemplate: 'livechatManagers', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-agents', | ||
| path: '/agents', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Livechat_agents', | ||
| pageTemplate: 'livechatAgents', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-departments', | ||
| path: '/departments', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Departments', | ||
| pageTemplate: 'livechatDepartments', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-department-edit', | ||
| path: '/departments/:_id/edit', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Edit_Department', | ||
| pageTemplate: 'livechatDepartmentForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-department-new', | ||
| path: '/departments/new', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'New_Department', | ||
| pageTemplate: 'livechatDepartmentForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-triggers', | ||
| path: '/triggers', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Triggers', | ||
| pageTemplate: 'livechatTriggers', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-trigger-edit', | ||
| path: '/triggers/:_id/edit', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Edit_Trigger', | ||
| pageTemplate: 'livechatTriggersForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-trigger-new', | ||
| path: '/triggers/new', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'New_Trigger', | ||
| pageTemplate: 'livechatTriggersForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-installation', | ||
| path: '/installation', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Installation', | ||
| pageTemplate: 'livechatInstallation', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-appearance', | ||
| path: '/appearance', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Appearance', | ||
| pageTemplate: 'livechatAppearance', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-officeHours', | ||
| path: '/officeHours', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Office_Hours', | ||
| pageTemplate: 'livechatOfficeHours', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-customfields', | ||
| path: '/customfields', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Custom_Fields', | ||
| pageTemplate: 'livechatCustomFields', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-customfield-edit', | ||
| path: '/customfields/:_id/edit', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Edit_Custom_Field', | ||
| pageTemplate: 'livechatCustomFieldForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-customfield-new', | ||
| path: '/customfields/new', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'New_Custom_Field', | ||
| pageTemplate: 'livechatCustomFieldForm', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-webhooks', | ||
| path: '/webhooks', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Webhooks', | ||
| pageTemplate: 'livechatIntegrationWebhook', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-facebook', | ||
| path: '/facebook', | ||
| sideNav: 'livechatFlex', | ||
| i18nPageTitle: 'Facebook Messenger', | ||
| pageTemplate: 'livechatIntegrationFacebook', | ||
| }, livechatManagerRoutes); | ||
| }, livechatManagerRoutes, load); | ||
|
|
||
| AccountBox.addRoute({ | ||
| name: 'livechat-queue', | ||
| path: '/livechat-queue', | ||
| i18nPageTitle: 'Livechat_Queue', | ||
| pageTemplate: 'livechatQueue', | ||
| }); | ||
| }, null, load); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,57 @@ | ||
| import { Template } from 'meteor/templating'; | ||
| import { ReactiveVar } from 'meteor/reactive-var'; | ||
|
|
||
| import { LivechatExternalMessage } from '../../../../lib/LivechatExternalMessage'; | ||
| import './externalSearch.html'; | ||
| import { APIClient } from '../../../../../utils/client'; | ||
|
|
||
| const MESSAGES_COUNT = 50; | ||
|
|
||
| Template.externalSearch.helpers({ | ||
| messages() { | ||
| return LivechatExternalMessage.findByRoomId(this.rid, { ts: 1 }); | ||
| return Template.instance().externalMessages.get(); | ||
| }, | ||
| hasMore() { | ||
| const instance = Template.instance(); | ||
| const externalMessages = instance.externalMessages.get(); | ||
| return instance.total.get() > externalMessages.length; | ||
| }, | ||
| }); | ||
|
|
||
| Template.externalSearch.events({ | ||
| 'click button.pick-message'(event, instance) { | ||
| event.preventDefault(); | ||
|
|
||
| $(`#chat-window-${ instance.roomId } .input-message`).val(this.msg).focus(); | ||
| $(`#chat-window-${ instance.roomId } .js-input-message`).val(this.msg).focus(); | ||
| }, | ||
| 'click .load-more'(e, t) { | ||
| e.preventDefault(); | ||
| e.stopPropagation(); | ||
| t.offset.set(t.offset.get() + MESSAGES_COUNT); | ||
| }, | ||
| 'click .load-more-livechat-external-messages'(event, instance) { | ||
| return instance.offset.set(instance.offset.get() + MESSAGES_COUNT); | ||
| }, | ||
| }); | ||
|
|
||
| Template.externalSearch.onCreated(function() { | ||
| this.roomId = null; | ||
| // console.log('externalSearch.this ->',this); | ||
| this.autorun(() => { | ||
| this.externalMessages = new ReactiveVar([]); | ||
| this.offset = new ReactiveVar(0); | ||
| this.ready = new ReactiveVar(true); | ||
| this.total = new ReactiveVar(0); | ||
|
|
||
| this.autorun(async () => { | ||
| this.ready.set(false); | ||
| const offset = this.offset.get(); | ||
| this.roomId = Template.currentData().rid; | ||
| this.subscribe('livechat:externalMessages', Template.currentData().rid); | ||
| if (this.roomId) { | ||
| const { messages, total } = await APIClient.v1.get(`livechat/messages.external/${ this.roomId }?count=${ MESSAGES_COUNT }&offset=${ offset }`); | ||
| this.total.set(total); | ||
| if (offset === 0) { | ||
| this.externalMessages.set(messages); | ||
| } else { | ||
| this.externalMessages.set(this.externalMessages.get().concat(messages)); | ||
| } | ||
| } | ||
| this.ready.set(true); | ||
| }); | ||
| }); |
Oops, something went wrong.