Merge branch 'master' into hajar

app/Http/Controllers/Form/ResidentialController.php

@@ -324,11 +324,9 @@ class ResidentialController extends Controller
     public function viewFormAddressD($package,$dealer_id) {
 
         $coverage = Coverage::where('Type','R')->orderBy('building_name')->get();
-        $exclusiveBuilding = Coverage::where('Type','Ex')->first();
         $dealer = Staff::where('_id',$dealer_id)->first();
 
-        $company = $dealer->company_id;
-        return view('sales.form.dealer.residential_address', compact('coverage','package','dealer_id','exclusiveBuilding', 'company'));
+        return view('sales.form.dealer.residential_address', compact('coverage','package','dealer_id'));
     }
 
     public function viewFormApplicationD(Request $request) {   

resources/views/pdf/workorder-pdf.blade.php

@@ -120,7 +120,7 @@
 						<td style="font-size: 11px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>{{ $wo->pppoe_password }}</b></td>
 						<td bgcolor="#f7ca57" style="font-size: 11px; padding-left: 5; padding-top: 5; padding-bottom: 5;"><b>NAME</b></td>
 						@if($created_by == '')
-						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>Nizam</b></td>
+						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>-</b></td>
 						@else
 						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>{{ $created_by->StaffDetail->name }}</b></td>
 						@endif
@@ -130,7 +130,7 @@
 						<td style="font-size: 11px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>{{ $product }}</b></td>
 						<td bgcolor="#f7ca57" style="font-size: 11px; padding-left: 5; padding-top: 5; padding-bottom: 5;"><b>EMAIL</b></td>
 						@if($created_by == '')
-						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>nizam@allo.com.my</b></td>
+						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>-</b></td>
 						@else
 						<td bgcolor="#f7ca57" style="font-size: 10px; padding-left: 5; padding-top: 5; padding-bottom: 5;word-wrap: break-word;"><b>{{ $created_by->StaffDetail->email }}</b></td>
 						@endif

resources/views/sales/form/dealer/residential_address.blade.php

@@ -180,9 +180,6 @@
 																				@foreach($coverage as $c)						
 																				<option value="{{ $c->_id }}">{{ $c->building_name }}</option>
 																				@endforeach
-																				@if ($company == "5bb2bc66ee0dc2271c6fedf6")
-																				<option value="{{ $exclusiveBuilding->_id }}">{{ $exclusiveBuilding->building_name }}</option>
-																				@endif
 																			</select>
 																		</div>
 																	</div>