diff --git a/src/components/card/CscCollapsible.vue b/src/components/card/CscCollapsible.vue index 81c4e5d2..81c2a1ed 100644 --- a/src/components/card/CscCollapsible.vue +++ b/src/components/card/CscCollapsible.vue @@ -3,6 +3,7 @@ + @@ -34,4 +35,10 @@ color black font-size 18px font-weight 400 + ul + list-style none + font-size 1rem + line-height 2rem + strong + font-weight 500 diff --git a/src/components/pages/Conversations.vue b/src/components/pages/Conversations.vue index 10128a65..4c432402 100644 --- a/src/components/pages/Conversations.vue +++ b/src/components/pages/Conversations.vue @@ -7,18 +7,35 @@ +
+ +
-
+
{{ $t('pages.conversations.buttons.call') }} - + {{ $t('pages.conversations.buttons.audioCall') }} - + {{ $t('pages.conversations.buttons.videoCall') }} @@ -78,10 +95,6 @@ this.$refs.infinite.stop(); }); }, - hasCallOption(type) { - return (['call', 'call forward', 'sms', 'voicemail'] - .indexOf(type) > -1); - }, getCollapsibleIcons(item) { let directionIcon = item.direction == 'out' ? 'call_made' : 'call_received'; @@ -111,6 +124,24 @@ this.$t('pages.conversations.labels.from') : this.$t('pages.conversations.labels.to'); return `${prefix} ${item.type} ${direction} ${item.caller}`; + }, + isCall(type) { + return type == 'call'; + }, + isVoicemail(type) { + return type == 'voicemail'; + }, + isFax(type) { + return type == 'fax'; + }, + isXmpp(type) { + return type == 'xmpp'; + }, + isSms(type) { + return type == 'sms'; + }, + isCallForward(type) { + return type == 'call forward'; } } } diff --git a/src/locales/en.json b/src/locales/en.json index 3d089f99..2ccb343d 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -93,6 +93,14 @@ "call": "CALL", "audioCall": "Audio Call", "videoCall": "Video Call" + }, + "card": { + "date": "Date", + "duration": "Duration", + "folder": "Folder", + "pages": "Pages", + "cost": "Cost", + "message": "Message" } }, "reminder": { diff --git a/src/store/conversations.js b/src/store/conversations.js index 49252594..d895f967 100644 --- a/src/store/conversations.js +++ b/src/store/conversations.js @@ -29,9 +29,9 @@ export default { }, actions: { loadConversations(context) { - return new Promise((resolve, reject)=>{ + return new Promise((resolve, reject) => { getConversations(localStorage.getItem('subscriberId'), context.state.page, context.state.rows) - .then((result)=>{ + .then(result => { context.commit('loadConversations', result); resolve(); })