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

Merge branch 'master' of github.com:akaunting/akaunting into 2.1-dev

Browse Source 
# Conflicts:
#	composer.lock
#	resources/views/banking/accounts/index.blade.php
#	resources/views/banking/reconciliations/index.blade.php
#	resources/views/banking/transactions/index.blade.php
#	resources/views/banking/transfers/index.blade.php
#	resources/views/common/items/index.blade.php
#	resources/views/common/reports/index.blade.php
#	resources/views/purchases/bills/index.blade.php
#	resources/views/purchases/payments/index.blade.php
#	resources/views/purchases/vendors/index.blade.php
#	resources/views/sales/customers/index.blade.php
#	resources/views/sales/invoices/index.blade.php
#	resources/views/sales/revenues/index.blade.php
This commit is contained in:
Cüneyt Şentürk
2020-10-22 18:03:20 +03:00
parent 77e4109b03 bf66a5988b
commit 642243790e
114 changed files with 2409 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/partials/admin/empty_page.blade.php
View File

@@ -5,11 +5,10 @@
</div>
<div class="col-xs-12 col-sm-6 text-center p-5">
<p class="text-justify description">
{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}
</p>
<p class="text-justify description">{!! trans('general.empty.' . $page) !!} {!! trans('general.empty.documentation', ['url' => 'https://akaunting.com/docs/user-manual/' . $docs_path]) !!}</p>
<a href="{{ route($page . '.create') }}" class="btn btn-success header-button-top float-right mt-4">
<span class="btn-inner--icon"><i class="fas fa-plus"></i></span>
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice('general.' . $page, 1)]) }}</span>
</a>
</div>

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

@@ -23,7 +23,7 @@
$message = trans('general.delete_confirm', ['name' => '<strong>' . $name . '</strong>', 'type' => $type]);
@endphp
{!! Form::button(trans('general.delete'), array(
{!! Form::button('<i class="fa fa-trash-o" aria-hidden="true"></i> ' . trans('general.delete'), array(
'type' => 'button',
'class' => 'btn btn-danger btn-xs',
'title' => trans('general.delete'),

9
resources/views/partials/form/save_buttons.blade.php
View File

@@ -8,11 +8,14 @@
@endphp
<div class="{{ $col }}">
<a href="{{ $url }}" class="btn btn-outline-secondary">{{ trans('general.cancel') }}</a>
<a href="{{ $url }}" class="btn btn-icon btn-outline-secondary header-button-top">
<span class="btn-inner--icon"><i class="fas fa-times"></i></span>
<span class="btn-inner--text">{{ trans('general.cancel') }}</span>
</a>
{!! Form::button(
'<span v-if="form.loading" class="btn-inner--icon"><i class="aka-loader"></i></span> <span :class="[{\'ml-0\': form.loading}]" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success']) !!}
'<div v-if="form.loading" class="aka-loader-frame"><div class="aka-loader"></div></div> <span v-if="!form.loading" class="btn-inner--icon"><i class="fas fa-save"></i></span>' . '<span v-if="!form.loading" class="btn-inner--text">' . trans('general.save') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success button-submit header-button-top', 'data-loading-text' => trans('general.loading')]) !!}
</div>
@stack('save_buttons_end')

2
resources/views/partials/reports/filter.blade.php
View File

@@ -13,7 +13,7 @@
@foreach($class->filters as $name => $values)
{!! Form::select($name . '[]', $values, request($name), ['id' => 'filter-' . $name, 'class' => 'form-control form-control-sm d-inline-block w-auto']) !!}
@endforeach
{!! Form::button(trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-secondary']) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-secondary']) !!}
</div>
{!! Form::close() !!}

16
resources/views/partials/reports/header.blade.php
View File

@@ -1,10 +1,14 @@
@section('title', $class->model->name)
@section('new_button')
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm">
{{ trans('general.print') }}
</a>
<a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm header-button-top">
{{ trans('general.export') }}
</a>
<span>
<a href="{{ url($class->getUrl('print')) }}" target="_blank" class="btn btn-white btn-sm header-button-top">
<span class="fa fa-print"></span> &nbsp;{{ trans('general.print') }}
</a>
</span>
<span>
<a href="{{ url($class->getUrl('export')) }}" class="btn btn-white btn-sm header-button-top">
<span class="fa fa-upload"></span> &nbsp;{{ trans('general.export') }}
</a>
</span>
@endsection

2
resources/views/partials/reports/table/rows.blade.php
View File

@@ -1,6 +1,6 @@
@if ($row_total = array_sum($rows))
<tr class="row rp-border-top-1 font-size-unset">
<td class="{{ $class->column_name_width }} long-texts pr-0" title="{{ $class->row_names[$table][$id] }}">{{ $class->row_names[$table][$id] }}</td>
<td class="{{ $class->column_name_width }} long-texts pr-0">{{ $class->row_names[$table][$id] }}</td>
@foreach($rows as $row)
<td class="{{ $class->column_value_width }} text-right px-0">@money($row, setting('default.currency'), true)</td>
@endforeach