cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-19 04:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Jack Goh
2018-06-20 11:28:06 +08:00
parent 262884f369
commit 256014c75b
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CompanyController.php
+1 -3
View File
@@ -38,8 +38,8 @@ class CompanyController extends Controller
return response()->json(['success'=> false, 'error'=> 'All the fields are required'], 400);
//return response()->json(['success'=> false, 'error'=> $validator->messages()], 400);
}
}
<<<<<<< HEAD
public function search($company_name)
{
$matchedTerm = Company::where('company_name', 'LIKE','%'. $company_name . '%')->get();
@@ -54,7 +54,6 @@ class CompanyController extends Controller
public function create()
{
//
=======
$company->company_name=$request->input('company_name');
$company->registration_no=$request->input('registration_no');
$company->tax_no=$request->input('tax_no');
@@ -69,7 +68,6 @@ class CompanyController extends Controller
$company->save();
return response()->json(['success'=> true, 'message'=>'Company created successfully'],200);
>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
}
public function companyProfile(Request $request)
routes/api.php
-7
View File
@@ -25,8 +25,6 @@ use App\Company;
Route::post('register', 'AuthController@register');
/* Authentication */
Route::post('login', 'AuthController@login');
<<<<<<< HEAD
//Route::post('recover', 'AuthController@recover');
//
//Route::group(['middleware' => ['jwt.auth']], function() {
// Route::get('logout', 'AuthController@logout');
@@ -45,12 +43,10 @@ Route :: get('/warehouse','WarehouseController@index');
Route :: delete('/contacts/{ff_id}','ContactController@destroy');
Route :: get('/contacts','ContactController@index');
Route :: post('/contacts','ContactController@store');
=======
Route::post('password/recover', 'AuthController@recover');
Route::post('password/reset', 'AuthController@reset');
Route::post('send-verification', 'AuthController@sendVerification');
Route::post('verify-phone', 'AuthController@verifyPhone');
>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
Route::group(['middleware' => ['jwt.auth']], function() {
Route::get('logout', 'AuthController@logout');
@@ -73,7 +69,6 @@ Route::group(['middleware' => ['jwt.auth']], function() {
Route::post('/company/reg_cert/', 'CompanyController@regCert'); //upload registration certificaate
});
<<<<<<< HEAD
Route::post('/company', 'CompanyController@store'); //store company information
Route::put('/company/{company}', 'CompanyController@update'); //update company information
Route::get('/company/search/{company_name}', 'CompanyController@search');
@@ -92,5 +87,3 @@ Route::get('/company/search/{company_name}', 'CompanyController@search');
// return $company;
// });
=======
>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106