TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-12-16 02:12:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor mail sender

Browse Source
This commit is contained in:
yashkanakiya
2023-03-16 11:48:15 +05:30
parent 2bea727d19
commit aececb8575
13 changed files with 26 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/Http/Controllers/V1/Admin/MailSender/MailSenderController.php
View File

@@ -43,10 +43,10 @@ class MailSenderController extends Controller
$mailConfiguration = MailSender::where('company_id', $request->header('company'))
->where('is_default', true)
->count();
->first();
if ($mailConfiguration > 0 && $request['is_default'] == true) {
return respondJson('default_record_exists', 'Default mail sender already exist');
if ($mailConfiguration && $request['is_default'] == true) {
$mailConfiguration->update(['is_default' => false]);
}
$mailSender = MailSender::createFromRequest($request);
@@ -81,10 +81,10 @@ class MailSenderController extends Controller
$mailConfiguration = MailSender::where('company_id', $request->header('company'))
->where('is_default', true)
->where('id', '<>', $mailSender->id)
->count();
->first();
if ($mailConfiguration > 0 && $request['is_default'] == true) {
return respondJson('default_record_exists', 'Default mail sender already exist');
if ($mailConfiguration && $request['is_default'] == true) {
$mailConfiguration->update(['is_default' => false]);
}
$mailSender->updateFromRequest($request);

2
app/Http/Requests/MailSenderRequest.php
View File

@@ -72,7 +72,7 @@ class MailSenderRequest extends FormRequest
{
$data = $this->validated();
if ($data['settings']['encryption'] == 'none') {
if ($data['settings'] && $data['settings']['encryption'] == 'none') {
$data['settings']['encryption'] = '';
}