Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 21:24:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for invoice properties

Browse Source
This commit is contained in:
David Bomba 2021-04-08 20:50:53 +10:00
parent d9d042724e
commit 47113da4fa
5 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Requests/Invoice/StoreInvoiceRequest.php
View File

@ -63,7 +63,7 @@ class StoreInvoiceRequest extends Request
protected function prepareForValidation() protected function prepareForValidation()
{ {
$input = $this->all(); $input = $this->all();
nlog($input);
$input = $this->decodePrimaryKeys($input); $input = $this->decodePrimaryKeys($input);
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; $input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];

4
app/Http/Requests/RecurringInvoice/UpdateRecurringInvoiceRequest.php
View File

@ -97,7 +97,9 @@ class UpdateRecurringInvoiceRequest extends Request
} }
} }
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : []; if (isset($input['line_items'])) {
$input['line_items'] = isset($input['line_items']) ? $this->cleanItems($input['line_items']) : [];
}
if (isset($input['auto_bill'])) { if (isset($input['auto_bill'])) {
$input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']); $input['auto_bill_enabled'] = $this->setAutoBillFlag($input['auto_bill']);

8
app/Models/Credit.php
View File

@ -70,10 +70,10 @@ class Credit extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',

12
app/Models/Invoice.php
View File

@ -84,10 +84,10 @@ class Invoice extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',
@ -103,10 +103,6 @@ class Invoice extends BaseModel
'updated_at' => 'timestamp', 'updated_at' => 'timestamp',
'created_at' => 'timestamp', 'created_at' => 'timestamp',
'deleted_at' => 'timestamp', 'deleted_at' => 'timestamp',
'custom_surcharge_tax1' => 'bool',
'custom_surcharge_tax2' => 'bool',
'custom_surcharge_tax3' => 'bool',
'custom_surcharge_tax4' => 'bool',
]; ];
protected $with = []; protected $with = [];

8
app/Models/Quote.php
View File

@ -71,10 +71,10 @@ class Quote extends BaseModel
'custom_surcharge2', 'custom_surcharge2',
'custom_surcharge3', 'custom_surcharge3',
'custom_surcharge4', 'custom_surcharge4',
'custom_surcharge_tax1', // 'custom_surcharge_tax1',
'custom_surcharge_tax2', // 'custom_surcharge_tax2',
'custom_surcharge_tax3', // 'custom_surcharge_tax3',
'custom_surcharge_tax4', // 'custom_surcharge_tax4',
'design_id', 'design_id',
'assigned_user_id', 'assigned_user_id',
'exchange_rate', 'exchange_rate',