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

new list design

Browse Source
This commit is contained in:
denisdulici
2017-10-13 18:41:17 +03:00
parent 705b704685
commit a936c54daa
21 changed files with 376 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/expenses/bills/bill.blade.php
View File

@@ -112,13 +112,12 @@
</div>
<div class="col-xs-5">
<div class="table-responsive">
<table class="table">
<table class="table">
<tbody>
@foreach($invoice->totals as $total)
@foreach($bill->totals as $total)
<tr>
<th>{{ trans($total['name']) }}:</th>
<td class="text-right">@money($total->amount, $invoice->currency_code, true)</td>
<td class="text-right">@money($total->amount, $bill->currency_code, true)</td>
</tr>
@endforeach
</tbody>

50
resources/views/expenses/bills/index.blade.php
View File

@@ -11,17 +11,17 @@
@section('content')
<!-- Default box -->
<div class="box box-success">
<div class="box-header">
<div class="box-header with-border">
{!! Form::open(['url' => 'expenses/bills', 'role' => 'form', 'method' => 'GET']) !!}
<div class="pull-left">
<span class="title-filter">{{ trans('general.search') }}:</span>
<span class="title-filter hidden-xs">{{ trans('general.search') }}:</span>
{!! Form::text('search', request('search'), ['class' => 'form-control input-filter input-sm', 'placeholder' => trans('general.search_placeholder')]) !!}
{!! Form::select('vendor', $vendors, request('vendor'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::select('status', $status, request('status'), ['class' => 'form-control input-filter input-sm']) !!}
{!! Form::button('<span class="fa fa-filter"></span> &nbsp;' . trans('general.filter'), ['type' => 'submit', 'class' => 'btn btn-sm btn-default btn-filter']) !!}
</div>
<div class="pull-right">
<span class="title-filter">{{ trans('general.show') }}:</span>
<span class="title-filter hidden-xs">{{ trans('general.show') }}:</span>
{!! Form::select('limit', $limits, request('limit', setting('general.list_limit', '25')), ['class' => 'form-control input-filter input-sm', 'onchange' => 'this.form.submit()']) !!}
</div>
{!! Form::close() !!}
@@ -30,33 +30,53 @@
<div class="box-body">
<div class="table table-responsive">
<table class="table table-bordered table-striped table-hover" id="tbl-bills">
<table class="table table-striped table-hover" id="tbl-bills">
<thead>
<tr>
<th class="col-md-1">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-2">@sortablelink('bill_number', trans_choice('general.numbers', 1))</th>
<th class="col-md-3">@sortablelink('vendor_name', trans_choice('general.vendors', 1))</th>
<th class="col-md-1">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-2">@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th class="col-md-2">@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-1">@sortablelink('status.name', trans_choice('general.statuses', 1))</th>
<th>@sortablelink('billed_at', trans('bills.bill_date'))</th>
<th>@sortablelink('due_at', trans('bills.due_date'))</th>
<th class="col-md-3">{{ trans('general.actions') }}</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr>
</thead>
<tbody>
@foreach($bills as $item)
@php
switch ($item->status->code) {
case 'paid':
$label = 'label-success';
break;
case 'partial':
$label = 'label-warning';
break;
default:
$label = 'bg-aqua';
break;
}
@endphp
<tr>
<td><a href="{{ url('expenses/bills/' . $item->id . ' ') }}">{{ $item->bill_number }}</a></td>
<td>{{ $item->vendor_name }}</td>
<td>@money($item->amount, $item->currency_code, true)</td>
<td>{{ $item->status->name }}</td>
<td>{{ Date::parse($item->billed_at)->format($date_format) }}</td>
<td>{{ Date::parse($item->due_at)->format($date_format) }}</td>
<td>
<a href="{{ url('expenses/bills/' . $item->id) }}" class="btn btn-info btn-xs"><i class="fa fa-eye" aria-hidden="true"></i> {{ trans('general.show') }}</a>
<a href="{{ url('expenses/bills/' . $item->id . '/edit') }}" class="btn btn-primary btn-xs"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> {{ trans('general.edit') }}</a>
@permission('delete-expenses-bills')
{!! Form::deleteButton($item, 'expenses/bills') !!}
@endpermission
<td><span class="label {{ $label }}">{{ $item->status->name }}</span></td>
<td class="text-center">
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" data-toggle-position="left" aria-expanded="false">
<i class="fa fa-ellipsis-h"></i>
</button>
<ul class="dropdown-menu dropdown-menu-right">
<li><a href="{{ url('expenses/bills/' . $item->id) }}">{{ trans('general.show') }}</a></li>
<li><a href="{{ url('expenses/bills/' . $item->id . '/edit') }}">{{ trans('general.edit') }}</a></li>
@permission('delete-expenses-bills')
<li>{!! Form::deleteLink($item, 'expenses/bills') !!}</li>
@endpermission
</ul>
</div>
</td>
</tr>
@endforeach

12
resources/views/expenses/bills/show.blade.php
View File

@@ -117,22 +117,22 @@
<div class="table-responsive">
<table class="table">
<tbody>
@foreach($invoice->totals as $total)
@if($total->code != 'total')
@foreach($bill->totals as $total)
@if ($total->code != 'total')
<tr>
<th>{{ trans($total['name']) }}:</th>
<td class="text-right">@money($total->amount, $invoice->currency_code, true)</td>
<td class="text-right">@money($total->amount, $bill->currency_code, true)</td>
</tr>
@else
@if ($invoice->paid)
@if ($bill->paid)
<tr class="text-success">
<th>{{ trans('invoices.paid') }}:</th>
<td class="text-right">@money('-' . $invoice->paid, $invoice->currency_code, true)</td>
<td class="text-right">@money('-' . $bill->paid, $bill->currency_code, true)</td>
</tr>
@endif
<tr>
<th>{{ trans($total['name']) }}:</th>
<td class="text-right">@money($total->amount - $invoice->paid, $invoice->currency_code, true)</td>
<td class="text-right">@money($total->amount - $bill->paid, $bill->currency_code, true)</td>
</tr>
@endif
@endforeach