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

updates

Browse Source
This commit is contained in:
Manish Verma
2017-01-05 19:09:46 +05:30
parent f2981b7ec3
commit 1b45e5a952
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Kernel.php
View File

@@ -30,7 +30,8 @@ class Kernel extends ConsoleKernel
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
if (env('DB_INSTALL') == 1) { if (env('DB_INSTALL') == 1) {
if ($this->getCurrentQueue() != "sync") {
if ($this->getCurrentQueue() != 'sync') {
$schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute(); $schedule->command('queue:listen '.$this->getCurrentQueue().' --sleep 60')->everyMinute();
} }
$this->execute($schedule, 'fetching'); $this->execute($schedule, 'fetching');

6
app/FaveoStorage/Controllers/SettingsController.php
View File

@@ -108,9 +108,11 @@ class SettingsController extends Controller {
$storage->upload(); $storage->upload();
} }
public function activate() {
public function activate()
{
if (!\Schema::hasColumn('ticket_attachment', 'driver')) { if (!\Schema::hasColumn('ticket_attachment', 'driver')) {
$path = 'app' . DIRECTORY_SEPARATOR . 'FaveoStorage' . DIRECTORY_SEPARATOR . 'database' . DIRECTORY_SEPARATOR . 'migrations'; $path = 'app'.DIRECTORY_SEPARATOR.'FaveoStorage'.DIRECTORY_SEPARATOR.'database'.DIRECTORY_SEPARATOR.'migrations';
Artisan::call('migrate', [ Artisan::call('migrate', [
'--path' => $path, '--path' => $path,
'--force' => true, '--force' => true,

9
app/Http/Controllers/Admin/helpdesk/TemplateController.php
View File

@@ -327,16 +327,17 @@ class TemplateController extends Controller
throw new Exception('Sorry! We can not find your request'); throw new Exception('Sorry! We can not find your request');
} }
$to_address = [ $to_address = [
'name' => "",
'email' => $to 'name' => '',
'email' => $to,
]; ];
$message = [ $message = [
'subject' => $subject, 'subject' => $subject,
'scenario' => null, 'scenario' => null,
'body' => $msg 'body' => $msg,
]; ];
$this->PhpMailController->sendmail($from, $to_address, $message,[],[]); $this->PhpMailController->sendmail($from, $to_address, $message, [], []);
return redirect()->back()->with('success', 'Mail has send successfully'); return redirect()->back()->with('success', 'Mail has send successfully');
} catch (Exception $e) { } catch (Exception $e) {
return redirect()->back()->with('fails', $e->getMessage()); return redirect()->back()->with('fails', $e->getMessage());