Resolved all error after merging master into predictive branch

@@ -87,7 +87,6 @@ class CreateCall extends Command {
 		} catch (Exception $e) {
 		} catch (Exception $e) {
 			Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
 			Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
 			Log::error($e);
 			Log::error($e);
-			continue;
 		}
 		}
 	}
 	}
 
 

@@ -80,7 +80,6 @@ class PredictiveCallHangUp extends Command {
 		} catch (Exception $e) {
 		} catch (Exception $e) {
 			Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
 			Log::useFiles(storage_path()."/logs/predictive_".date("Y_m_d").".log");
 			Log::error($e);
 			Log::error($e);
-			continue;
 		}
 		}
 	}
 	}
 }
 }
\ No newline at end of file

@@ -5,6 +5,7 @@ use App\Http\Requests;
 use Auth;
 use Auth;
 use Log;
 use Log;
 use DB;
 use DB;
+use App\Models\CRMCall;
 class SmsController extends Controller
 class SmsController extends Controller
 {
 {
 	public $smsUrl = 'https://10.2.55.165:443/servlet/com.aclwireless.pushconnectivity.listeners.TextListener?';
 	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();
 	$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();
 	$custIdArr = array();
 	foreach($bulkCallID as $key=> $callID){
 	foreach($bulkCallID as $key=> $callID){
 		
 		

@@ -972,7 +972,10 @@ function popMail($userid)
 	  		$spostvars=serialize($personarr['peopledata']);
 	  		$spostvars=serialize($personarr['peopledata']);
 	  		$screatedlog=serialize($personarr['modifylog']);
 	  		$screatedlog=serialize($personarr['modifylog']);
 	  		$sfdirty=serialize($personarr['dirty']);
 	  		$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;
 	  			return -2;
 	  		}
 	  		}

@@ -1251,11 +1251,6 @@ function dialerTimersUpdate()
 		{
 		{
 			saveCloseDialerCall('AUTOWRAPUP');
 			saveCloseDialerCall('AUTOWRAPUP');
 		}
 		}
-		
-		if(thiswraptime==90 || thiswraptime==300)
-		{
-			showWrapUp();
-		}
 
 
 		dispD="Wrapup : "+thiswraptime;
 		dispD="Wrapup : "+thiswraptime;
 		$("#spandialer_ts").html(dispD);
 		$("#spandialer_ts").html(dispD);
@@ -2252,7 +2247,7 @@ function dialerSipMsg(omsg)
 {
 {
   try
   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("|");
       var vparts=omsg.ao_headers[6].s_value.split("|");