Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-21 08:51:34 +02:00
Code Issues Releases Activity

Merge pull request #5447 from turbo124/v5-develop

Browse Source 
Payment Bulk Actions
This commit is contained in:
David Bomba 2021-04-17 07:43:00 +10:00 committed by GitHub
commit 2a72505817
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/PaymentController.php
View File

@ -614,7 +614,7 @@ class PaymentController extends BaseController
break; break;
case 'email': case 'email':
//dispatch email to queue //dispatch email to queue
$this->payment->service()->sendEmail(); $payment->service()->sendEmail();
if (! $bulk) { if (! $bulk) {
return $this->itemResponse($payment); return $this->itemResponse($payment);

24
app/Providers/MailServiceProvider.php
View File

@ -18,28 +18,30 @@ class MailServiceProvider extends MailProvider
public function boot() public function boot()
{ {
$this->app['mail.manager']->extend('postmark', function () {
return new PostmarkTransport(
$this->guzzle(config('postmark.guzzle', [])),
config('postmark.secret', config('services.postmark.secret'))
);
});
} }
protected function registerIlluminateMailer() protected function registerIlluminateMailer()
{ {
// $this->app->singleton('mail.manager', function($app) { $this->app->singleton('mail.manager', function($app) {
// return new GmailTransportManager($app);
// });
$this->app->bind('mail.manager', function($app) {
return new GmailTransportManager($app); return new GmailTransportManager($app);
}); });
// $this->app->bind('mail.manager', function($app) {
// return new GmailTransportManager($app);
// });
$this->app->bind('mailer', function ($app) { $this->app->bind('mailer', function ($app) {
return $app->make('mail.manager')->mailer(); return $app->make('mail.manager')->mailer();
}); });
$this->app['mail.manager']->extend('postmark', function () {
return new PostmarkTransport(
$this->guzzle(config('postmark.guzzle', [])),
config('postmark.secret')
);
});
} }
protected function guzzle(array $config): HttpClient protected function guzzle(array $config): HttpClient