Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for invoice creation from recurring where balance doubles

Browse Source
This commit is contained in:
David Bomba 2021-01-08 12:44:31 +11:00
parent b5606c1524
commit da7eb3b4c2
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/RecurringInvoiceToInvoiceFactory.php
View File

@ -43,7 +43,7 @@ class RecurringInvoiceToInvoiceFactory
$invoice->custom_value3 = $recurring_invoice->custom_value3; $invoice->custom_value3 = $recurring_invoice->custom_value3;
$invoice->custom_value4 = $recurring_invoice->custom_value4; $invoice->custom_value4 = $recurring_invoice->custom_value4;
$invoice->amount = $recurring_invoice->amount; $invoice->amount = $recurring_invoice->amount;
$invoice->balance = $recurring_invoice->balance; // $invoice->balance = $recurring_invoice->balance;
$invoice->user_id = $recurring_invoice->user_id; $invoice->user_id = $recurring_invoice->user_id;
$invoice->assigned_user_id = $recurring_invoice->assigned_user_id; $invoice->assigned_user_id = $recurring_invoice->assigned_user_id;
$invoice->company_id = $recurring_invoice->company_id; $invoice->company_id = $recurring_invoice->company_id;

8
app/Jobs/Entity/CreateEntityPdf.php
View File

@ -168,8 +168,12 @@ class CreateEntityPdf implements ShouldQueue
return $file_path; return $file_path;
} }
public function failed(\Exception $exception) public function failed($e)
{ {
nlog("help!");
} }
// public function failed(\Exception $exception)
// {
// nlog("help!");
// }
} }

2
app/Jobs/RecurringInvoice/SendRecurring.php
View File

@ -58,7 +58,7 @@ class SendRecurring implements ShouldQueue
$invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client); $invoice = RecurringInvoiceToInvoiceFactory::create($this->recurring_invoice, $this->recurring_invoice->client);
$invoice->date = now()->format('Y-m-d'); $invoice->date = now()->format('Y-m-d');
$invoice = $invoice->service() $invoice = $invoice->service()
->markSent() ->markSent()
->applyNumber() ->applyNumber()