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

edit page and show pages media delete issue solved.

Browse Source
This commit is contained in:
cuneytsenturk
2019-02-02 14:26:03 +03:00
parent d4b5861120
commit 8708512b96
6 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/Http/Controllers/Common/Uploads.php
View File

@@ -37,12 +37,20 @@ class Uploads extends Controller
public function show($id, Request $request)
{
$file = false;
$options = false;
$column_name = 'attachment';
if ($request->has('column_name')) {
$column_name = $request->get('column_name');
}
if ($request->has('page')) {
$options = [
'page' => $request->get('page'),
'key' => $request->get('key'),
];
}
$media = Media::find($id);
// Get file path
@@ -58,7 +66,7 @@ class Uploads extends Controller
$file = $media;
$html = view('partials.media.file', compact('file', 'column_name'))->render();
$html = view('partials.media.file', compact('file', 'column_name', 'options'))->render();
return response()->json([
'success' => true,

2
resources/views/expenses/bills/show.blade.php
View File

@@ -431,11 +431,13 @@
@push('scripts')
<script type="text/javascript">
@permission('delete-common-uploads')
@if($bill->attachment)
$(document).on('click', '#remove-attachment', function (e) {
confirmDelete("#attachment-{!! $bill->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $bill->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete') !!}");
});
@endif
@endpermission
$(document).on('click', '#button-payment', function (e) {
$('#modal-add-payment').remove();

2
resources/views/incomes/invoices/show.blade.php
View File

@@ -459,11 +459,13 @@
@push('scripts')
<script type="text/javascript">
@permission('delete-common-uploads')
@if($invoice->attachment)
$(document).on('click', '#remove-attachment', function (e) {
confirmDelete("#attachment-{!! $invoice->attachment->id !!}", "{!! trans('general.attachment') !!}", "{!! trans('general.delete_confirm', ['name' => '<strong>' . $invoice->attachment->basename . '</strong>', 'type' => strtolower(trans('general.attachment'))]) !!}", "{!! trans('general.cancel') !!}", "{!! trans('general.delete') !!}");
});
@endif
@endpermission
$(document).on('click', '#button-payment', function (e) {
$('#modal-add-payment').remove();

15
resources/views/partials/media/file.blade.php
View File

@@ -1,3 +1,8 @@
@php
$column_name = !empty($column_name) ? $column_name : 'attachment';
$options = !empty($options) ? $options : false;
@endphp
<ul class="mailbox-attachments clearfix margin-top">
<li>
@if ($file->aggregate_type != 'image')
@@ -20,18 +25,24 @@
<span class="mailbox-attachment-size">
{{ $file->readableSize() }}
@permission('delete-common-uploads')
{!! Form::open([
'id' => $column_name. '-' . $file->id,
'method' => 'DELETE',
'url' => [url('uploads/' . $file->id)],
'style' => 'display:inline'
]) !!}
@permission('delete-common-uploads')
<a href="javascript:void();" id="remove-{{ $column_name }}" class="btn btn-danger btn-xs pull-right mailbox-attachment-remove">
<i class="fa fa fa-times"></i>
</a>
@endpermission
@if ($options)
<input type="hidden" name="page" value="{{ $options['page'] }}" />
<input type="hidden" name="key" value="{{ $options['key'] }}" />
<input type="hidden" name="value" value="{{ $file->id }}" />
@endif
{!! Form::close() !!}
@endpermission
<a href="{{ url('uploads/' . $file->id . '/download') }}" class="btn btn-info btn-xs pull-right mailbox-attachment-download">
<i class="fa fa-cloud-download"></i>

15
resources/views/partials/media/files.blade.php
View File

@@ -1,3 +1,8 @@
@php
$column_name = !empty($column_name) ? $column_name : 'attachment';
$options = !empty($options) ? $options : false;
@endphp
<ul class="mailbox-attachments clearfix margin-top">
@foreach ($files as $file)
<li>
@@ -21,18 +26,24 @@
<span class="mailbox-attachment-size">
{{ $file->readableSize() }}
@permission('delete-common-uploads')
{!! Form::open([
'id' => 'attachment-' . $file->id,
'method' => 'DELETE',
'url' => [url('uploads/' . $file->id)],
'style' => 'display:inline'
]) !!}
@permission('delete-common-uploads')
<a href="javascript:void();" id="remove-attachment" class="btn btn-danger btn-xs pull-right mailbox-attachment-remove">
<i class="fa fa fa-times"></i>
</a>
@endpermission
@if ($options)
<input type="hidden" name="page" value="{{ $options['page'] }}" />
<input type="hidden" name="key" value="{{ $options['key'] }}" />
<input type="hidden" name="value" value="{{ $file->id }}" />
@endif
{!! Form::close() !!}
@endpermission
<a href="{{ url('uploads/' . $file->id . '/download') }}" class="btn btn-info btn-xs pull-right mailbox-attachment-download">
<i class="fa fa-cloud-download"></i>

4
resources/views/settings/settings/edit.blade.php
View File

@@ -249,7 +249,7 @@
$.ajax({
url: '{{ url('uploads/' . $setting['company_logo']->id . '/show') }}',
type: 'GET',
data: {column_name: 'company_logo'},
data: {column_name: 'company_logo', page: 'setting', key: 'general.company_logo'},
dataType: 'JSON',
success: function(json) {
if (json['success']) {
@@ -285,7 +285,7 @@
$.ajax({
url: '{{ url('uploads/' . $setting['invoice_logo']->id . '/show') }}',
type: 'GET',
data: {column_name: 'invoice_logo'},
data: {column_name: 'invoice_logo', page: 'setting', key: 'general.invoice_logo'},
dataType: 'JSON',
success: function(json) {
if (json['success']) {