Delivery CRUD Fix

This commit is contained in:
Mouhamed Lamine
2018-08-21 16:56:47 +08:00
parent ede82f860d
commit 905af4ef8f
3 changed files with 103 additions and 68 deletions
@@ -12,7 +12,7 @@ class DeliveryinfoController extends Controller
{
public function index()
{
$deliveryinfos = App\Deliveryinfo::all();
$deliveryinfos = Deliveryinfo::all();
return response()->json($deliveryinfos, 200);
}
@@ -24,8 +24,8 @@ class DeliveryinfoController extends Controller
*/
public function show(Deliveryinfo $id)
{
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->first();
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->first();
$deliveryinfo = Deliveryinfo::find($id)->first();
return response()->json($deliveryinfo, 200);
}
@@ -63,8 +63,9 @@ class DeliveryinfoController extends Controller
*/
public function update(Request $request, $id)
{
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
$user = Auth::user();
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
$deliveryinfo = Deliveryinfo::find($id)->first();
if (!$deliveryinfo)
{
return response()->json(['message'=>'Access Denied!'], 404);
@@ -78,7 +79,7 @@ class DeliveryinfoController extends Controller
$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->com_id = $user->company()->first()->id;
$deliveryinfo->save();
return response()->json(['deliveryinfo'=>$deliveryinfo],200);
@@ -93,8 +94,8 @@ class DeliveryinfoController extends Controller
*/
public function destroy(Deliveryinfo $id)
{
$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
//$deliveryinfo = Deliveryinfo::where('com_id', Auth::user()->company())->where('id', $id)->firstOrFail();
$deliveryinfo = Deliveryinfo::find($id)->first();
if (!$deliveryinfo)
{
return response()->json(['message'=>'Access Denied!'], 404);
@@ -102,6 +103,6 @@ class DeliveryinfoController extends Controller
$deliveryinfo->delete($id);
return response()->json($deliveryinfo, 204);
return response()->json(['deliveryinfo'=>$deliveryinfo], 204);
}
}