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

Merge pull request #4053 from beganovich/v2-fix-migration-design-issue

Browse Source 
Fix migration issue with designs
This commit is contained in:
David Bomba 2020-09-11 07:47:36 +10:00 committed by GitHub
commit 51eedf313a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -84,7 +84,6 @@ class CreateInvoicePdf implements ShouldQueue
$invoice_design_id = $this->invoice->design_id ? $this->invoice->design_id : $this->decodePrimaryKey($this->invoice->client->getSetting('invoice_design_id'));
$design = Design::find($invoice_design_id);
$html = new HtmlEngine(null, $this->invitation, 'invoice');
$template = new PdfMakerDesign(strtolower($design->name));

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

@ -208,6 +208,13 @@ class Import implements ShouldQueue
{
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);
$rules = (new UpdateCompanyRequest())->rules();