Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix migration issues

Browse Source
This commit is contained in:
Benjamin Beganović 2020-09-10 13:01:10 +02:00
parent 9beafcd73b
commit 207c9388b5
2 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Jobs/Invoice/CreateInvoicePdf.php
View File

@ -85,6 +85,10 @@ class CreateInvoicePdf implements ShouldQueue
$design = Design::find($invoice_design_id); $design = Design::find($invoice_design_id);
if (!$design) {
$design = Design::first();
}
$html = new HtmlEngine(null, $this->invitation, 'invoice'); $html = new HtmlEngine(null, $this->invitation, 'invoice');
$template = new PdfMakerDesign(strtolower($design->name)); $template = new PdfMakerDesign(strtolower($design->name));

7
app/Jobs/Util/Import.php
View File

@ -208,6 +208,13 @@ class Import implements ShouldQueue
{ {
Company::unguard(); Company::unguard();
if (
$data['settings']['invoice_design_id'] > 9 ||
$data['settings']['invoice_design_id'] > "9"
) {
$data['settings']['invoice_design_id'] = 1;
}
$data = $this->transformCompanyData($data); $data = $this->transformCompanyData($data);
$rules = (new UpdateCompanyRequest())->rules(); $rules = (new UpdateCompanyRequest())->rules();