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

Ensure when merging, we purge empty contacts

Browse Source
This commit is contained in:
David Bomba 2023-02-17 10:17:05 +11:00
parent 94670413ab
commit 75335ba8e4
2 changed files with 57 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Client/Merge.php
View File

@ -53,7 +53,7 @@ class Merge extends AbstractService
/* Loop through contacts an only merge distinct contacts by email */ /* Loop through contacts an only merge distinct contacts by email */
$this->mergable_client->contacts->each(function ($contact) { $this->mergable_client->contacts->each(function ($contact) {
$exist = $this->client->contacts->contains(function ($client_contact) use ($contact) { $exist = $this->client->contacts->contains(function ($client_contact) use ($contact) {
return $client_contact->email == $contact->email; return $client_contact->email == $contact->email || empty($contact->email) || $contact->email == ' ';
}); });
if ($exist) { if ($exist) {

56
tests/Feature/ClientTest.php
View File

@ -63,6 +63,62 @@ class ClientTest extends TestCase
$this->makeTestData(); $this->makeTestData();
} }
public function testClientMergeContactDrop()
{
$c = Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id]);
ClientContact::factory()->create([
'user_id' => $this->user->id,
'client_id' => $c->id,
'company_id' => $this->company->id,
'is_primary' => 1,
]);
ClientContact::factory()->create([
'user_id' => $this->user->id,
'client_id' => $c->id,
'company_id' => $this->company->id,
]);
$c1 = Client::factory()->create(['user_id' => $this->user->id, 'company_id' => $this->company->id]);
ClientContact::factory()->create([
'user_id' => $this->user->id,
'client_id' => $c1->id,
'company_id' => $this->company->id,
'is_primary' => 1,
]);
ClientContact::factory()->create([
'user_id' => $this->user->id,
'client_id' => $c1->id,
'company_id' => $this->company->id,
]);
ClientContact::factory()->create([
'user_id' => $this->user->id,
'client_id' => $c1->id,
'company_id' => $this->company->id,
'email' => ''
]);
$this->assertEquals(2, $c->contacts->count());
$this->assertEquals(3, $c1->contacts->count());
$c->service()->merge($c1);
$c = $c->fresh();
nlog($c->contacts->pluck('email'));
$this->assertEquals(4, $c->contacts->count());
}
private function buildLineItems($number = 2) private function buildLineItems($number = 2)
{ {
$line_items = []; $line_items = [];