diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php index 2b861fe..2c0a317 100755 --- a/app/Entities/BaseRepository.php +++ b/app/Entities/BaseRepository.php @@ -22,7 +22,9 @@ abstract class BaseRepository extends EloquentRepository */ public function getCustomersList() { - return Customer::orderBy('name')->pluck('name', 'id'); + return Customer::where('is_active', 1) + ->orderBy('name') + ->pluck('name', 'id'); } /** @@ -57,7 +59,9 @@ abstract class BaseRepository extends EloquentRepository */ public function getVendorsList() { - return Vendor::orderBy('name')->pluck('name', 'id'); + return Vendor::where('is_active', 1) + ->orderBy('name') + ->pluck('name', 'id'); } /** diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 4d92ad5..873680e 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -98,8 +98,10 @@ class PaymentsController extends Controller if ($payment->partner_type == 'App\Entities\Users\User') { $partners = $this->repo->getWorkersList(); + } elseif ($payment->partner_type == 'App\Entities\Partners\Customer') { + $partners = ['Customer' => $this->repo->getCustomersList()]; } else { - $partners = $this->repo->getCustomersAndVendorsList(); + $partners = ['Vendor' => $this->repo->getVendorsList()]; } return view('payments.edit', compact('payment', 'projects', 'partners'));