Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:37:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6401 from turbo124/v5-develop

Browse Source 
Fixes for preview
This commit is contained in:
David Bomba 2021-08-05 22:39:22 +10:00 committed by GitHub
commit 51c98d4323
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,45 +169,47 @@ class PreviewController extends BaseController
public function live(PreviewInvoiceRequest $request) public function live(PreviewInvoiceRequest $request)
{ {
MultiDB::setDb(auth()->user()->company()->db); $company = auth()->user()->company();
MultiDB::setDb($company->db);
info("preview db = ".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($company->id, auth()->user()->id);
$class = Invoice::class; $class = Invoice::class;
} }
elseif($request->input('entity') == 'quote'){ elseif($request->input('entity') == 'quote'){
$repo = new QuoteRepository(); $repo = new QuoteRepository();
$factory = QuoteFactory::create(auth()->user()->company()->id, auth()->user()->id); $factory = QuoteFactory::create($company->id, auth()->user()->id);
$class = Quote::class; $class = Quote::class;
} }
elseif($request->input('entity') == 'credit'){ elseif($request->input('entity') == 'credit'){
$repo = new CreditRepository(); $repo = new CreditRepository();
$factory = CreditFactory::create(auth()->user()->company()->id, auth()->user()->id); $factory = CreditFactory::create($company->id, auth()->user()->id);
$class = Credit::class; $class = Credit::class;
} }
elseif($request->input('entity') == 'recurring_invoice'){ elseif($request->input('entity') == 'recurring_invoice'){
$repo = new RecurringInvoiceRepository(); $repo = new RecurringInvoiceRepository();
$factory = RecurringInvoiceFactory::create(auth()->user()->company()->id, auth()->user()->id); $factory = RecurringInvoiceFactory::create($company->id, auth()->user()->id);
$class = RecurringInvoice::class; $class = RecurringInvoice::class;
} }
try { try {
DB::connection(auth()->user()->company()->db)->beginTransaction(); DB::connection($company->db)->beginTransaction();
if($request->has('entity_id')){ if($request->has('entity_id')){
info("trying to find entity id = " . $this->decodePrimaryKey($request->input('entity_id'))); info("trying to find entity id = " . $this->decodePrimaryKey($request->input('entity_id')));
info("company id = " . auth()->user()->company()->id); info("company id = " . $company->id);
$entity_obj = $class::on(auth()->user()->company()->db) $entity_obj = $class::on($company->db)
->where('id', $this->decodePrimaryKey($request->input('entity_id'))) ->where('id', $this->decodePrimaryKey($request->input('entity_id')))
->where('company_id', auth()->user()->company()->id) ->where('company_id', $company->id)
->withTrashed() ->withTrashed()
->first(); ->first();
@ -269,7 +271,7 @@ class PreviewController extends BaseController
->design($template) ->design($template)
->build(); ->build();
DB::connection(auth()->user()->company()->db)->rollBack(); DB::connection($company->db)->rollBack();
if (request()->query('html') == 'true') { if (request()->query('html') == 'true') {
return $maker->getCompiledHTML; return $maker->getCompiledHTML;
@ -279,7 +281,7 @@ class PreviewController extends BaseController
} }
catch(\Exception $e){ catch(\Exception $e){
DB::connection(auth()->user()->company()->db)->rollBack(); DB::connection($company->db)->rollBack();
return; return;
} }
@ -293,7 +295,7 @@ class PreviewController extends BaseController
return (new NinjaPdf())->build($maker->getCompiledHTML(true)); return (new NinjaPdf())->build($maker->getCompiledHTML(true));
} }
$file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), auth()->user()->company()); $file_path = PreviewPdf::dispatchNow($maker->getCompiledHTML(true), $company);
if(Ninja::isHosted()) if(Ninja::isHosted())