Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for purging existing company

Browse Source
This commit is contained in:
David Bomba 2020-11-23 13:07:32 +11:00
parent 72d8c567bd
commit 53e40a4e6a
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Services/Migration/CompleteService.php
View File

@ -43,8 +43,10 @@ class CompleteService
$files = []; $files = [];
foreach ($this->data as $companyKey => $companyData) { foreach ($this->data as $companyKey => $companyData) {
$data[] = [ $data[] = [
'company_key' => $companyKey, 'company_index' => $companyKey,
'company_key' => $companyData['data']['company']['company_key'],
'force' => $companyData['force'], 'force' => $companyData['force'],
]; ];

2
app/Traits/GenerateMigrationResources.php
View File

@ -773,7 +773,7 @@ trait GenerateMigrationResources
'date' => Carbon::parse($item->created_at)->toDateString(), 'date' => Carbon::parse($item->created_at)->toDateString(),
'custom_value1' => $item->custom_value1, 'custom_value1' => $item->custom_value1,
'custom_value2' => $item->custom_value2, 'custom_value2' => $item->custom_value2,
'type_id' => $item->invoice_item_type_id, 'type_id' => (string)$item->invoice_item_type_id,
]; ];
} }

2
resources/lang/en/texts.php
View File

@ -3536,7 +3536,7 @@ $LANG = array(
'marked_credit_as_sent' => 'Successfully marked credit as sent', 'marked_credit_as_sent' => 'Successfully marked credit as sent',
'email_subject_payment_partial' => 'Email Partial Payment Subject', 'email_subject_payment_partial' => 'Email Partial Payment Subject',
'is_approved' => 'Is Approved', 'is_approved' => 'Is Approved',
'migration_went_wrong' => 'Oops, something went wrong! Make sure you did proper setup with V2 of Invoice Ninja, before starting migration.', 'migration_went_wrong' => 'Error: Make sure you did proper setup with V5 of Invoice Ninja, before starting migration.',
'cross_migration_message' => 'Cross account migration is not allowed. Make sure e-mail address is same on V4 and V5.', 'cross_migration_message' => 'Cross account migration is not allowed. Make sure e-mail address is same on V4 and V5.',
'email_credit' => 'Email Credit', 'email_credit' => 'Email Credit',
'client_email_not_set' => 'Client does not have an email address set', 'client_email_not_set' => 'Client does not have an email address set',