Merge branch 'master' into hajar

app/Http/Controllers/Controller.php

@@ -120,10 +120,17 @@ class Controller extends BaseController
 
     public function getDatabase(Request $request)
     {
-        $subscriber = Subscriber::where('subscriber_id', 'CBB-N22E2XR')->first();
-        $subscriber->name = "PAMELA ESTHER A/P PAUL DEVADASON";
-        $subscriber->save();
-
-        return $subscriber;
+        $subscriber = Subscriber::groupBy('city')->get();
+
+        $city = array();
+        
+        foreach ($subscriber as $key => $s) {
+            # code...
+            array_push($city, array(
+                'city' => $s->city
+            ));
+        }
+        
+        return $city;
     }
 }

app/Http/Controllers/CustomerService/CustomerController.php

@@ -506,9 +506,10 @@ class CustomerController extends Controller
 				$state = $cov->state;
 			}else {
 				$building = $request->building;
-				$postcode = '-'; 
-				$city = '-'; 
-				$state = '-';
+				$street = $request->address;
+				$postcode = $request->postcode; 
+				$city = $request->city; 
+				$state = $request->state;
 			}
 
 	    	$form->company_reg = $request->company_reg;

resources/views/customer-service/edit_subscriber.blade.php

@@ -310,7 +310,10 @@
 							<div class="grid4">
 								<label><b>Street : </b></label>
 								<select id="street" name="street" class="styled" required aria-required="true">
-									<option value>Select Street</option>					
+									<option value>Select Street</option>
+									@if ($form->street==!null)
+                                       <option value="{{$form->street}}" <?php echo 'selected = "selected"'; ?>>{{$form->street}}</option>
+                                    @endif	
 								</select>
 							</div>
 							<div class="grid2">&nbsp;</div>