diff --git a/src/app/pd/chat-component/chat-component.component.ts b/src/app/pd/chat-component/chat-component.component.ts index 5d12d04..475710f 100644 --- a/src/app/pd/chat-component/chat-component.component.ts +++ b/src/app/pd/chat-component/chat-component.component.ts @@ -71,12 +71,22 @@ export class ChatComponentComponent implements OnInit { } this.type_name = this.type == '1' ? 'CUSTOMER' : this.type == '2' ? 'PDOFFICER' : this.type == '3' ? this.cm_name : 'UNKNOWN' if(this.type == '2' || this.type == '3') { - if(window.location.origin.includes('localhost')){ - this.cusUrl = window.location.origin+'/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1;"; - } - else{ - this.cusUrl = window.location.origin+'/vchat/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1;"; + if(this.pd_category == '2'){ + if(window.location.origin.includes('localhost')){ + this.cusUrl = window.location.origin+'/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1"+";pd_category=2"; + } + else{ + this.cusUrl = window.location.origin+'/vchat/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1"+";pd_category=2"; + } + }else{ + if(window.location.origin.includes('localhost')){ + this.cusUrl = window.location.origin+'/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1;"; + } + else{ + this.cusUrl = window.location.origin+'/vchat/#/chat/'+this.randomStr+";id="+this.pd_id+";type=1;"; + } } + } this.username = this.route.snapshot.paramMap.get('name') if (this.username == null) { diff --git a/src/app/pd/services/twilio/twilio.service.ts b/src/app/pd/services/twilio/twilio.service.ts index 82efff5..1cdc809 100644 --- a/src/app/pd/services/twilio/twilio.service.ts +++ b/src/app/pd/services/twilio/twilio.service.ts @@ -148,15 +148,30 @@ export class TwilioService { console.log('sineedge'); // alert('record'); console.log("User type in service",this.user_data) - let params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"0"} - console.log("connected api",params) + console.log(this.user_data.pd_category) + let params + if(this.user_data.pd_category == '2'){ + console.log('pd cat') + params = {"pd_category":this.user_data.pd_category,"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + }else{ + console.log('pd cat else') + params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + } + console.log("connected api",params) this.sendRoomandStatus(params).subscribe(rr=>{}) } else if(this.user_data.type == '3' && withoutcustomer == '1'){ console.log('lenderdemo'); console.log("User type in service",this.user_data) - let params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"0"} - console.log("connected api",params) + let params + if(this.user_data.pd_category == '2'){ + console.log('pd cat') + params = {"pd_category":this.user_data.pd_category,"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + }else{ + console.log('pd cat else') + params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + } + console.log("connected api",params) this.sendRoomandStatus(params).subscribe(rr=>{}) } // } @@ -548,8 +563,10 @@ disconnect(){ if(this.user_data.type == '2' && this.remoteVideo.nativeElement.firstChild != null) { let params if(this.user_data.pd_category == '2'){ + console.log('pd cat') params = {"pd_category":this.user_data.pd_category,"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} }else{ + console.log('pd cat else') params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} } @@ -558,8 +575,14 @@ disconnect(){ } else if(this.user_data.type == '3' && withoutcustomer == '0'){ console.log("User type in service",this.user_data) - let params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} - console.log("disconnected api",params) + let params + if(this.user_data.pd_category == '2'){ + console.log('pd cat') + params = {"pd_category":this.user_data.pd_category,"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + }else{ + console.log('pd cat else') + params = {"fk_pd_id":this.user_data.pd_id,"room_id":this.roomObj.sid,"is_call_ended":"1"} + } console.log("disconnected api",params) this.sendRoomandStatus(params).subscribe(rr=>{}) } this.roomObj.disconnect();