diff --git a/app/Http/Controllers/CompanyController.php b/app/Http/Controllers/CompanyController.php index 7e8938d..3a0cecb 100644 --- a/app/Http/Controllers/CompanyController.php +++ b/app/Http/Controllers/CompanyController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Models\Company; +use App\Models\MenuCompany; use Illuminate\Http\Request; class CompanyController extends Controller @@ -10,18 +11,22 @@ class CompanyController extends Controller public function add(Request $request) { $this->validate($request, [ - 'name' => 'required', - 'description' => 'required' + 'company_name' => 'required', + 'registration_no' => 'required', + 'template_id' => 'required', + 'is_active' => 'required' ]); $data = $request->all(); $data['created_by'] = $this->currentName; - + if(isset($data['base_url']) && $data['base_url'] != NULL) { + $data['base_url'] = json_encode($data['base_url'], true); + } $result = Company::create($data); if ($result) { - return response()->json(['status' => 'success', 'message' => 'add Company successfully!', 'code' => 200], 200); + return response()->json(['status' => 'success','data' => $result, 'message' => 'add Company successfully!', 'code' => 200], 200); } else { return response()->json(['status' => 'failed', 'message' => 'add data Company failed!', 'code' => 400], 400); } @@ -51,6 +56,10 @@ class CompanyController extends Controller $data = Company::find($id); + if(isset($data['base_url']) && $data['base_url'] != NULL) { + $data->update(['base_url'=>null]); + $data['base_url'] = json_encode($data['base_url'], true); + } if ($data) { $result = $data->update($request->all()); } else { @@ -71,6 +80,7 @@ class CompanyController extends Controller $data = Company::find($id); if ($data) { + MenuCompany::where('company_id',$id)->delete(); $delete = $data->delete(); } else { return response()->json(['status' => 'failed', 'message' => 'data Company not found!', 'code' => 400], 400);