refs #1564 for bill show page..

This commit is contained in:
Cüneyt Şentürk 2020-08-10 09:52:38 +03:00
parent 4f1efdb8e4
commit 004020705d

View File

@ -199,25 +199,27 @@
{{ setting('company.name') }} {{ setting('company.name') }}
</th> </th>
</tr> </tr>
<tr> @if (setting('company.address'))
<th> <tr>
{!! nl2br(setting('company.address')) !!} <th>
</th> {!! nl2br(setting('company.address')) !!}
</tr> </th>
<tr> </tr>
<th> @endif
@if (setting('company.tax_number')) @if (setting('company.tax_number'))
<tr>
<th>
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }} {{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@endif </th>
</th> </tr>
</tr> @endif
<tr> @if (setting('company.phone'))
<th> <tr>
@if (setting('company.phone')) <th>
{{ setting('company.phone') }} {{ setting('company.phone') }}
@endif </th>
</th> </tr>
</tr> @endif
<tr> <tr>
<th> <th>
{{ setting('company.email') }} {{ setting('company.email') }}
@ -244,38 +246,50 @@
@stack('name_input_end') @stack('name_input_end')
</th> </th>
</tr> </tr>
<tr> @if ($invoice->contact_address || $__env->hasStack('address_input_start', 'address_input_end'))
<th> <tr>
@stack('address_input_start') <th>
{!! nl2br($bill->contact_address) !!} @stack('address_input_start')
@stack('address_input_end') @if ($bill->contact_address)
</th> {!! nl2br($bill->contact_address) !!}
</tr> @endif
<tr> @stack('address_input_end')
<th> </th>
@stack('tax_number_input_start') </tr>
@if ($bill->contact_tax_number) @endif
{{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }} @if ($invoice->contact_tax_number || $__env->hasStack('tax_number_input_start', 'tax_number_input_end'))
@endif <tr>
@stack('tax_number_input_end') <th>
</th> @stack('tax_number_input_start')
</tr> @if ($bill->contact_tax_number)
<tr> {{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }}
<th> @endif
@stack('phone_input_start') @stack('tax_number_input_end')
@if ($bill->contact_phone) </th>
{{ $bill->contact_phone }} </tr>
@endif @endif
@stack('phone_input_end') @if ($invoice->contact_phone || $__env->hasStack('phone_input_start', 'phone_input_end'))
</th> <tr>
</tr> <th>
<tr> @stack('phone_input_start')
<th> @if ($bill->contact_phone)
@stack('email_start') {{ $bill->contact_phone }}
{{ $bill->contact_email }} @endif
@stack('email_input_end') @stack('phone_input_end')
</th> </th>
</tr> </tr>
@endif
@if ($invoice->contact_email || $__env->hasStack('email_start', 'email_input_end'))
<tr>
<th>
@stack('email_start')
@if ($bill->contact_email)
{{ $bill->contact_email }}
@endif
@stack('email_input_end')
</th>
</tr>
@endif
</tbody> </tbody>
</table> </table>
</div> </div>
@ -370,7 +384,7 @@
<tr> <tr>
<th> <th>
<p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p> <p class="form-control-label">{{ trans_choice('general.notes', 2) }}</p>
<p class="text-muted long-texts">{{ $bill->notes }}</p> <p class="text-muted long-texts">{!! nl2br($bill->notes) !!}</p>
</th> </th>
</tr> </tr>
@endif @endif
@ -431,9 +445,9 @@
<div class="col-xs-12 col-sm-8 text-right"> <div class="col-xs-12 col-sm-8 text-right">
@stack('button_edit_start') @stack('button_edit_start')
@if(!$bill->reconciled) @if(!$bill->reconciled)
<a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top"> <a href="{{ route('bills.edit', $bill->id) }}" class="btn btn-info header-button-top">
<i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }} <i class="fas fa-edit"></i>&nbsp; {{ trans('general.edit') }}
</a> </a>
@endif @endif
@stack('button_edit_end') @stack('button_edit_end')
@ -449,13 +463,13 @@
<div class="dropdown-menu" role="menu"> <div class="dropdown-menu" role="menu">
@stack('button_dropdown_start') @stack('button_dropdown_start')
@if ($bill->status != 'cancelled') @if ($bill->status != 'cancelled')
@if($bill->status != 'paid') @if ($bill->status != 'paid')
@stack('button_pay_start') @stack('button_pay_start')
@permission('update-purchases-bills') @permission('update-purchases-bills')
<a class="dropdown-item" href="{{ route('bills.paid', $bill->id) }}">{{ trans('bills.mark_paid') }}</a> <a class="dropdown-item" href="{{ route('bills.paid', $bill->id) }}">{{ trans('bills.mark_paid') }}</a>
@endpermission @endpermission
@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 @endif
@stack('button_pay_end') @stack('button_pay_end')