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

fix bugs on visa master

Browse Source
This commit is contained in:
Nurmuhammet Allanov
2024-09-09 21:05:21 +05:00
parent b7ee29173c
commit fc697f6318
9 changed files with 408 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,13 +40,20 @@ class VisaMasterPaymentOrder extends Model implements HasMedia
*/
public function registerMediaCollections(): void
{
foreach (static::reciverFiles() as $reciverFile) {
$this->addMediaCollection($reciverFile['code'])->singleFile();
}
$this->addMediaCollection('receiver_requisite')->singleFile();
$this->addMediaCollection('receiver_document_stating_he_is_studying')->singleFile();
$this->addMediaCollection('receiver_passport_local')->singleFile();
$this->addMediaCollection('receiver_passport_international')->singleFile();
$this->addMediaCollection('receiver_visa')->singleFile();
$this->addMediaCollection('receiver_travel_stamp_on_passport')->singleFile();
$this->addMediaCollection('receiver_document_stating_he_is_studying_2')->singleFile();
foreach (static::senderFiles() as $senderFile) {
$this->addMediaCollection($senderFile['code'])->singleFile();
}
$this->addMediaCollection('sender_passport_local')->singleFile();
$this->addMediaCollection('sender_passport_international')->singleFile();
$this->addMediaCollection('sender_travel_stamp_on_passport')->singleFile();
$this->addMediaCollection('sender_proof_of_kinship')->singleFile();
$this->addMediaCollection('sender_passport_local_old')->singleFile();
$this->addMediaCollection('sender_passport_local_old_replacement')->singleFile();
}
/**

42
app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
View File

@@ -8,6 +8,7 @@ use App\Nova\Resources\Branch\Branch;
use App\Repos\Order\OrderRepo;
use App\Repos\System\Settings\Legal\PassportRepo;
use App\Repos\System\Settings\Location\RegionRepo;
use Ebess\AdvancedNovaMediaLibrary\Fields\Files;
use Laravel\Nova\Fields\Badge;
use Laravel\Nova\Fields\BelongsTo;
use Laravel\Nova\Fields\Hidden;
@@ -146,8 +147,45 @@ class VisaMasterPaymentOrderFieldsForDetail
])->maxRows(1)->minRows(1)->rules('required'),
]),
new Panel(__('Reciver files'), VisaMasterPaymentOrderFileFields::reciverFiles()),
new Panel(__('Sender files'), VisaMasterPaymentOrderFileFields::senderFiles()),
new Panel(__('Reciver files'), [
Files::make(__('Talyba degişli walýuta “SBERBANK” kartyň rekwizitleri'), 'receiver_requisite')
->required()
->rules('required'),
Files::make(__('Talybyň daşary ýurt döwletiniň ýokary okuw mekdebinde okaýandygy baradaky güwänamasy'), 'receiver_document_stating_he_is_studying'),
Files::make(__('Talyba degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi'), 'receiver_passport_local'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin (zagran) pasportynyň göçürmesi'), 'receiver_passport_international'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky daşary ýurtda galyp okap bilýändigi baradaky berlen möhleti hereket edýän rugsatnamasynyň (wizasynyň) bellenen sahypasynyň göçürmesi'), 'receiver_visa'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky Türkmenistandan çykandygy we daşary ýurt döwletine girendigi baradaky ştamplaryň (seneli ştampyň) bellenen sahypasynyň göçürmesi'), 'receiver_travel_stamp_on_passport'),
Files::make(__('Talybyň daşary ýurt döwletiniň ýokary okuw mekdebinde okaýandygy baradaky güwänamasyndaky maglumatyň doly takyk däl ýagdaýynda takyk däl maglumatyň sebäpleri baradaky daşary ýurt döwletiniň ýokary okuw mekdebinden haty'), 'receiver_document_stating_he_is_studying_2'),
]),
new Panel(__('Sender files'), [
Files::make(__('Ugradyja degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi'), 'sender_passport_local')
->required()
->rules('required'),
Files::make(__('Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportynyň asyl görnüşi we göçürmesi'), 'sender_passport_international'),
Files::make(
__('Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky daşary döwletine gidendigi we daşary döwlete barandygy baradaky (ştampyň) bellenen sahypasynyň göçürmesi'),
'sender_travel_stamp_on_passport'
)->required(),
Files::make(
__('Ugradyjynyň we kabul edijiniň (talybyň) özara garyndaşlyk derejesini tassyklaýjy resminamalarynyň göçürmesi'),
'sender_proof_of_kinship'
),
Files::make(
__('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'
),
]),
];
}
}

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

@@ -12,8 +12,7 @@ use App\Repos\Order\OrderRepo;
use App\Repos\System\Nova\NovaRepo;
use App\Repos\System\Settings\Legal\PassportRepo;
use App\Repos\System\Settings\Location\RegionRepo;
use Eminiarts\Tabs\Tab;
use Eminiarts\Tabs\Tabs;
use Ebess\AdvancedNovaMediaLibrary\Fields\Files;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Laravel\Nova\Fields\Badge;
@@ -22,6 +21,7 @@ use Laravel\Nova\Fields\ID;
use Laravel\Nova\Fields\Select;
use Laravel\Nova\Fields\Text;
use Laravel\Nova\Http\Requests\NovaRequest;
use Laravel\Nova\Panel;
use Nurmuhammet\NovaInputmask\NovaInputmask;
use Outl1ne\NovaSimpleRepeatable\SimpleRepeatable;
@@ -248,8 +248,45 @@ class NovaVisaMasterPaymentOrder extends Resource
])->maxRows(1)->minRows(1)->rules('required'),
]),
new Panel(__('Reciver files'), VisaMasterPaymentOrderFileFields::reciverFiles()),
new Panel(__('Sender files'), VisaMasterPaymentOrderFileFields::senderFiles()),
new Panel(__('Reciver files'), [
Files::make(__('Talyba degişli walýuta “SBERBANK” kartyň rekwizitleri'), 'receiver_requisite')
->required()
->rules('required'),
Files::make(__('Talybyň daşary ýurt döwletiniň ýokary okuw mekdebinde okaýandygy baradaky güwänamasy'), 'receiver_document_stating_he_is_studying'),
Files::make(__('Talyba degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi'), 'receiver_passport_local'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin (zagran) pasportynyň göçürmesi'), 'receiver_passport_international'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky daşary ýurtda galyp okap bilýändigi baradaky berlen möhleti hereket edýän rugsatnamasynyň (wizasynyň) bellenen sahypasynyň göçürmesi'), 'receiver_visa'),
Files::make(__('Talybyň Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky Türkmenistandan çykandygy we daşary ýurt döwletine girendigi baradaky ştamplaryň (seneli ştampyň) bellenen sahypasynyň göçürmesi'), 'receiver_travel_stamp_on_passport'),
Files::make(__('Talybyň daşary ýurt döwletiniň ýokary okuw mekdebinde okaýandygy baradaky güwänamasyndaky maglumatyň doly takyk däl ýagdaýynda takyk däl maglumatyň sebäpleri baradaky daşary ýurt döwletiniň ýokary okuw mekdebinden haty'), 'receiver_document_stating_he_is_studying_2'),
]),
new Panel(__('Sender files'), [
Files::make(__('Ugradyja degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi'), 'sender_passport_local')
->required()
->rules('required'),
Files::make(__('Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportynyň asyl görnüşi we göçürmesi'), 'sender_passport_international'),
Files::make(
__('Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportyndaky daşary döwletine gidendigi we daşary döwlete barandygy baradaky (ştampyň) bellenen sahypasynyň göçürmesi'),
'sender_travel_stamp_on_passport'
)->required(),
Files::make(
__('Ugradyjynyň we kabul edijiniň (talybyň) özara garyndaşlyk derejesini tassyklaýjy resminamalarynyň göçürmesi'),
'sender_proof_of_kinship'
),
Files::make(
__('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'
),
]),
];
}
}

84
app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php
View File

@@ -16,25 +16,33 @@ class VisaMasterPaymentOrderFileFields
{
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) {
// @phpstan-ignore-next-line
$model->addMediaFromRequest($file['code'])
->preservingOriginal()
->toMediaCollection($file['code']);
};
})
->preview(function ($value, $disk, $resource) use ($file) {
return $resource->getFirstMediaUrl($file['code']);
});
return Files::make(__($file['name']), $file['code'])
->required()
->singleMediaRules('max:2000')
->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();
}
/**
@@ -44,24 +52,32 @@ class VisaMasterPaymentOrderFileFields
{
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) {
// @phpstan-ignore-next-line
$model->addMediaFromRequest($file['code'])
->preservingOriginal()
->toMediaCollection($file['code']);
};
})
->preview(function ($value, $disk, $resource) use ($file) {
return $resource->getFirstMediaUrl($file['code']);
});
return Files::make(__($file['name']), $file['code'])
->required()
->singleMediaRules('max:2000')
->rules('required');
})
->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();
}
}