adjust street name

app/Http/Controllers/Api/ClaimedController.php

@@ -68,7 +68,12 @@ class ClaimedController extends BaseController
 					}else if($f->formT == 'B'){
 						$name = $f->Subscriber->company_name;
 						$contact_no = $f->Subscriber->company_num;
-						$building = $f->Subscriber->street;
+						if($f->Subscriber->building_name == null){
+							$building = $f->Subscriber->street;
+						} else {
+							$building = $f->Subscriber->building_name;
+						}
+						
 					}
 				
 				if(!empty($f->docket)){

app/Http/Controllers/Api/FormController.php

@@ -60,8 +60,13 @@ class FormController extends BaseController
 					}else if($f->type_application == 'B'){
 						$name = $f->Subscriber->company_name;
 						$contact_no = $f->Subscriber->company_num;
-						$building = $f->Subscriber->street;
-						$address = $f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
+						if ($f->Subscriber->building_name == null) {
+							$building = $f->Subscriber->street;
+							$address = $f->Subscriber->postcode . ' , ' . $f->Subscriber->city . ' , ' . $f->Subscriber->state;
+						} else {
+							$building = $f->Subscriber->building_name;
+							$address = $f->Subscriber->street . ' , ' . $f->Subscriber->postcode . ' , ' . $f->Subscriber->city . ' , ' . $f->Subscriber->state;
+						}
 					}
 
 					if($f->Subscriber->city == 'Jasin'){
@@ -145,8 +150,13 @@ class FormController extends BaseController
 						$company_reg = $f->Subscriber->company_reg;
 						$subscriber_id = $f->Subscriber->subscriber_id;
 						$contact_no = $f->Subscriber->company_num;
-						$building = $f->Subscriber->street;
-						$address = $f->Subscriber->postcode. ' , '.$f->Subscriber->city. ' , '.$f->Subscriber->state;
+						if ($f->Subscriber->building_name == null) {
+							$building = $f->Subscriber->street;
+							$address = $f->Subscriber->postcode . ' , ' . $f->Subscriber->city . ' , ' . $f->Subscriber->state;
+						} else {
+							$building = $f->Subscriber->building_name;
+							$address = $f->Subscriber->street . ' , ' . $f->Subscriber->postcode . ' , ' . $f->Subscriber->city . ' , ' . $f->Subscriber->state;
+						}
 					}
 
 					$woD = '-'; $woId = 'none'; $natureWork = ''; $doId = ''; $woRate=""; $installer_name=""; $contractor_name="";

app/Http/Controllers/Api/MynixController.php

@@ -90,9 +90,15 @@ class MynixController extends BaseController
 					}else if($form->type_application == 'B'){
 
 						if($form->Subscriber->unit_no != ''){
-							$address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+							$unit = $form->Subscriber->unit_no;
 						}else {
-							$address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+							$unit = ' ';
+						}
+
+						if ($form->Subscriber->building_name == null) {
+							$address = $unit . ' , ' .$form->Subscriber->street . ' , ' .$form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+						} else {
+							$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' .$form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 						}
 						
 					}
@@ -152,20 +158,22 @@ class MynixController extends BaseController
 						if($v->type_application == 'R'){
 							if($v->Subscriber->street != ''){
 								$address = $v->Subscriber->unit_no. ' , '.$v->Subscriber->building_name. ' , '.$v->Subscriber->street. ' , '.$v->Subscriber->postcode. ' , '.$v->Subscriber->city. ' , '.$v->Subscriber->state;
-								$building = $v->Subscriber->building_name;
 							}else {
 								$address = $v->Subscriber->unit_no. ' , '.$v->Subscriber->building_name. ' , '.$v->Subscriber->postcode. ' , '.$v->Subscriber->city. ' , '.$v->Subscriber->state;
-								$building = $v->Subscriber->building_name;
 							}
 							
 						}else if($v->type_application == 'B'){
 
-							if($v->Subscriber->unit_no != ''){
-								$address = $v->Subscriber->unit_no. ', '.$v->Subscriber->company_name. ', '.$v->Subscriber->street. ' , '.$v->Subscriber->postcode. ' , '.$v->Subscriber->city. ' , '.$v->Subscriber->state;
-								$building = $v->Subscriber->company_name;
-							}else {
-								$address = $v->Subscriber->company_name. ', '.$v->Subscriber->street. ' , '.$v->Subscriber->postcode. ' , '.$v->Subscriber->city. ' , '.$v->Subscriber->state;
-								$building = $v->Subscriber->company_name;
+							if ($v->Subscriber->unit_no != '') {
+								$unit = $v->Subscriber->unit_no;
+							} else {
+								$unit = ' ';
+							}
+
+							if ($v->Subscriber->building_name == null) {
+								$address = $unit . ' , ' . $v->Subscriber->street . ' , ' . $v->Subscriber->postcode . ' , ' . $v->Subscriber->city . ' , ' . $v->Subscriber->state;
+							} else {
+								$address = $unit . ' , ' . $v->Subscriber->building_name . ' , ' . $v->Subscriber->street . ' , ' . $v->Subscriber->postcode . ' , ' . $v->Subscriber->city . ' , ' . $v->Subscriber->state;
 							}
 							
 						}

app/Http/Controllers/Api/WorkOrderMobile.php

@@ -83,10 +83,16 @@ class WorkOrderMobile extends BaseController
 						
 					}else if($form->type_application == 'B'){
 
-						if($form->Subscriber->unit_no != ''){
-							$address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-						}else {
-							$address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+						if ($form->Subscriber->unit_no != '') {
+							$unit = $form->Subscriber->unit_no;
+						} else {
+							$unit = ' ';
+						}
+
+						if ($form->Subscriber->building_name == null) {
+							$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+						} else {
+							$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 						}
 						
 					}
@@ -167,10 +173,16 @@ class WorkOrderMobile extends BaseController
 						
 					}else if($form->type_application == 'B'){
 
-						if($form->Subscriber->unit_no != ''){
-							$address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-						}else {
-							$address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+						if ($form->Subscriber->unit_no != '') {
+							$unit = $form->Subscriber->unit_no;
+						} else {
+							$unit = ' ';
+						}
+
+						if ($form->Subscriber->building_name == null) {
+							$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+						} else {
+							$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 						}
 						
 					}

app/Http/Controllers/Contractor/DocketController.php

@@ -793,11 +793,17 @@ class DocketController extends Controller
 
             }else if($form->type_application == 'B'){
 
-                if($form->Subscriber->unit_no != ''){
-                    $address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-                }else {
-                    $address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-                }
+				if ($form->Subscriber->unit_no != '') {
+					$unit = $form->Subscriber->unit_no;
+				} else {
+					$unit = ' ';
+				}
+
+				if ($form->Subscriber->building_name == null) {
+					$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				} else {
+					$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				}
 
 			}
 			

app/Http/Controllers/Contractor/WorkOrderController.php

@@ -642,10 +642,16 @@ class WorkOrderController extends Controller
 
 		}else if($form->type_application == 'B'){
 
-			if($form->Subscriber->unit_no != ''){
-				$address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-			}else {
-				$address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+			if ($form->Subscriber->unit_no != '') {
+				$unit = $form->Subscriber->unit_no;
+			} else {
+				$unit = ' ';
+			}
+
+			if ($form->Subscriber->building_name == null) {
+				$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+			} else {
+				$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 			}
 
 		}

app/Http/Controllers/CustomerService/DocketController.php

@@ -171,11 +171,17 @@ class DocketController extends Controller
 
             }else if($form->type_application == 'B'){
 
-                if($form->Subscriber->unit_no != ''){
-                    $address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-                }else {
-                    $address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-                }
+				if ($form->Subscriber->unit_no != '') {
+					$unit = $form->Subscriber->unit_no;
+				} else {
+					$unit = ' ';
+				}
+
+				if ($form->Subscriber->building_name == null) {
+					$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				} else {
+					$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				}
 
 			}
 			

app/Http/Controllers/CustomerService/WorkOrderController.php

@@ -1196,10 +1196,16 @@ class WorkOrderController extends Controller
 
 		}else if($form->type_application == 'B'){
 
-			if($form->Subscriber->unit_no != ''){
-				$address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-			}else {
-				$address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+			if ($form->Subscriber->unit_no != '') {
+				$unit = $form->Subscriber->unit_no;
+			} else {
+				$unit = ' ';
+			}
+
+			if ($form->Subscriber->building_name == null) {
+				$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+			} else {
+				$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 			}
 
 		}

app/Http/Controllers/DS/DealerController.php

@@ -618,9 +618,15 @@ class DealerController extends Controller
 				} else if ($c->Subscriber->Form->type_application == 'B') {
 
 					if ($c->Subscriber->unit_no != '') {
-						$address = $c->Subscriber->unit_no . ', ' . $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = $c->Subscriber->unit_no;
 					} else {
-						$address = $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = ' ';
+					}
+
+					if ($c->Subscriber->building_name == null) {
+						$address = $unit . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+					} else {
+						$address = $unit . ' , ' . $c->Subscriber->building_name . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 					}
 
 					$name = $c->Subscriber->company_name;
@@ -874,9 +880,15 @@ class DealerController extends Controller
 			} else if ($customer->Form->type_application == 'B') {
 
 				if ($customer->unit_no != '') {
-					$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					$unit = $customer->unit_no;
 				} else {
-					$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					$unit = ' ';
+				}
+
+				if ($customer->building_name == null) {
+					$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+				} else {
+					$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 				}
 			}
 
@@ -1001,9 +1013,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1040,9 +1058,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1080,9 +1104,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1483,9 +1513,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1529,9 +1565,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1575,9 +1617,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1620,9 +1668,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1665,9 +1719,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1710,9 +1770,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1756,9 +1822,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1801,9 +1873,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1847,9 +1925,15 @@ class DealerController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2067,9 +2151,15 @@ class DealerController extends Controller
 				} else if ($c->Subscriber->Form->type_application == 'B') {
 
 					if ($c->Subscriber->unit_no != '') {
-						$address = $c->Subscriber->unit_no . ', ' . $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = $c->Subscriber->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($c->Subscriber->building_name == null) {
+						$address = $unit . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 					} else {
-						$address = $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$address = $unit . ' , ' . $c->Subscriber->building_name . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 					}
 
 					$name = $c->Subscriber->company_name;
@@ -3347,11 +3437,17 @@ class DealerController extends Controller
 
 						$name = $c->Subscriber->name;
 					} else if ($c->Subscriber->Form->type_application == 'B') {
-
+					
 						if ($c->Subscriber->unit_no != '') {
-							$address = $c->Subscriber->unit_no . ', ' . $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+							$unit = $c->Subscriber->unit_no;
+						} else {
+							$unit = ' ';
+						}
+
+						if ($c->Subscriber->building_name == null) {
+							$address = $unit . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 						} else {
-							$address = $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+							$address = $unit . ' , ' . $c->Subscriber->building_name . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 						}
 
 						$name = $c->Subscriber->company_name;

app/Http/Controllers/DS/MarketingController.php

@@ -1705,9 +1705,15 @@ class MarketingController extends Controller
 		} else if ($form->type_application == 'B') {
 
 			if ($form->Subscriber->unit_no != '') {
-				$address = $form->Subscriber->unit_no . ', ' . $form->Subscriber->company_name . ', ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				$unit = $form->Subscriber->unit_no;
 			} else {
-				$address = $form->Subscriber->company_name . ', ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				$unit = ' ';
+			}
+
+			if ($form->Subscriber->building_name == null) {
+				$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+			} else {
+				$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 			}
 		}
 
@@ -1735,9 +1741,15 @@ class MarketingController extends Controller
 			} else if ($form->type_application == 'B') {
 
 				if ($form->Subscriber->unit_no != '') {
-					$address = $form->Subscriber->unit_no . ', ' . $form->Subscriber->company_name . ', ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+					$unit = $form->Subscriber->unit_no;
 				} else {
-					$address = $form->Subscriber->company_name . ', ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+					$unit = ' ';
+				}
+
+				if ($form->Subscriber->building_name == null) {
+					$address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+				} else {
+					$address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
 				}
 			}
 
@@ -1802,9 +1814,15 @@ class MarketingController extends Controller
 			} else if ($customer->Form->type_application == 'B') {
 
 				if ($customer->unit_no != '') {
-					$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					$unit = $customer->unit_no;
 				} else {
-					$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					$unit = ' ';
+				}
+
+				if ($customer->building_name == null) {
+					$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+				} else {
+					$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 				}
 				$name = $customer->company_name;
 			}
@@ -1929,9 +1947,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -1967,9 +1991,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2006,9 +2036,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2412,9 +2448,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2458,9 +2500,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2503,9 +2551,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2547,9 +2601,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2592,9 +2652,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2637,9 +2703,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2683,9 +2755,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+					} else {
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2727,9 +2805,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -2773,9 +2857,15 @@ class MarketingController extends Controller
 				} else if ($customer->Form->type_application == 'B') {
 
 					if ($customer->unit_no != '') {
-						$address = $customer->unit_no . ', ' . $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$unit = $customer->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($customer->building_name == null) {
+						$address = $unit . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					} else {
-						$address = $customer->company_name . ', ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
+						$address = $unit . ' , ' . $customer->building_name . ' , ' . $customer->street . ' , ' . $customer->postcode . ' , ' . $customer->city . ' , ' . $customer->state;
 					}
 					$name = $customer->company_name;
 				}
@@ -3719,11 +3809,16 @@ class MarketingController extends Controller
 				} else if ($c->Subscriber->Form->type_application == 'B') {
 
 					if ($c->Subscriber->unit_no != '') {
-						$address = $c->Subscriber->unit_no . ', ' . $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = $c->Subscriber->unit_no;
 					} else {
-						$address = $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = ' ';
 					}
 
+					if ($c->Subscriber->building_name == null) {
+						$address = $unit . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+					} else {
+						$address = $unit . ' , ' . $c->Subscriber->building_name . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+					}
 					$name = $c->Subscriber->company_name;
 				}
 
@@ -3849,9 +3944,15 @@ class MarketingController extends Controller
 				} else if ($c->Subscriber->Form->type_application == 'B') {
 
 					if ($c->Subscriber->unit_no != '') {
-						$address = $c->Subscriber->unit_no . ', ' . $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$unit = $c->Subscriber->unit_no;
+					} else {
+						$unit = ' ';
+					}
+
+					if ($c->Subscriber->building_name == null) {
+						$address = $unit . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 					} else {
-						$address = $c->Subscriber->company_name . ', ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
+						$address = $unit . ' , ' . $c->Subscriber->building_name . ' , ' . $c->Subscriber->street . ' , ' . $c->Subscriber->postcode . ' , ' . $c->Subscriber->city . ' , ' . $c->Subscriber->state;
 					}
 
 					$name = $c->Subscriber->company_name;

app/Mail/AssignWorkOrder.php

@@ -83,10 +83,16 @@ class AssignWorkOrder extends Mailable
 
         }else if($form->type_application == 'B'){
 
-            if($form->Subscriber->unit_no != ''){
-                $address = $form->Subscriber->unit_no. ', '.$form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
-            }else {
-                $address = $form->Subscriber->company_name. ', '.$form->Subscriber->street. ' , '.$form->Subscriber->postcode. ' , '.$form->Subscriber->city. ' , '.$form->Subscriber->state;
+            if ($form->Subscriber->unit_no != '') {
+                $unit = $form->Subscriber->unit_no;
+            } else {
+                $unit = ' ';
+            }
+
+            if ($form->Subscriber->building_name == null) {
+                $address = $unit . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
+            } else {
+                $address = $unit . ' , ' . $form->Subscriber->building_name . ' , ' . $form->Subscriber->street . ' , ' . $form->Subscriber->postcode . ' , ' . $form->Subscriber->city . ' , ' . $form->Subscriber->state;
             }
 
         }

resources/views/email/assign_wo.blade.php

@@ -190,7 +190,7 @@
 																				@if(empty($customer->company_name))
 																				<p>{{ $customer->unit_no }}, {{ $customer->building_name }}, {{ $customer->postcode }}, {{ $customer->city }}, {{ $customer->state }}</p>
 																				@else
-																				<p>{{ $customer->unit_no }}, {{ $customer->company_name }}, {{ $customer->street }}, {{ $customer->postcode }}, {{ $customer->city }}, {{ $customer->state }}</p>
+																				<p>{{ $customer->company_name }}, {{ $customer->unit_no }},  {{ $customer->street }}, {{ $customer->postcode }}, {{ $customer->city }}, {{ $customer->state }}</p>
 																				@endif
 																			</td>
 																		</tr>

resources/views/email/invoiceb.blade.php

@@ -224,7 +224,7 @@
 																		<tr>
 																			<td colspan="2" style="padding:10px 15px" width="50%" valign="middle" align="center" bgcolor="#eee">
 																				<b>Service Installation Address</b>
-																				<p>{{ $form->Subscriber->unit_no }}, {{ ucwords($form->Subscriber->street) }}, {{ $form->Subscriber->postcode }}, {{ $form->Subscriber->city }}, {{ $form->Subscriber->state }}</p>
+																				<p>{{ $form->Subscriber->unit_no }}, {{ $form->Subscriber->building_name }} , {{ ucwords($form->Subscriber->street) }}, {{ $form->Subscriber->postcode }}, {{ $form->Subscriber->city }}, {{ $form->Subscriber->state }}</p>
 																			</td>
 																		</tr>
 																	</tbody>