Skip to content

flexydial / hdfc-beu-v2

Go to a project
Toggle navigation
Toggle navigation pinning
8531fe49 by Manish Mihsra
Options

Added report changes and changed logic in createcall to pick up dialline channel

1 parent fa27a3e9
Inline Side-by-side
Showing 6 changed files with 54 additions and 14 deletions
application/app/Console/Commands/CreateCall.php
...@@ -268,6 +268,7 @@ class CreateCall extends Command { ...@@ -268,6 +268,7 @@ class CreateCall extends Command {
268 268
269 public function useChannelToDial($client, $availDialStr) 269 public function useChannelToDial($client, $availDialStr)
270 { 270 {
271 $retCrmCall = 0;
271 $dialline=Dialline::where('server','=', env('app_ip'))->where("status","=","Free")->where("enabled","=","1")->where("dialstr", "=", $availDialStr)->orderBy('updated_at','ASC')->first(); 272 $dialline=Dialline::where('server','=', env('app_ip'))->where("status","=","Free")->where("enabled","=","1")->where("dialstr", "=", $availDialStr)->orderBy('updated_at','ASC')->first();
272 273
273 //TODO::Need To Code Dspan Logic as per discussion 274 //TODO::Need To Code Dspan Logic as per discussion
...@@ -276,9 +277,17 @@ class CreateCall extends Command { ...@@ -276,9 +277,17 @@ class CreateCall extends Command {
276 277
277 if(!empty($dialline)) 278 if(!empty($dialline))
278 { 279 {
279 $this->createCrmCall($client, $dialline); 280 $dialline->status = "Incall";
281 $dialline->save();
282
283 $retCrmCall = $this->createCrmCall($client, $dialline);
280 } 284 }
281 285
286 if(!$retCrmCall)
287 {
288 $dialline->status = "Free";
289 $dialline->save();
290 }
282 return; 291 return;
283 } 292 }
284 293
...@@ -303,7 +312,7 @@ class CreateCall extends Command { ...@@ -303,7 +312,7 @@ class CreateCall extends Command {
303 312
304 $dialline->user_id=$user_id; 313 $dialline->user_id=$user_id;
305 $dialline->status="AutoCall"; 314 $dialline->status="AutoCall";
306 $dialline->regexstr=$users[0]['client']; 315 $dialline->regexstr=$users[0]["client"];
307 $dialline->number=$users[0]["mobile"]; 316 $dialline->number=$users[0]["mobile"];
308 $dialline->save(); 317 $dialline->save();
309 318
...@@ -334,9 +343,10 @@ class CreateCall extends Command { ...@@ -334,9 +343,10 @@ class CreateCall extends Command {
334 //start actual calls 343 //start actual calls
335 $newqueue=new Kqueue(); 344 $newqueue=new Kqueue();
336 $newqueue->autoCallOut($users[0]["mobile"],$callerid,$crmcall,$dialline); 345 $newqueue->autoCallOut($users[0]["mobile"],$callerid,$crmcall,$dialline);
337 }
338 346
339 return; 347 return 1;
348 }
349 return 0;
340 } 350 }
341 351
342 public function getSpanCount() 352 public function getSpanCount()
......
application/app/Constants/gatewaydispo.php
1 <?php 1 <?php
2 $gatewaydispoArry=Array('19'=>'NC-BUSY','17'=>'NC-BUSY','0'=>'NC-BUSY','16'=>'NC-Ringing'); 2 $gatewaydispoArry=Array('0' =>'NC-UNALLOCATED',
3 3 '1' =>'NC-UNALLOCATED',
4 '16' =>'NC-Ringing',
5 '17' =>'NC-BUSY',
6 '18' =>'NC-Ringing',
7 '19' =>'NC-BUSY',
8 '27' =>'NC-CONGESTION',
9 '29' =>'NC-BUSY',
10 '34' =>'NC-CONGESTION',
11 '38' =>'NC-CONGESTION',
12 '102'=>'NC-CONGESTION'
13 );
4 ?> 14 ?>
......
application/app/Http/Controllers/ReportController.php
...@@ -37,9 +37,11 @@ class ReportController extends Controller ...@@ -37,9 +37,11 @@ class ReportController extends Controller
37 $timeoffset = $dashboarduser->timezone; //-330; //$dashboarduser->timezone; 37 $timeoffset = $dashboarduser->timezone; //-330; //$dashboarduser->timezone;
38 $timeoffset = $timeoffset*60; 38 $timeoffset = $timeoffset*60;
39 39
40 $data['user'] = $dashboarduser;
41
40 if($id=="reports") 42 if($id=="reports")
41 { 43 {
42 return view("layout.module.reports.reports"); 44 return view("layout.module.reports.reports", $data);
43 } 45 }
44 46
45 $logtime =(isset($_GET['logtime'])) ? $_GET['logtime'] :9; 47 $logtime =(isset($_GET['logtime'])) ? $_GET['logtime'] :9;
......
application/app/Jobs/KPAMIListen.php
...@@ -1423,6 +1423,10 @@ class KPAMIListen implements IEventListener ...@@ -1423,6 +1423,10 @@ class KPAMIListen implements IEventListener
1423 { 1423 {
1424 foreach($diallines as $dialline) 1424 foreach($diallines as $dialline)
1425 { 1425 {
1426 $lastUpdatedTime = strtotime(date("Y-m-d H:i:s")) - strtotime($dialline->updated_at);
1427
1428 if($lastUpdatedTime < 3) continue;
1429
1426 exec("/usr/sbin/asterisk -rx 'core show channels'",$allChnnlsArr); 1430 exec("/usr/sbin/asterisk -rx 'core show channels'",$allChnnlsArr);
1427 $cnt = 0; 1431 $cnt = 0;
1428 foreach($allChnnlsArr as $allChnnls) 1432 foreach($allChnnlsArr as $allChnnls)
......
application/resources/views/layout/module/reports/calllog.blade.php
...@@ -236,7 +236,11 @@ if(Input::has("dllogxls")) ...@@ -236,7 +236,11 @@ if(Input::has("dllogxls"))
236 { 236 {
237 $row = $baseRow++; 237 $row = $baseRow++;
238 $col = 0; 238 $col = 0;
239 239 if($aline->type == "Auto" || $aline->type == "AutoCall")
240 {
241 $aline->waitSec = 0;
242 $aline->callSec = 0;
243 }
240 244
241 $clientcode="";$currentstatus="";$legalstatus=""; 245 $clientcode="";$currentstatus="";$legalstatus="";
242 if($aline->crm_id>0) 246 if($aline->crm_id>0)
...@@ -347,6 +351,12 @@ foreach($alist as $aline) ...@@ -347,6 +351,12 @@ foreach($alist as $aline)
347 { 351 {
348 $clientcode=""; 352 $clientcode="";
349 353
354 if($aline->type == "Auto" || $aline->type == "AutoCall")
355 {
356 $aline->waitSec = 0;
357 $aline->callSec = 0;
358 }
359
350 if($aline->crm_id>0) 360 if($aline->crm_id>0)
351 { 361 {
352 /*$user=$wakka->getPerson($aline->crm_id); 362 /*$user=$wakka->getPerson($aline->crm_id);
...@@ -716,16 +726,16 @@ series: [{ ...@@ -716,16 +726,16 @@ series: [{
716 { 726 {
717 var sortstr='';if(sortby!="")sortstr="&sort="+sortby 727 var sortstr='';if(sortby!="")sortstr="&sort="+sortby
718 var searchStr = dataString(); 728 var searchStr = dataString();
719 doAjax('dialer/calllog?'+searchStr+sortstr,'','rightmainreportdiv','ajax_dialer_reports','singlethis','GET'); 729 doAjax('report/calllog?'+searchStr+sortstr,'','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');
720 } 730 }
721 function getCallRec(id) 731 function getCallRec(id)
722 { 732 {
723 doAjax("dialer/calllog","getCallRec=1&calllog="+id+"&logdate="+$("#modfrom").val(),'recspan_'+id,'rec_ajax','singlefail','GET'); 733 doAjax("report/calllog","getCallRec=1&calllog="+id+"&logdate="+$("#modfrom").val(),'recspan_'+id,'rec_ajax','singlefail','GET');
724 } 734 }
725 function dlCalllogXls() 735 function dlCalllogXls()
726 { 736 {
727 var searchStr = dataString(); 737 var searchStr = dataString();
728 window.open('dialer/calllog?dllogxls=1&'+searchStr);return false; 738 window.open('report/calllog?dllogxls=1&'+searchStr);return false;
729 739
730 } 740 }
731 741
......
application/resources/views/layout/module/reports/reports.blade.php
...@@ -24,9 +24,11 @@ ...@@ -24,9 +24,11 @@
24 <div class="col-app"> 24 <div class="col-app">
25 25
26 <ul class="list-group list-group-1 margin-none borders-none" style='padding-right: 26px;'> 26 <ul class="list-group list-group-1 margin-none borders-none" style='padding-right: 26px;'>
27 @if($user->usertype != "User")
27 <li class="list-group-item"> 28 <li class="list-group-item">
28 <a href="#" onclick="doAjax('report/liveusers','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i> Live</a> 29 <a href="#" onclick="doAjax('report/liveusers','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i> Live</a>
29 </li> 30 </li>
31 @endif
30 32
31 <li class="list-group-item"> 33 <li class="list-group-item">
32 <a href="#" onclick="doAjax('report/calllog','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i> Call</a> 34 <a href="#" onclick="doAjax('report/calllog','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i> Call</a>
...@@ -46,7 +48,7 @@ ...@@ -46,7 +48,7 @@
46 </li> 48 </li>
47 49
48 <li class="list-group-item"> 50 <li class="list-group-item">
49 <a href="#" onclick="doAjax('report/relationshipreport','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i>Relationship</a> 51 <a href="#" onclick="doAjax('report/campaignwise','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');return false"><i class="fa fa-circle-o"></i>Campaign Wise</a>
50 </li> 52 </li>
51 </ul> 53 </ul>
52 </div> 54 </div>
...@@ -87,9 +89,11 @@ ...@@ -87,9 +89,11 @@
87 89
88 <div class="" id=rightmainreportdiv> 90 <div class="" id=rightmainreportdiv>
89 <script> 91 <script>
90 92 @if($user->usertype != "User")
91 doAjax('report/liveusers','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET'); 93 doAjax('report/liveusers','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');
92 94 @else
95 doAjax('report/calllog','','rightmainreportdiv','ajax_dialer_reports','singlethis','GET');
96 @endif
93 </script> 97 </script>
94 </div> 98 </div>
95 99
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!