cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Manish Verma
2020-03-17 05:14:38 +00:00
committed by StyleCI Bot
parent 9fe479b141
commit ed3bbd76d7
75 changed files with 1285 additions and 1030 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Http/Controllers/Common/NotificationController.php
View File

@@ -13,7 +13,7 @@ class NotificationController extends Controller
{
/**
* ********************************************
* Class Notification Controller
* Class Notification Controller.
* ********************************************
* This controller is used to generate in app notification
* under the folling occurrence
@@ -157,13 +157,13 @@ class NotificationController extends Controller
public static function getNotifications()
{
$notifications = UserNotification::with([
'notification.type' => function ($query) {
$query->select('id', 'message', 'type');
}, 'users' => function ($query) {
$query->select('id', 'email', 'profile_pic');
}, 'notification.model' => function ($query) {
$query->select('id', 'ticket_number');
},
'notification.type' => function ($query) {
$query->select('id', 'message', 'type');
}, 'users' => function ($query) {
$query->select('id', 'email', 'profile_pic');
}, 'notification.model' => function ($query) {
$query->select('id', 'ticket_number');
},
])->where('user_id', '=', \Auth::user()->id);
return $notifications;

25
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -28,7 +28,8 @@ class PhpMailController extends Controller
{
$emails = Emails::where(
[['id', '=', $id],
['sending_status', '=', 1], ])
['sending_status', '=', 1], ]
)
->first();
return $emails;
@@ -182,11 +183,11 @@ class PhpMailController extends Controller
switch ($mail->sending_protocol) {
case 'smtp':
$config = ['host' => $mail->sending_host,
'port' => $mail->sending_port,
'security' => $mail->sending_encryption,
'username' => $mail->email_address,
'password' => $mail->password,
];
'port' => $mail->sending_port,
'security' => $mail->sending_encryption,
'username' => $mail->email_address,
'password' => $mail->password,
];
if (!$this->commonMailer->setSmtpDriver($config)) {
\Log::info('Invaid configuration :- '.$config);
@@ -195,12 +196,12 @@ class PhpMailController extends Controller
break;
case 'send_mail':
$config = [
'host' => \Config::get('mail.host'),
'port' => \Config::get('mail.port'),
'security' => \Config::get('mail.encryption'),
'username' => \Config::get('mail.username'),
'password' => \Config::get('mail.password'),
];
'host' => \Config::get('mail.host'),
'port' => \Config::get('mail.port'),
'security' => \Config::get('mail.encryption'),
'username' => \Config::get('mail.username'),
'password' => \Config::get('mail.password'),
];
$this->commonMailer->setSmtpDriver($config);
break;
case 'mailgun':

2
app/Http/Controllers/Common/SettingsController.php
View File

@@ -22,7 +22,7 @@ use Lang;
/**
* ***************************
* Settings Controllers
* Settings Controllers.
* ***************************
* Controller to keep smtp details and fetch where ever needed.
*/