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

Merge pull request #5161 from turbo124/master

Browse Source 
Migration fixes
This commit is contained in:
David Bomba 2021-03-17 22:05:24 +11:00 committed by GitHub
commit 3542d7fffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Migration/StepsController.php
View File

@ -94,7 +94,7 @@ class StepsController extends BaseController
);
}
session()->put('MIGRATION_ENDPOINT', $request->endpoint);
session()->put('MIGRATION_ENDPOINT', rtrim($request->endpoint,'/'));
return redirect(
url('/migration/auth')

10
app/Traits/GenerateMigrationResources.php
View File

@ -132,6 +132,7 @@ info("get company");
'font_size' => $this->account->font_size ?: 9,
'invoice_labels' => $this->account->invoice_labels ?: '',
'military_time' => $this->account->military_time ? (bool) $this->account->military_time : false,
'invoice_number_counter' => $this->account->invoice_number_counter ?: 0,
'invoice_number_pattern' => $this->account->invoice_number_pattern ?: '',
'quote_number_pattern' => $this->account->quote_number_pattern ?: '',
'quote_terms' => $this->account->quote_terms ?: '',
@ -159,7 +160,8 @@ info("get company");
'payment_number_pattern' => '',
'payment_number_counter' => 0,
'payment_terms' => $this->account->payment_terms ?: '',
'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->account->reset_counter_frequency_id : '0',
'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->transformFrequencyId
($this->account->reset_counter_frequency_id) : '0',
'payment_type_id' => $this->account->payment_type_id ? (string) $this->account->payment_type_id : '1',
'reset_counter_date' => $this->account->reset_counter_date ?: '',
'tax_name1' => $this->account->tax_name1 ?: '',
@ -555,7 +557,7 @@ info("get company");
'updated_at' => $invoice->updated_at ? Carbon::parse($invoice->updated_at)->toDateString() : null,
'deleted_at' => $invoice->deleted_at ? Carbon::parse($invoice->deleted_at)->toDateString() : null,
'next_send_date' => $this->getNextSendDateForMigration($invoice),
'frequency_id' => $this->transformFrequencyId($invoice),
'frequency_id' => $this->transformFrequencyId($invoice->frequency_id),
'due_date_days' => $this->transformDueDate($invoice),
'remaining_cycles' => $this->getRemainingCycles($invoice),
'invitations' => $this->getResourceInvitations($invoice->invitations, 'recurring_invoice_id'),
@ -679,9 +681,9 @@ info("get company");
// const FREQUENCY_THREE_YEARS = 12;
private function transformFrequencyId($invoice)
private function transformFrequencyId($frequency_id)
{
switch ($invoice->frequency_id) {
switch ($frequency_id) {
case 1:
return 2;
break;

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

@ -4174,6 +4174,9 @@ $LANG = array(
'zoho' => 'Zoho',
'accounting' => 'Accounting',
'required_files_missing' => 'Please provide all CSVs.',
'migration_auth_label' => 'Let\'s continue by authenticating.',
'api_secret' => 'API secret',
'migration_api_secret_notice' => 'You can find API_SECRET in the .env file or Invoice Ninja v5. If property is missing, leave field blank.',
'use_last_email' => 'Use last email',
'activate_company' => 'Activate Company',
'activate_company_help' => 'Enable emails, recurring invoices and notifications',