merged master

This commit is contained in:
Jack Goh
2018-06-20 11:26:23 +08:00
139 changed files with 23187 additions and 400 deletions
+99 -184
View File
@@ -4,22 +4,42 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use App\Company;
use Image;
use Illuminate\Support\Facades\Storage;
use Validator;
use Auth;
class CompanyController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
public function index()
public function update(Request $request)
{
//
return view ('home');
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
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);
}
<<<<<<< HEAD
public function search($company_name)
{
$matchedTerm = Company::where('company_name', 'LIKE','%'. $company_name . '%')->get();
@@ -34,156 +54,7 @@ class CompanyController extends Controller
public function create()
{
//
}
/**
* Store a newly created resource in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
//
//$company = new Company;
// if($request->hasFile('avatar'))
// {
// $avatar = $request->file('avatar');
// $filename = time() . '.' . $avatar->getClientOriginalExtension();
// Image::make($avatar)->resize(300,300)->save(public_path('/uploads/company_profile/'.$filename));
// }
// else
// {
// return response()->json(['message'=>'Document not found']);
// }
$input = $request->all();
//validating uploaded files
// $this->validate(request(),[
// 'company_profile' => 'required|image|mimes:jpg,jpeg,bmp,png',
// 'reg_cerf' => 'required|mimes:jpg,jpeg,bmp,png,gif,svg,pdf'
// ]);
if($file = $request->file('company_profile')) //company profile picture
{
$company_profile = $request->file('company_profile');
$filename = $company_profile->getClientOriginalName();
//$destinationPath = config('app.fileDestinationPath').'/'.$filename;
$file = $request->file('company_profile');
$ext = $file->getClientOriginalExtension();
Storage::putFileAs(
'company_profile',/*folder name*/ $file, $filename. '.' .$ext
);
// $name = $file->getClientOriginalName();
// $img_file = $request->file('company_profile');
// Image::make($img_file)->resize(300,300)->save(public_path('\company_profile'));
// //return $img_file;
// // $file->move('uploads/company_profile/', $img_file);
// $input['company_profile'] = $name;
}
if($request->hasFile('reg_cert')) //Registration Certificate upload
{
$reg_cert = $request->file('reg_cert');
$filename = $reg_cert->getClientOriginalName();
//$destinationPath = config('app.fileDestinationPath').'/'.$filename;
$file = $request->file('reg_cert');
$ext = $file->getClientOriginalExtension();
Storage::putFileAs(
'reg_cert',/*folder name*/ $file, $filename. '.' .$ext
);
// $uploaded = Storage::put($destinationPath, file_get_contents($reg_cert->getRealPath()));
// $name = $file->getClientOriginalName();
// $img_file = $request->file('reg_cert');
// Image::make($img_file)->save(public_path('uploads\reg_cert'));
// $input['company_profile'] = $name;
// $request->file('req_cert');
// //$request->image->store('\uploads\reg_cert');
// Storage::putFile('uploads\reg_cert', $request->file('reg_cert'));
}
// else{
// return "failed";
// }
Company::create($input);
//Company::create(request()->all());
//dd(request()->all());
return redirect('/');
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show($id)
{
//
}
/**
* Show the form for editing the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function edit($id)
{
//
}
/**
* Update the specified resource in storage.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $id)
{
$company = Company::find($id);
if (!$company)
{
return response()->json(['message'=>'Document not found'],200);
}
//updating company profile picture
if($file = $request->file('company_profile')) //company profile picture
{
$company_profile = $request->file('company_profile');
$filename = $company_profile->getClientOriginalName();
//$destinationPath = config('app.fileDestinationPath').'/'.$filename;
$file = $request->file('company_profile');
$ext = $file->getClientOriginalExtension();
Storage::putFileAs(
'company_profile',/*folder name*/ $file, $filename. '.' .$ext
);
}
//updating registration certificate
if($request->hasFile('reg_cert')) //Registration Certificate upload
{
$reg_cert = $request->file('reg_cert');
$filename = $reg_cert->getClientOriginalName();
//$destinationPath = config('app.fileDestinationPath').'/'.$filename;
$file = $request->file('reg_cert');
$ext = $file->getClientOriginalExtension();
Storage::putFileAs(
'reg_cert',/*folder name*/ $file, $filename. '.' .$ext
);
}
=======
$company->company_name=$request->input('company_name');
$company->registration_no=$request->input('registration_no');
$company->tax_no=$request->input('tax_no');
@@ -195,34 +66,78 @@ class CompanyController extends Controller
$company->state=$request->input('state');
$company->country=$request->input('country');
$company->contact_person=$request->input('contact_person');
$company->save();
return response()->json(['warehouse'=>$company],200);
// $product = Company::findOrFail($productId);
// $product->update($request->all());
// $product->company_name = 'imagepath';
// $product->save();
//return response()->json($product, 200);
return response()->json(['success'=> true, 'message'=>'Company created successfully'],200);
>>>>>>> 49abcb49236cdde1e1fa759f89a704688447c106
}
/**
* Remove the specified resource from storage.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy($id)
public function companyProfile(Request $request)
{
//
}
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
return response()->json(['success'=> false, 'error'=>'Company not found'], 404);
}
//validaating file types
$validator = Validator::make($request->all(), [
'company_profile' => 'image|mimes:jpg,jpeg,bmp,png'
]);
if($validator->fails())
{
return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400);
}
public function uploadImage($request)
if($file = $request->file('company_profile')) //company profile picture
{
$company_profile = $request->file('company_profile');
$filename = $company_profile->getClientOriginalName(); //get the original file name
$unique_name = 'comp_prof_' . md5($filename. time()); //generating a random file name
$file = $request->file('company_profile');
$ext = $file->getClientOriginalExtension();
$input['company_profile'] = $filename;
Storage::putFileAs(
'company_profile',/*folder name*/ $file, $unique_name. '.' .$ext
);
$company->company_profile = $unique_name. '.' .$ext; //update database
} //end if
$company->save();
return response()->json(['success'=> true, 'message'=>'Company profile picture uploaded successfully'],200);
}//end of companyProfile()
public function regCert(Request $request)
{
// if($request->hasFile('avatar'))
// {
// $avatar = $request->file('avatar');
// $filename = time() . '.' . $avatar->getClientOriginalExtension();
// Image::make($avatar)->resize(300,300)->save(public_path('/uploads/company_profile/'.$filename));
// }
}
}
$company = Company::where("user_id", Auth::user()->id)->first();
if (!$company)
{
return response()->json(['success'=> false, 'error'=>'Company not found'], 404);
}
//validating file types
$validator = Validator::make($request->all(), [
'reg_cert' => 'mimes:jpg,jpeg,bmp,png,gif,svg,pdf'
]);
if($validator->fails()){
return response()->json(['success'=> false, 'error'=>'Incorrect format'], 400);
}
if($request->hasFile('reg_cert')) //Registration Certificate upload
{
$reg_cert = $request->file('reg_cert');
$filename = $reg_cert->getClientOriginalName(); //original filename
$unique_name = 'reg_cert_' . md5($filename. time()); //generating a random file name
$file = $request->file('reg_cert');
$ext = $file->getClientOriginalExtension();
$input['reg_cert'] = $filename;
Storage::putFileAs(
'reg_cert',/*folder name*/ $file, $unique_name. '.' .$ext
);
$company->reg_cert = $unique_name. '.' .$ext; //this updates database
}//end if
$company->save();
return response()->json(['success'=> true, 'message'=>'Registration Certificate uploaded successfully'], 200);
}//end regCert()
}//end of class