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

Merge pull request #4903 from turbo124/master

Browse Source 
Update texts
This commit is contained in:
David Bomba 2021-02-15 07:54:07 +11:00 committed by GitHub
commit 14b67a2053
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Console/Commands/ExportMigrations.php
View File

@ -62,6 +62,7 @@ class ExportMigrations extends Command
$users = User::all();
foreach($users as $user) {
Auth::login($user);
$this->export($user);
}
}
@ -78,18 +79,28 @@ class ExportMigrations extends Command
$fileName = "{$accountKey}-{$date}-invoiceninja";
$data['data'] = [
'account' => $this->getAccount(),
'company' => $this->getCompany(),
'users' => $this->getUsers(),
'tax_rates' => $this->getTaxRates(),
'payment_terms' => $this->getPaymentTerms(),
'clients' => $this->getClients(),
'products' => $this->getProducts(),
'invoices' => $this->getInvoices(),
'quotes' => $this->getQuotes(),
'payments' => array_merge($this->getPayments(), $this->getCredits()),
'credits' => $this->getCreditsNotes(),
'documents' => $this->getDocuments(),
'company_gateways' => $this->getCompanyGateways(),
'client_gateway_tokens' => $this->getClientGatewayTokens(),
'vendors' => $this->getVendors(),
'projects' => $this->getProjects(),
'products' => $this->getProducts(),
'credits' => $this->getCreditsNotes(),
'invoices' => $this->getInvoices(),
'recurring_invoices' => $this->getRecurringInvoices(),
'quotes' => $this->getQuotes(),
'payments' => array_merge($this->getPayments(), $this->getCredits()),
'documents' => $this->getDocuments(),
'expense_categories' => $this->getExpenseCategories(),
'task_statuses' => $this->getTaskStatuses(),
'expenses' => $this->getExpenses(),
'tasks' => $this->getTasks(),
'documents' => $this->getDocuments(),
];
$file = storage_path("migrations/{$fileName}.zip");

3
app/Traits/GenerateMigrationResources.php
View File

@ -715,7 +715,7 @@ info("get company");
default:
# code...
return 5;
break;
}
}
@ -1015,6 +1015,7 @@ info("get company");
$transformed = [];
$payments = Payment::where('account_id', $this->account->id)
->where('payment_status_id', '!=', PAYMENT_STATUS_VOIDED)
->withTrashed()
->get();

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

@ -4140,6 +4140,9 @@ $LANG = array(
//////////////////////////////////////
'start_migration' => 'Start Migration',
'recurring_cancellation_request' => 'Request for recurring invoice cancellation from :contact',
'recurring_cancellation_request_body' => ':contact from Client :client requested to cancel Recurring Invoice :invoice',
);
return $LANG;