From 821ec1fe47ae60ab11f2d3b3007f4058f4e3c3d1 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Sun, 16 Mar 2025 00:55:08 +0500 Subject: [PATCH] fix stan errors --- .../Repositories/DateHelperRepository.php | 2 +- .../Models/LoanOrderRequiredDocs.php | 7 ++ .../LoanOrderRequiredDocsRepository.php | 3 +- app/Nova/Filters/ActiveFilter.php | 6 +- app/Nova/Filters/ProductType.php | 4 +- app/Nova/Filters/RegionFilter.php | 6 +- app/Nova/Filters/StatusFilter.php | 9 +- .../Filters/VisaMasterMonthlyPaidFilter.php | 6 +- app/Nova/Forms/NovaForm.php | 7 +- app/Nova/Lenses/VisaMasterMonthlyPaid.php | 119 ------------------ app/Nova/Resources/Branch/Branch.php | 33 +---- app/Nova/Resources/CurrencyRate.php | 49 +------- app/Nova/Resources/Order/Card/CardOrder.php | 45 +++---- app/Nova/Resources/Order/Card/CardState.php | 37 +----- app/Nova/Resources/Order/Card/CardType.php | 37 +----- .../Concerns/CardOrderFieldsForDetail.php | 5 +- .../Card/Concerns/CardOrderFieldsForIndex.php | 5 +- app/Nova/Resources/Order/Card/Pin/CardPin.php | 55 +++----- .../Order/Card/Requisite/CardRequisite.php | 55 +++----- .../Concerns/CardRequisiteFieldsForDetail.php | 5 +- .../Concerns/CardRequisiteFieldsForIndex.php | 6 +- .../Concerns/LoanOrderFieldsForDetail.php | 5 +- .../Loan/Concerns/LoanOrderFieldsForIndex.php | 3 +- app/Nova/Resources/Order/Loan/LoanOrder.php | 41 ++---- .../Resources/Order/Loan/LoanOrderMobile.php | 27 +--- .../Loan/LoanOrderMobileFieldsForDetail.php | 12 +- .../LoanPaidOffLetterOrderFieldsForDetail.php | 6 +- .../LoanPaidOffLetterOrderFieldsForIndex.php | 5 +- .../Order/Loan/LoanPaidOffLetterOrder.php | 50 +++----- migrate.md | 2 + phpstan.neon | 1 + 31 files changed, 159 insertions(+), 494 deletions(-) delete mode 100644 app/Nova/Lenses/VisaMasterMonthlyPaid.php diff --git a/app/Modules/DateHelper/Repositories/DateHelperRepository.php b/app/Modules/DateHelper/Repositories/DateHelperRepository.php index d5d8863..2f97cb6 100644 --- a/app/Modules/DateHelper/Repositories/DateHelperRepository.php +++ b/app/Modules/DateHelper/Repositories/DateHelperRepository.php @@ -25,7 +25,7 @@ class DateHelperRepository * * @param int|int $max * - * @return array + * @return array */ public static function yearsUntil(int $max = 50): array { diff --git a/app/Modules/LoanOrder/Models/LoanOrderRequiredDocs.php b/app/Modules/LoanOrder/Models/LoanOrderRequiredDocs.php index 6bf8bfd..1ac6c94 100644 --- a/app/Modules/LoanOrder/Models/LoanOrderRequiredDocs.php +++ b/app/Modules/LoanOrder/Models/LoanOrderRequiredDocs.php @@ -7,6 +7,13 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\HasMany; use Spatie\Translatable\HasTranslations; +/** + * @property int $id + * @property string $name + * @property string $value + * @property \Illuminate\Support\Carbon $created_at + * @property \Illuminate\Support\Carbon $updated_at + */ class LoanOrderRequiredDocs extends Model { use HasTranslations; diff --git a/app/Modules/LoanOrder/Repositories/LoanOrderRequiredDocsRepository.php b/app/Modules/LoanOrder/Repositories/LoanOrderRequiredDocsRepository.php index 023698e..0531d84 100644 --- a/app/Modules/LoanOrder/Repositories/LoanOrderRequiredDocsRepository.php +++ b/app/Modules/LoanOrder/Repositories/LoanOrderRequiredDocsRepository.php @@ -3,7 +3,6 @@ namespace App\Modules\LoanOrder\Repositories; use App\Modules\LoanOrder\Models\LoanOrderRequiredDocs; -use Illuminate\Database\Eloquent\Model; use Illuminate\Support\Collection; class LoanOrderRequiredDocsRepository @@ -13,7 +12,7 @@ class LoanOrderRequiredDocsRepository * * @param int $id */ - public static function find(int $id): ?Model + public static function find(int $id): ?LoanOrderRequiredDocs { return LoanOrderRequiredDocs::find($id); } diff --git a/app/Nova/Filters/ActiveFilter.php b/app/Nova/Filters/ActiveFilter.php index deaa7df..4a1e6ec 100644 --- a/app/Nova/Filters/ActiveFilter.php +++ b/app/Nova/Filters/ActiveFilter.php @@ -25,9 +25,9 @@ class ActiveFilter extends Filter /** * Apply the filter to the given query. * - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> $query * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> */ public function apply(NovaRequest $request, $query, $value) { @@ -36,6 +36,8 @@ class ActiveFilter extends Filter /** * Get the filter's available options. + * + * @return array */ public function options(NovaRequest $request): array { diff --git a/app/Nova/Filters/ProductType.php b/app/Nova/Filters/ProductType.php index 8a4fd10..11d46fd 100644 --- a/app/Nova/Filters/ProductType.php +++ b/app/Nova/Filters/ProductType.php @@ -17,9 +17,9 @@ class ProductType extends Filter /** * Apply the filter to the given query. * - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> $query * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> */ public function apply(NovaRequest $request, $query, $value) { diff --git a/app/Nova/Filters/RegionFilter.php b/app/Nova/Filters/RegionFilter.php index 71b2bd7..16948a8 100644 --- a/app/Nova/Filters/RegionFilter.php +++ b/app/Nova/Filters/RegionFilter.php @@ -26,9 +26,9 @@ class RegionFilter extends Filter /** * Apply the filter to the given query. * - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> $query * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> */ public function apply(NovaRequest $request, $query, $value) { @@ -37,6 +37,8 @@ class RegionFilter extends Filter /** * Get the filter's available options. + * + * @return array */ public function options(NovaRequest $request): array { diff --git a/app/Nova/Filters/StatusFilter.php b/app/Nova/Filters/StatusFilter.php index 1488605..2ca1dcf 100644 --- a/app/Nova/Filters/StatusFilter.php +++ b/app/Nova/Filters/StatusFilter.php @@ -3,6 +3,7 @@ namespace App\Nova\Filters; use App\Repos\Order\OrderRepo; +use Illuminate\Database\Eloquent\Builder; use Laravel\Nova\Filters\Filter; use Laravel\Nova\Http\Requests\NovaRequest; @@ -26,17 +27,19 @@ class StatusFilter extends Filter /** * Apply the filter to the given query. * - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> $query * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> */ - public function apply(NovaRequest $request, $query, $value) + public function apply(NovaRequest $request, $query, $value): Builder { return ($value) ? $query->where('status', $value) : $query; } /** * Get the filter's available options. + * + * @return array */ public function options(NovaRequest $request): array { diff --git a/app/Nova/Filters/VisaMasterMonthlyPaidFilter.php b/app/Nova/Filters/VisaMasterMonthlyPaidFilter.php index f3c939c..b404d43 100644 --- a/app/Nova/Filters/VisaMasterMonthlyPaidFilter.php +++ b/app/Nova/Filters/VisaMasterMonthlyPaidFilter.php @@ -33,9 +33,9 @@ class VisaMasterMonthlyPaidFilter extends Filter * Apply the filter to the given query. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @param \Illuminate\Database\Eloquent\Builder $query + * @param \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> $query * @param mixed $value - * @return \Illuminate\Database\Eloquent\Builder + * @return \Illuminate\Database\Eloquent\Builder<\Illuminate\Database\Eloquent\Model> */ public function apply(NovaRequest $request, $query, $value) { @@ -58,7 +58,7 @@ class VisaMasterMonthlyPaidFilter extends Filter * Get the filter's available options. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array + * @return array */ public function options(NovaRequest $request): array { diff --git a/app/Nova/Forms/NovaForm.php b/app/Nova/Forms/NovaForm.php index 4371caf..a6ffa07 100644 --- a/app/Nova/Forms/NovaForm.php +++ b/app/Nova/Forms/NovaForm.php @@ -18,7 +18,7 @@ class NovaForm /** * Fill attribute */ - public static function fillAttribute($key, $value): Closure + public static function fillAttribute(string $key, string $value): Closure { return function ($request, $model, $attribute, $requestAttribute) use ($key, $value) { $model->{$key} = $request->input($value); @@ -28,7 +28,7 @@ class NovaForm /** * Fill schemaless */ - public static function fillSchemalessField($schemalessAttribute = 'options'): Closure + public static function fillSchemalessField(string $schemalessAttribute = 'options'): Closure { return function ($request, $model, $attribute, $requestAttribute) use ($schemalessAttribute) { $model->{$schemalessAttribute}->set($attribute, $request->input($attribute)); @@ -47,6 +47,9 @@ class NovaForm /** * Fill the slug field + * + * @param string|array $from + * @param string $resource */ public static function fillSlug(string|array $from, ?string $resource): Closure { diff --git a/app/Nova/Lenses/VisaMasterMonthlyPaid.php b/app/Nova/Lenses/VisaMasterMonthlyPaid.php deleted file mode 100644 index 7ac5aa4..0000000 --- a/app/Nova/Lenses/VisaMasterMonthlyPaid.php +++ /dev/null @@ -1,119 +0,0 @@ -month.'-01')->monthName ?? 'Ýanwar'; - } - - /** - * Create a new lens instance. - * - * @param \Illuminate\Database\Eloquent\Model|null $resource - * @return void - */ - public function __construct($resource = null, string $month = '01') - { - $this->resource = $resource ?: new stdClass; - $this->month = $month; - } - - /** - * Get the query builder / paginator for the lens. - * - * @param \Laravel\Nova\Http\Requests\LensRequest $request - * @param \Illuminate\Database\Eloquent\Builder $query - * @return mixed - */ - public static function query(LensRequest $request, $query) - { - $query->with('branch', 'paymentItems'); - - return $request->withOrdering($request->withFilters( - $query - )); - } - - /** - * Get the fields available to the lens. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function fields(NovaRequest $request): array - { - return VisaMasterPaymentOrderFieldsForIndex::make($this, $this->month); - } - - /** - * Get the cards available on the lens. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function cards(NovaRequest $request): array - { - return []; - } - - /** - * Get the filters available for the lens. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function filters(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available on the lens. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function actions(NovaRequest $request): array - { - return parent::actions($request); - } - - /** - * Get the URI key for the lens. - * - * @return string - */ - public function uriKey(): string - { - return 'visa-master-monthly-paid-'.$this->month; - } -} diff --git a/app/Nova/Resources/Branch/Branch.php b/app/Nova/Resources/Branch/Branch.php index 8f8ad5d..5399d6e 100644 --- a/app/Nova/Resources/Branch/Branch.php +++ b/app/Nova/Resources/Branch/Branch.php @@ -5,9 +5,9 @@ namespace App\Nova\Resources\Branch; use App\Models\Branch\Branch as BranchModel; use App\Nova\Filters\ActiveFilter; use App\Nova\Filters\RegionFilter; +use App\Nova\Resource; use App\Repos\System\Nova\NovaRepo; use App\Repos\System\Settings\Location\RegionRepo; -use Illuminate\Http\Request; use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Select; @@ -15,7 +15,6 @@ use Laravel\Nova\Fields\Text; use Laravel\Nova\Fields\Textarea; use Laravel\Nova\Http\Requests\NovaRequest; use Laravel\Nova\Panel; -use Laravel\Nova\Resource; class Branch extends Resource { @@ -36,7 +35,7 @@ class Branch extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'name', 'unique_code', 'billing_username', 'billing_sber_username', 'billing_visa_master_username', @@ -60,6 +59,8 @@ class Branch extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -116,16 +117,10 @@ class Branch extends Resource ]; } - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - /** * Get the filters available for the resource. + * + * @return array */ public function filters(NovaRequest $request): array { @@ -134,20 +129,4 @@ class Branch extends Resource new ActiveFilter, ]; } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/CurrencyRate.php b/app/Nova/Resources/CurrencyRate.php index e0084e3..278e697 100644 --- a/app/Nova/Resources/CurrencyRate.php +++ b/app/Nova/Resources/CurrencyRate.php @@ -5,7 +5,6 @@ namespace App\Nova\Resources; use App\Models\CurrencyRate as ModelsCurrencyRate; use App\Nova\Resource; use App\Nova\Resources\CurrencyRate\CurrencyRateAuth; -use Illuminate\Http\Request; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Select; use Laravel\Nova\Fields\Text; @@ -32,7 +31,7 @@ class CurrencyRate extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'id', @@ -50,7 +49,7 @@ class CurrencyRate extends Resource * Get the fields displayed by the resource. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array + * @return array */ public function fields(NovaRequest $request) { @@ -78,48 +77,4 @@ class CurrencyRate extends Resource ->rules('required', 'numeric'), ]; } - - /** - * Get the cards available for the request. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function cards(NovaRequest $request) - { - return []; - } - - /** - * Get the filters available for the resource. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function filters(NovaRequest $request) - { - return []; - } - - /** - * Get the lenses available for the resource. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function lenses(NovaRequest $request) - { - return []; - } - - /** - * Get the actions available for the resource. - * - * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array - */ - public function actions(NovaRequest $request) - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/CardOrder.php b/app/Nova/Resources/Order/Card/CardOrder.php index 04f4657..f41c027 100644 --- a/app/Nova/Resources/Order/Card/CardOrder.php +++ b/app/Nova/Resources/Order/Card/CardOrder.php @@ -23,7 +23,6 @@ use App\Rules\DowranAgaAllowed; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Hidden; @@ -57,14 +56,14 @@ class CardOrder extends Resource /** * The relationships that should be eager loaded on index queries. * - * @var array + * @var array */ public static $with = ['branch', 'cardState', 'cardType']; /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'unique_id', 'customer_name', 'customer_surname', 'phone', @@ -110,8 +109,8 @@ class CardOrder extends Resource /** * Build an "index" query for the given resource. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder */ public static function indexQuery(NovaRequest $request, mixed $query): Builder { @@ -142,7 +141,7 @@ class CardOrder extends Resource /** * Return the location to redirect the user after creation. * - * @param \Laravel\Nova\Resource $resource + * @param \Laravel\Nova\Resource $resource */ public static function redirectAfterCreate(NovaRequest $request, $resource): URL|string { @@ -169,6 +168,8 @@ class CardOrder extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(NovaRequest $request): array { @@ -176,7 +177,9 @@ class CardOrder extends Resource } /** - * Get the fields for detail + * Get the fields for detail. + * + * @return array */ public function fieldsForDetail(): array { @@ -185,6 +188,8 @@ class CardOrder extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -358,16 +363,10 @@ class CardOrder extends Resource ]; } - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - /** * Get the filters available for the resource. + * + * @return array */ public function filters(NovaRequest $request): array { @@ -378,20 +377,4 @@ class CardOrder extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/CardState.php b/app/Nova/Resources/Order/Card/CardState.php index 36e9de8..9cf9b00 100644 --- a/app/Nova/Resources/Order/Card/CardState.php +++ b/app/Nova/Resources/Order/Card/CardState.php @@ -4,7 +4,6 @@ namespace App\Nova\Resources\Order\Card; use App\Models\Order\Card\CardState as CardStateModel; use App\Nova\Resource; -use Illuminate\Http\Request; use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Text; @@ -29,7 +28,7 @@ class CardState extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'name', @@ -53,6 +52,8 @@ class CardState extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -73,36 +74,4 @@ class CardState extends Resource ->default(true), ]; } - - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - - /** - * Get the filters available for the resource. - */ - public function filters(NovaRequest $request): array - { - return []; - } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/CardType.php b/app/Nova/Resources/Order/Card/CardType.php index 1382af0..ff1dc81 100644 --- a/app/Nova/Resources/Order/Card/CardType.php +++ b/app/Nova/Resources/Order/Card/CardType.php @@ -4,7 +4,6 @@ namespace App\Nova\Resources\Order\Card; use App\Models\Order\Card\CardType as CardTypeModel; use App\Nova\Resource; -use Illuminate\Http\Request; use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Text; @@ -29,7 +28,7 @@ class CardType extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'name', @@ -53,6 +52,8 @@ class CardType extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -73,36 +74,4 @@ class CardType extends Resource ->default(true), ]; } - - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - - /** - * Get the filters available for the resource. - */ - public function filters(NovaRequest $request): array - { - return []; - } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php index 26cbe14..6ed39cb 100644 --- a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php +++ b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForDetail.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Card\Concerns; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Card\CardOrder; use App\Nova\Resources\Order\Card\CardState; use App\Nova\Resources\Order\Card\CardType; use App\Nova\User; @@ -25,8 +26,10 @@ class CardOrderFieldsForDetail { /** * Fields for index page + * + * @return array */ - public static function make($resource): array + public static function make(CardOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php index 280623f..4d17231 100644 --- a/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php +++ b/app/Nova/Resources/Order/Card/Concerns/CardOrderFieldsForIndex.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Card\Concerns; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Card\CardOrder; use App\Nova\Resources\Order\Card\CardState; use App\Nova\Resources\Order\Card\CardType; use App\Repos\Order\OrderRepo; @@ -19,8 +20,10 @@ class CardOrderFieldsForIndex { /** * Fields for index page + * + * @return array */ - public static function make($resource): array + public static function make(CardOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Card/Pin/CardPin.php b/app/Nova/Resources/Order/Card/Pin/CardPin.php index 2dbe3a4..c23e3cc 100644 --- a/app/Nova/Resources/Order/Card/Pin/CardPin.php +++ b/app/Nova/Resources/Order/Card/Pin/CardPin.php @@ -20,7 +20,6 @@ use App\Repos\System\Settings\Location\RegionRepo; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Hidden; @@ -38,6 +37,8 @@ class CardPin extends Resource { /** * The model the resource corresponds to. + * + * @var class-string */ public static $model = CardPinModel::class; @@ -51,7 +52,7 @@ class CardPin extends Resource /** * The relationships that should be eager loaded on index queries. * - * @var array + * @var array */ public static $with = ['branch', 'cardType']; @@ -124,8 +125,8 @@ class CardPin extends Resource /** * Build an "index" query for the given resource. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder */ public static function indexQuery(NovaRequest $request, mixed $query): Builder { @@ -156,7 +157,7 @@ class CardPin extends Resource /** * Return the location to redirect the user after creation. * - * @param \Laravel\Nova\Resource $resource + * @param \Laravel\Nova\Resource $resource */ public static function redirectAfterCreate(NovaRequest $request, $resource): URL|string { @@ -169,22 +170,28 @@ class CardPin extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(NovaRequest $request): array { - return CardRequisiteFieldsForIndex::make($this, $request); + return CardRequisiteFieldsForIndex::make($this); } /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { - return CardRequisiteFieldsForDetail::make($this); + return CardRequisiteFieldsForDetail::make(); } /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -308,22 +315,12 @@ class CardPin extends Resource ]; } - /** - * Get the cards available for the request. - * - * @return array - */ - public function cards(NovaRequest $request) - { - return []; - } - /** * Get the filters available for the resource. * - * @return array + * @return array */ - public function filters(NovaRequest $request) + public function filters(NovaRequest $request): array { return [ RegionFilter::make() @@ -332,24 +329,4 @@ class CardPin extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - * - * @return array - */ - public function lenses(NovaRequest $request) - { - return []; - } - - /** - * Get the actions available for the resource. - * - * @return array - */ - public function actions(NovaRequest $request) - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/Requisite/CardRequisite.php b/app/Nova/Resources/Order/Card/Requisite/CardRequisite.php index 33bf755..fae6213 100644 --- a/app/Nova/Resources/Order/Card/Requisite/CardRequisite.php +++ b/app/Nova/Resources/Order/Card/Requisite/CardRequisite.php @@ -20,7 +20,6 @@ use App\Repos\System\Settings\Location\RegionRepo; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\File; @@ -39,6 +38,8 @@ class CardRequisite extends Resource { /** * The model the resource corresponds to. + * + * @var class-string */ public static $model = CardRequisiteModel::class; @@ -52,14 +53,14 @@ class CardRequisite extends Resource /** * The relationships that should be eager loaded on index queries. * - * @var array + * @var array */ public static $with = ['branch', 'cardType']; /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'unique_id', 'customer_name', 'customer_surname', 'phone', @@ -129,8 +130,8 @@ class CardRequisite extends Resource /** * Build an "index" query for the given resource. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder */ public static function indexQuery(NovaRequest $request, mixed $query): Builder { @@ -161,7 +162,7 @@ class CardRequisite extends Resource /** * Return the location to redirect the user after creation. * - * @param \Laravel\Nova\Resource $resource + * @param \Laravel\Nova\Resource $resource */ public static function redirectAfterCreate(NovaRequest $request, $resource): URL|string { @@ -174,22 +175,28 @@ class CardRequisite extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(NovaRequest $request): array { - return CardRequisiteFieldsForIndex::make($this, $request); + return CardRequisiteFieldsForIndex::make($this); } /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { - return CardRequisiteFieldsForDetail::make($this); + return CardRequisiteFieldsForDetail::make(); } /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -320,20 +327,10 @@ class CardRequisite extends Resource ]; } - /** - * Get the cards available for the request. - * - * @return array - */ - public function cards(NovaRequest $request) - { - return []; - } - /** * Get the filters available for the resource. * - * @return array + * @return array */ public function filters(NovaRequest $request) { @@ -344,24 +341,4 @@ class CardRequisite extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - * - * @return array - */ - public function lenses(NovaRequest $request) - { - return []; - } - - /** - * Get the actions available for the resource. - * - * @return array - */ - public function actions(NovaRequest $request) - { - return []; - } } diff --git a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php index 26d019d..0b4cd7a 100644 --- a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php +++ b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForDetail.php @@ -26,10 +26,9 @@ class CardRequisiteFieldsForDetail /** * Fields for index * - * @param mixed $resource - * @return array + * @return array */ - public static function make(mixed $resource): array + public static function make(): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForIndex.php b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForIndex.php index 8558b1b..7b43f37 100644 --- a/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForIndex.php +++ b/app/Nova/Resources/Order/Card/Requisite/Concerns/CardRequisiteFieldsForIndex.php @@ -4,6 +4,8 @@ namespace App\Nova\Resources\Order\Card\Requisite\Concerns; use App\Nova\Resources\Branch\Branch; use App\Nova\Resources\Order\Card\CardType; +use App\Nova\Resources\Order\Card\Pin\CardPin; +use App\Nova\Resources\Order\Card\Requisite\CardRequisite; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Location\RegionRepo; use Laravel\Nova\Fields\Badge; @@ -17,8 +19,10 @@ class CardRequisiteFieldsForIndex { /** * Fields for index + * + * @return array */ - public static function make($resource, $request): array + public static function make(CardRequisite|CardPin $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php index 37e7a34..70e87ee 100644 --- a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForDetail.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Loan\Concerns; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Loan\LoanOrder; use App\Nova\Resources\Order\Loan\LoanType; use App\Nova\Resources\System\Location\Province; use App\Nova\User; @@ -27,8 +28,10 @@ class LoanOrderFieldsForDetail { /** * Loan order fields for detail + * + * @return array */ - public static function make($resource): array + public static function make(LoanOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php index b861ab1..92de91f 100644 --- a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php +++ b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Loan\Concerns; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Loan\LoanOrder; use App\Nova\Resources\Order\Loan\LoanOrderMobile; use App\Nova\Resources\Order\Loan\LoanType; use App\Repos\Order\OrderRepo; @@ -21,7 +22,7 @@ class LoanOrderFieldsForIndex * * @return array */ - public static function make(LoanOrderMobile $resource): array + public static function make(LoanOrder|LoanOrderMobile $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/LoanOrder.php b/app/Nova/Resources/Order/Loan/LoanOrder.php index 27b0164..0cab1ab 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanOrder.php @@ -21,7 +21,6 @@ use App\Rules\DowranAgaAllowed; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Email; @@ -54,14 +53,14 @@ class LoanOrder extends Resource /** * The relationships that should be eager loaded on index queries. * - * @var array + * @var array */ public static $with = ['branch', 'loanType']; /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'unique_id', 'customer_name', 'customer_surname', 'phone', @@ -107,8 +106,8 @@ class LoanOrder extends Resource /** * Build an "index" query for the given resource. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder */ public static function indexQuery(NovaRequest $request, mixed $query): Builder { @@ -129,6 +128,8 @@ class LoanOrder extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(NovaRequest $request): array { @@ -137,6 +138,8 @@ class LoanOrder extends Resource /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { @@ -145,6 +148,8 @@ class LoanOrder extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -364,16 +369,10 @@ class LoanOrder extends Resource ]; } - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - /** * Get the filters available for the resource. + * + * @return array */ public function filters(NovaRequest $request): array { @@ -384,20 +383,4 @@ class LoanOrder extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php index 182bb62..0770e50 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php @@ -23,7 +23,6 @@ use App\Rules\DowranAgaAllowed; use App\Rules\OnlyLetters; use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Model; -use Illuminate\Http\Request; use Illuminate\Support\Facades\Gate; use Laravel\Nova\Fields\Date; use Laravel\Nova\Fields\Email; @@ -577,16 +576,10 @@ class LoanOrderMobile extends Resource ]; } - /** - * Get the cards available for the request. - */ - public function cards(NovaRequest $request): array - { - return []; - } - /** * Get the filters available for the resource. + * + * @return array */ public function filters(NovaRequest $request): array { @@ -597,20 +590,4 @@ class LoanOrderMobile extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - */ - public function lenses(NovaRequest $request): array - { - return []; - } - - /** - * Get the actions available for the resource. - */ - public function actions(NovaRequest $request): array - { - return []; - } } diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php index e1e252d..1ff8a99 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php @@ -191,10 +191,10 @@ class LoanOrderMobileFieldsForDetail Text::make(__('Guarantor Patronic name'), 'guarantor_patronic_name'), - Text::make(__('Passport'), fn () => sprintf( + Text::make(__('Passport'), fn ($model) => sprintf( '%s %s', - $resource->guarantor_passport_serie, - $resource->guarantor_passport_id, + $model->guarantor_passport_serie, + $model->guarantor_passport_id, ))->asHtml(), Text::make(__('Ortaça zähmet haky'), 'guarantor_note') @@ -212,10 +212,10 @@ class LoanOrderMobileFieldsForDetail Text::make(__('Guarantor Surname'), 'guarantor_2_surname'), Text::make(__('Guarantor Patronic name'), 'guarantor_2_patronic_name'), - Text::make(__('Passport'), fn () => sprintf( + Text::make(__('Passport'), fn ($model) => sprintf( '%s %s', - $resource->guarantor_2_passport_serie, - $resource->guarantor_2_passport_id, + $model->guarantor_2_passport_serie, + $model->guarantor_2_passport_id, ))->asHtml(), Text::make(__('Ortaça zähmet haky'), 'guarantor_2_note') diff --git a/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForDetail.php b/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForDetail.php index 38ebd48..3d5f95d 100644 --- a/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForDetail.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Loan\LoanPaidOffLetter; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Loan\LoanPaidOffLetterOrder; use App\Nova\User; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Legal\PassportRepo; @@ -23,9 +24,10 @@ class LoanPaidOffLetterOrderFieldsForDetail /** * Loan paidoff letter detail fields * - * @param mixed $resource + * @param LoanPaidOffLetterOrder $resource + * @return array */ - public static function make(mixed $resource): array + public static function make(LoanPaidOffLetterOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForIndex.php b/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForIndex.php index 9e04d70..2ad5286 100644 --- a/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForIndex.php +++ b/app/Nova/Resources/Order/Loan/LoanPaidOffLetter/LoanPaidOffLetterOrderFieldsForIndex.php @@ -3,6 +3,7 @@ namespace App\Nova\Resources\Order\Loan\LoanPaidOffLetter; use App\Nova\Resources\Branch\Branch; +use App\Nova\Resources\Order\Loan\LoanPaidOffLetterOrder; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Location\RegionRepo; use Laravel\Nova\Fields\Badge; @@ -16,8 +17,10 @@ class LoanPaidOffLetterOrderFieldsForIndex { /** * Loan paidoff letter index fields + * + * @return array */ - public static function make($resource, $request): array + public static function make(LoanPaidOffLetterOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php index 9424590..2f19d98 100644 --- a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php @@ -47,14 +47,14 @@ class LoanPaidOffLetterOrder extends Resource /** * The relationships that should be eager loaded on index queries. * - * @var array + * @var array */ public static $with = ['branch']; /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'unique_id', 'customer_name', 'customer_surname', 'phone', @@ -100,8 +100,8 @@ class LoanPaidOffLetterOrder extends Resource /** * Build an "index" query for the given resource. * - * @param \Illuminate\Database\Eloquent\Builder $query - * @return \Illuminate\Database\Eloquent\Builder + * @param \Illuminate\Database\Eloquent\Builder $query + * @return \Illuminate\Database\Eloquent\Builder */ public static function indexQuery(NovaRequest $request, mixed $query): Builder { @@ -131,14 +131,18 @@ class LoanPaidOffLetterOrder extends Resource /** * Get the fields for index. + * + * @return array */ - public function fieldsForIndex(NovaRequest $request): array + public function fieldsForIndex(): array { - return LoanPaidOffLetterOrderFieldsForIndex::make($this, $request); + return LoanPaidOffLetterOrderFieldsForIndex::make($this); } /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { @@ -147,6 +151,8 @@ class LoanPaidOffLetterOrder extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -247,18 +253,10 @@ class LoanPaidOffLetterOrder extends Resource ]; } - /** - * Get the cards available for the request. - * - * @return array - */ - public function cards(NovaRequest $request) - { - return []; - } - /** * Get the filters available for the resource. + * + * @return array */ public function filters(NovaRequest $request): array { @@ -269,24 +267,4 @@ class LoanPaidOffLetterOrder extends Resource new StatusFilter, ]; } - - /** - * Get the lenses available for the resource. - * - * @return array - */ - public function lenses(NovaRequest $request) - { - return []; - } - - /** - * Get the actions available for the resource. - * - * @return array - */ - public function actions(NovaRequest $request) - { - return []; - } } diff --git a/migrate.md b/migrate.md index d91a633..f052cc0 100644 --- a/migrate.md +++ b/migrate.md @@ -4,3 +4,5 @@ **processing** **completed** **cancelled** + +Schema::getColumnListing('loan_order_required_docs') diff --git a/phpstan.neon b/phpstan.neon index 6b6fe97..c14d4b4 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -14,5 +14,6 @@ parameters: # excludePaths: - ./app/Http/Controllers/Auth/LoginController.php + - ./app/Nova/Resource.php # # checkMissingIterableValueType: false