mirror of
https://gitlab.com/CIEFWorldwideSdnBhd/izyim-api.git
synced 2026-08-19 04:24:01 +00:00
bug fixed
This commit is contained in:
@@ -19,15 +19,19 @@ class ContactController extends Controller
|
|||||||
|
|
||||||
public function store(Request $request)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
|
$user = Auth::user();
|
||||||
|
|
||||||
|
$contact = new Contact;
|
||||||
|
$contact->com_id = $user->company();
|
||||||
|
|
||||||
// get company id from request ex:
|
// get company id from request ex:
|
||||||
//$request->input('company_id');
|
|
||||||
$company_id = $request->input('company_id');
|
|
||||||
// query to find company asisng to $company
|
// query to find company asisng to $company
|
||||||
$company = Company::find($company_id);
|
// $company = Company::find($company_id);
|
||||||
|
|
||||||
// get user from session
|
// get user from session
|
||||||
//$request->user();
|
// $request->user();
|
||||||
$user = $request->user();
|
// $user = $request->user();
|
||||||
|
|
||||||
// prepare query
|
// prepare query
|
||||||
$contact = new Contact();
|
$contact = new Contact();
|
||||||
|
|||||||
@@ -8,43 +8,29 @@ use Illuminate\Http\Request;
|
|||||||
|
|
||||||
class WarehouseController extends Controller
|
class WarehouseController extends Controller
|
||||||
{
|
{
|
||||||
// for freight forwarder
|
/**
|
||||||
|
* list all the warehouse from user's contact's where user is freight forwarder
|
||||||
|
*
|
||||||
|
* @param int $id
|
||||||
|
* @return \Illuminate\Http\Response
|
||||||
|
*/
|
||||||
public function index()
|
public function index()
|
||||||
{
|
{
|
||||||
|
$warehouse = Warehouse::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||||
|
|
||||||
|
if (!$warehouse)
|
||||||
|
{
|
||||||
|
return response()->json(['message'=>'Access Denied!'], 404);
|
||||||
|
}
|
||||||
|
|
||||||
$warehouse=Warehouse::all();
|
$warehouse=Warehouse::all();
|
||||||
$response=[
|
|
||||||
'warehouse'=>$warehouse
|
|
||||||
];
|
|
||||||
return response()->json($warehouse, 200);
|
return response()->json($warehouse, 200);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the form for creating a new resource.
|
* Display warehouse list from freight forwarder.
|
||||||
*
|
|
||||||
* @return \Illuminate\Http\Response
|
|
||||||
*/
|
|
||||||
public function create()
|
|
||||||
{
|
|
||||||
//
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Store a newly created resource in storage.
|
|
||||||
*
|
|
||||||
* @param \Illuminate\Http\Request $request
|
|
||||||
* @return \Illuminate\Http\Response
|
|
||||||
*/
|
|
||||||
public function store(Request $request)
|
|
||||||
{
|
|
||||||
$warehouse = Warehouse::create($request->all());
|
|
||||||
|
|
||||||
return response()->json($warehouse, 201);
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Display the specified resource.
|
|
||||||
*
|
*
|
||||||
* @param int $id
|
* @param int $id
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
@@ -61,18 +47,33 @@ class WarehouseController extends Controller
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the form for editing the specified resource.
|
* Store a new warehouse.
|
||||||
*
|
*
|
||||||
* @param int $id
|
* @param \Illuminate\Http\Request $request
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function edit($id)
|
public function store(Request $request)
|
||||||
{
|
{
|
||||||
//
|
$user = Auth::user();
|
||||||
}
|
|
||||||
|
|
||||||
|
$warehouse = new Warehouse;
|
||||||
|
$warehouse->address=$request->input('address');
|
||||||
|
$warehouse->city=$request->input('city');
|
||||||
|
$warehouse->zip=$request->input('zip');
|
||||||
|
$warehouse->state=$request->input('state');
|
||||||
|
$warehouse->contact_person=$request->input('contact_person');
|
||||||
|
$warehouse->contact_person_no=$request->input('contact_person_no');
|
||||||
|
$warehouse->branch=$request->input('branch');
|
||||||
|
$warehouse->country=$request->input('country');
|
||||||
|
$warehouse->com_id = $user->company();
|
||||||
|
$warehouse->save();
|
||||||
|
|
||||||
|
return response()->json($warehouse, 201);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Update the specified resource in storage.
|
* Update warehouse.
|
||||||
*
|
*
|
||||||
* @param \Illuminate\Http\Request $request
|
* @param \Illuminate\Http\Request $request
|
||||||
* @param int $id
|
* @param int $id
|
||||||
@@ -81,11 +82,11 @@ class WarehouseController extends Controller
|
|||||||
public function update(Request $request, $id)
|
public function update(Request $request, $id)
|
||||||
{
|
{
|
||||||
|
|
||||||
$warehouse = Warehouse::find($id);
|
$warehouse = Warehouse::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||||
|
|
||||||
if (!$warehouse)
|
if (!$warehouse)
|
||||||
{
|
{
|
||||||
return response()->json(['message'=>'Document not found'],200);
|
return response()->json(['message'=>'Access Denied!'], 404);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$warehouse->address=$request->input('address');
|
$warehouse->address=$request->input('address');
|
||||||
@@ -96,22 +97,30 @@ class WarehouseController extends Controller
|
|||||||
$warehouse->contact_person_no=$request->input('contact_person_no');
|
$warehouse->contact_person_no=$request->input('contact_person_no');
|
||||||
$warehouse->branch=$request->input('branch');
|
$warehouse->branch=$request->input('branch');
|
||||||
$warehouse->country=$request->input('country');
|
$warehouse->country=$request->input('country');
|
||||||
$warehouse->company_id=$request->input('company_id');
|
$warehouse->com_id = $user->company();
|
||||||
$warehouse->save();
|
$warehouse->save();
|
||||||
|
|
||||||
return response()->json(['warehouse'=>$warehouse],200);
|
return response()->json(['warehouse'=>$warehouse],200);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove the specified resource from storage.
|
* Remove the warehouse.
|
||||||
*
|
*
|
||||||
* @param int $id
|
* @param int $id
|
||||||
* @return \Illuminate\Http\Response
|
* @return \Illuminate\Http\Response
|
||||||
*/
|
*/
|
||||||
public function destroy($id)
|
public function destroy(Warehouse $id)
|
||||||
{
|
{
|
||||||
//
|
$warehouse = Warehouse::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
|
||||||
|
|
||||||
|
if (!$warehouse)
|
||||||
|
{
|
||||||
|
return response()->json(['message'=>'Access Denied!'], 404);
|
||||||
|
}
|
||||||
|
|
||||||
|
$warehouse->delete($id);
|
||||||
|
|
||||||
|
return response()->json($warehouse, 204);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user