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-16 10:01:43 +03:00
commit 06fe3616fe
5 changed files with 143 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
resources/lang/en-GB/auth.php
View File

@ -29,8 +29,9 @@ return [
], ],
'failed' => 'These credentials do not match our records.', 'failed' => 'These credentials do not match our records.',
'disabled' => 'This account is disabled. Please, contact the system administrator.', 'password' => 'The provided password is incorrect.',
'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
'disabled' => 'This account is disabled. Please, contact the system administrator.',
'notification' => [ 'notification' => [
'message_1' => 'You are receiving this email because we received a password reset request for your account.', 'message_1' => 'You are receiving this email because we received a password reset request for your account.',

6
resources/lang/en-GB/passwords.php
View File

@ -15,9 +15,9 @@ return [
'password' => 'Passwords must be at least six characters and match the confirmation.', 'password' => 'Passwords must be at least six characters and match the confirmation.',
'reset' => 'Your password has been reset!', 'reset' => 'Your password has been reset!',
'sent' => 'We have e-mailed your password reset link!', 'sent' => 'We have emailed your password reset link!',
'throttled' => 'Please wait before retrying.',
'token' => 'This password reset token is invalid.', 'token' => 'This password reset token is invalid.',
'user' => "We can't find a user with that e-mail address.", 'user' => "We can't find a user with that email address.",
'throttle' => 'Please wait before retrying.',
]; ];

174
resources/lang/en-GB/validation.php
View File

@ -13,79 +13,115 @@ return [
| |
*/ */
'accepted' => 'The :attribute must be accepted.', 'accepted' => 'The :attribute must be accepted.',
'active_url' => 'The :attribute is not a valid URL.', 'active_url' => 'The :attribute is not a valid URL.',
'after' => 'The :attribute must be a date after :date.', 'after' => 'The :attribute must be a date after :date.',
'after_or_equal' => 'The :attribute must be a date after or equal to :date.', 'after_or_equal' => 'The :attribute must be a date after or equal to :date.',
'alpha' => 'The :attribute may only contain letters.', 'alpha' => 'The :attribute must only contain letters.',
'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', 'alpha_dash' => 'The :attribute must only contain letters, numbers, dashes and underscores.',
'alpha_num' => 'The :attribute may only contain letters and numbers.', 'alpha_num' => 'The :attribute must only contain letters and numbers.',
'array' => 'The :attribute must be an array.', 'array' => 'The :attribute must be an array.',
'before' => 'The :attribute must be a date before :date.', 'before' => 'The :attribute must be a date before :date.',
'before_or_equal' => 'The :attribute must be a date before or equal to :date.', 'before_or_equal' => 'The :attribute must be a date before or equal to :date.',
'between' => [ 'between' => [
'numeric' => 'The :attribute must be between :min and :max.', 'numeric' => 'The :attribute must be between :min and :max.',
'file' => 'The :attribute must be between :min and :max kilobytes.', 'file' => 'The :attribute must be between :min and :max kilobytes.',
'string' => 'The :attribute must be between :min and :max characters.', 'string' => 'The :attribute must be between :min and :max characters.',
'array' => 'The :attribute must have between :min and :max items.', 'array' => 'The :attribute must have between :min and :max items.',
], ],
'boolean' => 'The :attribute field must be true or false.', 'boolean' => 'The :attribute field must be true or false.',
'confirmed' => 'The :attribute confirmation does not match.', 'confirmed' => 'The :attribute confirmation does not match.',
'date' => 'The :attribute is not a valid date.', 'current_password' => 'The password is incorrect.',
'date_format' => 'The :attribute does not match the format :format.', 'date' => 'The :attribute is not a valid date.',
'different' => 'The :attribute and :other must be <strong>different</strong>.', 'date_equals' => 'The :attribute must be a date equal to :date.',
'digits' => 'The :attribute must be :digits digits.', 'date_format' => 'The :attribute does not match the format :format.',
'digits_between' => 'The :attribute must be between :min and :max digits.', 'different' => 'The :attribute and :other must be different.',
'dimensions' => 'The :attribute has invalid image dimensions.', 'digits' => 'The :attribute must be :digits digits.',
'distinct' => 'The :attribute field has a duplicate value.', 'digits_between' => 'The :attribute must be between :min and :max digits.',
'email' => 'The :attribute must be a valid <strong>email address</strong>.', 'dimensions' => 'The :attribute has invalid image dimensions.',
'ends_with' => 'The :attribute must end with one of the following: :values', 'distinct' => 'The :attribute field has a duplicate value.',
'exists' => 'The selected :attribute is invalid.', 'email' => 'The :attribute must be a valid email address.',
'file' => 'The :attribute must be a <strong>file</strong>.', 'ends_with' => 'The :attribute must end with one of the following: :values.',
'filled' => 'The :attribute field must have a <strong>value</strong>.', 'exists' => 'The selected :attribute is invalid.',
'image' => 'The :attribute must be an <strong>image</strong>.', 'file' => 'The :attribute must be a file.',
'in' => 'The selected :attribute is invalid.', 'filled' => 'The :attribute field must have a value.',
'in_array' => 'The :attribute field does not exist in :other.', 'gt' => [
'integer' => 'The :attribute must be an <strong>integer</strong>.', 'numeric' => 'The :attribute must be greater than :value.',
'ip' => 'The :attribute must be a valid IP address.', 'file' => 'The :attribute must be greater than :value kilobytes.',
'json' => 'The :attribute must be a valid JSON string.', 'string' => 'The :attribute must be greater than :value characters.',
'max' => [ 'array' => 'The :attribute must have more than :value items.',
'numeric' => 'The :attribute may not be greater than :max.',
'file' => 'The :attribute may not be greater than :max kilobytes.',
'string' => 'The :attribute may not be greater than :max characters.',
'array' => 'The :attribute may not have more than :max items.',
], ],
'mimes' => 'The :attribute must be a file of type: :values.', 'gte' => [
'mimetypes' => 'The :attribute must be a file of type: :values.', 'numeric' => 'The :attribute must be greater than or equal :value.',
'min' => [ 'file' => 'The :attribute must be greater than or equal :value kilobytes.',
'string' => 'The :attribute must be greater than or equal :value characters.',
'array' => 'The :attribute must have :value items or more.',
],
'image' => 'The :attribute must be an image.',
'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field does not exist in :other.',
'integer' => 'The :attribute must be an integer.',
'ip' => 'The :attribute must be a valid IP address.',
'ipv4' => 'The :attribute must be a valid IPv4 address.',
'ipv6' => 'The :attribute must be a valid IPv6 address.',
'json' => 'The :attribute must be a valid JSON string.',
'lt' => [
'numeric' => 'The :attribute must be less than :value.',
'file' => 'The :attribute must be less than :value kilobytes.',
'string' => 'The :attribute must be less than :value characters.',
'array' => 'The :attribute must have less than :value items.',
],
'lte' => [
'numeric' => 'The :attribute must be less than or equal :value.',
'file' => 'The :attribute must be less than or equal :value kilobytes.',
'string' => 'The :attribute must be less than or equal :value characters.',
'array' => 'The :attribute must not have more than :value items.',
],
'max' => [
'numeric' => 'The :attribute must not be greater than :max.',
'file' => 'The :attribute must not be greater than :max kilobytes.',
'string' => 'The :attribute must not be greater than :max characters.',
'array' => 'The :attribute must not have more than :max items.',
],
'mimes' => 'The :attribute must be a file of type: :values.',
'mimetypes' => 'The :attribute must be a file of type: :values.',
'min' => [
'numeric' => 'The :attribute must be at least :min.', 'numeric' => 'The :attribute must be at least :min.',
'file' => 'The :attribute must be at least :min kilobytes.', 'file' => 'The :attribute must be at least :min kilobytes.',
'string' => 'The :attribute must be at least :min characters.', 'string' => 'The :attribute must be at least :min characters.',
'array' => 'The :attribute must have at least :min items.', 'array' => 'The :attribute must have at least :min items.',
], ],
'not_in' => 'The selected :attribute is invalid.', 'multiple_of' => 'The :attribute must be a multiple of :value.',
'numeric' => 'The :attribute must be a number.', 'not_in' => 'The selected :attribute is invalid.',
'present' => 'The :attribute field must be <strong>present</strong>.', 'not_regex' => 'The :attribute format is invalid.',
'regex' => 'The :attribute format is <strong>invalid</strong>.', 'numeric' => 'The :attribute must be a number.',
'required' => 'The :attribute field is <strong>required</strong>.', 'password' => 'The password is incorrect.',
'required_if' => 'The :attribute field is required when :other is :value.', 'present' => 'The :attribute field must be present.',
'required_unless' => 'The :attribute field is required unless :other is in :values.', 'regex' => 'The :attribute format is invalid.',
'required_with' => 'The :attribute field is required when :values is present.', 'required' => 'The :attribute field is required.',
'required_with_all' => 'The :attribute field is required when :values is present.', 'required_if' => 'The :attribute field is required when :other is :value.',
'required_without' => 'The :attribute field is required when :values is not present.', 'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.', 'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute and :other must match.', 'prohibited' => 'The :attribute field is prohibited.',
'size' => [ 'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'same' => 'The :attribute and :other must match.',
'size' => [
'numeric' => 'The :attribute must be :size.', 'numeric' => 'The :attribute must be :size.',
'file' => 'The :attribute must be :size kilobytes.', 'file' => 'The :attribute must be :size kilobytes.',
'string' => 'The :attribute must be <strong>:size characters</strong>.', 'string' => 'The :attribute must be :size characters.',
'array' => 'The :attribute must contain :size items.', 'array' => 'The :attribute must contain :size items.',
], ],
'string' => 'The :attribute must be a <strong>string</strong>.', 'starts_with' => 'The :attribute must start with one of the following: :values.',
'timezone' => 'The :attribute must be a valid zone.', 'string' => 'The :attribute must be a string.',
'unique' => 'The :attribute has already been <strong>taken</strong>.', 'timezone' => 'The :attribute must be a valid zone.',
'uploaded' => 'The :attribute <strong>failed</strong> to upload.', 'unique' => 'The :attribute has already been taken.',
'url' => 'The :attribute format is <strong>invalid</strong>.', 'uploaded' => 'The :attribute failed to upload.',
'url' => 'The :attribute format is invalid.',
'uuid' => 'The :attribute must be a valid UUID.',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -100,7 +136,7 @@ return [
'custom' => [ 'custom' => [
'attribute-name' => [ 'attribute-name' => [
'rule-name' => 'custom-message', 'rule-name' => 'custom-message',
], ],
'invalid_currency' => 'The :attribute code is invalid.', 'invalid_currency' => 'The :attribute code is invalid.',
'invalid_amount' => 'The amount :attribute is invalid.', 'invalid_amount' => 'The amount :attribute is invalid.',
@ -112,9 +148,9 @@ return [
| Custom Validation Attributes | Custom Validation Attributes
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| The following language lines are used to swap attribute place-holders | The following language lines are used to swap our attribute placeholder
| with something more reader friendly such as E-Mail Address instead | with something more reader friendly such as "E-Mail Address" instead
| of "email". This simply helps us make messages a little cleaner. | of "email". This simply helps us make our message more expressive.
| |
*/ */

34
resources/views/common/reports/index.blade.php
View File

@ -19,29 +19,25 @@
<div class="col-md-4"> <div class="col-md-4">
<div class="card card-stats"> <div class="card card-stats">
@canany(['create-common-reports', 'update-common-reports', 'delete-common-reports']) @canany(['create-common-reports', 'update-common-reports', 'delete-common-reports'])
<span> <a class="btn btn-sm items-align-center py-2 mr-0 card-action-button shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<div class="dropdown card-action-button"> <i class="fa fa-ellipsis-v text-primary"></i>
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> </a>
<i class="fa fa-ellipsis-v text-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow"> <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
@can('update-common-reports') @can('update-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a> <a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
@endcan @endcan
@can('create-common-reports') @can('create-common-reports')
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('reports.duplicate', $report->id) }}">{{ trans('general.duplicate') }}</a> <a class="dropdown-item" href="{{ route('reports.duplicate', $report->id) }}">{{ trans('general.duplicate') }}</a>
@endcan @endcan
@can('delete-common-reports') @can('delete-common-reports')
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
{!! Form::deleteLink($report, 'reports.destroy') !!} {!! Form::deleteLink($report, 'reports.destroy') !!}
@endcan @endcan
</div>
</div> </div>
</span>
@endcanany @endcanany
<div class="card-body"> <div class="card-body">

38
resources/views/partials/widgets/stats_header.blade.php
View File

@ -1,24 +1,22 @@
@canany(['update-common-widgets', 'delete-common-widgets']) @canany(['update-common-widgets', 'delete-common-widgets'])
<span> <div>
<div class="dropdown card-action-button"> <a class="btn btn-sm items-align-center card-action-button py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
<a class="btn btn-sm items-align-center py-2 mr-0 shadow-none--hover" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-ellipsis-v text-white"></i>
<i class="fa fa-ellipsis-v text-white"></i> </a>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow"> <div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
@can('update-common-widgets') @can('update-common-widgets')
{!! Form::button(trans('general.edit'), [ {!! Form::button(trans('general.edit'), [
'type' => 'button', 'type' => 'button',
'class' => 'dropdown-item', 'class' => 'dropdown-item',
'title' => trans('general.edit'), 'title' => trans('general.edit'),
'@click' => 'onEditWidget(' . $class->model->id . ')' '@click' => 'onEditWidget(' . $class->model->id . ')'
]) !!} ]) !!}
@endcan @endcan
@can('delete-common-widgets') @can('delete-common-widgets')
<div class="dropdown-divider"></div> <div class="dropdown-divider"></div>
{!! Form::deleteLink($class->model, 'widgets.destroy') !!} {!! Form::deleteLink($class->model, 'widgets.destroy') !!}
@endcan @endcan
</div>
</div> </div>
</span> </div>
@endcanany @endcanany