Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-08 06:14:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/turbo124/invoiceninja

Browse Source
This commit is contained in:
David Bomba 2021-06-08 07:31:47 +10:00
commit c389fa7026
5 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Console/Commands/CheckData.php
View File

@ -75,6 +75,8 @@ class CheckData extends Command
config(['database.default' => $database]); config(['database.default' => $database]);
} }
$this->checkContacts();
if (! $this->option('client_id')) { if (! $this->option('client_id')) {
$this->checkBlankInvoiceHistory(); $this->checkBlankInvoiceHistory();
$this->checkPaidToDate(); $this->checkPaidToDate();
@ -84,7 +86,6 @@ class CheckData extends Command
//$this->checkInvoices(); //$this->checkInvoices();
$this->checkInvoiceBalances(); $this->checkInvoiceBalances();
$this->checkClientBalances(); $this->checkClientBalances();
$this->checkContacts();
$this->checkUserAccounts(); $this->checkUserAccounts();
//$this->checkLogoFiles(); //$this->checkLogoFiles();

2
app/Constants.php
View File

@ -361,7 +361,7 @@ if (! defined('APP_NAME')) {
define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com')); define('NINJA_APP_URL', env('NINJA_APP_URL', 'https://app.invoiceninja.com'));
define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest')); define('NINJA_DOCS_URL', env('NINJA_DOCS_URL', 'https://invoice-ninja.readthedocs.io/en/latest'));
define('NINJA_DATE', '2000-01-01'); define('NINJA_DATE', '2000-01-01');
define('NINJA_VERSION', '4.5.38' . env('NINJA_VERSION_SUFFIX')); define('NINJA_VERSION', '4.5.39' . env('NINJA_VERSION_SUFFIX'));
define('NINJA_TERMS_VERSION', '1.0.1'); define('NINJA_TERMS_VERSION', '1.0.1');
define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja')); define('SOCIAL_LINK_FACEBOOK', env('SOCIAL_LINK_FACEBOOK', 'https://www.facebook.com/invoiceninja'));

12
app/Traits/GenerateMigrationResources.php
View File

@ -840,7 +840,13 @@ info("get company");
return 1; return 1;
} }
/**
const STATUS_DRAFT = 1;
const STATUS_SENT = 2;
const STATUS_APPROVED = 3;
const STATUS_CONVERTED = 4;
const STATUS_EXPIRED = -1;
*/
private function transformQuoteStatusId($quote) private function transformQuoteStatusId($quote)
{ {
@ -1059,6 +1065,7 @@ info("get company");
'tax_name2' => $quote->tax_name2, 'tax_name2' => $quote->tax_name2,
'tax_rate1' => $quote->tax_rate1, 'tax_rate1' => $quote->tax_rate1,
'tax_rate2' => $quote->tax_rate2, 'tax_rate2' => $quote->tax_rate2,
'invoice_id' => $quote->quote_invoice_id,
'custom_surcharge1' => $quote->custom_value1 ?: '', 'custom_surcharge1' => $quote->custom_value1 ?: '',
'custom_surcharge2' => $quote->custom_value2 ?: '', 'custom_surcharge2' => $quote->custom_value2 ?: '',
'custom_value1' => $quote->custom_text_value1 ?: '', 'custom_value1' => $quote->custom_text_value1 ?: '',
@ -1371,6 +1378,9 @@ info("translated gateway_type = {$translated_gateway_type}");
'custom_value2' => '', 'custom_value2' => '',
'custom_value3' => '', 'custom_value3' => '',
'custom_value4' => '', 'custom_value4' => '',
'created_at' => $account_gateway->created_at ? Carbon::parse($account_gateway->created_at)->toDateString() : null,
'updated_at' => $account_gateway->updated_at ? Carbon::parse($account_gateway->updated_at)->toDateString() : null,
'deleted_at' => $account_gateway->deleted_at ? Carbon::parse($account_gateway->deleted_at)->toDateString() : null,
]; ];
// } // }
} }

2
docs/conf.py
View File

@ -59,7 +59,7 @@ author = u'Invoice Ninja'
# The short X.Y version. # The short X.Y version.
version = u'4.5' version = u'4.5'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = u'4.5.38' release = u'4.5.39'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.

2
resources/views/invoices/pdf.blade.php
View File

@ -1,5 +1,5 @@
@if (empty($hide_pdf)) @if (empty($hide_pdf))
<object id="pdfObject" type="application/pdf" style="display:block;background-color:#525659;border:solid 2px #9a9a9a;" frameborder="1" width="100%" height="{{ isset($pdfHeight) ? $pdfHeight : 1180 }}px"></object> <object id="pdfObject" style="display:block;background-color:#525659;border:solid 2px #9a9a9a;" frameborder="1" width="100%" height="{{ isset($pdfHeight) ? $pdfHeight : 1180 }}px"></object>
<div id="pdfCanvas" style="display:none;width:100%;background-color:#525659;border:solid 2px #9a9a9a;padding-top:40px;text-align:center"> <div id="pdfCanvas" style="display:none;width:100%;background-color:#525659;border:solid 2px #9a9a9a;padding-top:40px;text-align:center">
<canvas id="theCanvas" style="max-width:100%;border:solid 1px #CCCCCC;"></canvas> <canvas id="theCanvas" style="max-width:100%;border:solid 1px #CCCCCC;"></canvas>
</div> </div>