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 #6090 from beganovich/v5-2106-change-default-email-logo

Browse Source 
(v5) Change default company logo
This commit is contained in:
Benjamin Beganović 2021-06-21 14:22:35 +02:00 committed by GitHub
commit 8a3f06c039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Models/Presenters/CompanyPresenter.php
View File

@ -41,7 +41,7 @@ class CompanyPresenter extends EntityPresenter
else if(strlen($settings->company_logo) >= 1)
return url('') . $settings->company_logo;
else
return 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
return asset('images/new_logo.png');
}
@ -101,7 +101,7 @@ class CompanyPresenter extends EntityPresenter
{
$settings = $this->entity->settings;
return
return
"SPC\n0200\n1\n{$user_iban}\nK\n{$this->name}\n{$settings->address1}\n{$settings->postal_code} {$settings->city}\n\n\nCH\n\n\n\n\n\n\n\n{$balance_due_raw}\n{$client_currency}\n\n\n\n\n\n\n\nNON\n\n{$invoice_number}\nEPD\n";
}

2
tests/Integration/CompanyLedgerTest.php
View File

@ -84,7 +84,7 @@ class CompanyLedgerTest extends TestCase
$settings = CompanySettings::defaults();
$settings->company_logo = 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
$settings->company_logo = asset('images/new_logo.png');
$settings->website = 'www.invoiceninja.com';
$settings->address1 = 'Address 1';
$settings->address2 = 'Address 2';

8
tests/MockAccountData.php
View File

@ -167,7 +167,7 @@ trait MockAccountData
$settings = CompanySettings::defaults();
$settings->company_logo = 'https://www.invoiceninja.com/wp-content/uploads/2019/01/InvoiceNinja-Logo-Round-300x300.png';
$settings->company_logo = asset('images/new_logo.png');
$settings->website = 'www.invoiceninja.com';
$settings->address1 = 'Address 1';
$settings->address2 = 'Address 2';
@ -199,7 +199,7 @@ trait MockAccountData
}
$user->password = Hash::make('ALongAndBriliantPassword');
$user_id = $user->id;
$this->user = $user;
@ -292,7 +292,7 @@ trait MockAccountData
$this->task->status_id = TaskStatus::where('company_id', $this->company->id)->first()->id;
$this->task->save();
$this->expense_category = ExpenseCategory::factory()->create([
'user_id' => $user_id,
'company_id' => $this->company->id,
@ -562,7 +562,7 @@ trait MockAccountData
$data[1]['fee_tax_rate3'] = 0;
$data[1]['fee_cap'] = '';
$data[1]['is_enabled'] = true;
$cg = new CompanyGateway;
$cg->company_id = $this->company->id;
$cg->user_id = $user_id;