diff --git a/app/Entities/Payments/Payment.php b/app/Entities/Payments/Payment.php
index 00d6c8f..e654abe 100755
--- a/app/Entities/Payments/Payment.php
+++ b/app/Entities/Payments/Payment.php
@@ -26,6 +26,12 @@ class Payment extends Model
public function type()
{
- return Type::getNameById($this->type_id);
+ $type = Type::getNameById($this->type_id);
+
+ if ($this->in_out == 0 && $this->partner_type == 'App\Entities\Users\User') {
+ $type .= ' Fee';
+ }
+
+ return $type;
}
}
diff --git a/resources/views/payments/index.blade.php b/resources/views/payments/index.blade.php
index 16e63f9..6638c29 100755
--- a/resources/views/payments/index.blade.php
+++ b/resources/views/payments/index.blade.php
@@ -10,7 +10,7 @@
{!! str_replace('/?', '?', $payments->appends(Request::except('page'))->render()) !!}
{{ Form::open(['method'=>'get','class'=>'form-inline']) }}
- {{ Form::text('q', Request::get('q'), ['class'=>'form-control index-search-field','placeholder' => trans('payment.search')]) }}
+ {{ Form::text('q', request('q'), ['class'=>'form-control index-search-field','placeholder' => trans('payment.search')]) }}
{{ Form::select('partner_id', ['' => '-- '.trans('payment.customer').' --'] + $partnersList, request('partner_id'), ['class' => 'form-control', 'id' => 'partner_id']) }}
{{ Form::submit(trans('app.search'), ['class' => 'btn btn-info btn-sm']) }}
{{ link_to_route('payments.index','Reset',[],['class' => 'btn btn-default btn-sm']) }}
@@ -30,7 +30,15 @@
@forelse($payments as $key => $payment)
| {{ $payments->firstItem() + $key }} |
- {!! link_to_route('projects.payments', $payment->project->name, [$payment->project_id], ['title' => 'Lihat seluruh Pembayaran Project ini']) !!} [{{ $payment->type() }}] |
+
+ {{ link_to_route(
+ 'projects.payments',
+ $payment->project->name,
+ [$payment->project_id],
+ ['title' => 'Lihat seluruh Pembayaran Project ini']
+ ) }}
+ {{ $payment->type() }}
+ |
{{ $payment->date }} |
{{ $payment->present()->amount }} |
{{ $payment->description }} |