Merge pull request 'Added options in characteristics type and changed path of the fonts' (#1095) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 13s

Reviewed-on: #1095
This commit was merged in pull request #1095.
This commit is contained in:
2026-09-25 06:45:20 +00:00

View File

@@ -96,7 +96,7 @@ class StickerDetailResource extends Resource
->reactive() ->reactive()
->searchable() ->searchable()
->options( ->options(
collect(Schema::getColumnListing('class_characteristics')) collect(Schema::getColumnListing('class_characteristics'))
->reject(fn ($column) => in_array($column, [ ->reject(fn ($column) => in_array($column, [
'id', 'id',
'plant_id', 'plant_id',
@@ -121,6 +121,9 @@ class StickerDetailResource extends Resource
->prepend('Verified By', 'verified_by') ->prepend('Verified By', 'verified_by')
->prepend('Approved By', 'approved_by') ->prepend('Approved By', 'approved_by')
->prepend('Date Of Test', 'date_of_test') ->prepend('Date Of Test', 'date_of_test')
->prepend('Gross Wt Dual', 'zmm_grwt_pump_dual')
->prepend('Net Wt Dual', 'zmm_newt_pump_dual')
->prepend('MRP Dual', 'mrp_dual')
->toArray() ->toArray()
), ),
Forms\Components\TextInput::make('string_value') Forms\Components\TextInput::make('string_value')
@@ -131,7 +134,7 @@ class StickerDetailResource extends Resource
->label('String Font') ->label('String Font')
->reactive() ->reactive()
->options(function () { ->options(function () {
$files = File::files(storage_path('app/fonts')); $files = File::files(storage_path('app/private/fonts'));
return collect($files) return collect($files)
->mapWithKeys(function ($file) { ->mapWithKeys(function ($file) {