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

Merge pull request #4592 from turbo124/v5-develop

Browse Source 
fixes for migration
This commit is contained in:
David Bomba 2020-12-30 07:40:12 +11:00 committed by GitHub
commit b47f9941c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.txt
View File

@ -1 +1 @@
5.0.40 5.0.41

6
app/Jobs/Util/Import.php
View File

@ -689,6 +689,8 @@ class Import implements ShouldQueue
unset($modified['id']); unset($modified['id']);
if(array_key_exists('invitations', $resource))
{
foreach($resource['invitations'] as $key => $invite) foreach($resource['invitations'] as $key => $invite)
{ {
$resource['invitations'][$key]['client_contact_id'] = $this->transformId('client_contacts', $invite['client_contact_id']); $resource['invitations'][$key]['client_contact_id'] = $this->transformId('client_contacts', $invite['client_contact_id']);
@ -699,8 +701,10 @@ class Import implements ShouldQueue
nlog("find a match for " . $invite['client_contact_id'] . " " .$resource['invitations'][$key]['client_contact_id']); nlog("find a match for " . $invite['client_contact_id'] . " " .$resource['invitations'][$key]['client_contact_id']);
} }
$modified['invitations'] = $resource['invitations']; $modified['invitations'] = $resource['invitations'];
}
$invoice = $invoice_repository->save( $invoice = $invoice_repository->save(
$modified, $modified,
InvoiceFactory::create($this->company->id, $modified['user_id']) InvoiceFactory::create($this->company->id, $modified['user_id'])

2
config/ninja.php
View File

@ -12,7 +12,7 @@ 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', ''), 'app_domain' => env('APP_DOMAIN', ''),
'app_version' => '5.0.40', 'app_version' => '5.0.41',
'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', false), 'api_secret' => env('API_SECRET', false),