From dea84541ef80e07d4ffe57dec716ea6f1ab3f844 Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Sat, 15 Mar 2025 23:39:55 +0500 Subject: [PATCH] stan errors --- .../TuitionPaymentOrderFieldsForDetail.php | 2 +- .../TuitionPaymentOrderFieldsForIndex.php | 5 +- .../Resources/NovaTuitionPaymentOrder.php | 7 ++- .../VisaMasterPaymentOrderFieldsForDetail.php | 14 +++-- .../Resources/NovaVisaMasterPaymentOrder.php | 3 - .../Loan/Concerns/LoanOrderFieldsForIndex.php | 5 +- .../Resources/Order/Loan/LoanOrderMobile.php | 14 +++-- .../Loan/LoanOrderMobileFieldsForDetail.php | 8 ++- .../Order/Loan/LoanPaidOffLetterOrder.php | 2 + app/Nova/Resources/Order/Loan/LoanType.php | 31 ++--------- .../Order/Loan/Metrics/LoanOrderPerDay.php | 2 + .../Order/Loan/Metrics/NewLoanOrders.php | 2 + .../Loan/Remaining/NovaLoanRemainingOrder.php | 55 ++----------------- .../RequiredDocs/LoanOrderRequiredDocs.php | 30 ++-------- .../Payment/OnlinePaymentHistoryResource.php | 45 +++------------ 15 files changed, 65 insertions(+), 160 deletions(-) diff --git a/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForDetail.php b/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForDetail.php index bfef669..6395d73 100644 --- a/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForDetail.php +++ b/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForDetail.php @@ -23,7 +23,7 @@ class TuitionPaymentOrderFieldsForDetail /** * Get fields for detail view * - * @return array> + * @return array */ public static function make(NovaTuitionPaymentOrder $resource): array { diff --git a/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForIndex.php b/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForIndex.php index e7373e2..7d2f7e1 100644 --- a/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForIndex.php +++ b/app/Modules/TuitionPaymentOrder/Nova/Resources/Concerns/TuitionPaymentOrderFieldsForIndex.php @@ -2,6 +2,7 @@ namespace App\Modules\TuitionPaymentOrder\Nova\Resources\Concerns; +use App\Modules\TuitionPaymentOrder\Nova\Resources\NovaTuitionPaymentOrder; use App\Nova\Resources\Branch\Branch; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Location\RegionRepo; @@ -16,8 +17,10 @@ class TuitionPaymentOrderFieldsForIndex { /** * Loan Order fields for "create" + * + * @return array */ - public static function make($resource): array + public static function make(NovaTuitionPaymentOrder $resource): array { return [ ID::make()->hide(), diff --git a/app/Modules/TuitionPaymentOrder/Nova/Resources/NovaTuitionPaymentOrder.php b/app/Modules/TuitionPaymentOrder/Nova/Resources/NovaTuitionPaymentOrder.php index 34ed480..e12757c 100644 --- a/app/Modules/TuitionPaymentOrder/Nova/Resources/NovaTuitionPaymentOrder.php +++ b/app/Modules/TuitionPaymentOrder/Nova/Resources/NovaTuitionPaymentOrder.php @@ -24,9 +24,6 @@ use Laravel\Nova\Http\Requests\NovaRequest; use Nurmuhammet\NovaInputmask\NovaInputmask; use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable; -/** - * @template TModel of \App\Modules\TuitionPaymentOrder\Models\TuitionPaymentOrder - */ class NovaTuitionPaymentOrder extends Resource { /** @@ -96,6 +93,8 @@ class NovaTuitionPaymentOrder extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(): array { @@ -104,6 +103,8 @@ class NovaTuitionPaymentOrder extends Resource /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php index b606650..2b85bd7 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php @@ -3,6 +3,7 @@ namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns; use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder; +use App\Modules\VisaMasterPaymentOrder\Nova\Resources\NovaVisaMasterPaymentOrder; use App\Modules\VisaMasterPaymentOrder\Nova\Resources\NovaVisaMasterPaymentOrderItem; use App\Nova\Resources\Branch\Branch; use App\Nova\User; @@ -25,9 +26,9 @@ class VisaMasterPaymentOrderFieldsForDetail /** * Get fields for detail view * - * @return array + * @return array */ - public static function make($resource): array + public static function make(NovaVisaMasterPaymentOrder $resource): array { return [ new Panel(__('Status'), [ @@ -204,13 +205,16 @@ class VisaMasterPaymentOrderFieldsForDetail /** * Paid field */ - public static function paidField($resource, $date = null) + public static function paidField(NovaVisaMasterPaymentOrder $resource, ?string $date = null): string { - $paid = false; - $items = $resource->paymentItems; + /** @var \App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder */ + $model = $resource->model(); + + $items = $model->paymentItems; $month = $date ?: date('m'); + $paid = false; foreach ($items as $item) { if (boolval($item->paid)) { if ($item->created_at->format('m') == $month) { diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php index 44ce580..70fdb5a 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php @@ -33,9 +33,6 @@ use Nurmuhammet\NovaInputmask\NovaInputmask; use Outl1ne\NovaDetachedFilters\NovaDetachedFilters; use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable; -/** - * @template TModel of \App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder - */ class NovaVisaMasterPaymentOrder extends Resource { use VisaMasterAuth; diff --git a/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php b/app/Nova/Resources/Order/Loan/Concerns/LoanOrderFieldsForIndex.php index 973f633..b861ab1 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\LoanOrderMobile; use App\Nova\Resources\Order\Loan\LoanType; use App\Repos\Order\OrderRepo; use App\Repos\System\Settings\Location\RegionRepo; @@ -17,8 +18,10 @@ class LoanOrderFieldsForIndex { /** * Loan Order fields for "create" + * + * @return array */ - public static function make($resource): array + public static function make(LoanOrderMobile $resource): array { return [ ID::make()->hide(), diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php index d582c8e..182bb62 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobile.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobile.php @@ -58,14 +58,14 @@ class LoanOrderMobile 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', @@ -111,8 +111,8 @@ class LoanOrderMobile 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 { @@ -133,6 +133,8 @@ class LoanOrderMobile extends Resource /** * Get the fields for index. + * + * @return array */ public function fieldsForIndex(NovaRequest $request): array { @@ -141,6 +143,8 @@ class LoanOrderMobile extends Resource /** * Get the fields for detail + * + * @return array */ public function fieldsForDetail(): array { @@ -149,6 +153,8 @@ class LoanOrderMobile extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { diff --git a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php index e21088e..e1e252d 100644 --- a/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php +++ b/app/Nova/Resources/Order/Loan/LoanOrderMobileFieldsForDetail.php @@ -28,7 +28,12 @@ use Nurmuhammet\NovaInputmask\NovaInputmask; class LoanOrderMobileFieldsForDetail { - public static function make($resource): array + /** + * Fields for detail + * + * @return array + */ + public static function make(LoanOrderMobile $resource): array { return [ ID::make()->hide(), @@ -222,7 +227,6 @@ class LoanOrderMobileFieldsForDetail ])->render()) ->fillUsing(NovaForm::fillEmpty()), ]), - ]; } } diff --git a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php index 22b9cc2..9424590 100644 --- a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php @@ -32,6 +32,8 @@ class LoanPaidOffLetterOrder extends Resource { /** * The model the resource corresponds to. + * + * @var class-string */ public static $model = LoanPaidOffLetterOrderModel::class; diff --git a/app/Nova/Resources/Order/Loan/LoanType.php b/app/Nova/Resources/Order/Loan/LoanType.php index 66ebfec..c8ec4b5 100644 --- a/app/Nova/Resources/Order/Loan/LoanType.php +++ b/app/Nova/Resources/Order/Loan/LoanType.php @@ -5,7 +5,6 @@ namespace App\Nova\Resources\Order\Loan; use App\Models\Order\Loan\LoanType as LoanTypeModel; use App\Nova\Filters\ActiveFilter; use App\Nova\Resource; -use Illuminate\Http\Request; use Laravel\Nova\Fields\Boolean; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Number; @@ -31,7 +30,7 @@ class LoanType extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'name', @@ -55,6 +54,8 @@ class LoanType extends Resource /** * Get the fields displayed by the resource. + * + * @return array */ public function fields(NovaRequest $request): array { @@ -79,16 +80,10 @@ class LoanType 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 { @@ -96,20 +91,4 @@ class LoanType 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/Order/Loan/Metrics/LoanOrderPerDay.php b/app/Nova/Resources/Order/Loan/Metrics/LoanOrderPerDay.php index a348a27..5ec927e 100644 --- a/app/Nova/Resources/Order/Loan/Metrics/LoanOrderPerDay.php +++ b/app/Nova/Resources/Order/Loan/Metrics/LoanOrderPerDay.php @@ -27,6 +27,8 @@ class LoanOrderPerDay extends Trend /** * Get the ranges available for the metric. + * + * @return array */ public function ranges(): array { diff --git a/app/Nova/Resources/Order/Loan/Metrics/NewLoanOrders.php b/app/Nova/Resources/Order/Loan/Metrics/NewLoanOrders.php index ced1bbb..32e4273 100644 --- a/app/Nova/Resources/Order/Loan/Metrics/NewLoanOrders.php +++ b/app/Nova/Resources/Order/Loan/Metrics/NewLoanOrders.php @@ -27,6 +27,8 @@ class NewLoanOrders extends Value /** * Get the ranges available for the metric. + * + * @return array */ public function ranges(): array { diff --git a/app/Nova/Resources/Order/Loan/Remaining/NovaLoanRemainingOrder.php b/app/Nova/Resources/Order/Loan/Remaining/NovaLoanRemainingOrder.php index 598fa51..00cfafd 100644 --- a/app/Nova/Resources/Order/Loan/Remaining/NovaLoanRemainingOrder.php +++ b/app/Nova/Resources/Order/Loan/Remaining/NovaLoanRemainingOrder.php @@ -5,7 +5,6 @@ namespace App\Nova\Resources\Order\Loan\Remaining; use App\Nova\Resource; use App\Repos\System\Settings\Legal\PassportRepo; use Illuminate\Database\Eloquent\Builder; -use Illuminate\Http\Request; use Laravel\Nova\Fields\Hidden; use Laravel\Nova\Fields\ID; use Laravel\Nova\Fields\Number; @@ -34,7 +33,7 @@ class NovaLoanRemainingOrder extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'account_number', @@ -51,8 +50,8 @@ class NovaLoanRemainingOrder 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<\App\Modules\LoanRemainingOrder\Models\LoanRemainingOrder> $query + * @return \Illuminate\Database\Eloquent\Builder<\App\Modules\LoanRemainingOrder\Models\LoanRemainingOrder> */ public static function indexQuery(NovaRequest $request, $query): Builder { @@ -69,9 +68,9 @@ class NovaLoanRemainingOrder 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) + public function fields(NovaRequest $request): array { return [ ID::make()->sortable(), @@ -102,48 +101,4 @@ class NovaLoanRemainingOrder extends Resource ]), ]; } - - /** - * 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/Loan/RequiredDocs/LoanOrderRequiredDocs.php b/app/Nova/Resources/Order/Loan/RequiredDocs/LoanOrderRequiredDocs.php index 4f8aeb0..c89cf19 100644 --- a/app/Nova/Resources/Order/Loan/RequiredDocs/LoanOrderRequiredDocs.php +++ b/app/Nova/Resources/Order/Loan/RequiredDocs/LoanOrderRequiredDocs.php @@ -28,7 +28,7 @@ class LoanOrderRequiredDocs extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'name', @@ -46,7 +46,7 @@ class LoanOrderRequiredDocs 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) { @@ -68,7 +68,7 @@ class LoanOrderRequiredDocs extends Resource * Get the cards available for the request. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array + * @return array */ public function cards(NovaRequest $request) { @@ -79,32 +79,10 @@ class LoanOrderRequiredDocs extends Resource * Get the filters available for the resource. * * @param \Laravel\Nova\Http\Requests\NovaRequest $request - * @return array + * @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/Payment/OnlinePaymentHistoryResource.php b/app/Nova/Resources/Payment/OnlinePaymentHistoryResource.php index e858116..76fea00 100644 --- a/app/Nova/Resources/Payment/OnlinePaymentHistoryResource.php +++ b/app/Nova/Resources/Payment/OnlinePaymentHistoryResource.php @@ -32,7 +32,7 @@ class OnlinePaymentHistoryResource extends Resource /** * The columns that should be searched. * - * @var array + * @var array */ public static $search = [ 'orderId', 'orderNumber', @@ -50,8 +50,10 @@ class OnlinePaymentHistoryResource extends Resource * Fields for index * * @param NovaRequest $request + * + * @return array */ - public function fieldsForIndex(NovaRequest $request) + public function fieldsForIndex(NovaRequest $request): array { return [ Text::make('PNR', 'orderNumber'), @@ -81,9 +83,9 @@ class OnlinePaymentHistoryResource 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) + public function fields(NovaRequest $request): array { return [ ID::make()->sortable(), @@ -116,44 +118,11 @@ class OnlinePaymentHistoryResource extends Resource ]; } - /** - * 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 + * @return array */ public function actions(NovaRequest $request) {