diff --git a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php index 165cb66..a5565f7 100644 --- a/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php +++ b/app/Filament/Clusters/Cards/CardOrders/Tables/CardOrdersTable.php @@ -4,6 +4,7 @@ namespace App\Filament\Clusters\Cards\CardOrders\Tables; use App\Modules\CardOrder\Filament\Actions\PayCardOrderAction; use App\Modules\CardOrder\Models\CardOrder; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use App\Modules\OrderStatus\Repositories\OrderStatusRepository; use App\Modules\Region\Repositories\RegionRepository; use Filament\Actions\BulkActionGroup; @@ -15,12 +16,16 @@ use Filament\Tables\Columns\IconColumn; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Filters\TrashedFilter; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class CardOrdersTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('unique_id') ->label(__('ID')) diff --git a/app/Filament/Clusters/Cards/Cards/CardResource.php b/app/Filament/Clusters/Cards/Cards/CardResource.php index 83a96de..ad5bee6 100644 --- a/app/Filament/Clusters/Cards/Cards/CardResource.php +++ b/app/Filament/Clusters/Cards/Cards/CardResource.php @@ -2,8 +2,8 @@ namespace App\Filament\Clusters\Cards\Cards; -use App\Filament\Clusters\Cards\CardsCluster; use App\Filament\Clusters\Cards\Cards\Pages\ManageCards; +use App\Filament\Clusters\Cards\CardsCluster; use App\Modules\AppHelpers\Repositories\DateHelper; use App\Modules\Card\Filament\Actions\CheckCardBalanceAction; use App\Modules\Card\Filament\Actions\DownloadCardRequisteAction; diff --git a/app/Filament/Clusters/Cards/Resources/CardPinOrders/Tables/CardPinOrdersTable.php b/app/Filament/Clusters/Cards/Resources/CardPinOrders/Tables/CardPinOrdersTable.php index 286b3ed..a2c0bd5 100644 --- a/app/Filament/Clusters/Cards/Resources/CardPinOrders/Tables/CardPinOrdersTable.php +++ b/app/Filament/Clusters/Cards/Resources/CardPinOrders/Tables/CardPinOrdersTable.php @@ -2,6 +2,7 @@ namespace App\Filament\Clusters\Cards\Resources\CardPinOrders\Tables; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use App\Modules\OrderStatus\Repositories\OrderStatusRepository; use App\Modules\Region\Repositories\RegionRepository; use Filament\Actions\BulkActionGroup; @@ -9,12 +10,16 @@ use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class CardPinOrdersTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('id') ->label('ID'), diff --git a/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php b/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php index 53fddcc..b84e013 100644 --- a/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php +++ b/app/Filament/Clusters/Loans/LoanOrders/Tables/LoanOrdersTable.php @@ -2,6 +2,7 @@ namespace App\Filament\Clusters\Loans\LoanOrders\Tables; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; @@ -11,12 +12,18 @@ use Filament\Actions\ViewAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Filters\TrashedFilter; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class LoanOrdersTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + $query->where('source', 'web'); + + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Filament/Clusters/Loans/Loans/Tables/LoansTable.php b/app/Filament/Clusters/Loans/Loans/Tables/LoansTable.php index 4fe57a1..694efd8 100644 --- a/app/Filament/Clusters/Loans/Loans/Tables/LoansTable.php +++ b/app/Filament/Clusters/Loans/Loans/Tables/LoansTable.php @@ -2,6 +2,7 @@ namespace App\Filament\Clusters\Loans\Loans\Tables; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use App\Modules\Loan\Filaments\Actions\ShowLoanRemainingAction; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteAction; @@ -9,12 +10,16 @@ use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class LoansTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('account_number') ->label(__('Account number')) diff --git a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php index 3241c73..7cce8eb 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php +++ b/app/Filament/Clusters/Loans/Resources/LoanOrderMobiles/Tables/LoanOrderMobilesTable.php @@ -2,6 +2,7 @@ namespace App\Filament\Clusters\Loans\Resources\LoanOrderMobiles\Tables; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; @@ -10,12 +11,18 @@ use Filament\Actions\RestoreBulkAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Filters\TrashedFilter; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class LoanOrderMobilesTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + $query->where('source', 'mobile'); + + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php index b9171b0..b959b32 100644 --- a/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php +++ b/app/Filament/Clusters/Loans/Resources/LoanPaidOffLetters/Tables/LoanPaidOffLettersTable.php @@ -2,17 +2,22 @@ namespace App\Filament\Clusters\Loans\Resources\LoanPaidOffLetters\Tables; +use App\Modules\DefaultQueryForResourceIndex\Repositories\DefaultQueryForResourceIndexRepository; use Filament\Actions\BulkActionGroup; use Filament\Actions\DeleteBulkAction; use Filament\Actions\EditAction; use Filament\Tables\Columns\TextColumn; use Filament\Tables\Table; +use Illuminate\Database\Eloquent\Builder; class LoanPaidOffLettersTable { public static function configure(Table $table): Table { return $table + ->modifyQueryUsing(function (Builder $query) { + DefaultQueryForResourceIndexRepository::make($query); + }) ->columns([ TextColumn::make('id') ->label('ID') diff --git a/app/Modules/DefaultQueryForResourceIndex/DefaultQueryForResourceIndexModule.php b/app/Modules/DefaultQueryForResourceIndex/DefaultQueryForResourceIndexModule.php index 547da7b..b1eff94 100644 --- a/app/Modules/DefaultQueryForResourceIndex/DefaultQueryForResourceIndexModule.php +++ b/app/Modules/DefaultQueryForResourceIndex/DefaultQueryForResourceIndexModule.php @@ -27,7 +27,7 @@ class DefaultQueryForResourceIndexModule implements ModuleContract */ public function disable(): void { - $this->enabled = false; + $this->enabled = false; } /** @@ -35,7 +35,7 @@ class DefaultQueryForResourceIndexModule implements ModuleContract */ public function enable(): void { - $this->enabled = true; + $this->enabled = true; } /** diff --git a/app/Modules/DefaultQueryForResourceIndex/Repositories/DefaultQueryForResourceIndexRepository.php b/app/Modules/DefaultQueryForResourceIndex/Repositories/DefaultQueryForResourceIndexRepository.php index b7dcc9f..15236eb 100644 --- a/app/Modules/DefaultQueryForResourceIndex/Repositories/DefaultQueryForResourceIndexRepository.php +++ b/app/Modules/DefaultQueryForResourceIndex/Repositories/DefaultQueryForResourceIndexRepository.php @@ -2,14 +2,12 @@ namespace App\Modules\DefaultQueryForResourceIndex\Repositories; -use App\Modules\DefaultQueryForResourceIndex\Models\DefaultQueryForResourceIndex; use Illuminate\Database\Eloquent\Builder; class DefaultQueryForResourceIndexRepository { /** * Default filament table query builder - * @param Builder $query */ public static function make(Builder $query): void {