deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update to Laravel 6

Browse Source
This commit is contained in:
Deon George
2020-01-11 13:36:11 +11:00
parent 8224fba840
commit c941fcb148
19 changed files with 1867 additions and 2161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
resources/theme/backend/adminlte/u/invoice.blade.php
View File

@@ -32,6 +32,7 @@
<address>
<strong>{{ $so->site_name }}</strong><br>
{!! $so->address('html') !!}<br>
<br>
<strong>Email:</strong> {{ $so->site_email }}<br>
<strong>Phone:</strong> {{ $so->site_phone }}
</address>
@@ -42,11 +43,11 @@
<address>
<strong>{{ $o->account->company }}</strong><br>
{!! $o->account->address('html') !!}<br>
<br>
<strong>Email:</strong> {{ $o->account->email }}<br>
@if ($o->account->phone)
<strong>Phone:</strong> {{ $o->account->phone }}<br>
@endif
<strong>Account:</strong> {{ $o->account->account_id }}
</address>
</div>
{{-- col-sm-offset-2 not working here --}}
@@ -54,15 +55,17 @@
<div class="col-md-3 invoice-col">
<table class="table table-borderless text-right" style="font-size: 1.1rem;">
<tr >
<td class="p-0">Account:</td><td class="p-0"><strong>{{ $o->account->account_id }}</strong></td>
</tr>
<tr >
<td class="p-0">Invoice:</td><td class="p-0"><strong>{{ $o->invoice_id }}</strong></td>
</tr>
<tr>
<td class="p-0">Payment Due:</td><td class="p-0"><strong>{{ $o->due_date->format('Y-m-d') }}</strong></td>
</tr>
<tr>
<td class="p-0">Total:</td><td class="p-0"><strong>${{ number_format($o->total,$o->currency()->rounding) }}</strong></td>
<td class="p-0">Total Due:</td><td class="p-0"><strong>${{ number_format($o->total,$o->currency()->rounding) }}</strong></td>
</tr>
</table>
</div>
@@ -72,7 +75,7 @@
<!-- Table row -->
<div class="row">
<div class="col-12 table-responsive">
<table id="restripe" class="table table-borderless table-striped" width="100%">
<table id="restripe" class="table" width="100%">
<thead>
<tr>
<th>Qty</th>
@@ -134,7 +137,7 @@
<!-- /.col -->
<div class="offset-2 col-4 table-responsive">
<table class="table table-borderless">
<table class="table">
<tr>
<th colspan="2" style="width:50%">Subtotal:</th>
<td class="text-right">${{ number_format($o->sub_total,$o->currency()->rounding) }}</td>
@@ -160,9 +163,15 @@
<td class="text-right">${{ number_format($o->paid,$o->currency()->rounding) }}</td>
</tr>
<tr>
<th colspan="2">Account Due:</th>
<th colspan="2">Invoice Total Due:</th>
<td class="text-right">${{ number_format($o->due,$o->currency()->rounding) }}</td>
</tr>
{{--
<tr>
<th colspan="2">Account Due:</th>
<td class="text-right">${{ number_format($o->account->due,$o->currency()->rounding) }}</td>
</tr>
--}}
@endif
</table>
</div>
@@ -173,7 +182,7 @@
<!-- this row will not appear when printing -->
<div class="row d-print-none">
<div class="col-12">
<a href="javascript:window.print();" target="_blank" class="btn btn-default"><i class="fa fa-print"></i> Print</a>
<a href="javascript:window.print();" class="btn btn-default"><i class="fa fa-print"></i> Print</a>
@if($o->id)
<button type="button" class="btn btn-success pull-right"><i class="fa fa-credit-card"></i> Submit Payment</button>
<a href="{{ url(sprintf('u/invoice/%s/pdf',$o->id)) }}" class="btn btn-primary pull-right" style="margin-right: 5px;">