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 #4849 from turbo124/master

Browse Source 
Minor fixes for migration
This commit is contained in:
David Bomba 2021-02-09 08:09:40 +11:00 committed by GitHub
commit aca292b737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Traits/GenerateMigrationResources.php
View File

@ -73,6 +73,8 @@ trait GenerateMigrationResources
info("get company"); info("get company");
return [ return [
'first_day_of_week' => $this->account->start_of_week,
'first_month_of_year' => $this->account->financial_year_start,
'version' => NINJA_VERSION, 'version' => NINJA_VERSION,
'referral_code' => $this->account->referral_code ?: '', 'referral_code' => $this->account->referral_code ?: '',
'account_id' => $this->account->id, 'account_id' => $this->account->id,
@ -747,6 +749,34 @@ info("get company");
} }
private function transformQuoteStatusId($quote)
{
if(!$quote->is_public)
return 1;
if($quote->quote_invoice_id)
return 4;
switch ($quote->invoice_status_id) {
case 1:
return 1;
break;
case 2:
return 2;
break;
case 3:
return 2;
break;
case 4:
return 3;
break;
default:
return 2;
break;
}
}
/* /*
define('INVOICE_STATUS_DRAFT', 1); define('INVOICE_STATUS_DRAFT', 1);
define('INVOICE_STATUS_SENT', 2); define('INVOICE_STATUS_SENT', 2);
@ -916,7 +946,7 @@ info("get company");
'client_id' => $quote->client_id, 'client_id' => $quote->client_id,
'user_id' => $quote->user_id, 'user_id' => $quote->user_id,
'company_id' => $quote->account_id, 'company_id' => $quote->account_id,
'status_id' => $quote->invoice_status_id, 'status_id' => $this->transformQuoteStatusId($quote),
'design_id' => $this->getDesignId($quote->invoice_design_id), 'design_id' => $this->getDesignId($quote->invoice_design_id),
'number' => $quote->invoice_number, 'number' => $quote->invoice_number,
'discount' => $quote->discount, 'discount' => $quote->discount,