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

Show outstanding in customer/vendor list #89

Browse Source
This commit is contained in:
Batuhan Baş 2018-10-10 18:04:10 +03:00
parent 45c14ca9e2
commit 56d64b35a1
5 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,10 +71,16 @@ class Vendor extends Model
return $this->getMedia('logo')->last(); return $this->getMedia('logo')->last();
} }
public function getAmountAttribute() public function getUnpaidAttribute()
{ {
$invoice_total = $this->bills()->notPaid()->sum('amount'); $amount = 0;
$bills = $this->bills()->accrued()->notPaid()->get();
return $invoice_total; foreach ($bills as $bill) {
$bill_amount = $bill->amount - $bill->paid;
$amount += $this->dynamicConvert(setting('general.default_currency'), $bill_amount, $bill->currency_code, $bill->currency_rate, false);
}
return $amount;
} }
} }

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

@ -65,10 +65,16 @@ class Customer extends Model
$this->user_id = null; $this->user_id = null;
} }
public function getAmountAttribute() public function getUnpaidAttribute()
{ {
$invoice_total = $this->invoices()->notPaid()->sum('amount'); $amount = 0;
$invoices = $this->invoices()->accrued()->notPaid()->get();
return $invoice_total; foreach ($invoices as $invoice) {
$invoice_amount = $invoice->amount - $invoice->paid;
$amount += $this->dynamicConvert(setting('general.default_currency'), $invoice_amount, $invoice->currency_code, $invoice->currency_rate, false);
}
return $amount;
} }
} }

1
resources/lang/en-GB/general.php
View File

@ -106,6 +106,7 @@ return [
'disable' => 'Disable', 'disable' => 'Disable',
'select_all' => 'Select All', 'select_all' => 'Select All',
'unselect_all' => 'Unselect All', 'unselect_all' => 'Unselect All',
'outstanding' => 'Outstanding',
'title' => [ 'title' => [
'new' => 'New :type', 'new' => 'New :type',
'edit' => 'Edit :type', 'edit' => 'Edit :type',

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

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

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

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