diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php index bc37764..860569c 100755 --- a/app/Entities/BaseRepository.php +++ b/app/Entities/BaseRepository.php @@ -4,7 +4,6 @@ namespace App\Entities; use App\Entities\Users\User; use App\Entities\Projects\Job; -use App\Entities\Partners\Vendor; use App\Entities\Projects\Project; use App\Entities\Partners\Customer; @@ -28,21 +27,6 @@ abstract class BaseRepository extends EloquentRepository } /** - * Get list of customers and vendors. - * - * @return array - */ - public function getCustomersAndVendorsList() - { - $partners = [ - __('customer.customer') => Customer::orderBy('name')->pluck('name', 'id')->all(), - __('vendor.vendor') => Vendor::orderBy('name')->pluck('name', 'id')->all(), - ]; - - return $partners; - } - - /** * Get collection of workers. * * @return \Illuminate\Database\Eloquent\Collection diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index d693ffb..597e461 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -4,6 +4,7 @@ namespace App\Http\Controllers; use App\Entities\Partners\Vendor; use App\Entities\Projects\Project; +use App\Entities\Partners\Customer; use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; @@ -34,4 +35,17 @@ class Controller extends BaseController ->orderBy('name') ->pluck('name', 'id'); } + + /** + * Get list of customers and vendors. + * + * @return array + */ + public function getCustomersAndVendorsList() + { + return [ + __('customer.customer') => Customer::orderBy('name')->pluck('name', 'id')->all(), + __('vendor.vendor') => Vendor::orderBy('name')->pluck('name', 'id')->all(), + ]; + } } diff --git a/app/Http/Controllers/PaymentsController.php b/app/Http/Controllers/PaymentsController.php index 1ad1c4e..6c1bc4a 100755 --- a/app/Http/Controllers/PaymentsController.php +++ b/app/Http/Controllers/PaymentsController.php @@ -55,7 +55,7 @@ class PaymentsController extends Controller public function create() { $projects = $this->getProjectsList(); - $partners = $this->repo->getCustomersAndVendorsList(); + $partners = $this->getCustomersAndVendorsList(); $project = Project::find(request('project_id')); return view('payments.create', compact('projects', 'partners', 'project'));