completed the user intergration

This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-12 09:49:24 +08:00
parent 5909f50cd3
commit f463d0b6b2
15 changed files with 148 additions and 237 deletions
+5
View File
@@ -19,5 +19,10 @@ class Deliveryinfo extends Model
'contact_person_no',
];
public function company() {
return $this->belongsTo(App\Company);
}
}
+55 -63
View File
@@ -8,103 +8,95 @@ use App\Deliveryinfo;
class DeliveryinfoController extends Controller
{
/**
* Display a listing of the resource.
* Display the specified delivery-info.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function index()
public function show(Deliveryinfo $id)
{
$com_id = Deliveryinfo::all();
return view('company.deliveryinfo.index');
$deliveryinfo = deliveryinfo::find($id);
return response()->json($deliveryinfo, 200);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
* Store a newly delivery-info in storage.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
*/
public function store(Request $request)
{
$deliveryinfo = Deliveryinfo::create($request->all());
$user = Auth::user();
return response()->json($deliveryinfo, 201);
$deliveryinfo = new Deliveryinfo;
$deliveryinfo->branch = $request->input('branch');
$deliveryinfo->deli_info = $request->input('deli_info');
$deliveryinfo->address = $request->input('address');
$deliveryinfo->city = $request->input('city');
$deliveryinfo->postcode = $request->input('postcode');
$deliveryinfo->state = $request->input('state');
$deliveryinfo->country = $request->input('country');
$deliveryinfo->contact_person = $request->input('contact_person');
$deliveryinfo->contact_person_no = $request->input('contact_person_no');
$deliveryinfo->com_id = $user->company();
$deliveryinfo->save();
return response()->json(['deliveryinfo'=>$deliveryinfo],201);
}
/**
* Display the specified resource.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function show(Deliveryinfo $com_id)
{
$deliveryinfo = deliveryinfo::find($com_id);
return response()->json($deliveryinfo, 200);
// return $delievryinfo;
}
/**
* 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.
* Update the delivery-info.
*
* @param \Illuminate\Http\Request $request
* @param int $id
* @return \Illuminate\Http\Response
*/
public function update(Request $request, $com_id)
public function update(Request $request, $id)
{
$com_id = Deliveryinfo::find($com_id);
//$com_id->id = $request->input('id');
$com_id->branch = $request->input('branch');
$com_id->deli_info = $request->input('deli_info');
$com_id->address = $request->input('address');
$com_id->city = $request->input('city');
$com_id->postcode = $request->input('postcode');
$com_id->state = $request->input('state');
$com_id->country = $request->input('country');
$com_id->contact_person = $request->input('contact_person');
$com_id->contact_person_no = $request->input('contact_person_no');
$com_id->save();
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
return response()->json(['com_id'=>$com_id],200);
if (!$deliveryinfo)
{
return response()->json(['message'=>'Access Denied!'], 404);
}
$deliveryinfo->branch = $request->input('branch');
$deliveryinfo->deli_info = $request->input('deli_info');
$deliveryinfo->address = $request->input('address');
$deliveryinfo->city = $request->input('city');
$deliveryinfo->postcode = $request->input('postcode');
$deliveryinfo->state = $request->input('state');
$deliveryinfo->country = $request->input('country');
$deliveryinfo->contact_person = $request->input('contact_person');
$deliveryinfo->contact_person_no = $request->input('contact_person_no');
$deliveryinfo->com_id = $user->company();
$deliveryinfo->save();
return response()->json(['deliveryinfo'=>$deliveryinfo],200);
}
/**
* Remove the specified resource from storage.
* Remove the delivery-info.
*
* @param int $id
* @return \Illuminate\Http\Response
*/
public function destroy(Deliveryinfo $com_id)
public function destroy(Deliveryinfo $id)
{
$com_id->delete($com_id);
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
return response()->json($com_id, 204);
if (!$deliveryinfo)
{
return response()->json(['message'=>'Access Denied!'], 404);
}
$deliveryinfo->delete($id);
return response()->json($deliveryinfo, 204);
}
}