v0.9.4 - Added email notification when news gets added

skolehjem/app/Http/Controllers/EventController.php

@@ -90,7 +90,8 @@ class EventController extends Controller
                 $news->type_id = '3';
                 $news->content = $event->description;
                 $news->resource_id = $event->resource_id;
-                $news->save();
+
+                NewsController::storeAndGet($news);
             }
 
             return redirect()->route('events.index', ['events' => $events]);
@@ -189,7 +190,8 @@ class EventController extends Controller
                     '<a style="margin: 0; padding: 0; text-align: center; font-weight: 700;" class="sde-blue" href="'. route("events.show", ["event" => $event->id ]) .'">Læs mere</a>'.
                     '<a style="margin: 0; padding: 0; text-align: end; font-weight: 700;" class="sde-blue" href="'. route("events.accountsignups", ["event" => $event->id ]) .'">Se deltagere</a>'.
                     '</div>';
-                $news->save();
+
+                NewsController::storeAndGet($news);
             }
 
             return redirect()->route("events.index", ['events' => $events]);

skolehjem/app/Http/Controllers/GuideController.php

@@ -10,8 +10,6 @@ use tidy;
 
 class GuideController extends Controller
 {
-
-
     public function __construct()
     {
         $this->middleware([ "auth" ]);
@@ -63,11 +61,12 @@ class GuideController extends Controller
             "guide_articles" => "required",
         ]);
 
-
         $guide = new Guide($requestGuide);
+
         if($request->file("resource")) {
             $guide->resource_id = ResourceController::store($request)->id;
         }
+
         $saved = $guide->save();
 
         if(!$saved) {
@@ -78,15 +77,17 @@ class GuideController extends Controller
             if($request->newsoption == true){
                 $news = new News();
 
-                $news->name = "Ny Vejledning";
+                $news->name = "Ny vejledning";
                 $news->subname = $guide->name;
                 $news->arrangement_id = $guide->id;
                 $news->type_id = '4';
 
                 $news->content = $guide->guide_articles;
+
+                if($guide->resource_id !== null)
                     $news->resource_id = $guide->resource_id;
 
-                $news->save();
+                NewsController::storeAndGet($news);
             }
 
             return redirect()->route("guides.index", ['guides' => $guides]);
@@ -137,7 +138,7 @@ class GuideController extends Controller
         if(!$saved){
             return redirect()->route("guides.update", [ "guide" => $guide ]);
         }else{
-            $guide = Guide::query()->paginate($request->input("limit", 20));
+            $guides = Guide::query()->paginate($request->input("limit", 20));
 
             if($request->newsoption == true){
                 $news = new News();
@@ -149,10 +150,10 @@ class GuideController extends Controller
 
                 $news->content = $this->closetags(substr($guidee->guide_articles, 0, 300)). '<br><a style="font-weight: 700;" href="' . route("guides.show", ["guide" => $guide]). '" class="sde-blue ">Læs mere</a>';
 
-                $news->save();
+                NewsController::storeAndGet($news);
             }
 
-            return redirect()->route("guides.index", ['guides' => $guide]);
+            return redirect()->route("guides.index", ['guides' => $guides]);
         }
     }
 

skolehjem/app/Http/Controllers/MenuPlanController.php

@@ -79,15 +79,15 @@ class MenuPlanController extends Controller
 
                 $news->name = "Ny menuplan";
                 $news->subname = "Uge " . $menuPlan->week;
-                $news->arrangement_id = $menuPlan->id;
-                $news->type_id = '2';
                 $news->content = $menuPlan->menu;
+                $news->type_id = '2';
+                $news->arrangement_id = $menuPlan->id;
 
                 if($request->file("resource")) {
                     $news->resource_id = ResourceController::store($request)->id;
                 }
 
-                $news->save();
+                NewsController::storeAndGet($news);
             }
 
             return redirect()->route("menu-plans.index", ['menuPlans' => $menuPlans]);
@@ -142,18 +142,15 @@ class MenuPlanController extends Controller
             $menuPlans = MenuPlan::query()->paginate($request->input("limit", 20));
 
             if($request->newsoption == true){
-                $news = [
+                $news = new News();
-                    "name" => "Opdateret menuplan",
+
-                    "subname" => "Uge " . $menuplan->week,
-                    "content" => $menuplan->menu
-                ];
-                //Sæt ind i $news array'et
                 $news->name = "Opdateret menuplan";
                 $news->subname = "Uge " . $menuplan->week;
                 $news->arrangement_id = $menuplan->id;
                 $news->type_id = '2';
                 $news->content = $menuplan->menu;
 
+
                 NewsController::storeAndGet($news);
             }
 

skolehjem/app/Http/Controllers/NewsController.php

@@ -73,10 +73,8 @@ class NewsController extends Controller
      *
      * @return News
      */
-    public static function storeAndGet($request)
+    public static function storeAndGet(News $news)
     {
-        $news = new News($request);
-        $news->name = "";
         $news->save();
 
         Helpers::sendNewsNotification($news, User::all());
@@ -122,9 +120,27 @@ class NewsController extends Controller
 
         $news->update($data);
 
+        Helpers::sendNewsNotification($news, User::all());
+
         return redirect()->route("news.index");
     }
 
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\News  $news
+     * @return RedirectResponse
+     */
+    public static function updateAndGet(News $news)
+    {
+        $news->update();
+
+        Helpers::sendNewsNotification($news, User::all());
+
+        return $news;
+    }
+
     /**
      * Remove the specified resource from storage.
      *