Merge pull request #282 from viralsolani/develop

- Upgrade to Laravel 5.7
- Removed generator resources/vendor files
- Resolved html flash <br/> in validation messages issue
- updated fronted account section to remove address, state, city, ssn and zipcode as we are not using it anywhere
- MISC API Changes
- Fixed table names from faqs repository
- Remove Email Template Module And implemented Mailable
- Resolve Misc. Bug Fixes

Author: viralsolani

app/Events/Backend/EmailTemplates/EmailTemplateDeleted.php

@@ -9,4 +9,29 @@
  */
 class GeneralException extends Exception
 {
+    /**
+     * message.
+     *
+     * @var string
+     */
+    public $message;
+
+    /**
+     * dontHide.
+     *
+     * @var bool
+     */
+    public $dontHide;
+
+    /**
+     * Constructor function.
+     *
+     * @param string $message
+     * @param bool   $dontHide
+     */
+    public function __construct($message, $dontHide = false)
+    {
+        $this->message = $message;
+        $this->dontHide = $dontHide;
+    }
 }

app/Events/Backend/EmailTemplates/EmailTemplateUpdated.php

@@ -53,7 +53,6 @@ public function report(Exception $exception)
      */
     public function render($request, Exception $exception)
     {
-        //dd($exception);
         if (strpos($request->url(), '/api/') !== false) {
             \Log::debug('API Request Exception - '.$request->url().' - '.$exception->getMessage().(!empty($request->all()) ? ' - '.json_encode($request->except(['password'])) : ''));
 
@@ -112,6 +111,8 @@ public function render($request, Exception $exception)
          * All instances of GeneralException redirect back with a flash message to show a bootstrap alert-error
          */
         if ($exception instanceof GeneralException) {
+            session()->flash('dontHide', $exception->dontHide);
+
             return redirect()->back()->withInput()->withFlashDanger($exception->getMessage());
         }
 

app/Exceptions/GeneralException.php

@@ -1,8 +1,6 @@
 <?php
 
-use App\Exceptions\GeneralException;
 use App\Helpers\uuid;
-use App\Http\Utilities\SendEmail;
 use App\Models\Notification\Notification;
 use App\Models\Settings\Setting;
 use Carbon\Carbon as Carbon;
@@ -145,38 +143,25 @@ function settings()
     }
 }
 
-// Creating Notification
 if (!function_exists('createNotification')) {
     /**
      * create new notification.
      *
      * @param  $message    message you want to show in notification
      * @param  $userId     To Whom You Want To send Notification
-     * @param  $type       type of notification (1 - dashboard, 2 - email, 3 - both) (by default 1)
-     * @param  $option     associate array [ 'data' => $data, 'email_template_type' => $template_type ]
      *
      * @return object
      */
-    function createNotification($message, $userId, $type = 1, $options = [])
+    function createNotification($message, $userId)
     {
-        if ($type == 1 || $type == 3) {
-            $notification = new Notification();
+        $notification = new Notification();
 
-            return $notification->insert([
-                'message'    => $message,
-                'user_id'    => $userId,
-                'type'       => $type,
-                'created_at' => Carbon::now(),
-            ]);
-        }
-        if ($type == 2 || $type == 3) {
-            if (!empty($options['data']) && !empty($options['email_template_type'])) {
-                $mail = new SendEmail();
-                $emailResult = $mail->sendWithTemplate($options['data'], $options['email_template_type']);
-            } else {
-                throw new GeneralException('Invalid input given.option array shold contains data and email_template_type');
-            }
-        }
+        return $notification->insert([
+            'message'    => $message,
+            'user_id'    => $userId,
+            'type'       => 1,
+            'created_at' => Carbon::now(),
+        ]);
     }
 }
 

app/Exceptions/Handler.php

@@ -9,7 +9,6 @@
 require __DIR__.'/Access/Role.php';
 require __DIR__.'/Access/Permission.php';
 require __DIR__.'/Page.php';
-require __DIR__.'/Email_Template.php';
 require __DIR__.'/Setting.php';
 require __DIR__.'/Blog_Category.php';
 require __DIR__.'/Blog_Tag.php';

app/Helpers/helpers.php

@@ -12,7 +12,7 @@
 class NotificationController extends Controller
 {
     /**
-     * @var EmailTemplateContract
+     * @var \App\Repositories\Backend\Notification\NotificationRepository
      */
     protected $notification;