shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
Cüneyt Şentürk 2021-06-20 16:12:00 +03:00
commit 94e8d35259
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Banking/Reconciliation.php
View File

@ -25,8 +25,8 @@ class Reconciliation extends FormRequest
{
return [
'account_id' => 'required|integer',
'started_at' => 'required|date_format:Y-m-d H:i:s|before:ended_at',
'ended_at' => 'required|date_format:Y-m-d H:i:s|after:started_at',
'started_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:ended_at',
'ended_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:started_at',
'closing_balance' => 'required',
];
}

4
app/Http/Requests/Document/Document.php
View File

@ -57,8 +57,8 @@ class Document extends FormRequest
'type' => 'required|string',
'document_number' => 'required|string|unique:documents,NULL,' . $id . ',id,type,' . $type . ',company_id,' . $company_id . ',deleted_at,NULL',
'status' => 'required|string',
'issued_at' => 'required|date_format:Y-m-d H:i:s|before:due_at',
'due_at' => 'required|date_format:Y-m-d H:i:s|after:issued_at',
'issued_at' => 'required|date_format:Y-m-d H:i:s|before_or_equal:due_at',
'due_at' => 'required|date_format:Y-m-d H:i:s|after_or_equal:issued_at',
'amount' => 'required',
'items.*.name' => 'required|string',
'items.*.quantity' => 'required',

2
resources/views/partials/form/bulk_action_row_group.blade.php
View File

@ -46,7 +46,7 @@
<option
value="{{ $key }}"
@if(!empty($action['message']))
data-message="`{{ trans_choice($action['message'], 2, ['type' => strtolower(trans_choice($text, 2))]) }}`"
data-message="{{ trans_choice($action['message'], 2, ['type' => strtolower(trans_choice($text, 2))]) }}"
@endif
@if(isset($action['path']) && !empty($action['path']))
data-path="{{ route('bulk-actions.action', $action['path']) }}"