diff --git a/skolehjem/app/Http/Controllers/EventController.php b/skolehjem/app/Http/Controllers/EventController.php index 73902b3..73712df 100644 --- a/skolehjem/app/Http/Controllers/EventController.php +++ b/skolehjem/app/Http/Controllers/EventController.php @@ -228,6 +228,10 @@ class EventController extends Controller $userEvent->delete(); } + $news = News::query()->where("type_id", "=", "3")->where("arrangement_id", "=", $event->id)->first(); + if($news !== null) + $news->delete(); + $event->delete(); return redirect()->route("events.index"); diff --git a/skolehjem/app/Http/Controllers/MenuPlanController.php b/skolehjem/app/Http/Controllers/MenuPlanController.php index e41614b..7b4562b 100644 --- a/skolehjem/app/Http/Controllers/MenuPlanController.php +++ b/skolehjem/app/Http/Controllers/MenuPlanController.php @@ -183,9 +183,25 @@ class MenuPlanController extends Controller //$images = App\Resource::query()->where("id", '=', $menuPlan->resource_id)->first(); //$imagesSize = getimagesize($images->filename); $pdf = \Illuminate\Support\Facades\App::make('dompdf.wrapper'); - $data = '