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

Merge pull request #6396 from turbo124/v5-develop

Browse Source 
Fixes for recurring invoice due dates
This commit is contained in:
David Bomba 2021-08-05 21:46:15 +10:00 committed by GitHub
commit 8253de1511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Factory/RecurringInvoiceToInvoiceFactory.php
View File

@ -29,7 +29,7 @@ class RecurringInvoiceToInvoiceFactory
$invoice->public_notes = $recurring_invoice->public_notes; $invoice->public_notes = $recurring_invoice->public_notes;
$invoice->private_notes = $recurring_invoice->private_notes; $invoice->private_notes = $recurring_invoice->private_notes;
//$invoice->date = now()->format($client->date_format()); //$invoice->date = now()->format($client->date_format());
$invoice->due_date = $recurring_invoice->calculateDueDate($recurring_invoice->next_send_date); $invoice->due_date = $recurring_invoice->calculateDueDate(now());
$invoice->is_deleted = $recurring_invoice->is_deleted; $invoice->is_deleted = $recurring_invoice->is_deleted;
$invoice->line_items = $recurring_invoice->line_items; $invoice->line_items = $recurring_invoice->line_items;
$invoice->tax_name1 = $recurring_invoice->tax_name1; $invoice->tax_name1 = $recurring_invoice->tax_name1;

16
app/Http/Controllers/PreviewController.php
View File

@ -171,6 +171,8 @@ class PreviewController extends BaseController
{ {
MultiDB::setDb(auth()->user()->company()->db); MultiDB::setDb(auth()->user()->company()->db);
info("preview db = ".auth()->user()->company()->db);
if($request->input('entity') == 'invoice'){ if($request->input('entity') == 'invoice'){
$repo = new InvoiceRepository(); $repo = new InvoiceRepository();
$factory = InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id); $factory = InvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id);
@ -200,13 +202,15 @@ class PreviewController extends BaseController
if($request->has('entity_id')){ if($request->has('entity_id')){
// $entity_obj = $class::on(auth()->user()->company()->db) info("trying to find entity id = " . $this->decodePrimaryKey($request->input('entity_id')));
// ->withTrashed()
// ->where('id', $this->decodePrimaryKey($request->input('entity_id')))
// ->where('company_id', auth()->user()->company()->id)
// ->first();
$entity_obj = $repo->save($request->all(), $factory); $entity_obj = $class::on(auth()->user()->company()->db)
->withTrashed()
->where('id', $this->decodePrimaryKey($request->input('entity_id')))
->where('company_id', auth()->user()->company()->id)
->first();
$entity_obj = $repo->save($request->all(), $entity_obj);
} }
else { else {