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

Merge pull request #1742 from cuneytsenturk/master

Browse Source 
Add Document/Transaction/Contact types to the config vol 2
This commit is contained in:
Cüneyt Şentürk
2021-01-12 00:28:19 +03:00
committed by GitHub
parent 71146b56b1 e1e8aecb03
commit de27dbf116
26 changed files with 1456 additions and 1093 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
<div class="col-sm-6 col-md-6 col-lg-6 col-xl-6">
@if (!$hideCategory)
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.' . $category_type . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $category_type, 'remote_action' => route('categories.index'). '?type=' . $category_type], 'col-md-12') }}
{{ Form::selectRemoteAddNewGroup('category_id', trans_choice('general.categories', 1), 'folder', $categories, setting('default.' . $categoryType . '_category'), ['required' => 'required', 'path' => route('modals.categories.create') . '?type=' . $categoryType, 'remote_action' => route('categories.index'). '?type=' . $categoryType], 'col-md-12') }}
@endif
@if (!$hideAttachment)

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

@@ -2,7 +2,7 @@
<div class="card">
<div class="card-footer">
<div class="row save-buttons">
{{ Form::saveButtons('invoices.index') }}
{{ Form::saveButtons($routeCancel) }}
</div>
</div>
</div>

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

@@ -1,6 +1,6 @@
@if (empty($document))
{!! Form::open([
'route' => $formRoute,
'route' => $routeStore,
'id' => $formId,
'@submit.prevent' => $formSubmit,
'@keydown' => 'form.errors.clear($event.target.name)',
@@ -11,7 +11,7 @@
]) !!}
@else
{!! Form::model($document, [
'route' => [$formRoute, $document->id],
'route' => [$routeUpdate, $document->id],
'id' => $formId,
'method' => 'PATCH',
'@submit.prevent' => $formSubmit,
@@ -78,6 +78,7 @@
<x-documents.form.advanced
type="{{ $type }}"
:document="$document"
category-type="{{ $categoryType }}"
hide-recurring="{{ $hideRecurring }}"
hide-category="{{ $hideCategory }}"
hide-attachment="{{ $hideAttachment }}"
@@ -88,6 +89,7 @@
<x-documents.form.buttons
type="{{ $type }}"
:document="$document"
route-cancel="{{ $routeCancel }}"
/>
@endif

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

@@ -57,7 +57,7 @@
@if($item->bill)
@if ($item->bill->status == 'paid')
<el-tooltip content="{{ $item->bill->document_number }} / {{ trans('bills.statuses.paid') }}"
<el-tooltip content="{{ $item->bill->document_number }} / {{ trans('documents.statuses.paid') }}"
effect="success"
:open-delay="100"
placement="top">
@@ -66,7 +66,7 @@
</span>
</el-tooltip>
@elseif ($item->bill->status == 'partial')
<el-tooltip content="{{ $item->bill->document_number }} / {{ trans('bills.statuses.partial') }}"
<el-tooltip content="{{ $item->bill->document_number }} / {{ trans('documents.statuses.partial') }}"
effect="info"
:open-delay="100"
placement="top">

2
resources/views/purchases/vendors/show.blade.php vendored
View File

@@ -194,7 +194,7 @@
<td class="col-xs-4 col-sm-3 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-3 d-none d-sm-block text-left">@date($item->issued_at)</td>
<td class="col-sm-3 d-none d-sm-block text-left">@date($item->due_at)</td>
<td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('bills.statuses.' . $item->status) }}</span></td>
<td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('documents.statuses.' . $item->status) }}</span></td>
</tr>
@endforeach
</tbody>

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

@@ -194,7 +194,7 @@
<td class="col-xs-4 col-sm-3 text-right">@money($item->amount, $item->currency_code, true)</td>
<td class="col-sm-3 d-none d-sm-block text-left">@date($item->issued_at)</td>
<td class="col-sm-3 d-none d-sm-block text-left">@date($item->due_at)</td>
<td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('invoices.statuses.' . $item->status) }}</span></td>
<td class="col-xs-4 col-sm-2"><span class="badge badge-pill badge-{{ $item->status_label }} my--2">{{ trans('documents.statuses.' . $item->status) }}</span></td>
</tr>
@endforeach
</tbody>

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

@@ -57,7 +57,7 @@
@if($item->invoice)
@if ($item->invoice->status == 'paid')
<el-tooltip content="{{ $item->invoice->document_number }} / {{ trans('invoices.statuses.paid') }}"
<el-tooltip content="{{ $item->invoice->document_number }} / {{ trans('documents.statuses.paid') }}"
effect="success"
:open-delay="100"
placement="top">
@@ -66,7 +66,7 @@
</span>
</el-tooltip>
@elseif ($item->invoice->status == 'partial')
<el-tooltip content="{{ $item->invoice->document_number }} / {{ trans('invoices.statuses.partial') }}"
<el-tooltip content="{{ $item->invoice->document_number }} / {{ trans('documents.statuses.partial') }}"
effect="info"
:open-delay="100"
placement="top">