diff --git a/app/Controllers/Certificates.php b/app/Controllers/Certificates.php index 8348d91..07a68c5 100644 --- a/app/Controllers/Certificates.php +++ b/app/Controllers/Certificates.php @@ -537,7 +537,7 @@ class Certificates extends BaseController { certificates.cert_name, certificates.issued_date, certificates.expired_date, - certificates.status, + certificates.file_url, productcatalog.productname as productname, sites.sitename as sitename, products.productnumber, @@ -565,7 +565,7 @@ class Certificates extends BaseController { ->first(); $certificate = [ - 'status' => $latestData['status'], + 'file_url' => $latestData['file_url'], 'certname' => $latestData['cert_name'], 'sitename' => $latestData['sitename'], 'certtype' => $latestData['cert_type'], @@ -598,7 +598,9 @@ class Certificates extends BaseController { return $this->response->setStatusCode(500)->setJSON([ 'success' => false, - 'message' => $e->getMessage() + 'message' => $e->getMessage(), + 'line' => $e->getLine(), + 'file' => $e->getFile() ]); } @@ -681,6 +683,16 @@ class Certificates extends BaseController { $options->set('isRemoteEnabled', true); $options->set('isHtml5ParserEnabled', true); + // Create QR + $builder = new Builder( + writer: new PngWriter(), + data: $certificate['file_url'], + size: 120, + margin: 0 + ); + $resultQr = $builder->build(); + $certificate['qrcode'] = $resultQr->getDataUri(); + $dompdf = new Dompdf($options); $html = view($template, ['certificate' => $certificate]); diff --git a/app/Views/certificate_maintenance_index.php b/app/Views/certificate_maintenance_index.php index ab6a15a..c1c7465 100644 --- a/app/Views/certificate_maintenance_index.php +++ b/app/Views/certificate_maintenance_index.php @@ -496,11 +496,10 @@ $(function () { } }, 'json' - ).fail(function () { - $('#validateModal').modal('hide'); - alert('Server error.'); + ).fail(function (xhr) { + console.log(xhr); + alert(xhr.responseText); }); - }); }); diff --git a/app/Views/certificates/certificate_maintenance.php b/app/Views/certificates/certificate_maintenance.php index 3aae4cd..1a84536 100644 --- a/app/Views/certificates/certificate_maintenance.php +++ b/app/Views/certificates/certificate_maintenance.php @@ -98,14 +98,15 @@ + + +
- - + +
@@ -138,8 +139,8 @@ --> @@ -176,15 +177,6 @@ -