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

Merge pull request #538 from batuhawk/1.3-dev

Browse Source 
Adding not paid amount column for customers and vendors
This commit is contained in:
Cüneyt Şentürk 2018-10-10 10:05:52 +03:00 committed by GitHub
commit 5030c62a6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Expense/Vendor.php
View File

@ -70,4 +70,11 @@ class Vendor extends Model
return $this->getMedia('logo')->last();
}
public function getAmountAttribute()
{
$invoice_total = $this->bills()->notPaid()->sum('amount');
return $invoice_total;
}
}

7
app/Models/Income/Customer.php
View File

@ -64,4 +64,11 @@ class Customer extends Model
{
$this->user_id = null;
}
public function getAmountAttribute()
{
$invoice_total = $this->invoices()->notPaid()->sum('amount');
return $invoice_total;
}
}

4
resources/views/expenses/vendors/index.blade.php vendored
View File

@ -33,9 +33,10 @@
<table class="table table-striped table-hover" id="tbl-vendors">
<thead>
<tr>
<th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-4">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('email', trans('general.email'))</th>
<th class="col-md-2">@sortablelink('phone', trans('general.phone'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('amount', trans('general.amount'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr>
@ -46,6 +47,7 @@
<td><a href="{{ url('expenses/vendors/' . $item->id) }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ !empty($item->email) ? $item->email : trans('general.na') }}</td>
<td>{{ $item->phone }}</td>
<td>@money($item->amount, setting('general.default_currency'), true)</td>
<td class="hidden-xs">
@if ($item->enabled)
<span class="label label-success">{{ trans('general.enabled') }}</span>

4
resources/views/incomes/customers/index.blade.php
View File

@ -33,9 +33,10 @@
<table class="table table-striped table-hover" id="tbl-customers">
<thead>
<tr>
<th class="col-md-5">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-4">@sortablelink('name', trans('general.name'))</th>
<th class="col-md-3 hidden-xs">@sortablelink('email', trans('general.email'))</th>
<th class="col-md-2">@sortablelink('phone', trans('general.phone'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('amounts', trans('general.amount'))</th>
<th class="col-md-1 hidden-xs">@sortablelink('enabled', trans_choice('general.statuses', 1))</th>
<th class="col-md-1 text-center">{{ trans('general.actions') }}</th>
</tr>
@ -46,6 +47,7 @@
<td><a href="{{ url('incomes/customers/' . $item->id) }}">{{ $item->name }}</a></td>
<td class="hidden-xs">{{ !empty($item->email) ? $item->email : trans('general.na') }}</td>
<td>{{ $item->phone }}</td>
<td>@money($item->amount, setting('general.default_currency'), true)</td>
<td class="hidden-xs">
@if ($item->enabled)
<span class="label label-success">{{ trans('general.enabled') }}</span>