| @@ -1130,6 +1130,7 @@ class MarketingController extends Controller | |||
| foreach($subDetail as $a) | |||
| { | |||
| $var1=""; | |||
| $contractor_name=""; | |||
| if(empty($a->WorkOrder)){} | |||
| else | |||
| { | |||
| @@ -1140,12 +1141,17 @@ class MarketingController extends Controller | |||
| if(!empty($staff)) | |||
| { | |||
| $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 = ''; | |||
| if($curr < $expiry_date) { | |||
| $n1 = "New/"; | |||
| } | |||
| @@ -1168,7 +1174,7 @@ class MarketingController extends Controller | |||
| 'customer_building' => $building, | |||
| 'customer_postcode' => $a->Subscriber->postcode, | |||
| 'customer_city' => $a->Subscriber->city, | |||
| 'contractor_id' => $contractor->name, | |||
| 'contractor_id' => $contractor_name, | |||
| 'installer_id' => $var1, | |||
| 'dateTimeEnd' => $a->WorkOrder->dateTimeEnd, | |||
| 'status' => $a->WorkOrder->status, | |||