fix business address

app/Http/Controllers/CustomerService/CustomerController.php

@@ -208,29 +208,21 @@ class CustomerController extends Controller
 						}
 
 						$building = ''; $unit = '-'; $address = ''; $name = '';
+						$building = $f->Subscriber->building_name;
+						$unit = $f->Subscriber->unit_no;
+
+						if($f->Subscriber->street != ''){
+							$address = $f->Subscriber->street. ' , '.$f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
+						}else {
+							$address = $f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
+						}
+						
 						if($f->type_application == 'R'){
 							$name = $f->Subscriber->name;
-							$building = $f->Subscriber->building_name;
-							$unit = $f->Subscriber->unit_no;
-
-							if($f->Subscriber->street != ''){
-								$address = $f->Subscriber->street. ' , '.$f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
-							}else {
-								$address = $f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
-							}
 
 						}else if($f->type_application == 'B'){
 
 							$name = $f->Subscriber->company_name;
-							if($f->Subscriber->unit_no == ''){
-								$unit = '-';
-							}else {
-								$unit = $f->Subscriber->unit_no;
-							}
-
-							$building = $f->Subscriber->street;
-
-							$address = $f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
 						}
 
 						$nP = '';

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

@@ -191,7 +191,10 @@
 								<tr><td colspan="2" height="10"></td></tr>
 								<tr>
 									<td width="28%" style="font-size: 11px;">Address</td>
-									<td width="72%" height="18" style="font-size: 11px;border:1px solid black;padding:0px 3px;word-wrap: break-word;">{{ $form->street }}</td>
+									@if ($form->building_name != null)
+									<td width="72%" height="18" style="font-size: 11px;border:1px solid black;padding:0px 3px;word-wrap: break-word;">{{$form->building_name}} , {{ $form->street }}</td>
+									@else
+									<td width="72%" height="18" style="font-size: 11px;border:1px solid black;padding:0px 3px;word-wrap: break-word;">{{$form->building_name}} , {{ $form->street }}</td>
 								</tr>
 								<tr><td colspan="2" height="10"></td></tr>
 								<tr>