From f8194453eb2b61281f3a8be8112a60193b4b200a Mon Sep 17 00:00:00 2001 From: Nurmuhammet Allanov Date: Wed, 18 Sep 2024 19:03:47 +0500 Subject: [PATCH] authentication via username or phones --- .../Models/SberPaymentOrder.php | 11 ++++ .../Resources/SberPaymentOrderFileFields.php | 52 +++---------------- .../Models/VisaMasterPaymentOrder.php | 11 ++++ .../Resources/NovaVisaMasterPaymentOrder.php | 1 + .../VisaMasterPaymentOrderFileFields.php | 50 ++---------------- app/Providers/AppServiceProvider.php | 2 +- 6 files changed, 33 insertions(+), 94 deletions(-) diff --git a/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php b/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php index c21f1e8..499d6ff 100644 --- a/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php +++ b/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php @@ -3,6 +3,7 @@ namespace App\Modules\SberPaymentOrder\Models; use App\Models\Branch\Branch; +use App\Repos\Order\Loan\LoanOrderRepo; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Spatie\MediaLibrary\HasMedia; @@ -138,4 +139,14 @@ class SberPaymentOrder extends Model implements HasMedia ], ]; } + + /** + * "boot" method for model + */ + protected static function boot(): void + { + parent::boot(); + + static::creating(LoanOrderRepo::creating()); + } } diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/SberPaymentOrderFileFields.php b/app/Modules/SberPaymentOrder/Nova/Resources/SberPaymentOrderFileFields.php index 27a5911..67d5df1 100644 --- a/app/Modules/SberPaymentOrder/Nova/Resources/SberPaymentOrderFileFields.php +++ b/app/Modules/SberPaymentOrder/Nova/Resources/SberPaymentOrderFileFields.php @@ -4,8 +4,6 @@ namespace App\Modules\SberPaymentOrder\Nova\Resources; use App\Modules\SberPaymentOrder\Models\SberPaymentOrder; use Ebess\AdvancedNovaMediaLibrary\Fields\Files; -use Laravel\Nova\Fields\File; -use Laravel\Nova\Http\Requests\NovaRequest; class SberPaymentOrderFileFields { @@ -17,30 +15,11 @@ class SberPaymentOrderFileFields return collect(SberPaymentOrder::reciverFiles()) ->map(function (array $file) { return Files::make(__($file['name']), $file['code']) - ->rules('required', 'size:2048'); + ->required() + ->rules('required') + ->singleMediaRules(['max:2048']); }) ->toArray(); - - // return collect(SberPaymentOrder::reciverFiles()) - // ->map(function (array $file) { - // return File::make(__($file['name']), $file['code']) - // ->fullWidth() - // ->deletable(false) - // ->creationRules($file['required'] ? 'required' : 'nullable') - // ->updateRules('nullable') - // ->required($file['required']) - // ->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(); } /** @@ -51,29 +30,10 @@ class SberPaymentOrderFileFields return collect(SberPaymentOrder::senderFiles()) ->map(function (array $file) { return Files::make(__($file['name']), $file['code']) - ->rules('required', 'size:2048'); + ->required() + ->rules('required') + ->singleMediaRules(['max:2048']); }) ->toArray(); - - // return collect(SberPaymentOrder::senderFiles()) - // ->map(function (array $file) { - // return File::make(__($file['name']), $file['code']) - // ->fullWidth() - // ->deletable(false) - // ->creationRules($file['required'] ? 'required' : 'nullable') - // ->updateRules('nullable') - // ->required($file['required']) - // ->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(); } } diff --git a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php index 4c1c93a..013351e 100644 --- a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php @@ -3,6 +3,7 @@ namespace App\Modules\VisaMasterPaymentOrder\Models; use App\Models\Branch\Branch; +use App\Repos\Order\Loan\LoanOrderRepo; use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Relations\BelongsTo; use Spatie\MediaLibrary\HasMedia; @@ -157,4 +158,14 @@ class VisaMasterPaymentOrder extends Model implements HasMedia ], ]; } + + /** + * "boot" method for model + */ + protected static function boot(): void + { + parent::boot(); + + static::creating(LoanOrderRepo::creating()); + } } diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php index 396114d..27cb867 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php @@ -282,6 +282,7 @@ class NovaVisaMasterPaymentOrder extends Resource __('Ugradyjy we kabul ediji (talyp) 2015-nji ýyldan soňra Türkmenistanyň raýatynyň pasportyny ikinji gezek alan bolsa, onda birinji gezek alan pasportynyň seriýasy baradaky maglumat'), 'sender_passport_local_old' ), + Files::make( __('Ugradyjy we kabul ediji (talyp) 2015-nji ýyldan soňra Türkmenistanyň raýatynyň pasportyny ikinji gezek alandan soňra birinji gezek alan pasportynyň seriýasy baradaky maglumaty bilmeýän ,bolsa onda polisiýanyň degişli edaralaryndan birinji alan pasportynyň seriýasy baradaky güwänamasy'), 'sender_passport_local_old_replacement' diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php index e7261e6..2aaa9e9 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php @@ -4,8 +4,6 @@ namespace App\Modules\VisaMasterPaymentOrder\Nova\Resources; use App\Modules\VisaMasterPaymentOrder\Models\VisaMasterPaymentOrder; use Ebess\AdvancedNovaMediaLibrary\Fields\Files; -use Laravel\Nova\Fields\File; -use Laravel\Nova\Http\Requests\NovaRequest; class VisaMasterPaymentOrderFileFields { @@ -18,31 +16,10 @@ class VisaMasterPaymentOrderFileFields ->map(function (array $file) { return Files::make(__($file['name']), $file['code']) ->required() - ->singleMediaRules('max:2000') + ->singleMediaRules(['max:2048']) ->rules('required'); }) ->toArray(); - - // return collect(VisaMasterPaymentOrder::reciverFiles()) - // ->map(function (array $file) { - // return File::make(__($file['name']), $file['code']) - // ->fullWidth() - // ->deletable(false) - // ->creationRules($file['required'] ? 'required' : 'nullable') - // ->updateRules('nullable') - // ->required($file['required']) - // ->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(); } /** @@ -54,30 +31,9 @@ class VisaMasterPaymentOrderFileFields ->map(function (array $file) { return Files::make(__($file['name']), $file['code']) ->required() - ->singleMediaRules('max:2000') - ->rules('required'); + ->rules('required') + ->singleMediaRules(['max:2048']); }) ->toArray(); - - // return collect(VisaMasterPaymentOrder::senderFiles()) - // ->map(function (array $file) { - // return File::make(__($file['name']), $file['code']) - // ->fullWidth() - // ->deletable(false) - // ->creationRules($file['required'] ? 'required' : 'nullable') - // ->updateRules('nullable') - // ->required($file['required']) - // ->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(); } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 76df9a7..54d62a7 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -39,7 +39,7 @@ class AppServiceProvider extends ServiceProvider $openApi->secure(SecurityScheme::http('bearer')); }); - $this->listenDB(); + // $this->listenDB(); } /**