fix conflict issue in sticker pdf service
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 13s
Gemini PR Review / Gemini PR Review (pull_request) Successful in 20s
Laravel Pint / pint (pull_request) Failing after 2m32s
Laravel Larastan / larastan (pull_request) Failing after 5m36s
Some checks failed
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 12s
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (pull_request) Successful in 13s
Gemini PR Review / Gemini PR Review (pull_request) Successful in 20s
Laravel Pint / pint (pull_request) Failing after 2m32s
Laravel Larastan / larastan (pull_request) Failing after 5m36s
This commit is contained in:
@@ -895,7 +895,8 @@ class StickerPdfService
|
||||
if (
|
||||
($row->element_type) == 'Dynamic'
|
||||
) {
|
||||
$qrContent = $serNo ?? '';
|
||||
$qrContent = $itemCode . '|' . ($serNo ?? '');
|
||||
|
||||
$pdf->write2DBarcode(
|
||||
$qrContent,
|
||||
'QRCODE,H',
|
||||
@@ -1018,22 +1019,9 @@ class StickerPdfService
|
||||
}
|
||||
}
|
||||
|
||||
// $pdfContent = $pdf->Output('', 'S'); // 'S' returns string
|
||||
|
||||
// // Encode as base64
|
||||
// return base64_encode($pdfContent);
|
||||
|
||||
|
||||
// $pdfContent = $pdf->Output('', 'S');
|
||||
|
||||
// return response($pdfContent)
|
||||
// ->header('Content-Type', 'application/pdf')
|
||||
// ->header('Content-Disposition', 'inline; filename="sticker.pdf"');
|
||||
$pdfContent = $pdf->Output('', 'S'); // 'S' returns the PDF as a string
|
||||
|
||||
// Return the PDF as a response
|
||||
try {
|
||||
$pdfContent = $pdf->Output('', 'S'); // 'S' returns the PDF as a string
|
||||
$pdfContent = $pdf->Output('', 'S');
|
||||
|
||||
return response($pdfContent)
|
||||
->header('Content-Type', 'application/pdf')
|
||||
->header('Content-Disposition', 'inline; filename="sticker.pdf"');
|
||||
|
||||
Reference in New Issue
Block a user