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

Fixes for casts

Browse Source
This commit is contained in:
David Bomba 2022-02-27 17:49:49 +11:00
parent 2a4ec0fdb0
commit ff33cc5fca
10 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/DataMapper/BaseSettings.php
View File

@ -46,7 +46,8 @@ class BaseSettings
return is_null($value) ? '' : (string) $value;
case 'bool':
case 'boolean':
return (bool) ($value);
nlog($value);
return boolval($value);
case 'object':
return json_decode($value);
case 'array':

4
app/Http/Requests/Credit/StoreCreditRequest.php
View File

@ -58,7 +58,9 @@ class StoreCreditRequest extends Request
// $rules['number'] = new UniqueCreditNumberRule($this->all());
$rules['number'] = ['nullable', Rule::unique('credits')->where('company_id', auth()->user()->company()->id)];
$rules['discount'] = 'sometimes|numeric';
$rules['is_amount_discount'] = ['boolean'];
if($this->invoice_id)
$rules['invoice_id'] = new ValidInvoiceCreditRule();

3
app/Http/Requests/Credit/UpdateCreditRequest.php
View File

@ -58,7 +58,8 @@ class UpdateCreditRequest extends Request
$rules['line_items'] = 'array';
$rules['discount'] = 'sometimes|numeric';
$rules['is_amount_discount'] = ['boolean'];
return $rules;
}

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

@ -55,7 +55,8 @@ class StoreInvoiceRequest extends Request
$rules['number'] = ['nullable', Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)];
$rules['project_id'] = ['bail', 'sometimes', new ValidProjectForClient($this->all())];
$rules['is_amount_discount'] = ['boolean'];
$rules['line_items'] = 'array';
$rules['discount'] = 'sometimes|numeric';

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

@ -55,6 +55,8 @@ class UpdateInvoiceRequest extends Request
if($this->number)
$rules['number'] = Rule::unique('invoices')->where('company_id', auth()->user()->company()->id)->ignore($this->invoice->id);
$rules['is_amount_discount'] = ['boolean'];
$rules['line_items'] = 'array';
$rules['discount'] = 'sometimes|numeric';

2
app/Http/Requests/Quote/StoreQuoteRequest.php
View File

@ -52,6 +52,8 @@ class StoreQuoteRequest extends Request
$rules['number'] = ['nullable',Rule::unique('quotes')->where('company_id', auth()->user()->company()->id)];
$rules['discount'] = 'sometimes|numeric';
$rules['is_amount_discount'] = ['boolean'];
// $rules['number'] = new UniqueQuoteNumberRule($this->all());
$rules['line_items'] = 'array';

2
app/Http/Requests/Quote/UpdateQuoteRequest.php
View File

@ -52,6 +52,8 @@ class UpdateQuoteRequest extends Request
$rules['line_items'] = 'array';
$rules['discount'] = 'sometimes|numeric';
$rules['is_amount_discount'] = ['boolean'];
return $rules;
}

2
app/Models/Credit.php
View File

@ -90,6 +90,8 @@ class Credit extends BaseModel
'updated_at' => 'timestamp',
'created_at' => 'timestamp',
'deleted_at' => 'timestamp',
'is_amount_discount' => 'bool',
];
protected $touches = [];

1
app/Models/Invoice.php
View File

@ -103,6 +103,7 @@ class Invoice extends BaseModel
'created_at' => 'timestamp',
'deleted_at' => 'timestamp',
'is_deleted' => 'bool',
'is_amount_discount' => 'bool',
];
protected $with = [];

1
app/Models/Quote.php
View File

@ -89,6 +89,7 @@ class Quote extends BaseModel
'created_at' => 'timestamp',
'deleted_at' => 'timestamp',
'is_deleted' => 'boolean',
'is_amount_discount' => 'bool',
];
protected $dates = [];