Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 20:54:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Slow down hosted attachments

Browse Source
This commit is contained in:
David Bomba 2021-11-15 08:52:04 +11:00
parent 6f37249ffb
commit 2db0ea41fc
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Mail/GmailTransport.php
View File

@ -70,7 +70,7 @@ class GmailTransport extends Transport
if($child->getContentType() != 'text/plain') if($child->getContentType() != 'text/plain')
{ {
$this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') )); $this->gmail->attach(TempFile::filePath($child->getBody(), $child->getHeaders()->get('Content-Type')->getParameter('name') ));
} }

4
app/Http/Controllers/BaseController.php
View File

@ -334,7 +334,7 @@ class BaseController extends Controller
}, },
'company.expense_categories'=> function ($query) use ($updated_at, $user) { 'company.expense_categories'=> function ($query) use ($updated_at, $user) {
$query->where('updated_at', '>=', $updated_at); $query->whereNotNull('updated_at');
}, },
'company.task_statuses'=> function ($query) use ($updated_at, $user) { 'company.task_statuses'=> function ($query) use ($updated_at, $user) {
$query->whereNotNull('updated_at'); $query->whereNotNull('updated_at');
@ -568,7 +568,7 @@ class BaseController extends Controller
}, },
'company.expense_categories'=> function ($query) use ($created_at, $user) { 'company.expense_categories'=> function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at); $query->whereNotNull('created_at');
}, },
'company.task_statuses'=> function ($query) use ($created_at, $user) { 'company.task_statuses'=> function ($query) use ($created_at, $user) {

2
app/Jobs/Credit/ApplyCreditPayment.php
View File

@ -69,6 +69,7 @@ class ApplyCreditPayment implements ShouldQueue
$this->credit $this->credit
->service() ->service()
->markSent()
->setStatus(Credit::STATUS_APPLIED) ->setStatus(Credit::STATUS_APPLIED)
->adjustBalance($this->amount * -1) ->adjustBalance($this->amount * -1)
->updatePaidToDate($this->amount) ->updatePaidToDate($this->amount)
@ -78,6 +79,7 @@ class ApplyCreditPayment implements ShouldQueue
$this->credit $this->credit
->service() ->service()
->markSent()
->setStatus(Credit::STATUS_PARTIAL) ->setStatus(Credit::STATUS_PARTIAL)
->adjustBalance($this->amount * -1) ->adjustBalance($this->amount * -1)
->updatePaidToDate($this->amount) ->updatePaidToDate($this->amount)

2
app/Mail/Engine/InvoiceEmailEngine.php
View File

@ -136,4 +136,4 @@ class InvoiceEmailEngine extends BaseEmailEngine
return $this; return $this;
} }
} }

5
app/Mail/TemplateEmail.php
View File

@ -18,6 +18,7 @@ use App\Models\ClientContact;
use App\Models\User; use App\Models\User;
use App\Services\PdfMaker\Designs\Utilities\DesignHelpers; use App\Services\PdfMaker\Designs\Utilities\DesignHelpers;
use App\Utils\HtmlEngine; use App\Utils\HtmlEngine;
use App\Utils\Ninja;
use App\Utils\TemplateEngine; use App\Utils\TemplateEngine;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable; use Illuminate\Mail\Mailable;
@ -114,6 +115,10 @@ class TemplateEmail extends Mailable
$message->invitation = $this->invitation; $message->invitation = $this->invitation;
}); });
/*In the hosted platform we need to slow things down a little for Storage to catch up.*/
if(Ninja::isHosted())
sleep(1);
foreach ($this->build_email->getAttachments() as $file) { foreach ($this->build_email->getAttachments() as $file) {
if(is_string($file)) if(is_string($file))