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/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