diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
index 9e6ec02..81ff650 100644
--- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
+++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
@@ -116,30 +116,21 @@ class VisaMasterPaymentOrderFieldsForDetail
->hideFromIndex(),
]),
new Panel(__('Payment'), [
- SimpleRepeatable::make(__('Payment sender data'), 'sender_datas', [
- Select::make(__('Passport serie'), 'passport_serie')
- ->displayUsingLabels()
- ->searchable()
- ->options(PassportRepo::values())
- ->rules('required')
- ->sortable(),
+ Text::make(__('Payment sender data'), function () use ($resource) {
+ return sprintf(
+ '%s-%s %s',
+ $resource->sender_passport_serie,
+ $resource->sender_passport_number,
+ $resource->sender_full_name
+ );
+ })->asHtml(),
- 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'),
-
- Text::make(
- name: __('Goýum hasaby'),
- attribute: 'deposit_account'
- )
- ->rules('required', 'max:255'),
- ])->minRows(1)->rules('required'),
+ Text::make(__('Töleg ugradyjynyň goýum hasaby'), function () use ($resource) {
+ return sprintf(
+ '%s',
+ number_format($resource->sender_deposit_account, 0, '', '')
+ );
+ })->asHtml(),
SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
Select::make(__('Passport serie'), 'passport_serie')
diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
index ee6366f..88c561c 100644
--- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
+++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
@@ -263,32 +263,38 @@ class NovaVisaMasterPaymentOrder extends Resource
->hideFromIndex(),
]),
- new Panel(__('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'),
-
- Text::make(
- name: sprintf('%s %s %s', __('Surname'), __('Name'), __('Patronic name')),
- attribute: 'full_name'
- )
- ->rules('required', 'max:255'),
-
- Text::make(
- name: __('Goýum hasaby'),
- attribute: 'deposit_account'
- )
- ->rules('required', 'max:255'),
- ])->minRows(1)->rules('required'),
+ new Panel(__('Payment sender data'), [
+ Select::make(__('Passport serie'), 'sender_passport_serie')
+ ->displayUsingLabels()
+ ->searchable()
+ ->options(PassportRepo::values())
+ ->rules('required')
+ ->fullWidth()
+ ->sortable(),
+
+ NovaInputmask::make(__('Passport number'), 'sender_passport_number')
+ ->mask('999999')
+ ->fullWidth()
+ ->rules('required', 'max:255'),
+
+ Text::make(
+ name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
+ attribute: 'sender_full_name'
+ )
+ ->fullWidth()
+ ->rules('required', 'max:255'),
+
+ Text::make(
+ name: __('Goýum hasaby'),
+ attribute: 'sender_deposit_account'
+ )->fullWidth()
+ ->rules('required', 'string', 'max:255')
+ ->fillUsing(function ($request, $model, $attribute) {
+ $model->sender_deposit_account = strval($request->sender_deposit_account);
+ }),
+ ]),
+ new Panel(__('Payee information'), [
SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
Select::make(__('Passport serie'), 'passport_serie')
->displayUsingLabels()
@@ -296,18 +302,18 @@ class NovaVisaMasterPaymentOrder extends Resource
->options(PassportRepo::values())
->rules('required')
->sortable(),
-
+
NovaInputmask::make(__('Passport number'), 'passport_number')
->mask('999999')
->rules('required', 'max:255'),
-
+
Text::make(
name: sprintf('%s %s %s', __('Surname'), __('Name'), __('Patronic name')),
attribute: 'full_name'
)->rules('required', 'max:255'),
])->maxRows(1)->minRows(1)->rules('required'),
]),
-
+
new Panel(__('Reciver files'), [
Files::make(__('Talyba degişli walýuta "VISA" kartyň rekwizitleri'), 'receiver_requisite')
->required()