fix bugs on visa master
This commit is contained in:
@@ -11,8 +11,6 @@ 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 Illuminate\Database\Eloquent\Model;
|
||||
use Illuminate\Support\Str;
|
||||
use Laravel\Nova\Fields\Badge;
|
||||
@@ -21,6 +19,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;
|
||||
|
||||
@@ -119,129 +118,127 @@ class NovaSberPaymentOrder extends Resource
|
||||
public function fields(NovaRequest $request): array
|
||||
{
|
||||
return [
|
||||
Tabs::make('Wizard', [
|
||||
new Tab(__('Status'), [
|
||||
ID::make()
|
||||
->hideFromDetail(),
|
||||
new Panel(__('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')
|
||||
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()),
|
||||
|
||||
Text::make(__('Note'), 'notes')
|
||||
->fullWidth()
|
||||
->canSeeWhen('systemUser', $this),
|
||||
]),
|
||||
|
||||
new Panel(__('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(),
|
||||
]),
|
||||
|
||||
new Panel(__('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'),
|
||||
|
||||
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(__('Current Residence'), 'address')
|
||||
->fullWidth()
|
||||
->rules('required', 'string', 'max:255')
|
||||
->hideFromIndex(),
|
||||
]),
|
||||
|
||||
new Panel(__('Payment'), [
|
||||
SimpleRepeatable::make(__('Payment sender data'), 'sender_datas', [
|
||||
Select::make(__('Passport serie'), 'passport_serie')
|
||||
->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()),
|
||||
|
||||
Text::make(__('Note'), 'notes')
|
||||
->fullWidth()
|
||||
->canSeeWhen('systemUser', $this),
|
||||
]),
|
||||
|
||||
new Tab(__('Location'), [
|
||||
Select::make(__('Region'), 'region')
|
||||
->fullWidth()
|
||||
->displayUsingLabels()
|
||||
->searchable()
|
||||
->options(RegionRepo::values())
|
||||
->default(RegionRepo::default())
|
||||
->options(PassportRepo::values())
|
||||
->rules('required')
|
||||
->sortable(),
|
||||
|
||||
Select::make(__('Branch'), 'branch_id')
|
||||
->fullWidth()
|
||||
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'),
|
||||
|
||||
SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
|
||||
Select::make(__('Passport serie'), 'passport_serie')
|
||||
->displayUsingLabels()
|
||||
->searchable()
|
||||
->dependsOn('region', NovaRepo::dependsOnRegion('region', Branch::class))
|
||||
->options(PassportRepo::values())
|
||||
->rules('required')
|
||||
->sortable(),
|
||||
]),
|
||||
|
||||
new Tab(__('Personal data'), [
|
||||
Text::make(__('Passport name'), 'passport_name')
|
||||
->fullWidth()
|
||||
->rules('required', 'string', 'max:255'),
|
||||
NovaInputmask::make(__('Passport number'), 'passport_number')
|
||||
->mask('999999')
|
||||
->rules('required', 'max:255'),
|
||||
|
||||
Text::make(__('Passport surname'), 'passport_surname')
|
||||
->fullWidth()
|
||||
->rules('required', 'string', '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'),
|
||||
]),
|
||||
|
||||
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(__('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(),
|
||||
|
||||
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'),
|
||||
|
||||
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'),
|
||||
|
||||
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'), SberPaymentOrderFileFields::reciverFiles()),
|
||||
new Tab(__('Sender files'), SberPaymentOrderFileFields::senderFiles()),
|
||||
], $request)->asWizard(),
|
||||
new Panel(__('Reciver files'), SberPaymentOrderFileFields::reciverFiles()),
|
||||
new Panel(__('Sender files'), SberPaymentOrderFileFields::senderFiles()),
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,24 +16,31 @@ class SberPaymentOrderFileFields
|
||||
{
|
||||
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']);
|
||||
});
|
||||
return Files::make(__($file['name']), $file['code'])
|
||||
->rules('required', 'size: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();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -43,23 +50,30 @@ class SberPaymentOrderFileFields
|
||||
{
|
||||
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']);
|
||||
});
|
||||
return Files::make(__($file['name']), $file['code'])
|
||||
->rules('required', 'size: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();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user