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

Merge pull request #1236 from batuhawk/master

Browse Source 
Bill attachment updated
This commit is contained in:
Batuhan Baş 2020-02-07 15:16:05 +03:00 committed by GitHub
commit d28d6d6580
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,7 +7,7 @@
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-auto"> <div class="col-auto">
@if ($file->aggregate_type != 'image') @if ($file->aggregate_type != 'image')
<i class="fas fa-file-image"></i> <i class="fas fa-file-image font-size-50"></i>
@else @else
<a href="#" class="avatar"> <a href="#" class="avatar">
<img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}"> <img src="{{ url('uploads/' . $file->id) }}" alt="{{ $file->basename }}">

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

@ -76,23 +76,22 @@
<div class="row float-right"> <div class="row float-right">
<div class="col-md-12"> <div class="col-md-12">
@if (1) @if (1)
<div class="card mb-0"> <div class="card mb-0">
<div class="card-body text-center"> <div class="card-body">
<i class="far fa-file-pdf font-size-50"></i>
</div>
<div class="card-footer">
<div class="row align-items-center"> <div class="row align-items-center">
<div class="col-xs-6 col-sm-6"> <div class="col-auto">
<i class="far fa-file-pdf font-size-50"></i>
</div>
<div class="col-auto">
<a class="btn btn-icon btn-white" type="button"> <a class="btn btn-icon btn-white" type="button">
<span class="btn-inner--icon"> <span class="btn-inner--icon">
<i class="fas fa-paperclip"></i> <i class="fas fa-paperclip"></i>
{{ basename($payment->attachment) }} {{ basename($payment->attachment) }}
</span> </span>
</a> </a>
</div>
<div class="col-xs-6 col-sm-6"> <a class="btn btn-icon btn-info text-white float-right" type="button">
<a class="btn btn-icon btn-info float-right" type="button">
<span class="btn-inner--icon"> <span class="btn-inner--icon">
<i class="fas fa-file-download"></i> <i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }} {{ basename($payment->attachment) }}
@ -103,27 +102,26 @@
</div> </div>
</div> </div>
@else @else
<div class="card mb-0"> <div class="card mb-0">
<div class="card-body text-center"> <div class="card-body">
@if($payment->attachment) <div class="row align-items-center">
<img src="public/img/invoice_templates/classic.png" alt="Attachment"> <div class="col-auto">
@else @if($payment->attachment)
<i class="far fa-file-image font-size-50"></i> <img src="public/img/invoice_templates/classic.png" alt="Attachment">
@endif @else
</div> <i class="far fa-file-image font-size-50"></i>
<div class="card-footer"> @endif
<div class="row"> </div>
<div class="col-xs-6 col-md-6">
<div class="col-auto">
<a class="btn btn-icon btn-white" type="button"> <a class="btn btn-icon btn-white" type="button">
<span class="btn-inner--icon"> <span class="btn-inner--icon">
<i class="fas fa-camera"></i> <i class="fas fa-camera"></i>
{{ basename($payment->attachment) }} {{ basename($payment->attachment) }}
</span> </span>
</a> </a>
</div>
<div class="col-xs-6 col-md-6"> <a class="btn btn-icon btn-info text-white float-right" type="button">
<a class="btn btn-icon btn-info float-right" type="button">
<span class="btn-inner--icon"> <span class="btn-inner--icon">
<i class="fas fa-file-download"></i> <i class="fas fa-file-download"></i>
{{ basename($payment->attachment) }} {{ basename($payment->attachment) }}

97
resources/views/purchases/bills/show.blade.php
View File

@ -425,60 +425,63 @@
@stack('box_footer_start') @stack('box_footer_start')
<div class="card-footer"> <div class="card-footer">
<div class="float-right"> <div class="row align-items-center">
@stack('button_edit_start') <div class="col-xs-12 col-sm-6">
@if(!$bill->reconciled) @if($bill->attachment)
<a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top"> @php $file = $bill->attachment; @endphp
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }} @include('partials.media.file')
</a>
@endif @endif
@stack('button_edit_end') </div>
<div class="col-xs-12 col-sm-6 text-right">
@stack('button_edit_start')
@if(!$bill->reconciled)
<a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top">
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a>
@endif
@stack('button_edit_end')
@stack('button_print_start') @stack('button_print_start')
<a href="{{ route('bills.print', $bill->id) }}" target="_blank" class="btn btn-success header-button-top"> <a href="{{ route('bills.print', $bill->id) }}" target="_blank" class="btn btn-success header-button-top">
<i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }} <i class="fa fa-print"></i>&nbsp; {{ trans('general.print') }}
</a> </a>
@stack('button_print_end') @stack('button_print_end')
@stack('button_group_start') @stack('button_group_start')
<div class="dropup"> <div class="dropup">
<button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button> <button type="button" class="btn btn-primary header-button-top" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-chevron-up"></i>&nbsp; {{ trans('general.more_actions') }}</button>
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
@stack('button_pay_start') @stack('button_pay_start')
@if($bill->status != 'paid') @if($bill->status != 'paid')
@if(empty($bill->paid) || ($bill->paid != $bill->amount)) @if(empty($bill->paid) || ($bill->paid != $bill->amount))
<button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button> <button class="dropdown-item" id="button-payment" @click="onPayment">{{ trans('bills.add_payment') }}</button>
@endif
@permission('update-purchases-bills')
@if($bill->status == 'draft')
<a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a>
@else
<button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button>
@endif
@endpermission
<div class="dropdown-divider"></div>
@endif @endif
@permission('update-purchases-bills') @stack('button_pay_end')
@if($bill->status == 'draft')
<a class="dropdown-item" href="{{ route('bills.received', $bill->id) }}">{{ trans('bills.mark_received') }}</a></a> @stack('button_pdf_start')
@else <a class="dropdown-item" href="{{ route('bills.pdf', $bill->id) }}">{{ trans('bills.download_pdf') }}</a>
<button type="button" class="dropdown-item" disabled="disabled">{{ trans('bills.mark_received') }}</button> @stack('button_pdf_end')
@stack('button_delete_start')
@permission('delete-purchases-bills')
@if(!$bill->reconciled)
{!! Form::deleteLink($bill, 'purchases/bills') !!}
@endif @endif
@endpermission @endpermission
<div class="dropdown-divider"></div> @stack('button_delete_end')
@endif </div>
@stack('button_pay_end')
@stack('button_pdf_start')
<a class="dropdown-item" href="{{ route('bills.pdf', $bill->id) }}">{{ trans('bills.download_pdf') }}</a>
@stack('button_pdf_end')
@stack('button_delete_start')
@permission('delete-purchases-bills')
@if(!$bill->reconciled)
{!! Form::deleteLink($bill, 'purchases/bills') !!}
@endif
@endpermission
@stack('button_delete_end')
</div> </div>
</div> @stack('button_group_end')
@stack('button_group_end') </div>
@if($bill->attachment)
@php $file = $bill->attachment; @endphp
@include('partials.media.file')
@endif
</div> </div>
</div> </div>
@stack('box_footer_end') @stack('box_footer_end')