Skip to content

Commit

Permalink
Merge branch 'fusionid-hapus-ciqrcode' into rilis-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
eddieridwan committed Feb 25, 2021
2 parents 4a06c59 + 2ddf59e commit ada6dc5
Show file tree
Hide file tree
Showing 19 changed files with 60 additions and 7,301 deletions.
5 changes: 3 additions & 2 deletions catatan_rilis_21.02-premium-pasca.txt
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ Fitur Premium:
17. Kembali tampilkan breadcrumb dan tombol Kembali di form layanan cetak surat. [bug]
18. Kembalikan pengambilan data covid untuk peta web dari api.kawalcorona.com.
19. #4011: Sediakan tombol mencetak surat PDF pada Layanan Surat > Cetak Surat.
20. Sediakan alternatif mencetak surat dalam format PDF menggunakan LibreOffice stand-alone. (teknis)
21. Perbaharui library HTML2PDF dan TCPDF. (teknis)
20. Sediakan alternatif mencetak surat dalam format PDF menggunakan LibreOffice stand-alone. [teknis]
21. Perbaharui library HTML2PDF dan TCPDF. [teknis]
22. Hapus Library CIQRCODE dan gantikan dgn TCPDF untuk mengurangi duplikasi. [teknis]


Selalu diingatkan, apabila meng-upgrade (yaitu bukan install baru) dari versi SEBELUM versi 21.02-premium-pasca, lakukan Database > Migrasi DB untuk menyesuaikan struktur database dan folder desa.
Expand Down
48 changes: 19 additions & 29 deletions donjo-app/helpers/pict_helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
".zip", ".rar"
)));

// include 2D barcode class
require_once 'vendor/html2pdf/vendor/tecnickcom/tcpdf/tcpdf_barcodes_2d_include.php';

/**
* Tambahkan suffix unik ke nama file
* @param string $namaFile Nama file asli (beserta ekstensinya)
Expand Down Expand Up @@ -786,41 +789,29 @@ function periksa_file($upload, $mime_types, $exts)

function qrcode_generate($pathqr, $namaqr, $isiqr, $logoqr, $sizeqr, $backqr, $foreqr)
{
$CI =& get_instance();
$CI->load->library('ciqrcode'); //pemanggilan library QR CODE

$backqr1 = preg_replace('/#/', '0x', $backqr); // code warna default filter
$foreqr1 = preg_replace('/#/', '0x', $foreqr); // code warna filter

$config['cacheable'] = true; //boolean, the default is true
$config['cachedir'] = './cache/';
$config['errorlog'] = './logs/';
$config['imagedir'] = $pathqr; //direktori penyimpanan qr code
$config['quality'] = TRUE; //boolean, the default is true
$config['size'] = '1024'; //interger, the default is 1024
$CI->ciqrcode->initialize($config);
$barcodeobj = new TCPDF2DBarcode($isiqr, 'QRCODE,H');

$image_name = $namaqr.'.png';

$params['data'] = $isiqr; //data yang akan di jadikan QR CODE
$params['level'] = 'H'; //H=High
$params['size'] = $sizeqr; //Ukuran QR CODE
$params['savename'] = FCPATH.$config['imagedir'].$image_name; //simpan image QR CODE ke folder /desa/upload/media/
if (!empty($foreqr1))
if (!empty($foreqr))
{
$params['fore_color'] = hexdec($foreqr1);
}
else
{
$params['back_color'] = hexdec($backqr1); //0x000000
if ($foreqr[0] == '#' ) {
$foreqr = substr( $foreqr, 1 );
}

$split = str_split($foreqr, 2);
$r = hexdec($split[0]);
$g = hexdec($split[1]);
$b = hexdec($split[2]);
}
$CI->ciqrcode->generate($params); // fungsi untuk generate QR CODE

$imgData = $barcodeobj->getBarcodePngData($sizeqr, $sizeqr, array($r,$g,$b));
$filename = FCPATH . $pathqr . $namaqr . '.png';
file_put_contents($filename, $imgData);

//ambil logo
$logopath = $logoqr; // Logo yg tampil di tengah QRCode

// ambil file qrcode
$QR = imagecreatefrompng(FCPATH.$config['imagedir'].$image_name);
$QR = imagecreatefrompng($filename);

// memulai menggambar logo dalam file qrcode
// ambil file di server menggunakan absolute path, tidak menggunakan url
Expand All @@ -844,7 +835,6 @@ function qrcode_generate($pathqr, $namaqr, $isiqr, $logoqr, $sizeqr, $backqr, $f
imagecopyresampled($QR, $logo, $QR_width/2.5, $QR_height/2.5, 0, 0, $logo_qr_width, $logo_qr_height, $logo_width, $logo_height);

// Simpan kode QR lagi, dengan logo di atasnya
imagepng($QR, FCPATH.$config['imagedir'].$image_name);
imagepng($QR, $filename);
}

?>
107 changes: 0 additions & 107 deletions donjo-app/libraries/Ciqrcode.php

This file was deleted.

Loading

0 comments on commit ada6dc5

Please sign in to comment.