Merge branch 'dev-beu-dispositionList' of http://54.197.18.130/flexydial/hdfc-vr…

…m-v2 into dev-beu-dispositionList

@@ -245,13 +245,18 @@ class CampaignController extends Controller {
 
         	$data['selectedDispositionPlan'] = DB::table('campaign_disposition_plan')
         			->join('disposition_plan', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan.id')
-        			->select('disposition_plan.name as name ', 'disposition_plan.id as planid')->where("campaign","=",$campaign)->first();
+        			->select('disposition_plan.name as name ', 'disposition_plan.id as planid')
+        			->where("campaign","=",$campaign)
+        			->where("disposition_plan.status","active")
+        			->first();
 
 
         	$data['dispositionList'] = DB::table('campaign_disposition_plan')
         			->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
+        			->join('disposition_plan', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id')
         			->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
         			->where("campaign","=",$campaign)
+        			->where("disposition_plan.status","active")
         			->get();
 
 			//$campaign = Input::get("campaign");

@@ -862,8 +862,10 @@ $data.="</fieldset></div>
 
 	        $mastersdata = DB::table('campaign_disposition_plan')
         			->join('disposition_plan_config', 'campaign_disposition_plan.dispo_plan_id', '=', 'disposition_plan_config.dispo_plan_id')
+        			->join('disposition_plan', 'disposition_plan.id', '=', 'disposition_plan_config.dispo_plan_id')
         			->select('disposition_plan_config.disposition as disposition ', 'disposition_plan_config.sub_disposition as subDisposition')
         			->where("campaign","=",$dataarr['client'])
+        			->where("disposition_plan.status","active")
         			->get();
 
         	if(count($mastersdata) > 0){