Merge pull request 'ranjith-dev' (#1059) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 23s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 23s
Reviewed-on: #1059
This commit was merged in pull request #1059.
This commit is contained in:
@@ -153,10 +153,14 @@ class CharacteristicApproverMasterImporter extends Importer
|
|||||||
if (! is_numeric($apprDur1)) {
|
if (! is_numeric($apprDur1)) {
|
||||||
$warnMsg[] = 'Duration 1 must be a numeric value (HH.MM)!';
|
$warnMsg[] = 'Duration 1 must be a numeric value (HH.MM)!';
|
||||||
}
|
}
|
||||||
if ($apprDur2 != null && $apprDur2 != '' && ! is_numeric($apprDur2)) {
|
if ($apprDur2 == null || $apprDur2 == '') {
|
||||||
|
$apprDur2 = 0.00;
|
||||||
|
} elseif ($apprDur2 != null && $apprDur2 != '' && ! is_numeric($apprDur2)) {
|
||||||
$warnMsg[] = 'Duration 2 must be a numeric value (HH.MM)!';
|
$warnMsg[] = 'Duration 2 must be a numeric value (HH.MM)!';
|
||||||
}
|
}
|
||||||
if ($apprDur3 != null && $apprDur3 != '' && ! is_numeric($apprDur3)) {
|
if ($apprDur3 == null || $apprDur3 == '') {
|
||||||
|
$apprDur3 = 0.00;
|
||||||
|
} elseif ($apprDur3 != null && $apprDur3 != '' && ! is_numeric($apprDur3)) {
|
||||||
$warnMsg[] = 'Duration 3 must be a numeric value (HH.MM)!';
|
$warnMsg[] = 'Duration 3 must be a numeric value (HH.MM)!';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -117,6 +117,9 @@ class StickerDetailResource extends Resource
|
|||||||
->prepend('Plant Name', 'plant_name')
|
->prepend('Plant Name', 'plant_name')
|
||||||
->prepend('Plant Address', 'plant_address')
|
->prepend('Plant Address', 'plant_address')
|
||||||
->prepend('Current Date', 'current_date')
|
->prepend('Current Date', 'current_date')
|
||||||
|
->prepend('Tested By', 'tested_by')
|
||||||
|
->prepend('Verified By', 'verified_by')
|
||||||
|
->prepend('Approved By', 'approved_by')
|
||||||
->toArray()
|
->toArray()
|
||||||
),
|
),
|
||||||
Forms\Components\TextInput::make('string_value')
|
Forms\Components\TextInput::make('string_value')
|
||||||
|
|||||||
Reference in New Issue
Block a user