From cee905ec77451fd52bf6a6ef8126e4bb2407bc6d Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Fri, 1 Dec 2023 00:22:49 +0500 Subject: [PATCH] Added filter by region --- .DS_Store | Bin 6148 -> 0 bytes app/Nova/Filters/RegionFilter.php | 51 ++++++++++++++++++ app/Nova/Resources/Branch/Branch.php | 5 +- app/Nova/Resources/Order/Loan/LoanOrder.php | 5 +- .../Resources/System/Location/Province.php | 5 +- lang/tk.json | 2 +- lang/vendor/nova/tk.json | 2 +- 7 files changed, 65 insertions(+), 5 deletions(-) delete mode 100644 .DS_Store create mode 100644 app/Nova/Filters/RegionFilter.php diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 7df9327a759b108becd3a32c7a5576be4c27ee88..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK%}&BV5T1nsCB&o$O*n4imBb=dG+vsDFJO%x)L<(F8*7&Ug##h!SzpK}@p+v6 zfdr6~i5l5SX203lnKtv4>@Wa8ytGpXumHeB<(Mnu@`dnou4|H0o&qA_&lvlIBxXrZ z?$_eA)<@*`vV=#swoDBP6%tDNP5BqU69NG2<$>ohgv1FFaih1up zv57wlM(NNC2Df~7#aJB9?I664x|6oGd(M(k5GCD#NQgRJ47t0Bk`9}AEKNE?k?YF? zvuu{zR&_dc9H&MbN6lG{PEQZ*8g&}Svsu~P+dnwFY(K{@344{)68s$s*-->h}1rj>fn_gaejfXao(WfB)DXoyyfvAh*mQH7wNas$y-m`OwrivA-YXwZvh;71ww1i?&< AQ2+n{ diff --git a/app/Nova/Filters/RegionFilter.php b/app/Nova/Filters/RegionFilter.php new file mode 100644 index 0000000..34c78b8 --- /dev/null +++ b/app/Nova/Filters/RegionFilter.php @@ -0,0 +1,51 @@ +where('region', $value) : $query; + } + + /** + * Get the filter's available options. + * + * @param \Laravel\Nova\Http\Requests\NovaRequest $request + * @return array + */ + public function options(NovaRequest $request): array + { + return array_flip(RegionRepo::values()); + } +} diff --git a/app/Nova/Resources/Branch/Branch.php b/app/Nova/Resources/Branch/Branch.php index 37823b6..31853ba 100644 --- a/app/Nova/Resources/Branch/Branch.php +++ b/app/Nova/Resources/Branch/Branch.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Branch; use App\Models\Branch\Branch as BranchModel; +use App\Nova\Filters\RegionFilter; use App\Repos\System\Nova\NovaRepo; use App\Repos\System\Settings\Location\RegionRepo; use Illuminate\Http\Request; @@ -113,7 +114,9 @@ class Branch extends Resource */ public function filters(NovaRequest $request) { - return []; + return [ + new RegionFilter(), + ]; } /** diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index b804a2f..75a5f45 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -5,6 +5,7 @@ namespace App\Nova\Resources\Order\Loan; use App\Models\Branch\Branch; use App\Models\Order\Loan\LoanOrder as LoanOrderModel; use App\Models\System\Location\Province; +use App\Nova\Filters\RegionFilter; use App\Nova\Resource; use App\Nova\Resources\Order\Loan\Concerns\LoanOrderEvents; use App\Nova\Resources\Order\Loan\Concerns\LoanOrderFieldsForDetail; @@ -356,7 +357,9 @@ class LoanOrder extends Resource */ public function filters(NovaRequest $request): array { - return []; + return [ + new RegionFilter(), + ]; } /** diff --git a/app/Nova/Resources/System/Location/Province.php b/app/Nova/Resources/System/Location/Province.php index c1f248d..a49c905 100644 --- a/app/Nova/Resources/System/Location/Province.php +++ b/app/Nova/Resources/System/Location/Province.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\System\Location; use App\Models\System\Location\Province as ProvinceModel; +use App\Nova\Filters\RegionFilter; use App\Nova\Resource; use App\Repos\System\Settings\Location\RegionRepo; use Illuminate\Http\Request; @@ -91,7 +92,9 @@ class Province extends Resource */ public function filters(NovaRequest $request): array { - return []; + return [ + new RegionFilter(), + ]; } /** diff --git a/lang/tk.json b/lang/tk.json index 91295cd..516d741 100644 --- a/lang/tk.json +++ b/lang/tk.json @@ -147,7 +147,7 @@ "Regions": "Welaýatlar", "Register": "Hasaba al", "Registered": "Bellige alyndy", - "Remember Me": "Meni ýatla", + "Remember Me": "Meni ýatda sakla", "Request Header Fields Too Large": "Sözbaşy meýdanlaryny gaty uly haýyş", "Request Timeout": "Wagt gutarmagyny haýyş", "Reset Content": "Mazmuny täzeden düzmek", diff --git a/lang/vendor/nova/tk.json b/lang/vendor/nova/tk.json index f30b1fc..58ebe4b 100644 --- a/lang/vendor/nova/tk.json +++ b/lang/vendor/nova/tk.json @@ -326,7 +326,7 @@ "Remember me": "Meni ýatla", "Remove": "Aýyr", "Replicate": "Şeýle resurs goş", - "Reset Filters": "Süzgüçleri täzeden düzmek", + "Reset Filters": "Filterleri aýyr", "Reset Password": "Paroly täzeden düzmek", "Reset Password Notification": "Parol habarnamasyny täzeden düzmek", "resource": "resurs",