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

merged conflict

Browse Source
This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-28 17:11:56 +08:00
parent 93a5e93ce2 49abcb4923
commit 7a23b4ed3c
37 changed files with 7961 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/CompanyController.php
+29 -9
View File
@@ -15,9 +15,30 @@ class CompanyController extends Controller
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
return response()->json(['message'=>'company not found'], 404);
return response()->json(['success'=> false, 'message'=>'Company not found'], 404);
}
$rules = [
'company_name' => 'required',
'registration_no' => 'required',
'tax_no' => 'required',
'tax_no' => 'required',
'tel_no' => 'required',
'fax' => 'required',
'address' => 'required',
'city' => 'required',
'postcode' => 'required',
'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);
}
$company->company_name=$request->input('company_name');
$company->registration_no=$request->input('registration_no');
$company->tax_no=$request->input('tax_no');
@@ -30,8 +51,7 @@ class CompanyController extends Controller
$company->country=$request->input('country');
$company->contact_person=$request->input('contact_person');
$company->save();
return response()->json(['company'=>$company],200);
return response()->json(['success'=> true, 'message'=>'Company created successfully'],200);
}
public function companyProfile(Request $request)
@@ -39,7 +59,7 @@ class CompanyController extends Controller
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
return response()->json(['message'=>'company for company_prof not found'],200);
return response()->json(['success'=> false, 'error'=>'Company not found'], 404);
}
//validaating file types
$validator = Validator::make($request->all(), [
@@ -47,7 +67,7 @@ class CompanyController extends Controller
]);
if($validator->fails())
{
return response()->json(['message'=>'Incorrect format'],200);
return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400);
}
if($file = $request->file('company_profile')) //company profile picture
@@ -65,7 +85,7 @@ class CompanyController extends Controller
$company->company_profile = $unique_name. '.' .$ext; //update database
} //end if
$company->save();
return response()->json(['company'=>$company],200);
return response()->json(['success'=> true, 'message'=>'Company profile picture uploaded successfully'],200);
}//end of companyProfile()
public function regCert(Request $request)
@@ -73,7 +93,7 @@ class CompanyController extends Controller
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
return response()->json(['message'=>'Company not found'], 404);
return response()->json(['success'=> false, 'error'=>'Company not found'], 404);
}
//validating file types
@@ -81,7 +101,7 @@ class CompanyController extends Controller
'reg_cert' => 'mimes:jpg,jpeg,bmp,png,gif,svg,pdf'
]);
if($validator->fails()){
return response()->json(['message'=>'Incorrect format'],200);
return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400);
}
if($request->hasFile('reg_cert')) //Registration Certificate upload
@@ -99,7 +119,7 @@ class CompanyController extends Controller
$company->reg_cert = $unique_name. '.' .$ext; //this updates database
}//end if
$company->save();
return response()->json(['company'=>$company],200);
return response()->json(['success'=> true, 'message'=>'Registration Certificate uploaded successfully'], 200);
}//end regCert()
}//end of class