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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-02-23 22:07:21 +03:00
committed by GitHub
parent 4f02f14056 05d3706836
commit f5425ecdb2
284 changed files with 19538 additions and 1384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
resources/views/banking/reconciliations/index.blade.php
View File

@ -82,7 +82,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'reconciliations', 'docs_path' => 'banking/reconciliations'])
<x-empty-page group="banking" page="reconciliations" />
@endif
@endsection

19
resources/views/banking/transfers/index.blade.php
View File

@ -43,12 +43,19 @@
<tbody>
@foreach($transfers as $item)
@php
$item->name = trans('transfers.messages.delete', [
'from' => $item->expense_transaction->account->name,
'to' => $item->income_transaction->account->name,
'amount' => money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)
]);
@endphp
<tr class="row align-items-center border-top-1">
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->from_account) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->from_account }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->to_account }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-2 col-md-1 d-none d-sm-block">{{ Form::bulkActionGroup($item->id, $item->expense_transaction->account->name) }}</td>
<td class="col-md-2 d-none d-md-block"><a class="col-aka" href="{{ route('transfers.edit', $item->id) }}">@date($item->expense_transaction->paid_at)</a></td>
<td class="col-sm-2 col-md-3 d-none d-sm-block">{{ $item->expense_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-4 col-md-2">{{ $item->income_transaction->account->name }}</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-right">@money($item->expense_transaction->amount, $item->expense_transaction->currency_code, true)</td>
<td class="col-xs-4 col-sm-2 col-md-2 text-center">
<div class="dropdown">
<a class="btn btn-neutral btn-sm text-light items-align-center py-2" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@ -76,7 +83,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'transfers', 'docs_path' => 'banking/transfers'])
<x-empty-page group="banking" page="transfers" />
@endif
@endsection

33
resources/views/common/import/create.blade.php
View File

@ -6,9 +6,13 @@
<div class="card">
@php
$form_open = [
'id' => 'import',
'@submit.prevent' => 'onSubmit',
'@keydown' => 'form.errors.clear($event.target.name)',
'files' => true,
'role' => 'form',
'class' => 'form-loading-button'
'class' => 'form-loading-button',
'novalidate' => true
];
if (!empty($route)) {
@ -26,24 +30,9 @@
{!! trans('import.message', ['link' => url('public/files/import/' . $type . '.xlsx')]) !!}
</div>
</div>
</div>
@stack('import_input_start')
<div class="dropzone dropzone-single" data-toggle="dropzone" data-dropzone-url="#">
<div class="fallback">
<div class="custom-file">
<input type="file" name="import" class="custom-file-input" id="projectCoverUploads">
<label class="custom-file-label" for="projectCoverUploads">{{ trans('general.form.no_file_selected') }}</label>
</div>
</div>
<div class="dz-preview dz-preview-single">
<div class="dz-preview-cover">
<img class="dz-preview-img" src="..." alt="..." data-dz-thumbnail>
</div>
</div>
{!! $errors->first('import', '<p class="help-block">:message</p>') !!}
</div>
@stack('import_input_end')
{{ Form::fileGroup('import', '', 'plus', ['dropzone-class' => 'form-file', 'options' => ['acceptedFiles' => '.xls,.xlsx']], null, 'col-md-12') }}
</div>
</div>
<div class="card-footer">
@ -59,10 +48,16 @@
</a>
@endif
{!! Form::button(trans('import.import'), ['type' => 'submit', 'class' => 'btn btn-success']) !!}
{!! 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('import.import') . '</span>',
[':disabled' => 'form.loading', 'type' => 'submit', 'class' => 'btn btn-icon btn-success']) !!}
</div>
</div>
</div>
{!! Form::close() !!}
</div>
@endsection
@push('scripts_start')
<script src="{{ asset('public/js/common/imports.js?v=' . version('short')) }}"></script>
@endpush

2
resources/views/common/items/index.blade.php
View File

@ -103,7 +103,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'items', 'docs_path' => 'items'])
<x-empty-page page="items" />
@endif
@endsection

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

@ -19,13 +19,16 @@
@foreach($reports as $report)
<div class="col-md-4">
<div class="card card-stats">
@canany(['create-common-reports', 'update-common-reports', 'delete-common-reports'])
<span>
<div class="dropdown card-action-button">
<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-primary"></i>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
@can('update-common-reports')
<a class="dropdown-item" href="{{ route('reports.edit', $report->id) }}">{{ trans('general.edit') }}</a>
@endcan
@can('create-common-reports')
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="{{ route('reports.duplicate', $report->id) }}">{{ trans('general.duplicate') }}</a>
@ -37,6 +40,7 @@
</div>
</div>
</span>
@endcanany
<div class="card-body">
<div class="row">

2
resources/views/components/documents/form/advanced.blade.php
View File

@ -26,6 +26,8 @@
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, $document->category_id ?? setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?search=type:' . $categoryType], $more_form_class) }}
@endif
</div>
@else
{{ Form::hidden('category_id', $document->category_id ?? setting('default.' . $categoryType . '_category')) }}
@endif
@stack('more_row_end')

8
resources/views/components/documents/form/company.blade.php
View File

@ -15,21 +15,21 @@
<div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
@if (!$hideDocumentTitle)
{{ Form::textGroup('title', trans('settings.invoice.title'), 'font', ['data-field' => 'setting'], setting($type . '.title'), 'col-md-12') }}
{{ Form::textGroup('title', trans('settings.invoice.title'), 'font', ['data-field' => 'setting'], $titleSetting, 'col-md-12') }}
@endif
@if (!$hideDocumentSubheading)
{{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', ['data-field' => 'setting'], setting($type . '.subheading'), 'col-md-12') }}
{{ Form::textGroup('subheading', trans('settings.invoice.subheading'), 'font', ['data-field' => 'setting'], $subheadingSetting, 'col-md-12') }}
@endif
@if (!$hideCompanyEdit)
<akaunting-company-edit company-id="{{ session('company_id') }}"
button-text="{{ trans('Edit your business address') }}"
button-text="{{ trans('settings.company.edit_your_business_address') }}"
taxt-number-text="{{ trans('general.tax_number') }}"
:company="{{ json_encode($company) }}"
:company-form="{{ json_encode([
'show' => true,
'text' => trans('Edit your business address'),
'text' => trans('settings.company.edit_your_business_address'),
'buttons' => [
'cancel' => [
'text' => trans('general.cancel'),

5
resources/views/components/documents/form/content.blade.php
View File

@ -29,6 +29,7 @@
hide-document-title="{{ $hideDocumentTitle }}"
hide-document-subheading="{{ $hideDocumentSubheading }}"
hide-company-edit="{{ $hideCompanyEdit }}"
title-setting="{{ $titleSetting }}"
/>
@endif
@ -65,12 +66,16 @@
hide-discount="{{ $hideDiscount }}"
hide-amount="{{ $hideAmount }}"
text-amount="{{ $textAmount }}"
is-sale-price="{{ $isSalePrice }}"
is-purchase-price="{{ $isPurchasePrice }}"
notes-setting="{{ $notesSetting }}"
/>
@if (!$hideFooter)
<x-documents.form.footer
type="{{ $type }}"
:document="$document"
footer-setting="{{ $footerSetting }}"
/>
@endif

4
resources/views/components/documents/form/footer.blade.php
View File

@ -6,7 +6,7 @@
</div>
<div id="accordion-footer-body" class="collapse hide" aria-labelledby="accordion-footer-header">
{{ Form::textareaGroup('footer', '', '', setting($type . '.footer'), ['rows' => '3'], 'embed-acoordion-textarea') }}
{{ Form::textareaGroup('footer', '', '', $footerSetting, ['rows' => '3'], 'embed-acoordion-textarea') }}
</div>
</div>
</div>
</div>

2
resources/views/components/documents/form/line-item.blade.php
View File

@ -57,7 +57,7 @@
@if (!$hideDescription)
<textarea
class="form-control"
placeholder="Enter item description"
placeholder="{{ trans('items.enter_item_description') }}"
style="height: 46px; overflow: hidden;"
:name="'items.' + index + '.description'"
v-model="row.description"

3
resources/views/components/documents/form/main.blade.php
View File

@ -42,6 +42,8 @@
hide-discount="{{ $hideDiscount }}"
hide-amount="{{ $hideAmount }}"
text-amount="{{ $textAmount }}"
is-sale-price="{{ $isSalePrice }}"
is-purchase-price="{{ $isPurchasePrice }}"
/>
<x-documents.form.totals
@ -52,6 +54,7 @@
<x-documents.form.note
type="{{ $type }}"
:document="$document"
notes-setting="{{ $notesSetting }}"
/>
</div>
</div>

2
resources/views/components/documents/form/note.blade.php
View File

@ -1,3 +1,3 @@
<div class="row embed-card-body-footer">
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2), '', setting($type . '.notes'), ['rows' => '3', 'class' => 'form-control embed-card-body-footer-textarea'], 'col-md-12 embed-acoordion-textarea') }}
{{ Form::textareaGroup('notes', trans_choice('general.notes', 2), '', $notesSetting, ['rows' => '3', 'class' => 'form-control embed-card-body-footer-textarea'], 'col-md-12 embed-acoordion-textarea') }}
</div>

4
resources/views/components/documents/index/card-body.blade.php
View File

@ -242,10 +242,10 @@
@can($permissionDelete)
@if ($checkButtonReconciled)
@if (!$item->reconciled)
{!! Form::deleteLink($item, $routeButtonDelete) !!}
{!! Form::deleteLink($item, $routeButtonDelete, $textModalDelete, $valueModalDelete) !!}
@endif
@else
{!! Form::deleteLink($item, $routeButtonDelete) !!}
{!! Form::deleteLink($item, $routeButtonDelete, $textModalDelete, $valueModalDelete) !!}
@endif
@endcan
@endif

4
resources/views/components/documents/index/content.blade.php
View File

@ -51,6 +51,8 @@
hide-button-delete="{{ $hideButtonDelete }}"
permission-delete="{{ $permissionDelete }}"
route-button-delete="{{ $routeButtonDelete }}"
text-modal-delete="{{ $textModalDelete }}"
value-modal-delete="{{ $valueModalDelete }}"
/>
<x-documents.index.card-footer
@ -65,5 +67,7 @@
text-empty-page="{{ $textEmptyPage }}"
url-docs-path="{{ $urlDocsPath }}"
create-route="{{ $createRoute }}"
check-permission-create="{{ $checkPermissionCreate }}"
permission-create="{{ $permissionCreate }}"
/>
@endif

14
resources/views/components/documents/index/empty-page.blade.php
View File

@ -10,9 +10,17 @@
{!! trans($textEmptyPage) !!} {!! trans('general.empty.documentation', ['url' => $urlDocsPath]) !!}
</p>
<a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
</a>
@if ($checkPermissionCreate)
@can($permissionCreate)
<a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
</a>
@endcan
@else
<a href="{{ route($createRoute) }}" class="btn btn-success float-right mt-4">
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
</a>
@endif
</div>
</div>
</div>

16
resources/views/components/documents/index/top-buttons.blade.php
View File

@ -1,17 +1,21 @@
@if ($checkPermissionCreate)
@if ($checkPermissionCreate)
@can($permissionCreate)
@endif
@if (!$hideCreate)
<a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
@endif
@if (!$hideCreate)
@if (!$hideImport)
<a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endif
@endcan
@else
@if (!$hideCreate)
<a href="{{ route($createRoute) }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
@endif
@if (!$hideImport)
<a href="{{ route($importRoute, $importRouteParameters) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endif
@if ($checkPermissionCreate)
@endcan
@endif
@if (!$hideExport)

2
resources/views/components/documents/show/content.blade.php
View File

@ -84,7 +84,7 @@
:document="$document"
document-template="{{ $documentTemplate }}"
logo="{{ $logo }}"
back-ground-color="{{ $backGroundColor }}"
background-color="{{ $backgroundColor }}"
hide-footer="{{ $hideFooter }}"
hide-company-logo="{{ $hideCompanyLogo }}"
hide-company-details="{{ $hideCompanyDetails }}"

6
resources/views/components/documents/show/document.blade.php
View File

@ -10,7 +10,7 @@
:document="$document"
document-template="{{ $documentTemplate }}"
logo="{{ $logo }}"
back-ground-color="{{ $backGroundColor }}"
background-color="{{ $backgroundColor }}"
hide-footer="{{ $hideFooter }}"
hide-company-logo="{{ $hideCompanyLogo }}"
hide-company-details="{{ $hideCompanyDetails }}"
@ -53,7 +53,7 @@
:document="$document"
document-template="{{ $documentTemplate }}"
logo="{{ $logo }}"
back-ground-color="{{ $backGroundColor }}"
background-color="{{ $backgroundColor }}"
hide-footer="{{ $hideFooter }}"
hide-company-logo="{{ $hideCompanyLogo }}"
hide-company-details="{{ $hideCompanyDetails }}"
@ -96,7 +96,7 @@
:document="$document"
document-template="{{ $documentTemplate }}"
logo="{{ $logo }}"
back-ground-color="{{ $backGroundColor }}"
background-color="{{ $backgroundColor }}"
hide-footer="{{ $hideFooter }}"
hide-company-logo="{{ $hideCompanyLogo }}"
hide-company-details="{{ $hideCompanyDetails }}"

29
resources/views/components/documents/show/timeline.blade.php
View File

@ -59,7 +59,7 @@
@stack('timeline_sent_head_end')
@stack('timeline_sent_body_start')
@if ($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed')
@if ($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed' && $document->status != 'received')
@stack('timeline_sent_body_message_start')
<small>
{{ trans_choice('general.statuses', 1) . ':' }}
@ -89,9 +89,15 @@
@stack('timeline_receive_body_button_received_start')
@if (!$hideButtonReceived)
@can($permissionUpdate)
<a href="{{ route($routeButtonReceived, $document->id) }}" class="btn btn-danger btn-sm btn-alone">
{{ trans($textTimelineSentStatusReceived) }}
</a>
@if ($document->status == 'draft')
<a href="{{ route($routeButtonReceived, $document->id) }}" class="btn btn-danger btn-sm btn-alone">
{{ trans($textTimelineSentStatusReceived) }}
</a>
@else
<button type="button" class="btn btn-secondary btn-sm" disabled="disabled">
{{ trans($textTimelineSentStatusReceived) }}
</button>
@endif
@endcan
@endif
@stack('timeline_receive_body_button_received_end')
@ -99,7 +105,12 @@
@stack('timeline_viewed_invoice_body_message_start')
<small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<small>{{ trans('invoices.messages.status.viewed') }}</small>
@stack('timeline_viewed_invoice_body_message_end')
@stack('timeline_viewed_invoice_body_message_end'))
@elseif($document->status == 'received')
@stack('timeline_receive_bill_body_message_start')
<small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
<small>{{ trans('bills.messages.status.receive.received', ['date' => Date::parse($document->received_at)->format($date_format)]) }}</small>
@stack('timeline_receive_bill_body_message_end')
@else
@stack('timeline_sent_body_message_start')
<small>{{ trans_choice('general.statuses', 1) . ':' }}</small>
@ -107,7 +118,7 @@
@stack('timeline_sent_body_message_end')
@endif
@if (!($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed'))
@if (!($document->status != 'sent' && $document->status != 'partial' && $document->status != 'viewed' && $document->status != 'received'))
<div class="mt-3">
@endif
@ -118,8 +129,8 @@
{{ trans($textTimelineSendStatusMail) }}
</a>
@else
<el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="top" effect="danger">
<button type="button" class="btn btn-danger btn-sm" disabled="disabled">
<el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="top">
<button type="button" class="btn btn-danger btn-sm btn-tooltip disabled">
{{ trans($textTimelineSendStatusMail) }}
</button>
</el-tooltip>
@ -181,7 +192,7 @@
<div class="mt-3">
@stack('timeline_get_paid_body_button_pay_start')
@if (!$hideButtonPaid)
@can('update-sales-invoices')
@can($permissionUpdate)
<a href="{{ route($routeButtonPaid, $document->id) }}" class="btn btn-white btn-sm header-button-top">
{{ trans($textTimelineGetPaidMarkPaid) }}
</a>

4
resources/views/components/documents/show/top-buttons.blade.php
View File

@ -71,8 +71,8 @@
{{ trans($textTimelineSendStatusMail) }}
</a>
@else
<el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="right" effect="danger">
<button type="button" class="dropdown-item" disabled="disabled">
<el-tooltip content="{{ trans('invoices.messages.email_required') }}" placement="right">
<button type="button" class="dropdown-item btn-tooltip">
<span class="text-disabled">{{ trans($textTimelineSendStatusMail) }}</span>
</button>
</el-tooltip>

8
resources/views/components/documents/template/classic.blade.php
View File

@ -52,8 +52,8 @@
<div class="row mt-2">
<div class="col-33">
<hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backGroundColor }};">
<hr class="invoice-classic-line" style="background-color:{{ $backGroundColor }};">
<hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};">
<hr class="invoice-classic-line" style="background-color:{{ $backgroundColor }};">
</div>
<div class="col-33">
@ -72,8 +72,8 @@
</div>
<div class="col-33">
<hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backGroundColor }};">
<hr class="invoice-classic-line" style="background-color:{{ $backGroundColor }};">
<hr class="invoice-classic-line mb-1 mt-4" style="background-color:{{ $backgroundColor }};">
<hr class="invoice-classic-line" style="background-color:{{ $backgroundColor }};">
</div>
</div>

2
resources/views/components/documents/template/default.blade.php
View File

@ -148,7 +148,7 @@
<div class="col-100">
<div class="text">
<table class="lines">
<thead style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
<thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))

6
resources/views/components/documents/template/modern.blade.php
View File

@ -1,4 +1,4 @@
<div class="row" style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="row" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="col-58">
<div class="text company pl-2 mb-1 d-flex align-items-center">
@stack('company_logo_start')
@ -138,7 +138,7 @@
<div class="col-100">
<div class="text">
<table class="m-lines">
<thead style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
<thead style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<tr>
@stack('name_th_start')
@if (!$hideItems || (!$hideName && !$hideDescription))
@ -244,7 +244,7 @@
@if (!$hideFooter)
@if ($document->footer)
<div class="row mt-7">
<div class="col-100 py-2" style="background-color:{{ $backGroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="col-100 py-2" style="background-color:{{ $backgroundColor }} !important; -webkit-print-color-adjust: exact;">
<div class="text pl-2">
<strong class="text-white">{!! nl2br($document->footer) !!}</strong>
</div>

26
resources/views/components/empty-page.blade.php Normal file
View File

@ -0,0 +1,26 @@
<div class="card">
<div class="row align-items-center">
<div class="col-xs-12 col-sm-6 text-center p-5">
<img class="blank-image" src="{{ asset($imageEmptyPage) }}" alt="@yield('title')"/>
</div>
<div class="col-xs-12 col-sm-6 text-center p-5">
<p class="text-justify description">
{!! trans($textEmptyPage) !!} {!! trans('general.empty.documentation', ['url' => $urlDocsPath]) !!}
</p>
@if ($checkPermissionCreate)
@can($permissionCreate)
<a href="{{ route($routeCreate) }}" class="btn btn-success float-right mt-4">
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
</a>
@endcan
@else
<a href="{{ route($routeCreate) }}" class="btn btn-success float-right mt-4">
<span class="btn-inner--text">{{ trans('general.title.create', ['type' => trans_choice($textPage, 1)]) }}</span>
</a>
@endif
</div>
</div>
</div>

2
resources/views/components/search-string.blade.php
View File

@ -5,7 +5,7 @@
operator-is-not-text="{{ trans('general.isnot') }}"
no-data-text="{{ trans('general.no_data') }}"
no-matching-data-text="{{ trans('general.no_matching_data') }}"
value="{{ rtrim(ltrim(request()->get('search', null), '"'), '"') }}"
value="{{ request()->get('search', null) }}"
:filters="{{ json_encode($filters) }}"
:date-config="{
allowInput: true,

1
resources/views/install/updates/index.blade.php
View File

@ -82,6 +82,7 @@
</div>
<akaunting-modal v-if="changelog.show"
modal-dialog-class="modal-lg"
:show="changelog.show"
:title="'{{ trans('updates.changelog') }}'"
@cancel="changelog.show = false"

17
resources/views/modals/documents/item_columns.blade.php
View File

@ -10,23 +10,22 @@
'novalidate' => true,
]) !!}
<div class="row">
{{ Form::invoice_text('item_name', trans('settings.invoice.item_name'), 'font', $item_names, setting($type . '.item_name'), [], 'item_name_input', setting($type . '.item_name_input', null), 'col-md-12') }}
{{ Form::invoice_text('item_name', trans('settings.invoice.item_name'), 'font', $item_names, $item_name, [], 'item_name_input', $item_name_input, 'col-md-12') }}
{{ Form::invoice_text('price_name', trans('settings.invoice.price_name'), 'font', $price_names, setting($type . '.price_name'), [], 'price_name_input', setting($type . '.price_name_input', null), 'col-md-12') }}
{{ Form::invoice_text('price_name', trans('settings.invoice.price_name'), 'font', $price_names, $price_name, [], 'price_name_input', $price_name_input, 'col-md-12') }}
{{ Form::invoice_text('quantity_name', trans('settings.invoice.quantity_name'), 'font', $quantity_names, setting($type . '.quantity_name'), [], 'quantity_name_input', setting($type . '.quantity_name_input', null), 'col-md-12') }}
{{ Form::invoice_text('quantity_name', trans('settings.invoice.quantity_name'), 'font', $quantity_names, $quantity_name, [], 'quantity_name_input', $quantity_name_input, 'col-md-12') }}
{{ Form::radioGroup('hide_item_name', trans('settings.invoice.hide.item_name'), setting($type . '.hide_item_name', null)) }}
{{ Form::radioGroup('hide_item_name', trans('settings.invoice.hide.item_name'), $hide_item_name) }}
{{ Form::radioGroup('hide_item_description', trans('settings.invoice.hide.item_description'), setting($type . '.hide_item_description', null)) }}
{{ Form::radioGroup('hide_item_description', trans('settings.invoice.hide.item_description'), $hide_item_description) }}
{{ Form::radioGroup('hide_quantity', trans('settings.invoice.hide.quantity'), setting($type . '.hide_quantity', null)) }}
{{ Form::radioGroup('hide_quantity', trans('settings.invoice.hide.quantity'), $hide_quantity) }}
{{ Form::radioGroup('hide_price', trans('settings.invoice.hide.price'), setting($type . '.hide_price', null)) }}
{{ Form::radioGroup('hide_price', trans('settings.invoice.hide.price'), $hide_price) }}
{{ Form::radioGroup('hide_amount', trans('settings.invoice.hide.amount'), setting($type . '.hide_amount', null)) }}
{{ Form::radioGroup('hide_amount', trans('settings.invoice.hide.amount'), $hide_amount) }}
{!! Form::hidden('type', $type) !!}
{!! Form::hidden('_prefix', $type) !!}
</div>
{!! Form::close() !!}

4
resources/views/partials/admin/navbar.blade.php
View File

@ -254,12 +254,12 @@
@stack('navbar_profile_edit')
@can(['read-auth-users', 'read-auth-profile'])
@canany(['read-auth-users', 'read-auth-profile'])
<a href="{{ route('users.edit', $user->id) }}" class="dropdown-item">
<i class="fas fa-user"></i>
<span>{{ trans('auth.profile') }}</span>
</a>
@endcan
@endcanany
@canany(['read-auth-users', 'read-auth-roles', 'read-auth-permissions'])
<div class="dropdown-divider"></div>

6
resources/views/partials/admin/suggestions.blade.php
View File

@ -1,6 +1,6 @@
@foreach($modules as $module)
<span>
<a href="{{ url($module->action_url) . '?' . http_build_query((array) $module->action_parameters) }}" class="btn btn-white btn-sm" target="{{ $module->action_target }}">{{ $module->name }}</a>
</span>
<a href="{{ url($module->action_url) . '?' . http_build_query((array) $module->action_parameters) }}" class="btn btn-white btn-sm" target="{{ $module->action_target }}">
{{ $module->name }}
</a>
@endforeach

21
resources/views/partials/form/file_group.blade.php
View File

@ -45,17 +45,24 @@
@foreach($value as $attachment)
@php
$attachments[] = [
'id' => $attachment->id,
'name' => $attachment->filename . '.' . $attachment->extension,
'path' => route('uploads.get', $attachment->id),
'downloadPath' => route('uploads.download', $attachment->id)
'path' => route('uploads.get', $attachment->id),
'type' => $attachment->mime_type,
'size' => $attachment->size,
'downloadPath' => route('uploads.download', $attachment->id),
];
@endphp
@endforeach
@elseif ($value instanceof \Plank\Mediable\Media)
@php
$attachments[] = [
'id' => $value->id,
'name' => $value->filename . '.' . $value->extension,
'path' => route('uploads.get', $value->id)
'path' => route('uploads.get', $value->id),
'type' => $value->mime_type,
'size' => $value->size,
'downloadPath' => false,
];
@endphp
@else
@ -63,12 +70,16 @@
$attachment = \Plank\Mediable\Media::find($value);
$attachments[] = [
'id' => $attachment->id,
'name' => $attachment->filename . '.' . $attachment->extension,
'path' => route('uploads.get', $attachment->id)
'path' => route('uploads.get', $attachment->id),
'type' => $attachment->mime_type,
'size' => $attachment->size,
'downloadPath' => false,
];
@endphp
@endif
:attachments="{{ json_encode($attachments) }}"
@endif

2
resources/views/purchases/bills/create.blade.php
View File

@ -3,7 +3,7 @@
@section('title', trans('general.title.new', ['type' => setting('bill.title', trans_choice('general.bills', 1))]))
@section('content')
<x-documents.form.content type="bill" hide-company hide-footer hide-edit-item-columns />
<x-documents.form.content type="bill" hide-company hide-footer hide-edit-item-columns is-purchase-price />
@endsection
@push('scripts_start')

2
resources/views/purchases/bills/edit.blade.php
View File

@ -3,7 +3,7 @@
@section('title', trans('general.title.edit', ['type' => trans_choice('general.bills', 1)]))
@section('content')
<x-documents.form.content type="bill" :document="$bill" hide-company hide-footer hide-edit-item-columns />
<x-documents.form.content type="bill" :document="$bill" hide-company hide-footer hide-edit-item-columns is-purchase-price />
@endsection
@push('scripts_start')

4
resources/views/purchases/payments/create.blade.php
View File

@ -38,9 +38,9 @@
{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'form-file']) }}
{{ Form::selectGroup('document_id', trans_choice('general.bills', 1), 'file-invoice', [], null, ['disabled' => 'true']) }}
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'multiple' => 'multiple', 'options' => ['acceptedFiles' => $file_types]], null, 'col-md-12') }}
</div>
</div>

11
resources/views/purchases/payments/edit.blade.php
View File

@ -57,19 +57,12 @@
{{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
@if ($payment->attachment)
<div class="col-md-6">
@php $file = $payment->attachment; @endphp
@include('partials.media.file')
</div>
@else
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'form-file']) }}
@endif
@if ($payment->bill)
{{ Form::textGroup('document', trans_choice('general.bills', 1), 'file-invoice', ['disabled' => 'true'], $payment->bill->document_number) }}
{{ Form::hidden('document_id', $payment->bill->id) }}
@endif
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'multiple' => 'multiple', 'options' => ['acceptedFiles' => $file_types]], $payment->attachment, 'col-md-12') }}
</div>
</div>

4
resources/views/purchases/payments/index.blade.php
View File

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Banking\Transaction" />
<x-search-string model="App\Models\Purchase\Payment" />
</div>
{{ Form::bulkActionRowGroup('general.payments', $bulk_actions, ['group' => 'purchases', 'type' => 'payments']) }}
@ -116,7 +116,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'payments', 'docs_path' => 'purchases/payments'])
<x-empty-page group="purchases" page="payments" />
@endif
@endsection

4
resources/views/purchases/vendors/index.blade.php vendored
View File

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Purchase\Vendor" />
<x-search-string model="App\Models\Common\Contact" />
</div>
{{ Form::bulkActionRowGroup('general.vendors', $bulk_actions, ['group' => 'purchases', 'type' => 'vendors']) }}
@ -103,7 +103,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'vendors', 'docs_path' => 'purchases/vendors'])
<x-empty-page group="purchases" page="vendors" />
@endif
@endsection

2
resources/views/sales/customers/create.blade.php
View File

@ -76,7 +76,7 @@
@push('scripts_start')
<script>
var can_login_errors = {
valid: '{{ trans('validation.required', ['attribute' => 'email']) }}',
valid: '{!! trans('validation.required', ['attribute' => 'email']) !!}',
email: '{{ trans('customers.error.email') }}'
};
</script>

2
resources/views/sales/customers/index.blade.php
View File

@ -105,7 +105,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'customers', 'docs_path' => 'sales/customers'])
<x-empty-page group="sales" page="customers" />
@endif
@endsection

4
resources/views/sales/revenues/create.blade.php
View File

@ -38,9 +38,9 @@
{{ Form::textGroup('reference', trans('general.reference'), 'file', []) }}
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'form-file']) }}
{{ Form::selectGroup('document_id', trans_choice('general.invoices', 1), 'file-invoice', [], null, ['disabled' => 'true']) }}
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'multiple' => 'multiple', 'options' => ['acceptedFiles' => $file_types]], null, 'col-md-12') }}
</div>
</div>

11
resources/views/sales/revenues/edit.blade.php
View File

@ -57,19 +57,12 @@
{{ Form::textGroup('reference', trans('general.reference'), 'file',[]) }}
@if ($revenue->attachment)
<div class="col-md-6">
@php $file = $revenue->attachment; @endphp
@include('partials.media.file')
</div>
@else
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'form-file']) }}
@endif
@if ($revenue->invoice)
{{ Form::textGroup('document', trans_choice('general.invoices', 1), 'file-invoice', ['disabled' => 'true'], $revenue->invoice->document_number) }}
{{ Form::hidden('document_id', $revenue->invoice->id) }}
@endif
{{ Form::fileGroup('attachment', trans('general.attachment'), '', ['dropzone-class' => 'w-100', 'multiple' => 'multiple', 'options' => ['acceptedFiles' => $file_types]], $revenue->attachment, 'col-md-12') }}
</div>
</div>

4
resources/views/sales/revenues/index.blade.php
View File

@ -21,7 +21,7 @@
'class' => 'mb-0'
]) !!}
<div class="align-items-center" v-if="!bulk_action.show">
<x-search-string model="App\Models\Banking\Transaction" />
<x-search-string model="App\Models\Sale\Revenue" />
</div>
{{ Form::bulkActionRowGroup('general.revenues', $bulk_actions, ['group' => 'sales', 'type' => 'revenues']) }}
@ -116,7 +116,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'revenues', 'docs_path' => 'sales/revenues'])
<x-empty-page group="sales" page="revenues" />
@endif
@endsection

10
resources/views/settings/categories/index.blade.php
View File

@ -2,11 +2,13 @@
@section('title', trans_choice('general.categories', 2))
@can('create-settings-categories')
@section('new_button')
@section('new_button')
@can('create-settings-categories')
<a href="{{ route('categories.create') }}" class="btn btn-success btn-sm">{{ trans('general.add_new') }}</a>
@endsection
@endcan
<a href="{{ route('import.create', ['settings', 'categories']) }}" class="btn btn-white btn-sm">{{ trans('import.import') }}</a>
@endcan
<a href="{{ route('categories.export', request()->input()) }}" class="btn btn-white btn-sm">{{ trans('general.export') }}</a>
@endsection
@section('content')
<div class="card">

2
resources/views/settings/localisation/edit.blade.php
View File

@ -20,6 +20,8 @@
<div class="row">
{{ Form::dateGroup('financial_start', trans('settings.localisation.financial_start'), 'calendar', ['id' => 'financial_start', 'class' => 'form-control datepicker', 'show-date-format' => 'j F', 'date-format' => 'd-m', 'autocomplete' => 'off'], setting('localisation.financial_start')) }}
{{ Form::selectGroup('financial_denote', trans('settings.localisation.financial_denote.title'), 'calendar', $financial_denote_options, setting('localisation.financial_denote'), []) }}
{{ Form::selectGroupGroup('timezone', trans('settings.localisation.timezone'), 'globe', $timezones, setting('localisation.timezone'), []) }}
{{ Form::selectGroup('date_format', trans('settings.localisation.date.format'), 'calendar', $date_formats, setting('localisation.date_format'), ['autocomplete' => 'off']) }}

2
resources/views/settings/taxes/index.blade.php
View File

@ -86,7 +86,7 @@
</div>
</div>
@else
@include('partials.admin.empty_page', ['page' => 'taxes', 'docs_path' => 'settings/taxes'])
<x-empty-page group="settings" page="taxes" />
@endif
@endsection