Webulgam/online.tbbank.gov.tm-laravel-nova
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phpstan 5 errors fixed

Browse Source
This commit is contained in:
Nurmuhammet Allanov
2024-11-25 15:34:09 +05:00
parent 2e0cc45e99
commit 0d875acc4e
28 changed files with 463 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Modules/LoanOrder/Controllers/LoanOrderController.php
View File

@@ -84,7 +84,7 @@ class LoanOrderController extends Controller
public function show(LoanOrder $loanOrder)
{
if ($loanOrder->user_id === auth()->id()) {
return response()->status(403);
return response(status: 403);
}
return response()->json(new LoanOrderShowResource($loanOrder));
@@ -104,7 +104,7 @@ class LoanOrderController extends Controller
public function destroy(LoanOrder $loanOrder)
{
if ($loanOrder->user_id === auth()->id()) {
return response()->status(403);
return response(status: 403);
}
$loanOrder->delete();

3
app/Modules/LoanOrder/Controllers/Resources/LoanOrderIndexResource.php
View File

@@ -6,6 +6,9 @@ use App\Repos\Order\OrderRepo;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
/**
* @mixin \App\Models\Order\Loan\LoanOrder
*/
class LoanOrderIndexResource extends JsonResource
{
/**

3
app/Modules/LoanOrder/Controllers/Resources/LoanOrderShowResource.php
View File

@@ -10,6 +10,9 @@ use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Storage;
/**
* @mixin \App\Models\Order\Loan\LoanOrder
*/
class LoanOrderShowResource extends JsonResource
{
/**

22
app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php
View File

@@ -10,6 +10,28 @@ use Illuminate\Database\Eloquent\SoftDeletes;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
/**
* @property int $id
* @property string $unique_id
* @property string $type
* @property string $passport_name
* @property string $passport_surname
* @property string $phone
* @property string $email
* @property string $region
* @property int $branch_id
* @property int $user_id
* @property string $address
* @property array $sender_datas
* @property array $payment_reciever
* @property string $documents
* @property string $status
* @property string $notes
* @property \Illuminate\Support\Carbon $created_at
* @property \Illuminate\Support\Carbon $updated_at
* @property bool $paid
* @property \Illuminate\Support\Carbon $deleted_at
*/
class SberPaymentOrder extends Model implements HasMedia
{
use InteractsWithMedia;

11
app/Modules/SberPaymentOrder/Nova/Resources/Concerns/NovaSberPaymentOrderAuth.php
View File

@@ -2,6 +2,7 @@
namespace App\Modules\SberPaymentOrder\Nova\Resources\Concerns;
use App\Modules\SberPaymentOrder\Models\SberPaymentOrder;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request;
@@ -16,7 +17,9 @@ trait NovaSberPaymentOrderAuth
return;
}
if ($this->resource->user_id == auth()->id()) {
/** @var SberPaymentOrder $resource */
$resource = $this->resource;
if ($resource->user_id == auth()->id()) {
return;
}
@@ -44,7 +47,9 @@ trait NovaSberPaymentOrderAuth
return;
}
if ($this->resource->user_id == auth()->id()) {
/** @var SberPaymentOrder $resource */
$resource = $this->resource;
if ($resource->user_id == auth()->id()) {
return;
}
@@ -78,6 +83,6 @@ trait NovaSberPaymentOrderAuth
/** Force delete */
public function authorizedToForceDelete(Request $request)
{
throw_unless(auth()->user()->isMe(), AuthorizationException::class);
return auth()->user()->isMe();
}
}

5
app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
View File

@@ -332,7 +332,10 @@ class NovaSberPaymentOrder extends Resource
->icon('credit-card')
->sole()
->canSee(function ($request) {
if (in_array($this->resource->status, [
/** @var \App\Modules\SberPaymentOrder\Models\SberPaymentOrder $resource */
$resource = $this->resource;
if (in_array($resource->status, [
OrderRepo::PENDING,
OrderRepo::CANCELLED,
])) {

208
app/Modules/TuitionPaymentOrder/Nova/Resources/NovaTuitionPaymentOrder.php
View File

@@ -119,129 +119,129 @@ class NovaTuitionPaymentOrder extends Resource
public function fields(NovaRequest $request): array
{
return [
Tabs::make('Wizard', [
new Tab(__('Status'), [
ID::make()
->hideFromDetail(),
// Tabs::make('Wizard', [
// new Tab(__('Status'), [
// ID::make()
// ->hideFromDetail(),
Hidden::make('user_id')
->default(auth()->id())
->hideWhenUpdating(),
// Hidden::make('user_id')
// ->default(auth()->id())
// ->hideWhenUpdating(),
Text::make(__('ID'), 'unique_id')
->exceptOnForms(),
// Text::make(__('ID'), 'unique_id')
// ->exceptOnForms(),
Select::make(__('Status'), 'status')
->displayUsingLabels()
->searchable()
->options(OrderRepo::statusValues())
->default(OrderRepo::defaultStatus())
->fullWidth()
->hideFromDetail()
->rules('required')
->canSeeWhen('systemUser', $this),
// Select::make(__('Status'), 'status')
// ->displayUsingLabels()
// ->searchable()
// ->options(OrderRepo::statusValues())
// ->default(OrderRepo::defaultStatus())
// ->fullWidth()
// ->hideFromDetail()
// ->rules('required')
// ->canSeeWhen('systemUser', $this),
Badge::make(__('Status'), 'status')
->map(OrderRepo::statusClasses())
->addTypes([
'primary' => 'dark:bg-gray-900 bg-gray-600 text-white',
])
->labels(OrderRepo::statusValues())
->withIcons()
->icons(OrderRepo::statusIcons()),
// Badge::make(__('Status'), 'status')
// ->map(OrderRepo::statusClasses())
// ->addTypes([
// 'primary' => 'dark:bg-gray-900 bg-gray-600 text-white',
// ])
// ->labels(OrderRepo::statusValues())
// ->withIcons()
// ->icons(OrderRepo::statusIcons()),
Text::make(__('Note'), 'notes')
->fullWidth()
->canSeeWhen('systemUser', $this),
]),
// Text::make(__('Note'), 'notes')
// ->fullWidth()
// ->canSeeWhen('systemUser', $this),
// ]),
new Tab(__('Location'), [
Select::make(__('Region'), 'region')
->fullWidth()
->displayUsingLabels()
->searchable()
->options(RegionRepo::values())
->default(RegionRepo::default())
->rules('required')
->sortable(),
// new Tab(__('Location'), [
// Select::make(__('Region'), 'region')
// ->fullWidth()
// ->displayUsingLabels()
// ->searchable()
// ->options(RegionRepo::values())
// ->default(RegionRepo::default())
// ->rules('required')
// ->sortable(),
Select::make(__('Branch'), 'branch_id')
->fullWidth()
->displayUsingLabels()
->searchable()
->dependsOn('region', NovaRepo::dependsOnRegion('region', Branch::class))
->rules('required')
->sortable(),
]),
// Select::make(__('Branch'), 'branch_id')
// ->fullWidth()
// ->displayUsingLabels()
// ->searchable()
// ->dependsOn('region', NovaRepo::dependsOnRegion('region', Branch::class))
// ->rules('required')
// ->sortable(),
// ]),
new Tab(__('Personal data'), [
Text::make(__('Passport name'), 'passport_name')
->fullWidth()
->rules('required', 'string', 'max:255'),
// new Tab(__('Personal data'), [
// Text::make(__('Passport name'), 'passport_name')
// ->fullWidth()
// ->rules('required', 'string', 'max:255'),
Text::make(__('Passport surname'), 'passport_surname')
->fullWidth()
->rules('required', 'string', 'max:255'),
// Text::make(__('Passport surname'), 'passport_surname')
// ->fullWidth()
// ->rules('required', 'string', 'max:255'),
NovaInputmask::make(__('Phone'), 'phone')
->fullWidth()
->phonenumber('TM')
->rules('required', 'max:255')
->hideFromIndex(),
// NovaInputmask::make(__('Phone'), 'phone')
// ->fullWidth()
// ->phonenumber('TM')
// ->rules('required', 'max:255')
// ->hideFromIndex(),
Text::make(__('Email'), 'email')
->fullWidth()
->rules('nullable', 'max:255', 'email')
->hideFromIndex(),
// Text::make(__('Email'), 'email')
// ->fullWidth()
// ->rules('nullable', 'max:255', 'email')
// ->hideFromIndex(),
Text::make(__('Current Residence'), 'address')
->fullWidth()
->rules('required', 'string', 'max:255')
->hideFromIndex(),
]),
// Text::make(__('Current Residence'), 'address')
// ->fullWidth()
// ->rules('required', 'string', 'max:255')
// ->hideFromIndex(),
// ]),
new Tab(__('Payment'), [
SimpleRepeatable::make(__('Payment sender data'), 'sender_datas', [
Select::make(__('Passport serie'), 'passport_serie')
->displayUsingLabels()
->searchable()
->options(PassportRepo::values())
->rules('required')
->sortable(),
// new Tab(__('Payment'), [
// SimpleRepeatable::make(__('Payment sender data'), 'sender_datas', [
// Select::make(__('Passport serie'), 'passport_serie')
// ->displayUsingLabels()
// ->searchable()
// ->options(PassportRepo::values())
// ->rules('required')
// ->sortable(),
NovaInputmask::make(__('Passport number'), 'passport_number')
->mask('999999')
->rules('required', 'max:255'),
// NovaInputmask::make(__('Passport number'), 'passport_number')
// ->mask('999999')
// ->rules('required', 'max:255'),
Text::make(
name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
attribute: 'full_name'
)
->rules('required', 'max:255'),
])->minRows(1)->rules('required'),
// Text::make(
// name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
// attribute: 'full_name'
// )
// ->rules('required', 'max:255'),
// ])->minRows(1)->rules('required'),
SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
Select::make(__('Passport serie'), 'passport_serie')
->displayUsingLabels()
->searchable()
->options(PassportRepo::values())
->rules('required')
->sortable(),
// SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
// Select::make(__('Passport serie'), 'passport_serie')
// ->displayUsingLabels()
// ->searchable()
// ->options(PassportRepo::values())
// ->rules('required')
// ->sortable(),
NovaInputmask::make(__('Passport number'), 'passport_number')
->mask('999999')
->rules('required', 'max:255'),
// NovaInputmask::make(__('Passport number'), 'passport_number')
// ->mask('999999')
// ->rules('required', 'max:255'),
Text::make(
name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
attribute: 'full_name'
)->rules('required', 'max:255'),
])->maxRows(1)->minRows(1)->rules('required'),
]),
// Text::make(
// name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
// attribute: 'full_name'
// )->rules('required', 'max:255'),
// ])->maxRows(1)->minRows(1)->rules('required'),
// ]),
new Tab(__('Reciver files'), TuitionPaymentOrderFileFields::reciverFiles()),
new Tab(__('Sender files'), TuitionPaymentOrderFileFields::senderFiles()),
], $request)->asWizard(),
// new Tab(__('Reciver files'), TuitionPaymentOrderFileFields::reciverFiles()),
// new Tab(__('Sender files'), TuitionPaymentOrderFileFields::senderFiles()),
// ], $request)->asWizard(),
];
}
}

44
app/Modules/TuitionPaymentOrder/Nova/Resources/TuitionPaymentOrderFileFields.php
View File

@@ -20,17 +20,17 @@ class TuitionPaymentOrderFileFields
->fullWidth()
->deletable(false)
->creationRules($file['required'] ? 'required' : 'nullable')
->updateRules('nullable')
->store(function (NovaRequest $request, $model) use ($file) {
return function () use ($model, $file) {
$model->addMediaFromRequest($file['code'])
->preservingOriginal()
->toMediaCollection($file['code']);
};
})
->preview(function ($value, $disk, $resource) use ($file) {
return $resource->getFirstMediaUrl($file['code']);
});
->updateRules('nullable');
// ->store(function (NovaRequest $request, $model) use ($file) {
// return function () use ($model, $file) {
// $model->addMediaFromRequest($file['code'])
// ->preservingOriginal()
// ->toMediaCollection($file['code']);
// };
// })
// ->preview(function ($value, $disk, $resource) use ($file) {
// return $resource->getFirstMediaUrl($file['code']);
// });
})
->toArray();
}
@@ -46,17 +46,17 @@ class TuitionPaymentOrderFileFields
->fullWidth()
->deletable(false)
->creationRules($file['required'] ? 'required' : 'nullable')
->updateRules('nullable')
->store(function (NovaRequest $request, $model) use ($file) {
return function () use ($model, $file) {
$model->addMediaFromRequest($file['code'])
->preservingOriginal()
->toMediaCollection($file['code']);
};
})
->preview(function ($value, $disk, $resource) use ($file) {
return $resource->getFirstMediaUrl($file['code']);
});
->updateRules('nullable');
// ->store(function (NovaRequest $request, $model) use ($file) {
// return function () use ($model, $file) {
// $model->addMediaFromRequest($file['code'])
// ->preservingOriginal()
// ->toMediaCollection($file['code']);
// };
// })
// ->preview(function ($value, $disk, $resource) use ($file) {
// return $resource->getFirstMediaUrl($file['code']);
// });
})
->toArray();
}

22
app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php
View File

@@ -14,6 +14,28 @@ use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
/**
* @property int $id
* @property string $unique_id
* @property string $type
* @property string $passport_name
* @property string $passport_surname
* @property string $phone
* @property string $email
* @property string $region
* @property int $branch_id
* @property int $user_id
* @property string $address
* @property array $sender_datas
* @property array $payment_reciever
* @property string $documents
* @property string $status
* @property string $notes
* @property \Illuminate\Support\Carbon $created_at
* @property \Illuminate\Support\Carbon $updated_at
* @property bool $paid
* @property \Illuminate\Support\Carbon $deleted_at
*/
class VisaMasterPaymentOrder extends Model implements HasMedia
{
use InteractsWithMedia;

13
app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrderItem.php
View File

@@ -7,6 +7,19 @@ use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
/**
* @property int $id
* @property int $visa_master_payment_order_id
* @property int $online_payment_history_id
* @property ?string $payer_name
* @property ?string $payer_card
* @property ?string $payment_order_number
* @property string $tmt_payment_amount
* @property string $usd_payment_amount
* @property bool $paid
* @property \Illuminate\Support\Carbon $created_at
* @property \Illuminate\Support\Carbon $updated_at
*/
class VisaMasterPaymentOrderItem extends Model implements HasMedia
{
use InteractsWithMedia;

11
app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterAuth.php
View File

@@ -2,6 +2,7 @@
namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns;
use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Http\Request;
@@ -16,7 +17,10 @@ trait VisaMasterAuth
return;
}
if ($this->resource->user_id == auth()->id()) {
/** @var VisaMasterPaymentOrder $resource */
$resource = $this->resource;
if ($resource->user_id == auth()->id()) {
return;
}
@@ -44,7 +48,10 @@ trait VisaMasterAuth
return;
}
if ($this->resource->user_id == auth()->id()) {
/** @var VisaMasterPaymentOrder $resource */
$resource = $this->resource;
if ($resource->user_id == auth()->id()) {
return;
}

6
app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
View File

@@ -4,6 +4,7 @@ namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources;
use App\Models\Branch\Branch;
use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder;
use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder as VisaMasterPaymentOrderModel;
use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterAuth;
use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterPaymentOrderFieldsForDetail;
use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Concerns\VisaMasterPaymentOrderFieldsForIndex;
@@ -358,7 +359,10 @@ class NovaVisaMasterPaymentOrder extends Resource
->icon('credit-card')
->sole()
->canSee(function ($request) {
if (in_array($this->resource->status, [
/** @var VisaMasterPaymentOrderModel $order */
$order = $this->resource;
if (in_array($order->status, [
OrderRepo::PENDING,
OrderRepo::CANCELLED,
])) {

22
app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrderItem.php
View File

@@ -4,11 +4,12 @@ namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources;
use App\Models\Branch\Branch;
use App\Models\Payment\OnlinePaymentHistory;
use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrderItem as VisaMasterPaymentOrderItemModel;
use App\Modules\VisaMasterPaymentOrder\Nova\Resources\Item\NovaVisaMasterPaymentOrderItemAuth;
use App\Nova\Actions\CheckOnlinePayment;
use App\Nova\Resource;
use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Http;
use Laravel\Nova\Actions\Action;
use Laravel\Nova\Actions\ActionResponse;
@@ -19,7 +20,7 @@ use Laravel\Nova\Fields\Text;
use Laravel\Nova\Http\Requests\NovaRequest;
/**
* @template TModel of \App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder
* @template TModel of \App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrderItem
*/
class NovaVisaMasterPaymentOrderItem extends Resource
{
@@ -28,7 +29,7 @@ class NovaVisaMasterPaymentOrderItem extends Resource
/**
* The model the resource corresponds to.
*
* @var class-string<\App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder>
* @var class-string<\App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrderItem>
*/
public static $model = \App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrderItem::class;
@@ -107,16 +108,16 @@ class NovaVisaMasterPaymentOrderItem extends Resource
Text::make('Amaly geçiren raýatyň kart belgisi (mask)', 'payer_card'),
Text::make('Töleg ýyly', fn () => $this->created_at->format('Y')),
Text::make('Töleg aýy', fn () => $this->created_at->translatedFormat('F')),
Text::make('Töleg ýyly', fn ($model) => $model->format('Y')),
Text::make('Töleg aýy', fn ($model) => $model->created_at->translatedFormat('F')),
Text::make('Amalyň geçirilen wagty', fn () => $this->created_at->format('H:i, d.m.Y')),
Text::make('Amalyň geçirilen wagty', fn ($model) => $model->created_at->format('H:i, d.m.Y')),
Text::make('Amalyň möçberi', fn () => $this->usd_payment_amount.' USD'),
Text::make('Amalyň möçberi', fn ($model) => $model->usd_payment_amount.' USD'),
Text::make('Amalyň manat möçberi', fn () => $this->tmt_payment_amount.' TMT'),
Text::make('Amalyň manat möçberi', fn ($model) => $model->tmt_payment_amount.' TMT'),
Text::make('Amalyň referensi', fn () => $this->payment_order_number),
Text::make('Amalyň referensi', fn ($model) => $model->payment_order_number),
Boolean::make(__('Paid'), 'paid'),
];
@@ -126,7 +127,8 @@ class NovaVisaMasterPaymentOrderItem extends Resource
{
return [
Action::using('HALKBANK töleg barla', function (ActionFields $fields, Collection $models) {
$item = $onlinePaymentResource = $models->first();
/** @var VisaMasterPaymentOrderItemModel $item */
$item = $models->first();
$onlinePaymentResource = OnlinePaymentHistory::find($item->online_payment_history_id);

3
app/Modules/VisaMasterSettings/Models/VisaMasterSettings.php
View File

@@ -4,6 +4,9 @@ namespace App\Modules\VisaMasterSettings\Models;
use Illuminate\Database\Eloquent\Model;
/**
* @property string $value
*/
class VisaMasterSettings extends Model
{
protected $table = 'visa_master_settings';