fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix PM observations

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2020-09-01 15:05:36 +00:00
parent 12dfd1035e
commit 85797df0bc
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
workflow/engine/bin/tasks/cliWorkspaces.php
View File

@@ -387,11 +387,11 @@ EOT
CLI::taskRun("run_artisan"); CLI::taskRun("run_artisan");
/** /**
* Add new font to be used in Output Documents generation (TinyMCE editor and TCPDF library) * Add new font to be used in Documents generation (TinyMCE editor and TCPDF library for now)
*/ */
CLI::taskName('output-documents-add-font'); CLI::taskName('documents-add-font');
CLI::taskDescription(<<<EOT CLI::taskDescription(<<<EOT
Add new font to be used in Output Documents generation (TinyMCE editor and TCPDF library). Add new font to be used in Documents generation (TinyMCE editor and TCPDF library for now).
EOT EOT
); );
CLI::taskOpt('font_type', <<<EOT CLI::taskOpt('font_type', <<<EOT
@@ -401,7 +401,7 @@ EOT
CLI::taskArg('fontFileName', false); CLI::taskArg('fontFileName', false);
CLI::taskArg('friendlyName', true); CLI::taskArg('friendlyName', true);
CLI::taskArg('fontProperties', true); CLI::taskArg('fontProperties', true);
CLI::taskRun('output_documents_add_font'); CLI::taskRun('documents_add_font');
/** /**
* Function run_info * Function run_info
@@ -1426,12 +1426,12 @@ function run_artisan($args)
} }
/** /**
* Add new font to be used in Output Documents generation (TinyMCE editor and TCPDF library) * Add new font to be used in Documents generation (TinyMCE editor and TCPDF library for now)
* *
* @param array $args * @param array $args
* @param array $options * @param array $options
*/ */
function output_documents_add_font($args, $options) function documents_add_font($args, $options)
{ {
try { try {
// Validate the main required argument // Validate the main required argument

11
workflow/engine/controllers/designer.php
View File

@@ -144,13 +144,18 @@ class Designer extends Controller
} }
} }
// Load additional fonts registered by TCPDF library // Merge default fonts with fonts registered by TCPDF library
$tcPdfFonts = []; $tcPdfFonts = [
'Courier New' => 'Courier New=courier new,courier',
'Helvetica' => 'Helvetica=helvetica',
'Times New Roman' => 'Times New Roman=times new roman,times'
];
OutputDocument::checkTcPdfFontsPath(); OutputDocument::checkTcPdfFontsPath();
foreach (OutputDocument::loadTcPdfFontsList() as $font) { foreach (OutputDocument::loadTcPdfFontsList() as $font) {
$font['friendlyName'] = !empty($font['friendlyName']) ? $font['friendlyName'] : $font['familyName']; $font['friendlyName'] = !empty($font['friendlyName']) ? $font['friendlyName'] : $font['familyName'];
$tcPdfFonts[] = "{$font['friendlyName']}={$font['familyName']}"; $tcPdfFonts[$font['friendlyName']] = "{$font['friendlyName']}={$font['familyName']}";
} }
ksort($tcPdfFonts, SORT_NATURAL | SORT_FLAG_CASE);
$this->setVar('tcPdfFonts', implode(';', $tcPdfFonts)); $this->setVar('tcPdfFonts', implode(';', $tcPdfFonts));
//plugin set source path //plugin set source path