Fixed import transfer and invoice, bill currency rate 0 division issue..
This commit is contained in:
parent
962d678156
commit
b283cf51bc
@ -41,10 +41,10 @@ class Transfers extends Import
|
|||||||
return [
|
return [
|
||||||
'from_account_id' => 'required|integer',
|
'from_account_id' => 'required|integer',
|
||||||
'from_currency_code' => 'required|string|currency',
|
'from_currency_code' => 'required|string|currency',
|
||||||
'from_currency_rate' => 'required',
|
'from_currency_rate' => 'required|gt:0',
|
||||||
'to_account_id' => 'required|integer',
|
'to_account_id' => 'required|integer',
|
||||||
'to_currency_code' => 'required|string|currency',
|
'to_currency_code' => 'required|string|currency',
|
||||||
'to_currency_rate' => 'required',
|
'to_currency_rate' => 'required|gt:0',
|
||||||
'amount' => 'required|amount',
|
'amount' => 'required|amount',
|
||||||
'transferred_at' => 'required|date_format:Y-m-d',
|
'transferred_at' => 'required|date_format:Y-m-d',
|
||||||
'payment_method' => 'required|string',
|
'payment_method' => 'required|string',
|
||||||
|
@ -43,7 +43,7 @@ class Bills extends Import
|
|||||||
{
|
{
|
||||||
$rules['bill_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
|
$rules['bill_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
|
||||||
$rules['billed_at'] = $rules['issued_at'];
|
$rules['billed_at'] = $rules['issued_at'];
|
||||||
$rules['currency_rate'] = 'required';
|
$rules['currency_rate'] = 'required|gt:0';
|
||||||
|
|
||||||
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
|
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ class Invoices extends Import
|
|||||||
{
|
{
|
||||||
$rules['invoice_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
|
$rules['invoice_number'] = Str::replaceFirst('unique:documents,NULL', 'unique:documents,document_number', $rules['document_number']);
|
||||||
$rules['invoiced_at'] = $rules['issued_at'];
|
$rules['invoiced_at'] = $rules['issued_at'];
|
||||||
$rules['currency_rate'] = 'required';
|
$rules['currency_rate'] = 'required|gt:0';
|
||||||
|
|
||||||
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
|
unset($rules['document_number'], $rules['issued_at'], $rules['type']);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user