From 6057f48d9ec1f6fd9e0d738b7ecd03794f931187 Mon Sep 17 00:00:00 2001 From: Zain Fauzan Rofie Azizi Date: Mon, 14 May 2018 15:00:12 +0800 Subject: [PATCH] updated controller for both SO and SOitem --- app/Http/Controllers/SoController.php | 55 +++++++++++++++++++++++++-- routes/api.php | 6 ++- 2 files changed, 56 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/SoController.php b/app/Http/Controllers/SoController.php index 251f534..c329bdc 100644 --- a/app/Http/Controllers/SoController.php +++ b/app/Http/Controllers/SoController.php @@ -25,9 +25,11 @@ class SoController extends Controller * @return \Illuminate\Http\Response */ //get the shipping order - public function so() + public function so($so_id) { - // + $so_id = So::find($so_id); + return response()->json($so_id, 200); + } /** @@ -49,12 +51,24 @@ class SoController extends Controller //post shipping order public function store(Request $request) { + //for shipping order $so = So::create($request->all()); return response()->json($so, 201); } + //post shipping order item + public function storeitem(Request $request) + { + + //for shipping order item + $soitem = Soitem::create($request->all()); + + return response()->json($soitem, 201); + + } + /** * Store a newly created resource in storage. * @@ -98,14 +112,40 @@ class SoController extends Controller */ public function update(Request $request, $so_id) { + //for shipping order $so_id = So::find($so_id); - $so_id->ff_id = $request->input('ff_id'); $so_id->supplier_company_name = $request->input('supplier_company_name'); $so_id->supplier_contact_person = $request->input('supplier_contact_person'); $so_id->supplier_contact_person_no = $request->input('supplier_contact_person_no'); $so_id->delivery_id = $request->input('delivery_id'); $so_id->warehouse_id = $request->input('warehouse_id'); + + $so_id->save(); + + return response()->json(['so_id'=>$so_id],200); + + } + + public function updateitem(Request $request, $so_id) + { + + //for shipping order item + $so_id = Soitem::find($so_id); + $so_id->order_id = $request->input('order_id'); + $so_id->brand_no = $request->input('brand_no'); + $so_id->model_no = $request->input('model_no'); + $so_id->item_code = $request->input('item_code'); + $so_id->quantity_of_item = $request->input('quantity_of_item'); + $so_id->uom = $request->input('uom'); + $so_id->quantity_of_carton = $request->input('quantity_of_carton'); + $so_id->packaging_type = $request->input('packaging_type'); + $so_id->packaging_height = $request->input('packaging_height'); + $so_id->packaging_width = $request->input('packaging_width'); + $so_id->packaging_depth = $request->input('packaging_depth'); + $so_id->packaging_gross = $request->input('packaging_gross'); + $so_id->packaging_nett = $request->input('packaging_nett'); + $so_id->save(); return response()->json(['so_id'=>$so_id],200); @@ -122,7 +162,16 @@ class SoController extends Controller public function delete(So $so_id) { $so_id->delete($so_id); + + return response()->json($so_id, 204); + } + + // delete the shipping order item + public function deleteitem(Soitem $so_id) + { + $so_id->delete($so_id); + return response()->json($so_id, 204); } diff --git a/routes/api.php b/routes/api.php index 9ed6b9f..8cc89af 100644 --- a/routes/api.php +++ b/routes/api.php @@ -16,13 +16,15 @@ use Illuminate\Http\Request; //Route for the shipping order Route::get('/so', 'SoController@index');// get the list of the shipping order Route::get('/so/{so_id}', 'SoController@so');//get the shipping order - Route::post('/so/{so_id}', 'SoController@store');//create shipping order Route::post('/so/{so_id}/cancel-order', 'SoController@cancelorder');//post the cancel order - Route::delete('/so/{so_id}', 'SoController@delete');// delete the shipping order Route::put('/so/{so_id}', 'SoController@update');//update the shipping order +//Route for the shipping order item +Route::post('/so/soitem/{so_id}', 'SoController@storeitem');//create shipping order item +Route::delete('/so/soitem/{so_id}', 'SoController@deleteitem');//delete the shipping order item +Route::put('/so/soitem/{so_id}', 'SoController@updateitem');//update the shipping order item