diff --git a/app/Models/Presenters/CompanyPresenter.php b/app/Models/Presenters/CompanyPresenter.php index f5035e32bbf6..787bbd5a891c 100644 --- a/app/Models/Presenters/CompanyPresenter.php +++ b/app/Models/Presenters/CompanyPresenter.php @@ -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"; } diff --git a/tests/Integration/CompanyLedgerTest.php b/tests/Integration/CompanyLedgerTest.php index 9397fb1b3b42..b097e594111d 100644 --- a/tests/Integration/CompanyLedgerTest.php +++ b/tests/Integration/CompanyLedgerTest.php @@ -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'; diff --git a/tests/MockAccountData.php b/tests/MockAccountData.php index ad5225270ddc..9cfec53b1c4f 100644 --- a/tests/MockAccountData.php +++ b/tests/MockAccountData.php @@ -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;