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

Fixes for fillable properties

Browse Source
This commit is contained in:
David Bomba 2021-02-23 12:17:09 +11:00
parent 47a2ff7df3
commit 55b673241b
3 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Models/Credit.php
View File

@ -41,14 +41,11 @@ class Credit extends BaseModel
protected $presenter = CreditPresenter::class; protected $presenter = CreditPresenter::class;
protected $fillable = [ protected $fillable = [
'assigned_user_id',
'project_id',
'number', 'number',
'discount', 'discount',
'po_number', 'po_number',
'date', 'date',
'due_date', 'due_date',
'partial_due_date',
'terms', 'terms',
'public_notes', 'public_notes',
'private_notes', 'private_notes',
@ -59,8 +56,9 @@ class Credit extends BaseModel
'tax_name3', 'tax_name3',
'tax_rate3', 'tax_rate3',
'is_amount_discount', 'is_amount_discount',
'footer',
'partial', 'partial',
'partial_due_date',
'project_id',
'custom_value1', 'custom_value1',
'custom_value2', 'custom_value2',
'custom_value3', 'custom_value3',
@ -68,7 +66,16 @@ class Credit extends BaseModel
'line_items', 'line_items',
'client_id', 'client_id',
'footer', 'footer',
'custom_surcharge1',
'custom_surcharge2',
'custom_surcharge3',
'custom_surcharge4',
'custom_surcharge_tax1',
'custom_surcharge_tax2',
'custom_surcharge_tax3',
'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id',
'exchange_rate', 'exchange_rate',
]; ];

12
app/Models/Quote.php
View File

@ -42,7 +42,6 @@ class Quote extends BaseModel
protected $touches = []; protected $touches = [];
protected $fillable = [ protected $fillable = [
'assigned_user_id',
'number', 'number',
'discount', 'discount',
'po_number', 'po_number',
@ -51,7 +50,6 @@ class Quote extends BaseModel
'terms', 'terms',
'public_notes', 'public_notes',
'private_notes', 'private_notes',
'project_id',
'tax_name1', 'tax_name1',
'tax_rate1', 'tax_rate1',
'tax_name2', 'tax_name2',
@ -61,6 +59,7 @@ class Quote extends BaseModel
'is_amount_discount', 'is_amount_discount',
'partial', 'partial',
'partial_due_date', 'partial_due_date',
'project_id',
'custom_value1', 'custom_value1',
'custom_value2', 'custom_value2',
'custom_value3', 'custom_value3',
@ -68,7 +67,16 @@ class Quote extends BaseModel
'line_items', 'line_items',
'client_id', 'client_id',
'footer', 'footer',
'custom_surcharge1',
'custom_surcharge2',
'custom_surcharge3',
'custom_surcharge4',
'custom_surcharge_tax1',
'custom_surcharge_tax2',
'custom_surcharge_tax3',
'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id',
'exchange_rate', 'exchange_rate',
]; ];

3
app/Utils/HtmlEngine.php
View File

@ -157,8 +157,11 @@ class HtmlEngine
if ($this->entity->partial > 0) { if ($this->entity->partial > 0) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')]; $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
} else { } else {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')]; $data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
} }
$data['$quote.balance_due'] = $data['$balance_due']; $data['$quote.balance_due'] = $data['$balance_due'];