diff --git a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php index af0e91c..cd5e0e2 100644 --- a/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Models/VisaMasterPaymentOrder.php @@ -121,32 +121,32 @@ class VisaMasterPaymentOrder extends Model implements HasMedia [ 'required' => true, 'code' => 'passport_local', - 'name' => 'ugradyja degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi', + 'name' => 'Ugradyja degişli Türkmenistanyň raýatynyň (içki milli) pasportynyň asyl görnüşi we göçürmesi', ], [ 'required' => false, 'code' => 'passport_international', - 'name' => 'ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportynyň asyl görnüşi we göçürmesi', + 'name' => 'Ugradyja degişli Türkmenistandan çykmak we Türkmenistana girmek üçin pasportynyň asyl görnüşi we göçürmesi', ], [ 'required' => false, 'code' => 'travel_stamp_on_passport', - 'name' => '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', + 'name' => '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', ], [ 'required' => true, 'code' => 'proof_of_kinship', - 'name' => 'ugradyjynyň we kabul edijiniň (talybyň) özara garyndaşlyk derejesini tassyklaýjy resminamalarynyň göçürmesi', + 'name' => 'Ugradyjynyň we kabul edijiniň (talybyň) özara garyndaşlyk derejesini tassyklaýjy resminamalarynyň göçürmesi', ], [ 'required' => false, 'code' => 'passport_local_old', - 'name' => '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', + 'name' => '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', ], [ 'required' => false, 'code' => 'passport_local_old_replacement', - 'name' => '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', + 'name' => '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', ], ]; } diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php index c425a20..a438b47 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php @@ -221,7 +221,7 @@ class NovaVisaMasterPaymentOrder extends Resource ->rules('required', 'max:255'), ])->minRows(1)->rules('required'), - SimpleRepeatable::make('Tölegi kabul edijiniň maglumatlary', 'payment_reciever', [ + SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [ Select::make(__('Passport serie'), 'passport_serie') ->displayUsingLabels() ->searchable() @@ -240,7 +240,8 @@ class NovaVisaMasterPaymentOrder extends Resource ])->maxRows(1)->minRows(1)->rules('required'), ]), - new Tab(__('Reciver files'), VisaMasterPaymentOrderFileFields::reciverFiles()) + new Tab(__('Reciver files'), VisaMasterPaymentOrderFileFields::reciverFiles()), + new Tab(__('Sender files'), VisaMasterPaymentOrderFileFields::senderFiles()), ], $request)->asWizard(), ]; } diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php index 5dae432..6bebf06 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/VisaMasterPaymentOrderFileFields.php @@ -25,7 +25,9 @@ class VisaMasterPaymentOrderFileFields ->required($file['required']) ->store(function (NovaRequest $request, $model) use ($file) { return function () use ($model, $request, $file) { - $model->addMediaFromRequest($file['code'])->toMediaCollection($file['code']); + $model->addMediaFromRequest($file['code']) + ->preservingOriginal() + ->toMediaCollection($file['code']); }; }) ->preview(function ($value, $disk, $resource) use ($file) { @@ -41,11 +43,24 @@ class VisaMasterPaymentOrderFileFields public static function senderFiles(): array { return collect(VisaMasterPaymentOrder::senderFiles()) - ->map(fn (array $file) => Files::make(__($file['name']), $file['code']) - ->size('w-1/2') - ->rules($file['required'] ? 'required' : 'nullable') - ->required($file['required']) - ) + ->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, $request, $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/index.html b/index.html deleted file mode 100644 index fd604d4..0000000 --- a/index.html +++ /dev/null @@ -1,42 +0,0 @@ -