diff --git a/modules/visa/class/class_modules_tools_Abstract.php b/modules/visa/class/class_modules_tools_Abstract.php index 96fa00f50803eea00fff61a221628bba8f8a0d35..b4ed9ad244c57675f05c0fab1a0a085a823aff30 100755 --- a/modules/visa/class/class_modules_tools_Abstract.php +++ b/modules/visa/class/class_modules_tools_Abstract.php @@ -846,7 +846,7 @@ abstract class visa_Abstract extends Database if ($pdf_exist == false) { $collIdConv = ($from_res_attachment) ? 'attachments_coll' : 'letterbox_coll'; - $viewLinkHtml = '<a id="gen_'.$idFile.'" style="cursor:pointer;" title="'._GENERATE_PDF .'" target="_blank" onclick="generatePdf(\''.$idFile.'\',\''.$collIdConv.'\',\'false\')">' + $viewLinkHtml = '<a id="gen_'.$idFile.'" style="cursor:pointer;" title="'._GENERATE_PDF .'" target="_blank" onclick="generatePdf(\''.$idFile.'\',\''.$collIdConv.'\')">' .'<i id="spinner_'.$idFile.'" class="fa fa-sync-alt fa-2x" title="'._GENERATE_PDF.'"></i>' .'</a>'; } else { diff --git a/modules/visa/js/functions.js b/modules/visa/js/functions.js index 1999dd07191ab465187ec12a75d21c39a474d789..1ce45cc730575b545c91244920a3de075576f4ad 100755 --- a/modules/visa/js/functions.js +++ b/modules/visa/js/functions.js @@ -391,7 +391,7 @@ function selectAllPrintFolder() { } } -function generatePdf(resId, collId, isVersion) { +function generatePdf(resId, collId) { $j("#spinner_"+resId).addClass( "fa-spin" ); $j.ajax({ url: '?display=true&module=visa&page=generatePdf', @@ -399,9 +399,7 @@ function generatePdf(resId, collId, isVersion) { dataType : 'json', data: { res_id : resId, - coll_id : collId, - is_version : isVersion, - + coll_id : collId }, success: function(result) { if (result.status == "0") { diff --git a/modules/visa/sign_file.php b/modules/visa/sign_file.php index fe2c66aa8851cd7d1598efc52bee98fc24333fbc..de3eb82f579bf88e090d15771e82645cf178e1ee 100755 --- a/modules/visa/sign_file.php +++ b/modules/visa/sign_file.php @@ -82,12 +82,11 @@ if (!empty($_REQUEST['id']) && !empty($_REQUEST['collId'])) { $db->query("update res_letterbox SET departure_date = ? where res_id = ?", array($date,$line->res_id_master)); } - $isVersion = false; $attachResId = $line->res_id; $convertedAttachment = \Convert\controllers\ConvertPdfController::getConvertedPdfById(['select' => ['docserver_id', 'path', 'filename'], 'resId' => $attachResId, 'collId' => 'attachments_coll']); if (!empty($convertedAttachment['errors'])) { - echo "{\"status\":1, \"error\" : \""._ATTACH_PDF_NOT_FOUND . ": {$attachResId}, version : {$isVersion}\"}"; + echo "{\"status\":1, \"error\" : \""._ATTACH_PDF_NOT_FOUND . ": {$attachResId}, version : false\"}"; exit; }