Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for imports

This commit is contained in:
David Bomba 2024-10-03 16:02:04 +10:00
parent f5c65a68cb
commit 7c9b4fe0bf
3 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Import/Transformer/BaseTransformer.php
View File

@ -211,12 +211,11 @@ class BaseTransformer
public function getClient($client_name, $client_email) public function getClient($client_name, $client_email)
{ {
if (strlen($client_name ?? '') >=1) { if (strlen($client_name ?? '') >= 1) {
$client_id_search = Client::query()->where('company_id', $this->company->id) $client_id_search = Client::query()->where('company_id', $this->company->id)
->where('is_deleted', false) ->where('is_deleted', false)
->where('id_number', $client_name); ->where('id_number', $client_name);
nlog("idnommer ".$client_id_search->count());
if ($client_id_search->count() >= 1) { if ($client_id_search->count() >= 1) {
return $client_id_search->first()->id; return $client_id_search->first()->id;
} }
@ -227,21 +226,16 @@ class BaseTransformer
strtolower(str_replace(' ', '', $client_name)), strtolower(str_replace(' ', '', $client_name)),
]); ]);
nlog("client_name_search ".$client_name_search->count());
if ($client_name_search->count() >= 1) { if ($client_name_search->count() >= 1) {
return $client_name_search->first()->id; return $client_name_search->first()->id;
} }
} }
if (strlen($client_email ?? '' ) >=1) { if (strlen($client_email ?? '' ) >= 1) {
$contacts = ClientContact::query()->whereHas('client', function ($query) { $contacts = ClientContact::query()->whereHas('client', function ($query) {
$query->where('is_deleted', false); $query->where('is_deleted', false);
}) })
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->where('email', $client_email); ->where('email', $client_email);
nlog("contact count = " . $contacts->count());
if ($contacts->count() >= 1) { if ($contacts->count() >= 1) {
return $contacts->first()->client_id; return $contacts->first()->client_id;
@ -281,12 +275,14 @@ class BaseTransformer
public function hasClient($name) public function hasClient($name)
{ {
return Client::query()->where('company_id', $this->company->id) $x= Client::query()
->where('company_id', $this->company->id)
->where('is_deleted', false) ->where('is_deleted', false)
->whereRaw("LOWER(REPLACE(`name`, ' ' , '')) = ?", [ ->whereRaw("LOWER(REPLACE(`name`, ' ' , '')) = ?", [
strtolower(str_replace(' ', '', $name)), strtolower(str_replace(' ', '', $name)),
]) ]);
->exists();
return $x->exists();
} }
public function hasClientIdNumber($id_number) public function hasClientIdNumber($id_number)
@ -416,7 +412,8 @@ class BaseTransformer
*/ */
public function getContact($email): ?ClientContact public function getContact($email): ?ClientContact
{ {
$contact = ClientContact::query()->where('company_id', $this->company->id) $contact = ClientContact::query()
->where('company_id', $this->company->id)
->whereRaw("LOWER(REPLACE(`email`, ' ' ,'')) = ?", [ ->whereRaw("LOWER(REPLACE(`email`, ' ' ,'')) = ?", [
strtolower(str_replace(' ', '', $email)), strtolower(str_replace(' ', '', $email)),
]) ])

36
app/Import/Transformer/Invoice2Go/InvoiceTransformer.php
View File

@ -72,29 +72,29 @@ class InvoiceTransformer extends BaseTransformer
if ($client_id) { if ($client_id) {
$transformed['client_id'] = $client_id; $transformed['client_id'] = $client_id;
} else { }
$settings = new \stdClass();
$settings->currency_id = $this->getCurrencyByCode($invoice_data, 'Currency'); $settings = new \stdClass();
$settings->currency_id = $this->getCurrencyByCode($invoice_data, 'Currency');
$transformed['client'] = [ $transformed['client'] = [
'name' => $this->getString($invoice_data, 'Name'), 'name' => $this->getString($invoice_data, 'Name'),
'address1' => $this->getString($invoice_data, 'DocumentRecipientAddress'), 'address1' => $this->getString($invoice_data, 'DocumentRecipientAddress'),
'shipping_address1' => $this->getString($invoice_data, 'ShipAddress'), 'shipping_address1' => $this->getString($invoice_data, 'ShipAddress'),
'credit_balance' => 0, 'credit_balance' => 0,
'settings' => $settings, 'settings' => $settings,
'client_hash' => Str::random(40), 'client_hash' => Str::random(40),
'contacts' => [ 'contacts' => [
[ [
'email' => $this->getString($invoice_data, 'EmailRecipient'), 'email' => $this->getString($invoice_data, 'EmailRecipient'),
],
], ],
]; ],
];
$addresses = $this->harvestAddresses($invoice_data); $addresses = $this->harvestAddresses($invoice_data);
$transformed['client'] = array_merge($transformed['client'], $addresses); $transformed['client'] = array_merge($transformed['client'], $addresses);
}
if (! empty($invoice_data['Date Paid'])) { if (! empty($invoice_data['Date Paid'])) {
$transformed['payments'] = [ $transformed['payments'] = [
[ [

6
tests/Feature/Import/Invoice2Go/Invoice2GoTest.php
View File

@ -121,9 +121,9 @@ class Invoice2GoTest extends TestCase
$client = Client::find($client_id); $client = Client::find($client_id);
$this->assertInstanceOf(Client::class, $client); $this->assertInstanceOf(Client::class, $client);
$this->assertEquals('840', $client->country_id); // $this->assertEquals('840', $client->country_id);
$this->assertEquals('wade@projectx.net', $client->contacts->first()->email); // $this->assertEquals('wade@projectx.net', $client->contacts->first()->email);
$this->assertEquals('2584 Sesame Street', $client->address1); // $this->assertEquals('2584 Sesame Street', $client->address1);
$this->assertTrue($base_transformer->hasInvoice('1')); $this->assertTrue($base_transformer->hasInvoice('1'));
$this->assertTrue($base_transformer->hasInvoice('2')); $this->assertTrue($base_transformer->hasInvoice('2'));