Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Company Import

Browse Source
This commit is contained in:
= 2021-06-04 21:39:35 +10:00
parent 4131354454
commit 158f94993e
2 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
app/Jobs/Company/CompanyImport.php
View File

@ -646,24 +646,8 @@ class CompanyImport implements ShouldQueue
$this->backup_file->activities = $activities; $this->backup_file->activities = $activities;
$this->genericImport(Activity::class, $this->genericNewClassImport(Activity::class,
[ [
'user_id',
'company_id',
'client_id',
'client_contact_id',
'project_id',
'vendor_id',
'payment_id',
'invoice_id',
'credit_id',
'invitation_id',
'task_id',
'expense_id',
'token_id',
'quote_id',
'subscription_id',
'recurring_invoice_id',
'hashed_id', 'hashed_id',
'company_id', 'company_id',
], ],
@ -683,8 +667,7 @@ class CompanyImport implements ShouldQueue
['recurring_invoices' => 'recurring_invoice_id'], ['recurring_invoices' => 'recurring_invoice_id'],
['invitations' => 'invitation_id'], ['invitations' => 'invitation_id'],
], ],
'activities', 'activities');
'created_at');
return $this; return $this;
@ -955,16 +938,18 @@ class CompanyImport implements ShouldQueue
$activity_invitation_key = false; $activity_invitation_key = false;
if($class instanceof Activity){ if($class == 'App\Models\Activity'){
if(isset($obj->invitation_id)){ if(isset($obj->invitation_id)){
nlog($obj);
if(isset($obj->invoice_id)) if(isset($obj->invoice_id))
$activity_invitation_key = 'invoice_invitations'; $activity_invitation_key = 'invoice_invitations';
elseif(isset($obj->quote_id)) elseif(isset($obj->quote_id))
$activity_invitation_key = 'quote_invitations'; $activity_invitation_key = 'quote_invitations';
elseif($isset($obj->credit_id)) elseif($isset($obj->credit_id))
$activity_invitation_key = 'credit_invitations'; $activity_invitation_key = 'credit_invitations';
else
$activity_invitation_key = false;
} }
} }
@ -974,14 +959,20 @@ class CompanyImport implements ShouldQueue
{ {
foreach($transform as $key => $value) foreach($transform as $key => $value)
{ {
if($class instanceof Activity && $activity_invitation_key) if($class == 'App\Models\Activity' && $activity_invitation_key){
$key = $activity_invitation_key; $key = $activity_invitation_key;
nlog($class);
nlog("{$value} - {$key}");
nlog($obj->{$value});
nlog($activity_invitation_key);
}
$obj_array["{$value}"] = $this->transformId($key, $obj->{$value}); $obj_array["{$value}"] = $this->transformId($key, $obj->{$value});
} }
} }
if($class instanceof CompanyGateway) { if($class == 'App\Models\CompanyGateway') {
$obj_array['config'] = encrypt($obj_array['config']); $obj_array['config'] = encrypt($obj_array['config']);
} }
@ -1116,13 +1107,13 @@ class CompanyImport implements ShouldQueue
if (! array_key_exists($resource, $this->ids)) { if (! array_key_exists($resource, $this->ids)) {
nlog($this->ids); nlog($this->ids);
nlog($this->backup_file->payments); // nlog($this->backup_file->payments);
throw new \Exception("Resource {$resource} not available."); throw new \Exception("Resource {$resource} not available.");
} }
if (! array_key_exists("{$old}", $this->ids[$resource])) { if (! array_key_exists("{$old}", $this->ids[$resource])) {
nlog($this->ids); nlog($this->ids);
nlog($this->backup_file->payments); // nlog($this->backup_file->company_gateways);
throw new \Exception("Missing {$resource} key: {$old}"); throw new \Exception("Missing {$resource} key: {$old}");
} }

5
tests/Feature/Import/ImportCompanyTest.php
View File

@ -769,7 +769,7 @@ class ImportCompanyTest extends TestCase
$this->backup_json_object->activities = $activities; $this->backup_json_object->activities = $activities;
$this->genericImport(Activity::class, $this->genericNewClassImport(Activity::class,
[ [
'user_id', 'user_id',
'company_id', 'company_id',
@ -806,8 +806,7 @@ class ImportCompanyTest extends TestCase
['recurring_invoices' => 'recurring_invoice_id'], ['recurring_invoices' => 'recurring_invoice_id'],
['invitations' => 'invitation_id'], ['invitations' => 'invitation_id'],
], ],
'activities', 'activities');
'created_at');
$this->assertEquals(25, Activity::count()); $this->assertEquals(25, Activity::count());