TheCloneArmy/crater
1
0
Fork 1
mirror of https://github.com/crater-invoice/crater.git synced 2025-10-30 21:21:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor mail-sender

Browse Source
This commit is contained in:
yogesh-gohil
2023-03-17 18:54:58 +05:30
parent aececb8575
commit dea73bcdf8
10 changed files with 99 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,14 +41,6 @@ class MailSenderController extends Controller
{
$this->authorize('create', MailSender::class);
$mailConfiguration = MailSender::where('company_id', $request->header('company'))
->where('is_default', true)
->first();
if ($mailConfiguration && $request['is_default'] == true) {
$mailConfiguration->update(['is_default' => false]);
}
$mailSender = MailSender::createFromRequest($request);
return new MailSenderResource($mailSender);
@ -78,15 +70,6 @@ class MailSenderController extends Controller
{
$this->authorize('update', $mailSender);
$mailConfiguration = MailSender::where('company_id', $request->header('company'))
->where('is_default', true)
->where('id', '<>', $mailSender->id)
->first();
if ($mailConfiguration && $request['is_default'] == true) {
$mailConfiguration->update(['is_default' => false]);
}
$mailSender->updateFromRequest($request);
return new MailSenderResource($mailSender);
@ -102,6 +85,10 @@ class MailSenderController extends Controller
{
$this->authorize('delete', $mailSender);
if ($mailSender->is_default) {
return respondJson('You can\'t remove default mail sender.', 'You can\'t remove default mail sender.');
}
$mailSender->delete();
return response()->json([

17
app/Http/Controllers/V1/Customer/EstimatePdfController.php
View File

@ -9,6 +9,7 @@ use Crater\Models\CompanySetting;
use Crater\Models\Customer;
use Crater\Models\EmailLog;
use Crater\Models\Estimate;
use Crater\Models\MailSender;
use Illuminate\Http\Request;
class EstimatePdfController extends Controller
@ -27,14 +28,16 @@ class EstimatePdfController extends Controller
);
if ($notifyEstimateViewed == 'YES') {
$data['estimate'] = Estimate::findOrFail($estimate->id)->toArray();
$data['user'] = Customer::find($estimate->customer_id)->toArray();
$notificationEmail = CompanySetting::getSetting(
'notification_email',
$estimate->company_id
);
$notificationEmail = CompanySetting::getSetting('notification_email', $estimate->company_id);
$mailSender = MailSender::where('company_id', $estimate->company_id)->where('is_default', true)->first();
MailSender::setMailConfiguration($mailSender->id);
\Mail::to($notificationEmail)->send(new EstimateViewedMail($data));
$data['from_address'] = $mailSender->from_address;
$data['from_name'] = $mailSender->from_name;
$data['user'] = Customer::find($estimate->customer_id)->toArray();
$data['estimate'] = Estimate::findOrFail($estimate->id)->toArray();
send_mail(new EstimateViewedMail($data), $mailSender, $notificationEmail);
}
}

13
app/Http/Controllers/V1/Customer/InvoicePdfController.php
View File

@ -9,6 +9,7 @@ use Crater\Models\CompanySetting;
use Crater\Models\Customer;
use Crater\Models\EmailLog;
use Crater\Models\Invoice;
use Crater\Models\MailSender;
use Illuminate\Http\Request;
class InvoicePdfController extends Controller
@ -28,14 +29,16 @@ class InvoicePdfController extends Controller
);
if ($notifyInvoiceViewed == 'YES') {
$notificationEmail = CompanySetting::getSetting('notification_email', $invoice->company_id);
$mailSender = MailSender::where('company_id', $invoice->company_id)->where('is_default', true)->first();
MailSender::setMailConfiguration($mailSender->id);
$data['from_address'] = $mailSender->from_address;
$data['from_name'] = $mailSender->from_name;
$data['invoice'] = Invoice::findOrFail($invoice->id)->toArray();
$data['user'] = Customer::find($invoice->customer_id)->toArray();
$notificationEmail = CompanySetting::getSetting(
'notification_email',
$invoice->company_id
);
\Mail::to($notificationEmail)->send(new InvoiceViewedMail($data));
send_mail(new InvoiceViewedMail($data), $mailSender, $notificationEmail);
}
}

7
app/Http/Middleware/ConfigMiddleware.php
View File

@ -4,6 +4,7 @@ namespace Crater\Http\Middleware;
use Closure;
use Crater\Models\FileDisk;
use Crater\Models\MailSender;
class ConfigMiddleware
{
@ -28,6 +29,12 @@ class ConfigMiddleware
}
}
$default_mail_sender = MailSender::where('company_id', $request->header('company'))->where('is_default', true)->first();
if ($default_mail_sender) {
$default_mail_sender->setMailConfiguration($default_mail_sender->id);
}
return $next($request);
}
}