Merge branch 'master' into hajar

app/Http/Controllers/Controller.php

@@ -16,6 +16,7 @@ use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
 use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 use Illuminate\Http\Request;
+use Mockery\Matcher\Subset;
 
 class Controller extends BaseController
 {
@@ -47,24 +48,23 @@ class Controller extends BaseController
         return "Done standardize city in DB";
     }
 
-    public function taggingCategory()
+    public function standardizeAddress()
     {
         $response = json_decode(file_get_contents(public_path() . '/test.json'));
 
         if ($response->success == true) {
 
             foreach ($response->data as $key => $r) {
-                $work_order = WorkOrder::where('wo', $r->wo)->first();
+                $subscriber = Subscriber::where('subscriber_id', $r->subscriber_id)->first();
 
-                if (!empty($work_order)) {
-                    $form_submitted = Form::where('_id', $work_order->_id)->first();
-
-                    $form_submitted->customer_category = $r->category;
-                    $form_submitted->save();
+                if (!empty($subscriber)) {
+                    $subscriber->city = $r->city;
+                    $subscriber->state = $r->state;
+                    $subscriber->save();
                 }
             }
 
-            return 'data inserted ';
+            return count($response);
         }
     }
 
@@ -120,17 +120,9 @@ class Controller extends BaseController
 
     public function getDatabase(Request $request)
     {
-        $subscriber = Subscriber::groupBy('city')->get();
-
-        $city = array();
-        
-        foreach ($subscriber as $key => $s) {
-            # code...
-            array_push($city, array(
-                'city' => $s->city
-            ));
-        }
-        
-        return $city;
+        $subscriber = Subscriber::where('city',$request->city)->get();
+
+        return $subscriber;
+
     }
 }

app/Http/Controllers/CustomerService/CustomerController.php

@@ -33,9 +33,9 @@ class CustomerController extends Controller
 	function createWorkID(){
 		$number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
 		$numberOnly = str_replace('WO-','',$number->wo);
-		info('before WO'.$numberOnly);
+		info('before CC WO'.$numberOnly);
 		$numberOnly++;
-		info('after WO'.$numberOnly);
+		info('after CC WO'.$numberOnly);
 		return $numberOnly;
 	}
 

app/Http/Controllers/CustomerService/WorkOrderController.php

@@ -37,9 +37,9 @@ class WorkOrderController extends Controller
 	{
 		$number = WorkOrder::select('id', 'wo')->orderBy('created_at', 'DESC')->first();
 		$numberOnly = str_replace('WO-', '', $number->wo);
-		info('before WO' . $numberOnly);
+		info('before WC WO' . $numberOnly);
 		$numberOnly++;
-		info('after WO' . $numberOnly);
+		info('after WC WO' . $numberOnly);
 		return $numberOnly;
 	}
 

app/Http/Controllers/Form/FormController.php

@@ -26,9 +26,9 @@ class FormController extends Controller
 	function createWorkID(){
 		$number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
 		$numberOnly = str_replace('WO-','',$number->wo);
-		info('before WO'.$numberOnly);
+		info('before FC WO'.$numberOnly);
 		$numberOnly++;
-		info('after WO'.$numberOnly);
+		info('after FC WO'.$numberOnly);
 		return $numberOnly;
 	}
 

app/Http/Controllers/Form/ResidentialController.php

@@ -615,9 +615,9 @@ class ResidentialController extends Controller
     function createWorkID(){
 		$number = WorkOrder::select('id','wo')->orderBy('created_at','DESC')->first();
 		$numberOnly = str_replace('WO-','',$number->wo);
-		info('before WO'.$numberOnly);
+		info('before RC WO'.$numberOnly);
 		$numberOnly++;
-		info('after WO'.$numberOnly);
+		info('after RC WO'.$numberOnly);
 		return $numberOnly;
 	}