mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2024-09-20 16:31:33 +02:00
Merge branch 'v5-stable' into v5-develop
This commit is contained in:
commit
56af0f5721
@ -126,7 +126,9 @@ class TemplateEmail extends Mailable
|
||||
if($this->invitation->invoice && $settings->ubl_email_attachment && $this->company->account->hasFeature(Account::FEATURE_DOCUMENTS)){
|
||||
|
||||
$ubl_string = CreateUbl::dispatchNow($this->invitation->invoice);
|
||||
$this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
|
||||
|
||||
if($ubl_string)
|
||||
$this->attachData($ubl_string, $this->invitation->invoice->getFileName('xml'));
|
||||
|
||||
}
|
||||
|
||||
|
@ -205,7 +205,6 @@ class BaseDriver extends AbstractPaymentDriver
|
||||
|
||||
$invoices->each(function ($invoice) use ($payment) {
|
||||
event(new InvoiceWasPaid($invoice, $payment, $payment->company, Ninja::eventVars()));
|
||||
$invoice->service()->workFlow();
|
||||
});
|
||||
|
||||
return $payment->service()->applyNumber()->save();
|
||||
|
@ -83,6 +83,7 @@ class UpdateInvoicePayment
|
||||
->updatePaidToDate($paid_amount)
|
||||
->updateStatus()
|
||||
->deletePdf()
|
||||
->workFlow()
|
||||
->save();
|
||||
|
||||
event(new InvoiceWasUpdated($invoice, $invoice->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));
|
||||
|
Loading…
Reference in New Issue
Block a user