cief/izyim-api
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git synced 2026-08-27 16:34:05 +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
+6 -8
View File
@@ -31,15 +31,15 @@ class CompanyController extends Controller
'state' => 'required',
'country' => 'required',
'contact_person' => 'required'
];
];
$validator = Validator::make($request->all(), $rules);
if($validator->fails()) {
return response()->json(['success'=> false, 'error'=> 'All the fields are required'], 400);
//return response()->json(['success'=> false, 'error'=> $validator->messages()], 400);
$validator = Validator::make($request->all(), $rules);
if($validator->fails()) {
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)