diff --git a/app/Http/Controllers/BankTransactionController.php b/app/Http/Controllers/BankTransactionController.php index 3f63ce04e0e3..13fb7be803dd 100644 --- a/app/Http/Controllers/BankTransactionController.php +++ b/app/Http/Controllers/BankTransactionController.php @@ -12,6 +12,7 @@ namespace App\Http\Controllers; use App\Factory\BankTransactionFactory; +use App\Filters\BankTransactionFilters; use App\Helpers\Bank\Yodlee\Yodlee; use App\Http\Requests\BankTransaction\AdminBankTransactionRequest; use App\Http\Requests\BankTransaction\CreateBankTransactionRequest; @@ -92,13 +93,13 @@ class BankTransactionController extends BaseController * @OA\JsonContent(ref="#/components/schemas/Error"), * ), * ) - * @param Request $request + * @param BankTransactionFilters $filter * @return Response|mixed */ - public function index(Request $request) + public function index(BankTransactionFilters $filters) { - $bank_transactions = BankTransaction::query()->company(); + $bank_transactions = BankTransaction::filter($filters); return $this->listResponse($bank_transactions); diff --git a/app/Models/BankTransaction.php b/app/Models/BankTransaction.php index ece2263542df..45ff86ecd2f8 100644 --- a/app/Models/BankTransaction.php +++ b/app/Models/BankTransaction.php @@ -11,6 +11,7 @@ namespace App\Models; +use App\Models\Filterable; use App\Models\Invoice; use App\Utils\Traits\MakesHash; use Illuminate\Database\Eloquent\SoftDeletes; @@ -19,7 +20,8 @@ class BankTransaction extends BaseModel { use SoftDeletes; use MakesHash; - + use Filterable; + const STATUS_UNMATCHED = 1; const STATUS_MATCHED = 2;