474f8146 by Manish Mihsra

Resolved all error after merging master into predictive branch

1 parent d2f726c4
......@@ -87,7 +87,6 @@ class CreateCall extends Command {
} catch (Exception $e) {
Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
Log::error($e);
continue;
}
}
......
......@@ -80,7 +80,6 @@ class PredictiveCallHangUp extends Command {
} catch (Exception $e) {
Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
Log::error($e);
continue;
}
}
}
\ No newline at end of file
......
......@@ -5,6 +5,7 @@ use App\Http\Requests;
use Auth;
use Log;
use DB;
use App\Models\CRMCall;
class SmsController extends Controller
{
public $smsUrl = 'https://10.2.55.165:443/servlet/com.aclwireless.pushconnectivity.listeners.TextListener?';
......
......@@ -1770,7 +1770,6 @@ function createQaireHistTab()
$bulkCallID = DB::table("questionaire_details")->where('user_id','=',$user_id)->where('cust_id','=',$cust_id)->orderBy('id','desc')->select('call_id')->distinct()->get();
dy>
$custIdArr = array();
foreach($bulkCallID as $key=> $callID){
......
......@@ -972,7 +972,10 @@ function popMail($userid)
$spostvars=serialize($personarr['peopledata']);
$screatedlog=serialize($personarr['modifylog']);
$sfdirty=serialize($personarr['dirty']);
if(sizeof($personarr['peopledata'])!=sizeof(unserialize($spostvars))||sizeof($personarr['modifylog'])!=sizeof(unserialize($screatedlog))||sizeof($personarr['dirty'])!=sizeof(unserialize($sfdirty)))
if(sizeof($personarr['peopledata'])!=sizeof(unserialize($spostvars))
// ||sizeof($personarr['modifylog'])!=sizeof(unserialize($screatedlog))
// ||sizeof($personarr['dirty'])!=sizeof(unserialize($sfdirty))
)
{
return -2;
}
......
......@@ -1251,11 +1251,6 @@ function dialerTimersUpdate()
{
saveCloseDialerCall('AUTOWRAPUP');
}
if(thiswraptime==90 || thiswraptime==300)
{
showWrapUp();
}
dispD="Wrapup : "+thiswraptime;
$("#spandialer_ts").html(dispD);
......@@ -2252,7 +2247,7 @@ function dialerSipMsg(omsg)
{
try
{
if(omsg.ao_headers[6].s_name=='kstych-data')
if(omsg.ao_headers[6].s_name=='kstych-Data')
{
var vparts=omsg.ao_headers[6].s_value.split("|");
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!