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

Merge pull request #1235 from batuhawk/master

Browse Source 
File upload and review updated
This commit is contained in:
Batuhan Baş 2020-02-07 13:04:48 +03:00 committed by GitHub
commit 18b1e6e703
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 106 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,29 +2,29 @@
$column_name = !empty($column_name) ? $column_name : 'attachment';
$options = !empty($options) ? $options : false;
@endphp
<ul class="mailbox-attachments clearfix margin-top">
<li>
<div class="card mb-0">
<div class="card-body">
<div class="row align-items-center">
<div class="col-auto">
@if ($file->aggregate_type != 'image')
<span class="mailbox-attachment-icon">
<i class="fa fa-file-{{ $file->aggregate_type }}-o"></i>
</span>
<i class="fas fa-file-image"></i>
@else
<span class="mailbox-attachment-icon has-img">
<a href="#" class="avatar">
<img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}">
</span>
@endif
<div class="mailbox-attachment-info">
<a href="javascript:void();" class="mailbox-attachment-name">
<p class="mailbox-attachment-file-name">
<i class="fa fa-paperclip"></i> {{ $file->basename }}
</p>
</a>
@endif
</div>
<span class="mailbox-attachment-size">
{{ $file->readableSize() }}
<div class="col ml--2 long-texts">
<h4 class="mb-0">
<span><i class="fas fa-paperclip"></i></span>
<span>{{ $file->basename }}</span>
</h4>
<small>{{ $file->readableSize() }}</small>
</div>
<div class="col-auto">
@permission('delete-common-uploads')
{!! Form::open([
'id' => $column_name. '-' . $file->id,
@ -32,8 +32,9 @@
'url' => [url('uploads/' . $file->id)],
'class' => 'd-inline'
]) !!}
<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 href="javascript:void();" id="remove-{{ $column_name }}" type="button" class="btn btn-danger text-white header-button-top">
<i class="fas fa-times"></i>
</a>
@if ($options)
@ -44,10 +45,10 @@
{!! 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>
<a href="{{ url('uploads/' . $file->id . '/download') }}" type="button" class="btn btn-info text-white header-button-top">
<i class="fas fa-file-download"></i>
</a>
</span>
</div>
</li>
</ul>
</div>
</div>
</div>

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

@ -1,54 +0,0 @@
@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>
@if ($file->aggregate_type != 'image')
<span class="mailbox-attachment-icon">
<i class="fa fa-file-{{ $file->aggregate_type }}-o"></i>
</span>
@else
<span class="mailbox-attachment-icon has-img">
<img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}">
</span>
@endif
<div class="mailbox-attachment-info">
<a href="javascript:void();" class="mailbox-attachment-name">
<p class="mailbox-attachment-file-name">
<i class="fa fa-paperclip"></i> {{ $file->basename }}
</p>
</a>
<span class="mailbox-attachment-size">
{{ $file->readableSize() }}
@permission('delete-common-uploads')
{!! Form::open([
'id' => 'attachment-' . $file->id,
'method' => 'DELETE',
'url' => [url('uploads/' . $file->id)],
'class' => 'd-inline'
]) !!}
<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>
@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>
</a>
</span>
</div>
</li>
@endforeach
</ul>

14
resources/views/portal/payments/show.blade.php
View File

@ -72,17 +72,17 @@
</div>
@if ($payment->attachment)
<div class="card-footer pb-0">
<div class="card-footer">
<div class="row float-right">
<div class="col-md-12">
@if (1)
<div class="card w-50">
<div class="card mb-0">
<div class="card-body text-center">
<i class="far fa-file-pdf font-size-50"></i>
</div>
<div class="card-footer">
<div class="row align-items-center">
<div class="col-xs-6 col-md-6">
<div class="col-xs-6 col-sm-6">
<a class="btn btn-icon btn-white" type="button">
<span class="btn-inner--icon">
<i class="fas fa-paperclip"></i>
@ -91,8 +91,8 @@
</a>
</div>
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white float-right" type="button">
<div class="col-xs-6 col-sm-6">
<a class="btn btn-icon btn-info float-right" type="button">
<span class="btn-inner--icon">
<i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }}
@ -103,7 +103,7 @@
</div>
</div>
@else
<div class="card w-50">
<div class="card mb-0">
<div class="card-body text-center">
@if($payment->attachment)
<img src="public/img/invoice_templates/classic.png" alt="Attachment">
@ -123,7 +123,7 @@
</div>
<div class="col-xs-6 col-md-6">
<a class="btn btn-icon btn-white float-right" type="button">
<a class="btn btn-icon btn-info float-right" type="button">
<span class="btn-inner--icon">
<i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }}

16
resources/views/sales/invoices/show.blade.php
View File

@ -450,7 +450,15 @@
@stack('card_footer_start')
<div class="card-footer">
<div class="float-right">
<div class="row align-items-center">
<div class="col-xs-12 col-sm-6">
@if($invoice->attachment)
@php $file = $invoice->attachment; @endphp
@include('partials.media.file')
@endif
</div>
<div class="col-xs-12 col-sm-6 text-right">
@stack('button_edit_start')
@if(!$invoice->reconciled)
<a href="{{ route('invoices.edit', $invoice->id) }}" class="btn btn-info header-button-top">
@ -522,11 +530,7 @@
</div>
</div>
@stack('button_group_end')
@if($invoice->attachment)
@php $file = $invoice->attachment; @endphp
@include('partials.media.file')
@endif
</div>
</div>
</div>
@stack('card_footer_end')