Merge branch 'master' into dealer-fasten

app/Http/Controllers/Api/AppVersionController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+use App\Http\Controllers\Api\BaseController;
+use Illuminate\Support\Facades\Auth;
+
+use App\Model\AppsVersion;
+
+class AppVersionController extends BaseController
+{
+
+    public function compareVersion(Request $request){
+    	$apps = AppsVersion::all();
+    	return $this->sendResponse($apps, 'Get Data Successfully');
+    }
+    
+
+}
+
+
+

app/Http/Controllers/Controller.php

@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Model\Coverage;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Routing\Controller as BaseController;
 use Illuminate\Foundation\Validation\ValidatesRequests;
@@ -11,38 +10,4 @@ use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
 class Controller extends BaseController
 {
     use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
-
-    public function taggingCategory(){
-        $response = json_decode(file_get_contents(public_path() . '/test.json'));
-
-        if ($response->success == true) {
-
-            foreach ($response->data as $key => $r) {
-               
-                $coverage = Coverage::where(strtoupper('building_name'),strtoupper($r->building_name))->where(strtoupper('street'),strtoupper($r->street))->where('Type',$r->Type)->get();
-
-                if(count($coverage)==0){
-                    $coveragedetails = [
-                        'Type' => $r->Type,
-                        'building_name' => strtoupper($r->building_name),
-                        'project_type' => $r->project_type,
-                        'street' => strtoupper($r->street),
-                        'city' => strtoupper($r->city),
-                        'state' => strtoupper($r->state),
-                        'postcode' => $r->postcode,
-                        'installation_fee' => $r->installation_fee,
-                        'status_building' => $r->status_building,
-                        'jmb_email' => "",
-                    ];
-
-                    $coverageUpdate = Coverage::create($coveragedetails);
-                }else{
-                
-                }
-                
-            }
-
-            return 'data inserted ' ;
-        }
-    }
 }

app/Http/Controllers/CustomerService/WorkOrderController.php

@@ -283,6 +283,7 @@ class WorkOrderController extends Controller
 				$product = Product::where('speed',$form->PackageDetail->name)->where('formT',$w->Form->type_application)->first();
 				$company = Company::where('_id',$w->contractor_id)->first();
 
+				// info($w->installer_id);
 				if($w->installer_id != ''){
 					$installer = Staff::with('StaffDetail')->where('_id',$w->installer_id)->first();
 					$installer = $installer->StaffDetail->name;

app/Http/Controllers/Form/BusinessController.php

@@ -59,7 +59,7 @@ class BusinessController extends Controller
     public function viewFormApplication(Request $request) {   
         $data = array();
 
-        $coverage = Coverage::where('Type','B')->where('building_name', $request->coverage)->where('street',$request->street)->get();
+        $coverage = Coverage::where('building_name', $request->coverage)->where('street',$request->street)->get();
 
         array_push($data, array(
             'coverage' => $coverage[0]['_id'],
@@ -314,7 +314,7 @@ class BusinessController extends Controller
     public function viewFormApplicationD(Request $request) {   
         $data = array();
 
-        $coverage = Coverage::where('Type','B')->where('building_name', $request->coverage)->where('street',$request->street)->get();
+        $coverage = Coverage::where('building_name', $request->coverage)->where('street',$request->street)->get();
 
         array_push($data, array(
             'coverage' => $coverage[0]['_id'],

app/Http/Controllers/Form/ResidentialController.php

@@ -68,7 +68,7 @@ class ResidentialController extends Controller
 
     public function viewFormApplication(Request $request) {   
         $data = array();
-        $coverage = Coverage::where('Type','R')->where('building_name', $request->coverage)->where('street',$request->street)->get();
+        $coverage = Coverage::where('building_name', $request->coverage)->where('street',$request->street)->get();
 
         array_push($data, array(
             'coverage' => $coverage[0]['_id'],
@@ -333,7 +333,7 @@ class ResidentialController extends Controller
 
     public function viewFormApplicationD(Request $request) {   
         $data = array();
-        $coverage = Coverage::where('Type','R')->where('building_name', $request->coverage)->where('street',$request->street)->get();
+        $coverage = Coverage::where('building_name', $request->coverage)->where('street',$request->street)->get();
 
         array_push($data, array(
             'coverage' => $coverage[0]['_id'],

app/Model/AppsVersion.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Model;
+
+use Jenssegers\Mongodb\Eloquent\Model as Eloquent;
+use Jenssegers\Mongodb\Eloquent\SoftDeletes;
+
+
+class AppsVersion extends Eloquent
+{
+	use SoftDeletes;
+
+    protected $connection = 'mongodb';
+    protected $collection = 'app_version';
+
+    protected $guarded = ['_id'];
+}

routes/api.php

@@ -50,14 +50,21 @@ Route::group(['middleware' => 'mobileapps'], function() {
 	Route::get('/form/statistic','Api\FormController@getFormStatistic');
 	Route::get('/claim/12/12/2019','DS\MarketingController@manualDate');
 	Route::get('/get-data','Api\FormController@get_data_form');	
-});
 
+});
+/*
+|--------------------------------------------------------------------------
+| Check Version
+|--------------------------------------------------------------------------
+*/
+Route::get('/mobile/apps_version', 'Api\AppVersionController@compareVersion');
 /*
 |--------------------------------------------------------------------------
 | Residential Form 
 |--------------------------------------------------------------------------
 */
-Route::get('/get-coverage-detail/{building_name}/{street}', 'Api\Controller@getCoverageDetail');
+Route::get('/get-coverage-detail/{building_name}/{street}', 'Api\Controller@getCoverageDetail')->where('street', '.*');
 Route::get('/get-street/{building_name}', 'Api\Controller@getStreet');
 
 
+

routes/web.php

@@ -14,8 +14,6 @@ Route::get('/', function () {
     return view('index');
 });
 
-Route::get('/add-customer-category', ['uses' => 'Controller@taggingCategory']);
-
 Route::get('/convert-password/{action}/', ['uses' => 'Auth\AdminController@encryptPassword']);
 Route::get('/store-claim/pdf', ['uses' => 'DS\DealerController@exportDealerJson']);
 Route::get('/convert-total-claim-float', ['uses' => 'DS\DealerController@update_total_claim']);