Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 08:21:34 +02:00
Code Issues Releases Activity

Change company_logo_url to company_logo (#2980)

Browse Source
This commit is contained in:
David Bomba 2019-10-11 15:30:26 +11:00 committed by GitHub
parent 778b655aa3
commit dde3f1192a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/DataMapper/CompanySettings.php
View File

@ -155,7 +155,7 @@ class CompanySettings extends BaseSettings
/* Company Meta data that we can use to build sub companies*/
public $name = '';
public $company_logo_url = '';
public $company_logo = '';
public $website = '';
public $address1 = '';
public $address2 = '';
@ -170,7 +170,7 @@ class CompanySettings extends BaseSettings
public static $casts = [
'name' => 'string',
'company_logo_url' => 'string',
'company_logo' => 'string',
'website' => 'string',
'address1' => 'string',
'address2' => 'string',

4
app/Http/Controllers/OpenAPI/CompanySettingsSchema.php
View File

@ -7,7 +7,7 @@
* @OA\Property(property="date_format_id", type="string", example="15", description="____________"),
* @OA\Property(property="financial_year_start", type="string", example="2000-01-01", description="____________"),
* @OA\Property(property="language_id", type="string", example="1", description="____________"),
* @OA\Property(property="company_logo_url", type="string", example="https://example.com/logo.png", description="The URL to the company Logo"),
* @OA\Property(property="company_logo", type="string", example="https://example.com/logo.png", description="The URL to the company Logo"),
* @OA\Property(property="custom_label1", type="string", example="Custom Label", description="____________"),
* @OA\Property(property="custom_label2", type="string", example="Custom Label", description="____________"),
* @OA\Property(property="custom_label3", type="string", example="Custom Label", description="____________"),
@ -17,7 +17,7 @@
* @OA\Property(property="custom_value3", type="string", example="Custom Label", description="____________"),
* @OA\Property(property="custom_value4", type="string", example="Custom Label", description="____________"),
* @OA\Property(property="custom_message_dashboard", type="string", example="Please pay invoices immediately", description="____________"),
* @OA\Property(property="custom_message_unpaid_invoice", type="string", example="Please pay invoices immediatelyl", description="____________"),
* @OA\Property(property="custom_message_unpaid_invoice", type="string", example="Please pay invoices immediately", description="____________"),
* @OA\Property(property="custom_message_paid_invoice", type="string", example="Thanks for paying this invoice!", description="____________"),
* @OA\Property(property="custom_message_unapproved_quote", type="string", example="Please approve quote", description="____________"),
* @OA\Property(property="military_time", type="boolean", example=true, description="____________"),

2
app/Models/Company.php
View File

@ -193,7 +193,7 @@ class Company extends BaseModel
public function getLogo()
{
return $this->settings->company_logo_url ?: null;
return $this->settings->company_logo ?: null;
}
/**

2
app/Utils/Traits/Uploadable.php
View File

@ -30,7 +30,7 @@ trait Uploadable
if($path){
$settings = $entity->settings;
$settings->company_logo_url = $company->domain . $path;
$settings->company_logo = $company->domain . $path;
$entity->settings = $settings;
$entity->save();
}

2
tests/Integration/UploadLogoTest.php
View File

@ -62,7 +62,7 @@ class UploadLogoTest extends TestCase
$acc = $response->json();
$logo = $acc['data']['settings']['company_logo_url'];
$logo = $acc['data']['settings']['company_logo'];
$logo_file = Storage::url($logo);