Merge pull request #1188 from batuhawk/master

New page alignment updated
This commit is contained in:
Batuhan Baş 2020-01-27 10:49:10 +03:00 committed by GitHub
commit a0b0736f68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 22 deletions

View File

@ -187,27 +187,27 @@
</div>
</div>
<div class="col-42">
<div class="col-42 float-right text-right">
<div class="text company pr-2">
@foreach ($invoice->totals as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<div class="border-top-dashed py-2">
<strong>{{ trans($total->title) }}:</strong>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</span>
<strong class="float-left">{{ trans($total->title) }}:</strong>
<span>@money($total->amount, $invoice->currency_code, true)</span>
</div>
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<div class="border-top-dashed py-2">
<strong>{{ trans('invoices.paid') }}:</strong>
<span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span>
<strong class="float-left">{{ trans('invoices.paid') }}:</strong>
<span>- @money($invoice->paid, $invoice->currency_code, true)</span>
</div>
@endif
@stack('grand_total_td_start')
<div class="border-top-dashed py-2">
<strong>{{ trans($total->name) }}:</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
<strong class="float-left">{{ trans($total->name) }}:</strong>
<span>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
</div>
@stack('grand_total_td_end')
@endif

View File

@ -175,27 +175,27 @@
</div>
</div>
<div class="col-42">
<div class="text company pr-2">
<div class="col-42 float-right text-right">
<div class="text company">
@foreach ($invoice->totals as $total)
@if ($total->code != 'total')
@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)</span><br><br>
<strong class="float-left">{{ trans($total->title) }}:</strong>
<span>@money($total->amount, $invoice->currency_code, true)</span><br><br>
</div>
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<div class="border-top-1 py-2">
<strong>{{ trans('invoices.paid') }}:</strong>
<span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
<strong class="float-left">{{ trans('invoices.paid') }}:</strong>
<span>- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
</div>
@endif
@stack('grand_total_td_start')
<div class="border-top-1 py-2">
<strong>{{ trans($total->name) }}:</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
<strong class="float-left">{{ trans($total->name) }}:</strong>
<span>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
</div>
@stack('grand_total_td_end')
@endif

View File

@ -157,22 +157,22 @@
</div>
</div>
<div class="col-42">
<div class="col-42 float-right text-right">
<div class="text company pr-2">
@foreach ($invoice->totals as $total)
@if ($total->code != 'total')
@stack($total->code . '_td_start')
<strong>{{ trans($total->title) }}:</strong>
<span class="float-right">@money($total->amount, $invoice->currency_code, true)</span><br><br>
<strong class="float-left">{{ trans($total->title) }}:</strong>
<span>@money($total->amount, $invoice->currency_code, true)</span><br><br>
@stack($total->code . '_td_end')
@else
@if ($invoice->paid)
<strong>{{ trans('invoices.paid') }}:</strong>
<span class="float-right">- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
<strong class="float-left">{{ trans('invoices.paid') }}:</strong>
<span>- @money($invoice->paid, $invoice->currency_code, true)</span><br><br>
@endif
@stack('grand_total_td_start')
<strong>{{ trans($total->name) }}:</strong>
<span class="float-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
<strong class="float-left">{{ trans($total->name) }}:</strong>
<span>@money($total->amount - $invoice->paid, $invoice->currency_code, true)</span>
@stack('grand_total_td_end')
@endif
@endforeach