Merge branch '1.3-dev' of github.com:akaunting/akaunting into tax-rate
This commit is contained in:
@ -48,6 +48,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($bills as $item)
|
||||
@php $paid = $item->paid; @endphp
|
||||
<tr>
|
||||
<td><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
|
||||
<td>{{ $item->vendor_name }}</td>
|
||||
@ -62,7 +63,7 @@
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="{{ url('expenses/bills/' . $item->id) }}">{{ trans('general.show') }}</a></li>
|
||||
@if ($item->paid && !$item->reconciled)
|
||||
@if (!$item->reconciled)
|
||||
<li><a href="{{ url('expenses/bills/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
|
||||
@endif
|
||||
@permission('create-expenses-bills')
|
||||
|
@ -47,6 +47,7 @@
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach($invoices as $item)
|
||||
@php $paid = $item->paid; @endphp
|
||||
<tr>
|
||||
<td><a href="{{ url('incomes/invoices/' . $item->id . ' ') }}">{{ $item->invoice_number }}</a></td>
|
||||
<td>{{ $item->customer_name }}</td>
|
||||
@ -61,7 +62,7 @@
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-right">
|
||||
<li><a href="{{ url('incomes/invoices/' . $item->id) }}">{{ trans('general.show') }}</a></li>
|
||||
@if ($item->paid && !$item->reconciled)
|
||||
@if (!$item->reconciled)
|
||||
<li><a href="{{ url('incomes/invoices/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
|
||||
@endif
|
||||
@permission('create-incomes-invoices')
|
||||
|
@ -2,7 +2,7 @@
|
||||
{{-- Header --}}
|
||||
@slot('header')
|
||||
@component('mail::header', ['url' => config('app.url')])
|
||||
{{ setting('general.company_name', config('app.name')) }}
|
||||
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
{{-- Footer --}}
|
||||
@slot('footer')
|
||||
@component('mail::footer')
|
||||
© {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
|
||||
© {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endcomponent
|
||||
|
@ -2,7 +2,7 @@
|
||||
{{-- Header --}}
|
||||
@slot('header')
|
||||
@component('mail::header', ['url' => config('app.url')])
|
||||
{{ setting('general.company_name', config('app.name')) }}
|
||||
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
|
||||
@endcomponent
|
||||
@endslot
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
{{-- Footer --}}
|
||||
@slot('footer')
|
||||
@component('mail::footer')
|
||||
© {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
|
||||
© {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
|
||||
@endcomponent
|
||||
@endslot
|
||||
@endcomponent
|
||||
|
@ -45,7 +45,7 @@
|
||||
@if (! empty($salutation))
|
||||
{{ $salutation }}
|
||||
@else
|
||||
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('app.name'))]) !!}
|
||||
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('mail.from.name', config('app.name')))]) !!}
|
||||
@endif
|
||||
|
||||
<!-- Subcopy -->
|
||||
|
Reference in New Issue
Block a user