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

5.1.71

Browse Source
This commit is contained in:
David Bomba 2021-06-05 12:42:56 +10:00
parent 158f94993e
commit 2602144c7a
3 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.1.70 5.1.71

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

@ -20,6 +20,7 @@ use App\Libraries\MultiDB;
use App\Mail\DownloadBackup; use App\Mail\DownloadBackup;
use App\Mail\DownloadInvoices; use App\Mail\DownloadInvoices;
use App\Models\Activity; use App\Models\Activity;
use App\Models\Backup;
use App\Models\Client; use App\Models\Client;
use App\Models\ClientContact; use App\Models\ClientContact;
use App\Models\ClientGatewayToken; use App\Models\ClientGatewayToken;
@ -677,7 +678,7 @@ class CompanyImport implements ShouldQueue
{ {
$this->genericImportWithoutCompany(Backup::class, $this->genericImportWithoutCompany(Backup::class,
['activity_id','hashed_id'], ['hashed_id','id'],
[ [
['activities' => 'activity_id'], ['activities' => 'activity_id'],
], ],
@ -696,7 +697,7 @@ class CompanyImport implements ShouldQueue
[ [
['users' => 'user_id'], ['users' => 'user_id'],
['clients' => 'client_id'], ['clients' => 'client_id'],
['activities' => 'activity_id'], // ['activities' => 'activity_id'],
], ],
'company_ledger', 'company_ledger',
'created_at'); 'created_at');
@ -941,15 +942,14 @@ class CompanyImport implements ShouldQueue
if($class == 'App\Models\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;
} }
} }
@ -959,15 +959,10 @@ nlog($obj);
{ {
foreach($transform as $key => $value) foreach($transform as $key => $value)
{ {
if($class == 'App\Models\Activity' && $activity_invitation_key){ if($class == 'App\Models\Activity' && $activity_invitation_key && $key == 'invitations'){
$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});
} }
} }
@ -1106,14 +1101,13 @@ nlog($obj);
return null; return null;
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);
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[$resource]);
// nlog($this->backup_file->company_gateways); nlog("searching for {$old} in {$resource}");
throw new \Exception("Missing {$resource} key: {$old}"); throw new \Exception("Missing {$resource} key: {$old}");
} }

4
config/ninja.php
View File

@ -14,8 +14,8 @@ return [
'require_https' => env('REQUIRE_HTTPS', true), 'require_https' => env('REQUIRE_HTTPS', true),
'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_url' => rtrim(env('APP_URL', ''), '/'),
'app_domain' => env('APP_DOMAIN', 'invoicing.co'), 'app_domain' => env('APP_DOMAIN', 'invoicing.co'),
'app_version' => '5.1.70', 'app_version' => '5.1.71',
'app_tag' => '5.1.70-release', 'app_tag' => '5.1.71-release',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', ''),