Merge branch 'master' into hajar

app/Http/Controllers/DS/MarketingController.php

@@ -1054,6 +1054,7 @@ class MarketingController extends Controller
 		$nested_data = array();
 		$test = 0;
 
+		$curr = Carbon::now()->getTimestamp();
 		foreach ($docket as $a)
 		{	
 			$i++;
@@ -1063,6 +1064,15 @@ class MarketingController extends Controller
 				$contractor = Company::where('_id', $a->WorkOrder->contractor_id)->first();
 				$tempInstaller = Staff::with('StaffDetail')->withTrashed()->where('_id',$a->installer_id)->first();
 
+				$reg_time = $a->created_at;
+				$expiry_date = $reg_time->addDays(3);    
+				$expiry_date = $expiry_date->getTimestamp();  
+
+				$n1="";
+				if($curr < $expiry_date) {
+					$n1 = "New/";
+				}
+
 				if(!empty($subDetail->Subscriber->building_name))
 					$building=$subDetail->Subscriber->building_name;
 				else
@@ -1140,18 +1150,20 @@ class MarketingController extends Controller
 
 				if(!empty($staff))
 				{
-					$var1 =$staff->name;
-				}	
-				
-				if(!empty($contractor)){
-					$contractor_name = $contractor->name;
+					$var1 =$staff->name;=
 				}
+				
+				if(!empty($contractor))
+				{
+					$contractor_name =$contractor->name;
+				}	
 
 				$reg_time = $a->created_at;
 				$expiry_date = $reg_time->addDays(3);    
 				$expiry_date = $expiry_date->getTimestamp();  
 
-				$n1 = '';
+				$n1="";
+				
 				if($curr < $expiry_date) {
 					$n1 = "New/";
 				}

resources/views/market/docket.blade.php

@@ -125,7 +125,22 @@
 				{ "data": "rating","name": "rating"}, 
 				],	
 				 "columnDefs": [
-				 {
+					{
+						"render": function ( data, type, row ) {
+
+							if (data.indexOf("-You") >= 0) {
+								var split = data.split('-');
+								return '<small class="label label-info">'+split[1]+'</small>&nbsp;'+split[0];
+							}else if (data.indexOf("New/") >= 0) {
+								var split = data.split('/');
+								return '<small class="label label-warning">'+split[0]+'</small>&nbsp;'+split[1];
+							}else {
+								return data;
+							}
+						},
+						"targets": 0
+					},
+				 	{
 						"render": function ( data, type, row ) {
 							var link = "{{ url('/marketing/docket/generate-pdf') }}"+"/"+data;
 							return '<a href="'+link+'" target="_blank"><b>'+data+'</b></a>';