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

bugfixes

Browse Source
This commit is contained in:
RafficMohammed
2023-02-28 19:25:06 +05:30
parent 555b881753
commit 40809202df
8 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Agent/helpdesk/UserController.php
View File

@@ -996,7 +996,7 @@ class UserController extends Controller
$users = $this->getUsers($first_date, $second_date);
$excel_controller = new \App\Http\Controllers\Common\ExcelController();
$filename = 'users'.$date;
$excel_controller->export($filename, $users);
return $excel_controller->export($filename, $users);
} catch (Exception $ex) {
return redirect()->back()->with('fails', $ex->getMessage());
}

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

@@ -16,6 +16,6 @@ class ExcelController extends Controller
throw new Exception('No data');
}
//dd(Excel::download(new UserExport($data), $filename.'.'.'xls'));
return Excel::download(new UserExport(), $filename.'.'.'xls');
return Excel::download(new UserExport($data), $filename.'.'.'xlsx');
}
}

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

@@ -237,6 +237,7 @@ class PhpMailController extends Controller
//dd($to, $toname, $subject, $data, $cc, $attach);
//dd(\Config::get('mail'));
//dd($attach);
$mail = Mail::send('emails.mail', ['data' => $data], function ($m) use ($to, $subject, $toname, $cc, $attach, $from_address) {
$m->to($to, $toname)->subject($subject);
$m->from($from_address->email_address, $from_address->email_name);
@@ -263,6 +264,7 @@ class PhpMailController extends Controller
$name = $attach[$i]['file_name'];
$mime = $attach[$i]['mime'];
$this->attachmentMode($m, $file, $name, $mime, $mode);
break;
}
}
}