diff --git a/app/Decision.php b/app/Decision.php index 86ebf5d..da1e25d 100644 --- a/app/Decision.php +++ b/app/Decision.php @@ -23,3 +23,4 @@ class Decision extends Model return $this->hasMany('App\Decisionitem'); } } + diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php index d47f4dd..179b377 100644 --- a/app/Http/Controllers/WarehousearrangementController.php +++ b/app/Http/Controllers/WarehousearrangementController.php @@ -6,6 +6,8 @@ use Illuminate\Http\Request; use Illuminate\Support\Facades\Storage; use App\Warehousearr; use App\Warehouseitem; +use App\Decision; +use App\Decisionitem; use Validator; class WarehousearrangementController extends Controller @@ -28,7 +30,7 @@ class WarehousearrangementController extends Controller */ public function store(Request $request) { - //store new warehouse receive note + //store warehouse receive note $warehousearr = new Warehousearr; $warehousearr->so_id = $request->input('so_id'); $warehousearr->receive_on = $request->input('receive_on'); @@ -40,7 +42,7 @@ class WarehousearrangementController extends Controller $warehousearr->image = $request->input('image'); $warehousearr->save(); - //shipping order item + //store warehouse receive note item $warehouseitems = $request->input("warehouseitem"); foreach ($warehouseitems as $warehouseitem) { @@ -65,10 +67,63 @@ class WarehousearrangementController extends Controller } - return response()->json(['warehousearr'=>$warehousearr], 201); + return response()->json(['warehousearr'=>$warehousearr],201); } + /** + * Update the specified resource in storage. + * + * @param \Illuminate\Http\Request $request + * @param int $id + * @return \Illuminate\Http\Response + */ + public function update(Request $request, $wa_id) + { + + $warehousearr = Warehousearr::find($wa_id); + + //store warehouse receive note + $warehousearr = new Warehousearr; + $warehousearr->so_id = $request->input('so_id'); + $warehousearr->receive_on = $request->input('receive_on'); + $warehousearr->transport_company_name = $request->input('transport_company_name'); + $warehousearr->consignment_note_no = $request->input('consignment_note_no'); + $warehousearr->warehouse_receive_note_no = $request->input('warehouse_receive_note_no'); + $warehousearr->receiving_person = $request->input('receiving_person'); + $warehousearr->marking_number = $request->input('marking_number'); + $warehousearr->image = $request->input('image'); + $warehousearr->save(); + + //store warehouse receive note item + $warehouseitems = $request->input("warehouseitem"); + foreach ($warehouseitems as $warehouseitem) + { + $new_warehouseitem = new Warehouseitem(array( + 'description'=>$warehouseitem['description'], + 'nominal_ctn'=>$warehouseitem['nominal_ctn'], + 'actual_ctn'=>$warehouseitem['actual_ctn'], + 'nominal_measurement'=>$warehouseitem['nominal_measurement'], + 'actual_measurement'=>$warehouseitem['actual_measurement'], + 'nominal_weight'=>$warehouseitem['nominal_weight'], + 'actual_weight'=>$warehouseitem['actual_weight'], + 'balance'=>$warehouseitem['balance'], + 'isDamaged'=>$warehouseitem['isDamaged'], + 'status'=>$warehouseitem['status'], + 'image'=>$warehouseitem['image'], + 'wa_id'=>$warehouseitem['wa_id'], + 'soitem_id'=>$warehouseitem['soitem_id'], + )); + + $new_warehouseitem->save(); + + } + + return response()->json(['warehousearr'=>$warehousearr],201); + + } + + public function warehousearrpic(Request $request, $id) { $warehousearr = Warehousearr::find($id); @@ -110,7 +165,7 @@ class WarehousearrangementController extends Controller } - public function warehouseitempic(Request $request, $id) + public function warehouseitempic(Request $request, $id) { $warehouseitem = Warehouseitem::find($id); @@ -151,6 +206,46 @@ class WarehousearrangementController extends Controller } + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function storedecision(Request $request) + { + //decision-type + $decision = new Decision; + $decision->id = $request->input('id'); + $decision->wa_id = $request->input('wa_id'); + $decision->decision_type = $request->input('decision_type'); + $decision->description = $request->input('description'); + $decision->save(); + + return response()->json(['decision'=>$decision], 201); + + } + + /** + * Store a newly created resource in storage. + * + * @param \Illuminate\Http\Request $request + * @return \Illuminate\Http\Response + */ + public function storedecisionitem(Request $request) + { + //decision-type + $decisionitem = new Decisionitem; + $decisionitem->id = $request->input('id'); + $decisionitem->decision_id = $request->input('decision_id'); + $decisionitem->wi_id = $request->input('wi_id'); + $decisionitem->num_of_item = $request->input('num_of_item'); + $decisionitem->save(); + + return response()->json(['decisionitem'=>$decisionitem], 201); + + } + //need to do the put, delete, for the all post /** * Display the specified resource. @@ -163,26 +258,19 @@ class WarehousearrangementController extends Controller // } - /** - * Update the specified resource in storage. - * - * @param \Illuminate\Http\Request $request - * @param int $id - * @return \Illuminate\Http\Response - */ - public function update(Request $request, $id) - { - // - } - /** * Remove the specified resource from storage. * * @param int $id * @return \Illuminate\Http\Response */ - public function destroy($id) + public function delete(warehousearr $wa_id) { - // + + $wa_id->delete($wa_id); + + return response()->json($wa_id, 204); } + + } diff --git a/database/migrations/2018_05_23_084443_add_boolean_to_decisions_table.php b/database/migrations/2018_05_23_084443_add_boolean_to_decisions_table.php new file mode 100644 index 0000000..6f7cb55 --- /dev/null +++ b/database/migrations/2018_05_23_084443_add_boolean_to_decisions_table.php @@ -0,0 +1,34 @@ +boolean('decision_type')->change(); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('decisions', function (Blueprint $table) { + // + }); + } +} diff --git a/routes/api.php b/routes/api.php index 1e143c1..5fc0ed0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1,6 +1,5 @@ get('/user', function (Request $request) {