Merge pull request 'Added logic for current date in sticker pdf service' (#1162) from ranjith-dev into master
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 18s
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 18s
Reviewed-on: #1162
This commit was merged in pull request #1162.
This commit is contained in:
@@ -1054,6 +1054,7 @@ class StickerPdfService
|
||||
$plantName = $itemCharacteristic?->plant?->name ?? '';
|
||||
$plantAddress = $itemCharacteristic?->plant?->address ?? '';
|
||||
$dateOfTest = $itemCharacteristic?->created_at?->format('d.m.Y') ?? '';
|
||||
$currentDate = $itemCharacteristic?->created_at?->format('M-y') ?? '';
|
||||
|
||||
|
||||
foreach ($dynamicElements as $element) {
|
||||
@@ -1116,7 +1117,7 @@ class StickerPdfService
|
||||
$textValue = $plantAddress;
|
||||
}
|
||||
if ($row->characteristics_type == 'current_date') {
|
||||
$textValue = date('M-y');
|
||||
$textValue = $currentDate;
|
||||
}
|
||||
if ($row->characteristics_type == 'date_of_test') {
|
||||
$textValue = $dateOfTest;
|
||||
|
||||
Reference in New Issue
Block a user