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

Fix for blank contact name

Browse Source
This commit is contained in:
David Bomba 2020-06-09 07:55:31 +10:00
parent bf6044006d
commit 01f53e1689
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Listeners/Invoice/UpdateInvoiceActivity.php
View File

@ -50,7 +50,8 @@ class UpdateInvoiceActivity implements ShouldQueue
$fields->user_id = $event->invoice->user_id; $fields->user_id = $event->invoice->user_id;
$fields->company_id = $event->invoice->company_id; $fields->company_id = $event->invoice->company_id;
$fields->activity_type_id = Activity::UPDATE_INVOICE; $fields->activity_type_id = Activity::UPDATE_INVOICE;
$fields->invoice_id = $event->invoice->id;
$this->activity_repo->save($fields, $event->invoice); $this->activity_repo->save($fields, $event->invoice);
} }
} }

9
app/Models/Presenters/ClientPresenter.php
View File

@ -25,15 +25,20 @@ class ClientPresenter extends EntityPresenter
*/ */
public function name() public function name()
{ {
if($this->entity->name)
return $this->entity->name;
$contact = $this->entity->primary_contact->first(); $contact = $this->entity->primary_contact->first();
$contact_name = 'No Contact Set'; $contact_name = 'No Contact Set';
if ($contact) { if ($contact && (strlen($contact->first_name) >=1 || strlen($contact->last_name) >=1)) {
$contact_name = $contact->first_name. ' '. $contact->last_name; $contact_name = $contact->first_name. ' '. $contact->last_name;
} }
elseif($contact && (strlen($contact->email)))
$contact_name = $contact->email;
return $this->entity->name ?: $contact_name; return $contact_name;
} }
public function primary_contact_name() public function primary_contact_name()

1
database/factories/AccountFactory.php
View File

@ -7,5 +7,6 @@ $factory->define(App\Models\Account::class, function (Faker $faker) {
return [ return [
'default_company_id' => 1, 'default_company_id' => 1,
'key' => Str::random(32), 'key' => Str::random(32),
'report_errors' => 1,
]; ];
}); });