diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index e95914b..037ea75 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -29,8 +29,8 @@ class CompanyController extends Controller $company->state=$request->input('state'); $company->country=$request->input('country'); $company->contact_person=$request->input('contact_person'); - $company->save(); + return response()->json(['company'=>$company],200); } diff --git a/app/Http/Controllers/WarehousearrangementController.php b/app/Http/Controllers/WarehousearrangementController.php index 58226c0..adbdd6c 100644 --- a/app/Http/Controllers/WarehousearrangementController.php +++ b/app/Http/Controllers/WarehousearrangementController.php @@ -19,7 +19,37 @@ class WarehousearrangementController extends Controller */ public function index() { - return view('welcome'); + $warehousearr = Warehousearr::where('com_id', Auth::user()->company())->where('id', $id)->first(); + + if (!$warehousearr) + { + return response()->json(['message'=>'Access Denied!'], 404); + } + + return response()->json(['warehousearr'=>$warehousearr],200); + + } + + /** + * Display the specified resource. + * + * @param int $id + * @return \Illuminate\Http\Response + */ + public function show($id) + { + $warehousearrs = DB::table('warehousearrs') + ->select('id', 'so_id', 'receive_on', 'transport_company_name', 'consignment_note_no', 'warehouse_receive_note_no', 'receiving_person', 'marking_number', 'image') + ->where('com_id', Auth::user()->company()) + ->get(); + + if (!$warehousearr) + { + return response()->json(['message'=>'Access Denied!'], 404); + } + + return response()->json($warehousearr, 200); + } /** @@ -30,9 +60,10 @@ class WarehousearrangementController extends Controller */ public function store(Request $request) { - //store warehouse receive note + $user = Auth::user(); + $warehousearr = new Warehousearr; - $warehousearr->so_id = $request->input('so_id'); + $warehousearr->so_id = $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'); @@ -40,6 +71,8 @@ class WarehousearrangementController extends Controller $warehousearr->receiving_person = $request->input('receiving_person'); $warehousearr->marking_number = $request->input('marking_number'); $warehousearr->image = $request->input('image'); + $warehousearr->ff_id = $contact->id; + $warehousearr->com_id = $user->company(); $warehousearr->save(); //store warehouse receive note item @@ -66,13 +99,12 @@ class WarehousearrangementController extends Controller } - return response()->json(['warehousearr'=>$warehousearr],201); } /** - * Update the specified resource in storage. + * Update the warehouse receive note in storage. * * @param \Illuminate\Http\Request $request * @param int $id @@ -80,9 +112,14 @@ class WarehousearrangementController extends Controller */ public function update(Request $request, $id) { - //store warehouse receive note - $warehousearr = Warehousearr::find($id); - $warehousearr->so_id = $request->input('so_id'); + $warehousearr = Warehousearr::where('com_id', Auth::user()->company())->where('id', $id)->first(); + + if (!$warehousearr) + { + return response()->json(['message'=>'Access Denied!'], 404); + } + + $warehousearr->so_id = $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'); @@ -90,14 +127,15 @@ class WarehousearrangementController extends Controller $warehousearr->receiving_person = $request->input('receiving_person'); $warehousearr->marking_number = $request->input('marking_number'); $warehousearr->image = $request->input('image'); + $warehousearr->ff_id = $contact->id; + $warehousearr->com_id = $user->company(); $warehousearr->save(); - //store warehouse receive note item $warehouseitems = $request->input('warehouseitem'); foreach ($warehouseitems as $warehouseitem) { $ex_warehouseitem = Warehouseitem::where('wa_id', $id)->first(); - + $ex_warehouseitem->description = $warehouseitem['description']; $ex_warehouseitem->nominal_ctn = $warehouseitem['nominal_ctn']; $ex_warehouseitem->actual_ctn = $warehouseitem['actual_ctn']; @@ -113,17 +151,17 @@ class WarehousearrangementController extends Controller } - return response()->json(['warehousearr'=>$warehousearr],201); + return response()->json(['warehousearr'=>$warehousearr],200); } public function warehousearrpic(Request $request, $id) { - $warehousearr = Warehousearr::find($id); + $warehousearr = Warehousearr::where('com_id', Auth::user()->company())->where('id', $id)->first(); if (!$warehousearr) { - return response()->json(['message'=>'Document not found'],200); + return response()->json(['message'=>'Access Denied!'], 404); } //validaating file types @@ -154,17 +192,18 @@ class WarehousearrangementController extends Controller } //end if $warehousearr->save(); + return response()->json(['warehousearr'=>$warehousearr], 201); } public function warehouseitempic(Request $request, $id) { - $warehouseitem = Warehouseitem::find($id); + $warehousearr = Warehousearr::where('com_id', Auth::user()->company())->where('id', $id)->first(); - if (!$warehouseitem) + if (!$warehousearr) { - return response()->json(['message'=>'Document not found'],200); + return response()->json(['message'=>'Access Denied!'], 404); } //validaating file types @@ -195,12 +234,13 @@ class WarehousearrangementController extends Controller } //end if $warehouseitem->save(); + return response()->json(['warehouseitem'=>$warehouseitem], 201); } /** - * Store a newly created resource in storage. + * Store a the decision request in storage. * * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response @@ -209,8 +249,7 @@ class WarehousearrangementController extends Controller { //decision-type $decision = new Decision; - $decision->id = $request->input('id'); - $decision->wa_id = $request->input('wa_id'); + $decision->wa_id = $warehousearr->id; $decision->decision_type = $request->input('decision_type'); $decision->description = $request->input('description'); $decision->save(); @@ -220,7 +259,7 @@ class WarehousearrangementController extends Controller } /** - * Store a newly created resource in storage. + * Store a decision item in storage. * * @param \Illuminate\Http\Request $request * @return \Illuminate\Http\Response @@ -229,25 +268,13 @@ class WarehousearrangementController extends Controller { //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->decision_id = $decision->id; + $decisionitem->wi_id = $warehouseitems->id; $decisionitem->num_of_item = $request->input('num_of_item'); $decisionitem->save(); return response()->json(['decisionitem'=>$decisionitem], 201); } - - /** - * Display the specified resource. - * - * @param int $id - * @return \Illuminate\Http\Response - */ - public function show($id) - { - // - } } diff --git a/app/Warehousearr.php b/app/Warehousearr.php index 2ea9753..eca6c47 100644 --- a/app/Warehousearr.php +++ b/app/Warehousearr.php @@ -16,6 +16,8 @@ class Warehousearr extends Model 'receiving_person', 'marking_number', 'image', + 'ff_id', + 'com_id', ]; public function warehouseitem() diff --git a/database/migrations/2018_06_27_030001_add_ff_id_and_com_id_to_warehousearrs_table.php b/database/migrations/2018_06_27_030001_add_ff_id_and_com_id_to_warehousearrs_table.php new file mode 100644 index 0000000..7fd06b3 --- /dev/null +++ b/database/migrations/2018_06_27_030001_add_ff_id_and_com_id_to_warehousearrs_table.php @@ -0,0 +1,42 @@ +unsignedInteger('ff_id');//FK contact id + $table->foreign('ff_id') + ->references('id')->on('contacts') + ->onDelete('cascade'); + + $table->unsignedInteger('com_id');//FK company id + $table->foreign('com_id') + ->references('id')->on('companies') + ->onDelete('cascade'); + + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('warehousearrs', function (Blueprint $table) { + // + }); + } +}