From 304c44560d149f2b018373974e6613d4842c579c Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Fri, 5 Jun 2020 10:47:45 +0200 Subject: [PATCH 1/2] NEW add free text on each terminal of cash desk --- htdocs/takepos/admin/terminal.php | 56 +++++++++++++++++++++++++++++++ htdocs/takepos/receipt.php | 19 +++++++---- 2 files changed, 68 insertions(+), 7 deletions(-) diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index 6f042d7f10e..fedb0734703 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -94,6 +94,10 @@ if (GETPOST('action', 'alpha') == 'set') $res = dolibarr_set_const($db, "TAKEPOS_ADDON".$terminaltouse, GETPOST('TAKEPOS_ADDON'.$terminaltouse, 'alpha'), 'chaine', 0, '', $conf->entity); + // add free text on each terminal of cash desk + $res = dolibarr_set_const($db, 'TAKEPOS_HEADER'.$terminaltouse, GETPOST('TAKEPOS_HEADER'.$terminaltouse, 'none'), 'chaine', 0, '', $conf->entity); + $res = dolibarr_set_const($db, 'TAKEPOS_FOOTER'.$terminaltouse, GETPOST('TAKEPOS_FOOTER'.$terminaltouse, 'none'), 'chaine', 0, '', $conf->entity); + dol_syslog("admin/cashdesk: level ".GETPOST('level', 'alpha')); if (!$res > 0) $error++; @@ -322,6 +326,58 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") { } print ''; + +// add free text on each terminal of cash desk +$substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2); +$substitutionarray['__(AnyTranslationKey)__'] = $langs->trans('Translation'); +$htmltext = '' . $langs->trans('AvailableVariables') . ':
'; +foreach ($substitutionarray as $key => $val) $htmltext .= $key . '
'; +$htmltext .= ''; + +print '
'; +print load_fiche_titre($langs->trans('FreeLegalTextOnInvoices'), '', ''); + +print '
'; +print ''; +print ''; +print ''; +print ''; + +// free text on header +print ''; +print ''; +print ''; + +// free text on footer +print ''; +print ''; +print ''; + +print '
' . $langs->trans("Parameters") . '' . $langs->trans('Value') . '
'; +print $form->textwithpicto($langs->trans('Header'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'
'; +print '		'; +$variablename = 'TAKEPOS_HEADER' . $terminaltouse; +if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { + print ''; +} else { + include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; + $doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes'); + print $doleditor->Create(); +} +print '
'; +print $form->textwithpicto($langs->trans('Footer'), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'
'; +print '		'; +$variablename = 'TAKEPOS_FOOTER' . $terminaltouse; +if (empty($conf->global->PDF_ALLOW_HTML_FOR_FREE_TEXT)) { + print ''; +} else { + include_once DOL_DOCUMENT_ROOT . '/core/class/doleditor.class.php'; + $doleditor = new DolEditor($variablename, $conf->global->{$variablename}, '', 80, 'dolibarr_notes'); + print $doleditor->Create(); +} +print '
'; +print '
'; + print ''; if ($atleastonefound == 0 && !empty($conf->banque->enabled)) diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 90b3a5c1fee..1da92de8827 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -89,12 +89,14 @@ if (!empty($hookmanager->resPrint)) {

global->TAKEPOS_HEADER)) +$constFreeText = 'TAKEPOS_HEADER' . $_SESSION['takeposterminal']; +if (!empty($conf->global->TAKEPOS_HEADER) || !empty($conf->global->{$constFreeText})) { + $newfreetext = ''; $substitutionarray = getCommonSubstitutionArray($langs); - if (!empty($conf->global->TAKEPOS_HEADER)) - $newfreetext = make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray); - echo $newfreetext; + if (!empty($conf->global->TAKEPOS_HEADER)) $newfreetext .= make_substitutions($conf->global->TAKEPOS_HEADER, $substitutionarray); + if (!empty($conf->global->{$constFreeText})) $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray); + print $newfreetext; } ?>

@@ -183,11 +185,14 @@ if ($conf->global->TAKEPOS_SHOW_CUSTOMER)

global->TAKEPOS_FOOTER)) +$constFreeText = 'TAKEPOS_FOOTER' . $_SESSION['takeposterminal']; +if (!empty($conf->global->TAKEPOS_FOOTER) || !empty($conf->global->{$constFreeText})) { + $newfreetext = ''; $substitutionarray = getCommonSubstitutionArray($langs); - $newfreetext = make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray); - echo $newfreetext; + if (!empty($conf->global->{$constFreeText})) $newfreetext .= make_substitutions($conf->global->{$constFreeText}, $substitutionarray); + if (!empty($conf->global->TAKEPOS_FOOTER)) $newfreetext .= make_substitutions($conf->global->TAKEPOS_FOOTER, $substitutionarray); + print $newfreetext; } ?> From 81fbb808237f0f79743f8dbcb9178e14c76bcd5b Mon Sep 17 00:00:00 2001 From: VESSILLER Date: Fri, 5 Jun 2020 14:20:38 +0200 Subject: [PATCH 2/2] FIX end div for responsive table --- htdocs/takepos/admin/terminal.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index fedb0734703..54e5de37a5c 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -326,6 +326,7 @@ if ($conf->global->TAKEPOS_ADDON == "terminal") { } print ''; +print ''; // add free text on each terminal of cash desk $substitutionarray = pdf_getSubstitutionArray($langs, null, null, 2); @@ -378,8 +379,6 @@ print ''; print ''; print ''; -print ''; - if ($atleastonefound == 0 && !empty($conf->banque->enabled)) { print info_admin($langs->trans("AtLeastOneDefaultBankAccountMandatory"), 0, 0, 'error');