updated codes

This commit is contained in:
Zain Fauzan Rofie Azizi
2018-06-07 11:03:46 +08:00
parent 1361538f8b
commit 59d9588fdc
3 changed files with 37 additions and 120 deletions
+36 -72
View File
@@ -9,31 +9,9 @@ use App\Soitem;
class SoController extends Controller
{
/**
* Display a listing of the resource.
*
* @return \Illuminate\Http\Response
*/
//get the shipping order
public function showso($so_id)
{
$so_id = So::find($so_id);
return response()->json($so_id, 200);
}
/**
* Show the form for creating a new resource.
*
* @return \Illuminate\Http\Response
*/
public function create()
{
//
}
/**
* Store a newly created resource in storage.
* Store shipping order item.
*
* @param \Illuminate\Http\Request $request
* @return \Illuminate\Http\Response
@@ -42,8 +20,8 @@ class SoController extends Controller
public function store(Request $request)
{
//shipping order
$so = new So;
$so = So::where("user_id", Auth::user()->com_id)->first();
$so->ff_id = Auth::user()->company()->id;
$so->supplier_company_name = $request->input('supplier_company_name');
$so->supplier_contact_person = $request->input('supplier_contact_person');
@@ -53,7 +31,7 @@ class SoController extends Controller
$so->save();
//shipping order item
$soitems = $request->input("soitem");
$soitems = $request->input('soitem');
foreach ($soitems as $soitem)
{
$new_soitem = new Soitem(array(
@@ -91,12 +69,12 @@ class SoController extends Controller
//post the cancel order
public function cancelOrder(Request $request)
{
//
}
/**
* Update the specified resource in storage.
* Update the shipping order and item.
*
* @param \Illuminate\Http\Request $request
* @param int $id
@@ -104,54 +82,48 @@ class SoController extends Controller
*/
public function update(Request $request, $id)
{
//for shipping order
$so_id = So::find($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 = So::find($id);
$so->ff_id = $request->input('ff_id');
$so->supplier_company_name = $request->input('supplier_company_name');
$so->supplier_contact_person = $request->input('supplier_contact_person');
$so->supplier_contact_person_no = $request->input('supplier_contact_person_no');
$so->delivery_id = $request->input('delivery_id');
$so->warehouse_id = $request->input('warehouse_id');
$so->save();
$so_id->save();
$soitems = $request->input('soitem');
foreach ($soitems as $soitem)
{
$new_soitem = Soitem::where('so_id', $id)->first();
$new_soitem->status = $soitem['status'];
$new_soitem->order_id = $soitem['order_id'];
$new_soitem->brand_no = $soitem['brand_no'];
$new_soitem->model_no = $soitem['model_no'];
$new_soitem->item_code = $soitem['item_code'];
$new_soitem->quantity_of_item = $soitem['quantity_of_item'];
$new_soitem->uom = $soitem['uom'];
$new_soitem->quantity_of_carton = $soitem['quantity_of_carton'];
$new_soitem->packaging_type = $soitem['packaging_type'];
$new_soitem->packaging_height = $soitem['packaging_height'];
$new_soitem->packaging_width = $soitem['packaging_width'];
$new_soitem->packaging_depth = $soitem['packaging_depth'];
$new_soitem->packaging_gross = $soitem['packaging_gross'];
$new_soitem->packaging_nett = $soitem['packaging_nett'];
$new_soitem->save();
return response()->json(['so_id'=>$so_id],200);
}
return response()->json(['so'=>$so],200);
}
public function updateitem(Request $request, $so_id)
{
//for shipping order item
$so_id = Soitem::find($so_id);
$so_id->status = $request->input('status');
$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);
}
/**
* Remove the specified resource from storage.
* Remove the shipping order and item
*
* @param int $id
* @return \Illuminate\Http\Response
*/
// delete the shipping order
public function delete(So $so_id)
{
$so_id->delete($so_id);
@@ -160,12 +132,4 @@ class SoController extends Controller
}
// delete the shipping order item
public function deleteitem(Soitem $so_id)
{
$so_id->delete($so_id);
return response()->json($so_id, 204);
}
}