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

Merge pull request #1187 from batuhawk/master

Browse Source 
Bill print updated
This commit is contained in:
Batuhan Baş 2020-01-25 12:00:22 +03:00 committed by GitHub
commit b92d0aa9cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 182 additions and 255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
resources/views/purchases/bills/print.blade.php
View File

@ -3,185 +3,135 @@
@section('title', trans_choice('general.bills', 1) . ': ' . $bill->bill_number)
@section('content')
<div class="mt-6">
<div class="row">
<div class="col-md-7">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<tr>
<th>
<div class="row border-bottom-1">
<div class="col-58">
<div class="text company">
@if (!empty($bill->contact->logo) && !empty($bill->contact->logo->id))
<img src="{{ Storage::url($bill->contact->logo->id) }}" height="128" width="128" alt="{{ $bill->contact_name }}"/>
<img class="d-logo" src="{{ Storage::url($bill->contact->logo->id) }}" alt="{{ $bill->contact_name }}"/>
@else
<img src="{{ $logo }}" alt="{{ $bill->contact_name }}"/>
<img class="d-logo" src="{{ $logo }}" alt="{{ $bill->contact_name }}"/>
@endif
</th>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-md-5">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<tr>
<th>
{{ setting('company.name') }}
</th>
</tr>
<tr>
<th>
{!! nl2br(setting('company.address')) !!}
</th>
</tr>
<tr>
<th>
<div class="col-42">
<div class="text company">
<strong>{{ setting('company.name') }}</strong><br>
<p>{!! nl2br(setting('company.address')) !!}</p>
<p>
@if (setting('company.tax_number'))
{{ trans('general.tax_number') }}: {{ setting('company.tax_number') }}
@endif
</th>
</tr>
<tr>
<th>
</p>
<p>
@if (setting('company.phone'))
{{ setting('company.phone') }}
@endif
</th>
</tr>
<tr>
<th>
{{ setting('company.email') }}
</th>
</tr>
</tbody>
</table>
</div>
</div>
</div>
</p>
<div class="dropdown-divider"></div>
<p>{{ setting('company.email') }}</p>
</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<tr>
<th>
{{ trans('bills.bill_from') }}
<div class="col-58">
<div class="text company">
<br>
<strong>{{ trans('bills.bill_from') }}</strong><br>
@stack('name_input_start')
<strong class="d-block">{{ $bill->contact_name }}</strong><br>
@stack('name_input_end')
</th>
</tr>
<tr>
<th>
@stack('address_input_start')
{!! nl2br($bill->contact_address) !!}
<p>{!! nl2br($bill->contact_address) !!}</p>
@stack('address_input_end')
</th>
</tr>
<tr>
<th>
@stack('tax_number_input_start')
<p>
@if ($bill->contact_tax_number)
{{ trans('general.tax_number') }}: {{ $bill->contact_tax_number }}
@endif
</p>
@stack('tax_number_input_end')
</th>
</tr>
<tr>
<th>
@stack('phone_input_start')
<p>
@if ($bill->contact_phone)
{{ $bill->contact_phone }}
@endif
</p>
@stack('phone_input_end')
</th>
</tr>
<tr>
<th>
@stack('email_start')
<p>
{{ $bill->contact_email }}
</p>
@stack('email_input_end')
</th>
</tr>
</tbody>
</table>
</div>
</div>
<div class="col-md-5">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<div class="col-42">
<div class="text company">
<br>
@stack('bill_number_input_start')
<tr>
<th>{{ trans('bills.bill_number') }}:</th>
<td class="text-right">{{ $bill->bill_number }}</td>
</tr>
<strong>{{ trans('bills.bill_number') }}:</strong>
<span class="float-right">{{ $bill->bill_number }}</span><br><br>
@stack('bill_number_input_end')
@stack('order_number_input_start')
@if ($bill->order_number)
<tr>
<th>{{ trans('bills.order_number') }}:</th>
<td class="text-right">{{ $bill->order_number }}</td>
</tr>
<strong>{{ trans('bills.order_number') }}:</strong>
<span class="float-right">{{ $bill->order_number }}</span><br><br>
@endif
@stack('order_number_input_end')
@stack('billed_at_input_start')
<tr>
<th>{{ trans('bills.bill_date') }}:</th>
<td class="text-right">@date($bill->billed_at)</td>
</tr>
<strong>{{ trans('bills.bill_date') }}:</strong>
<span class="float-right">@date($bill->billed_at)</span><br><br>
@stack('billed_at_input_end')
@stack('due_at_input_start')
<tr>
<th>{{ trans('bills.payment_due') }}:</th>
<td class="text-right">@date($bill->due_at)</td>
</tr>
<strong>{{ trans('bills.payment_due') }}:</strong>
<span class="float-right">@date($bill->due_at)</span><br><br>
@stack('due_at_input_end')
</tbody>
</table>
</div>
</div>
</div>
<table class="table table-striped">
<thead>
<div class="row">
<div class="col-100">
<div class="text">
<table class="lines">
@foreach($bill as $item)
<thead style="background-color:{{ setting('invoice.color') }} !important; -webkit-print-color-adjust: exact;">
@endforeach
<tr>
@stack('actions_th_start')
@stack('actions_th_end')
@stack('name_th_start')
<th>{{ trans_choice('general.items', 1) }}</th>
<th class="item text-left text-white">{{ trans_choice('general.items', 1) }}</th>
@stack('name_th_end')
@stack('quantity_th_start')
<th class="text-center">{{ trans('bills.quantity') }}</th>
<th class="quantity text-white">{{ trans('bills.quantity') }}</th>
@stack('quantity_th_end')
@stack('price_th_start')
<th class="text-center pr-5">{{ trans('bills.price') }}</th>
<th class="price text-white">{{ trans('bills.price') }}</th>
@stack('price_th_end')
@stack('taxes_th_start')
@stack('taxes_th_end')
@stack('total_th_start')
<th class="text-right">{{ trans('bills.total') }}</th>
<th class="total text-white">{{ trans('bills.total') }}</th>
@stack('total_th_end')
</tr>
</thead>
<tbody>
@foreach($bill->items as $bill_item)
<tr>
@stack('name_td_start')
<td>
<td class="item">
{{ $bill_item->name }}
@if (!empty($bill_item->item->description))
<br><small>{!! \Illuminate\Support\Str::limit($bill_item->item->description, 500) !!}<small>
@ -190,86 +140,63 @@
@stack('name_td_end')
@stack('quantity_td_start')
<td class="text-center">{{ $bill_item->quantity }}</td>
<td class="quantity">{{ $bill_item->quantity }}</td>
@stack('quantity_td_end')
@stack('price_td_start')
<td class="text-center pr-5">@money($bill_item->price, $bill->currency_code, true)</td>
<td class="price">@money($bill_item->price, $bill->currency_code, true)</td>
@stack('price_td_end')
@stack('total_td_start')
<td class="text-right">@money($bill_item->total, $bill->currency_code, true)</td>
<td class="total">@money($bill_item->total, $bill->currency_code, true)</td>
@stack('total_td_end')
</tr>
@endforeach
</tbody>
</table>
</div>
</div>
</div>
<div class="row">
<div class="col-md-7">
<div class="table-responsive">
<div class="row mt-9">
<div class="col-58">
<div class="text company">
@stack('notes_input_start')
@if ($bill->notes)
<table class="table table-borderless">
<tbody>
<tr>
<th>
{{ trans_choice('general.notes', 2) }}
</th>
</tr>
<tr>
<th>
<br>
<strong>{{ trans_choice('general.notes', 2) }}</strong><br><br>
{{ $bill->notes }}
</th>
</tr>
</tbody>
</table>
@endif
@stack('notes_input_end')
</div>
</div>
<div class="col-md-5">
<div class="table-responsive">
<table class="table table-borderless">
<tbody>
<div class="col-42">
<div class="text company pr-2">
@foreach ($bill->totals as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<tr>
<th>
{{ trans($total->title) }}:
</th>
<td class="text-right">
@money($total->amount, $bill->currency_code, true)
</td>
</tr>
<div class="border-top-1 py-2">
<strong>{{ trans($total->title) }}:</strong>
<span class="float-right">@money($total->amount, $bill->currency_code, true)</span><br><br>
</div>
@stack($total->code . '_td_end')
@else
@if ($bill->paid)
<tr class="text-success">
<th>
{{ trans('invoices.paid') }}:
</th>
<td class="text-right">
- @money($bill->paid, $bill->currency_code, true)
</td>
</tr>
<div class="border-top-1 py-2">
<strong>{{ trans('invoices.paid') }}:</strong>
<span class="float-right">- @money($bill->paid, $bill->currency_code, true)
</span><br><br>
</div>
@endif
@stack('grand_total_td_start')
<tr>
<th>
{{ trans($total->name) }}:
</th>
<td class="text-right">
@money($total->amount - $bill->paid, $bill->currency_code, true)
</td>
</tr>
<div class="border-top-1 py-2">
<strong>{{ trans($total->name) }}:</strong>
<span class="float-right">@money($total->amount - $bill->paid, $bill->currency_code, true)</span>
</div>
@stack('grand_total_td_end')
@endif
@endforeach
</tbody>
</table>
</div>
</div>
</div>
</div>

2
resources/views/sales/invoices/print_default.blade.php
View File

@ -182,7 +182,7 @@
@stack($total->code . '_td_start')
<div class="border-top-1 py-2">
<strong>{{ trans($total->title) }}:</strong>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</s><br><br>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</span><br><br>
</div>
@stack($total->code . '_td_end')
@else