{{ this.allCallsFwd ? '' : $t('pages.newCallForward.destinationTimeoutLabel') }}
{{this.destinationTimeout}}
- {{ this.allCallsFwd ? $t('pages.newCallForward.allCallsForwardedTo') : $t('pages.newCallForward.destinationNumberLabel') }}
+ {{ this.allCallsFwd
+ ? $t('pages.newCallForward.allCallsForwardedTo')
+ : isVoiceMail()
+ ? $t('pages.newCallForward.destinationVoicemailLabel')
+ : $t('pages.newCallForward.destinationNumberLabel')
+ }}
-
+
{{ !this.destinationNumber || this.destinationNumber.length < 2
? $t('pages.newCallForward.destinationLabel')
: this.destinationNumber}}
+
-
@@ -133,7 +139,7 @@
destinationTimeout: 0,
destinationNumber: null,
destinationIndex: null,
- showDots: false,
+ removeInProgress: false,
toggleNumberForm: true
}
},
@@ -141,8 +147,11 @@
...mapGetters('newCallForward', [
'getOwnPhoneTimeout'
]),
- removed(){
- return this.showDots ? "csc-cf-removed-destination" : "";
+ disableDestType(){
+ return !this.groupId.toString().includes('temp-')
+ },
+ disableNumberPopover(){
+ return !this.groupId.toString().includes('temp-') ? false : this.toggleNumberForm;
}
},
methods: {
@@ -152,12 +161,30 @@
&& isNaN(this.getOwnPhoneTimeout) === false
? this.getOwnPhoneTimeout
: destination.timeout;
- this.destinationNumber = destination.simple_destination;
+ this.destinationNumber = this.isVoiceMail() ? `${this.$t('pages.newCallForward.voiceMailLabel')}` : destination.simple_destination;
this.destinationIndex = this.index;
},
- showNumberFormPopover(){ // temporarily called onClose
- this.toggleNumberForm = false;
- this.$refs.numberForm.open();
+ async showNext(){
+ switch(this.$refs.selectDestinationType.action){
+ case 'destination':
+ this.toggleNumberForm = false;
+ this.$refs.numberForm.open();
+ break;
+ case 'voicemail':
+ if(this.groupId.toString().includes('temp-')){ // unexisting group
+ this.$parent.toggleGroupInProgress = true;
+ await this.$store.dispatch('newCallForward/addForwardGroup', {
+ name: this.groupName,
+ destination: 'voicebox'
+ });
+ await this.$store.dispatch('newCallForward/loadForwardGroups');
+ this.$parent.toggleGroupInProgress = false;
+ }
+ else{
+ await this.$store.dispatch('newCallForward/addVoiceMail', this.groupId);
+ }
+ break;
+ }
},
showNumberForm(){
this.$refs.addDestinationForm.add();
@@ -167,22 +194,36 @@
this.$refs.selectDestinationType.add();
},
async saveTimeout(){
- this.$store.dispatch('newCallForward/editTimeout', {
+ this.$parent.toggleGroupInProgress = true;
+ await this.$store.dispatch('newCallForward/editTimeout', {
index: this.destinationIndex,
timeout: this.destinationTimeout,
forwardGroupId: this.groupId
});
+ this.$parent.toggleGroupInProgress = false;
+
},
showConfirmDialog(){
this.$refs.confirmDialog.open();
},
- async deleteDestination(){
- this.showDots = true;
+ async confirmDeleteDest(){
+ this.removeInProgress = true;
await this.$store.dispatch('newCallForward/removeDestination', {
destination: this.destination,
forwardGroupId: this.groupId
});
await this.$store.dispatch('newCallForward/loadForwardGroups');
+ await this.$store.dispatch('newCallForward/loadMappings');
+ },
+ isVoiceMail(){
+ return this.destination.destination.includes('voicebox.local')
+ },
+ getDestName(){
+ return this.destination.simple_destination
+ ? this.destination.simple_destination
+ : this.isVoiceMail()
+ ? `${this.$t('pages.newCallForward.voiceMailLabel')}`
+ : "";
}
}
}
@@ -199,6 +240,8 @@
white-space nowrap
overflow hidden
text-overflow ellipsis
+ font-weight bold
+ .csc-cf-destination-link
color $primary
cursor pointer
.csc-cf-timeout-form,
@@ -210,10 +253,12 @@
.csc-cf-destination-actions
text-align left
cursor pointer
+ .csc-cf-popover-hide
+ display none
+ .csc-cf-dest-popover-bottom
+ margin-left 0px
.csc-cf-removed-destination
visibility hidden
opacity 0
transition visibility 0s 1s, opacity 1s linear
- .csc-cf-popover-hide
- display none
diff --git a/src/components/pages/NewCallForward/CscNewCallForwardDestinationTypeForm.vue b/src/components/pages/NewCallForward/CscNewCallForwardDestinationTypeForm.vue
index 483f5474..bce65f7c 100644
--- a/src/components/pages/NewCallForward/CscNewCallForwardDestinationTypeForm.vue
+++ b/src/components/pages/NewCallForward/CscNewCallForwardDestinationTypeForm.vue
@@ -10,6 +10,7 @@
{{ $t('pages.newCallForward.voiceMailLabel') }}
@@ -27,14 +28,19 @@
},
data () {
return {
- enabled: false
+ enabled: false,
+ action: null
}
},
- props: [
- ],
+ props: [],
computed: {},
methods: {
showNumberForm(){
+ this.action = 'destination';
+ this.$parent.close()
+ },
+ addVoiceMail(){
+ this.action = 'voicemail';
this.$parent.close()
},
cancel() {
diff --git a/src/locales/en.json b/src/locales/en.json
index 77075bed..fc14a88b 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -218,6 +218,7 @@
"voiceMailLabel": "Voicemail",
"destinationTimeoutLabel": "Then after ",
"destinationNumberLabel": "seconds forwarded to",
+ "destinationVoicemailLabel": "seconds finally forwarded to",
"destinationLabel": "Destination",
"addDestinationLabel": "Add destination",
"allCallsForwardedTo": "All calls forwarded to",
diff --git a/src/store/new-call-forward.js b/src/store/new-call-forward.js
index 700655d0..81c46fbf 100644
--- a/src/store/new-call-forward.js
+++ b/src/store/new-call-forward.js
@@ -31,7 +31,6 @@ export default {
getters: {
primaryNumber(state, getters, rootState, rootGetters) {
const subscriber = rootGetters['user/getSubscriber'];
-
if(subscriber !== null) {
return subscriber.primary_number;
}
@@ -238,6 +237,25 @@ export default {
console.log(err);
}
},
+ async addVoiceMail(context, groupId){
+ try{
+ let group = context.state.forwardGroups.find((group)=>{
+ return group.id === groupId || group.id.toString() === groupId;
+ });
+ const destination = {
+ "announcement_id": null,
+ "destination": "voicebox",
+ "priority": 1
+ };
+ await addDestinationToDestinationset({
+ id: group.id,
+ data: [...group.destinations, destination]
+ });
+ }
+ catch(err){
+ console.log(err);
+ }
+ },
async replaceDestinations(context, data){
try{
let group = context.state.forwardGroups.find((group)=>{
@@ -267,7 +285,6 @@ export default {
if(destinations.length < 1){
context.dispatch('deleteForwardGroup', group);
context.dispatch('loadForwardGroups', group);
- context.dispatch('loadMappings', group);
}
}
catch(err){
@@ -305,68 +322,69 @@ export default {
}
},
async editTimeout(context, data){
- if(data.index === 0){ // first row -> change cft_ringtimeout
- context.dispatch('editRingTimeout', data.timeout);
- }
- else{
- const group = context.state.forwardGroups.find((group)=>{
- return group.id === data.forwardGroupId;
- });
- let destination = group.destinations.slice(data.index-1, data.index)[0];
- destination.timeout = data.timeout;
- context.commit('editTimeout', data);
- try{
+ try{
+ if(data.index === 0){ // first row -> change cft_ringtimeout
+ await context.dispatch('editRingTimeout', data.timeout);
+ }
+ else{
+ const group = context.state.forwardGroups.find((group)=>{
+ return group.id === data.forwardGroupId;
+ });
+ let destination = group.destinations.slice(data.index-1, data.index)[0];
+ destination.timeout = data.timeout;
await addDestinationToDestinationset({
id: group.id,
data: group.destinations
});
- }
- catch(err){
- console.log(err)
+ context.commit('editTimeout', data);
}
}
-
+ catch(err){
+ console.log(err)
+ }
},
async forwardAllCalls(context, noSelfNumber){
try{
let unconditionalGroup = await context.dispatch('getForwardGroupByName', 'unconditional')
let timeoutGroup = await context.dispatch('getForwardGroupByName', 'timeout');
+ if(noSelfNumber){
+ if(timeoutGroup && !timeoutGroup.id.toString().includes('temp')){
+ await context.dispatch('addForwardGroup', {
+ name: 'unconditional'
+ });
+ await context.dispatch('loadMappings');
+ await context.dispatch('loadForwardGroups');
+ //unconditionalGroup = await context.dispatch('getForwardGroupByName', 'unconditional');
+ await context.dispatch('replaceDestinations', {
+ groupName: 'unconditional',
+ destinations: timeoutGroup.destinations
+ });
+ await context.dispatch('deleteForwardGroup', timeoutGroup);
- if(!unconditionalGroup){
- await context.dispatch('addForwardGroup', {
- name: 'unconditional'
- });
- await context.dispatch('loadMappings');
+ }
+ else {
+ await context.dispatch('addTempDestination', 'temp-unconditional')
+ }
await context.dispatch('loadForwardGroups');
- unconditionalGroup = await context.dispatch('getForwardGroupByName', 'unconditional');
- }
- if(!timeoutGroup){
- await context.dispatch('addForwardGroup', {
- name: 'timeout'
- });
- await context.dispatch('loadMappings');
- await context.dispatch('loadForwardGroups');
- timeoutGroup = await context.dispatch('getForwardGroupByName', 'timeout');
- }
-
- if(noSelfNumber){
- await context.dispatch('replaceDestinations', {
- groupName: 'unconditional',
- destinations: timeoutGroup.destinations
- });
- await context.dispatch('deleteForwardGroup', timeoutGroup);
}
else{
- await context.dispatch('replaceDestinations', {
- groupName: 'timeout',
- destinations: unconditionalGroup.destinations
- });
- await context.dispatch('deleteForwardGroup', unconditionalGroup);
-
-
+ if(unconditionalGroup && !unconditionalGroup.id.toString().includes('temp')){
+ await context.dispatch('addForwardGroup', {
+ name: 'timeout'
+ });
+ await context.dispatch('loadMappings');
+ await context.dispatch('loadForwardGroups');
+ await context.dispatch('replaceDestinations', {
+ groupName: 'timeout',
+ destinations: unconditionalGroup.destinations
+ });
+ await context.dispatch('deleteForwardGroup', unconditionalGroup);
+ }
+ else{
+ await context.dispatch('addTempDestination', 'temp-timeout')
+ }
+ await context.dispatch('loadForwardGroups');
}
- await context.dispatch('loadMappings');
- await context.dispatch('loadForwardGroups');
}
catch(err){
console.log(err)