From e1658b981ca18aef37f1ba3a21fcb15ba027674d Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Sun, 28 Oct 2018 20:28:05 +0800 Subject: [PATCH] Refactor fee payment edit action --- app/Http/Controllers/PaymentsController.php | 7 ++++++- resources/lang/id/payment.php | 2 +- resources/views/payments/edit.blade.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 38eeb4d..4d92ad5 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -95,7 +95,12 @@ class PaymentsController extends Controller public function edit(Payment $payment) { $projects = $this->repo->getProjectsList(); - $partners = $this->repo->getCustomersAndVendorsList(); + + if ($payment->partner_type == 'App\Entities\Users\User') { + $partners = $this->repo->getWorkersList(); + } else { + $partners = $this->repo->getCustomersAndVendorsList(); + } return view('payments.edit', compact('payment', 'projects', 'partners')); } diff --git a/resources/lang/id/payment.php b/resources/lang/id/payment.php index e25c54c..534d704 100644 --- a/resources/lang/id/payment.php +++ b/resources/lang/id/payment.php @@ -8,7 +8,7 @@ return [ 'found' => 'Pembayaran ditemukan', 'not_found' => 'Pembayaran tidak ditemukan', 'empty' => 'Belum ada Pembayaran', - 'back_to_index' => 'Kembali ke daftar Pembayaran', + 'back_to_index' => 'Kembali ke list Pembayaran', 'receipt' => 'Bukti Pembayaran', 'from' => 'Terima dari', 'cash_amount' => 'Uang Sejumlah', diff --git a/resources/views/payments/edit.blade.php b/resources/views/payments/edit.blade.php index 53155b0..a8d923d 100755 --- a/resources/views/payments/edit.blade.php +++ b/resources/views/payments/edit.blade.php @@ -34,7 +34,7 @@
@if ($payment->partner_type == 'App\Entities\Users\User') - {!! FormField::select('partner_id', App\Entities\Users\User::pluck('name', 'id'), ['label'=> __('payment.partner')]) !!} + {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!} {{ Form::hidden('partner_type', 'users') }} @else {!! FormField::select('partner_id', $partners, ['label'=> __('payment.customer')]) !!}