diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index 5ce63138e05..ce43c595d28 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -44,3 +44,5 @@ OrderPrinters=Order printers SearchProduct=Search product Receipt=Receipt AmountAtEndOfPeriod=Amount at end of period (day, month or year) +Header=Header +Footer=Footer diff --git a/htdocs/langs/es_ES/cashdesk.lang b/htdocs/langs/es_ES/cashdesk.lang index 4d6a8b90940..b7a6ce7bd04 100644 --- a/htdocs/langs/es_ES/cashdesk.lang +++ b/htdocs/langs/es_ES/cashdesk.lang @@ -43,3 +43,5 @@ TakeposConnectorNecesary='Conector TakePOS' requerido OrderPrinters=Impresoras de pedidos SearchProduct=Buscar producto Receipt=Comprobante +Header=Cabecera +Footer=Pie de página diff --git a/htdocs/langs/fr_FR/cashdesk.lang b/htdocs/langs/fr_FR/cashdesk.lang index ec8207d60b6..1da2bce179f 100644 --- a/htdocs/langs/fr_FR/cashdesk.lang +++ b/htdocs/langs/fr_FR/cashdesk.lang @@ -43,3 +43,5 @@ TakeposConnectorNecesary='Connecteur TakePOS' requis OrderPrinters=Commande imprimantes SearchProduct=Rechercher un produit Receipt=Le reçu +Header=Entête +Footer=Bas de page diff --git a/htdocs/takepos/admin/setup.php b/htdocs/takepos/admin/setup.php index 654ef42431f..7ed220d1787 100644 --- a/htdocs/takepos/admin/setup.php +++ b/htdocs/takepos/admin/setup.php @@ -25,6 +25,7 @@ require '../../main.inc.php'; // Load $user and permissions require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php'; require_once DOL_DOCUMENT_ROOT.'/product/class/html.formproduct.class.php'; +require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php'; // If socid provided by ajax company selector if (! empty($_REQUEST['CASHDESK_ID_THIRDPARTY_id'])) @@ -59,6 +60,8 @@ if (GETPOST('action','alpha') == 'set') $res = dolibarr_set_const($db,"TAKEPOS_BAR_RESTAURANT", GETPOST('TAKEPOS_BAR_RESTAURANT','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"TAKEPOS_PRINT_SERVER", GETPOST('TAKEPOS_PRINT_SERVER','alpha'),'chaine',0,'',$conf->entity); $res = dolibarr_set_const($db,"TAKEPOS_ORDER_PRINTERS", GETPOST('TAKEPOS_ORDER_PRINTERS','alpha'),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"TAKEPOS_HEADER", GETPOST('TAKEPOS_HEADER','alpha'),'chaine',0,'',$conf->entity); + $res = dolibarr_set_const($db,"TAKEPOS_FOOTER", GETPOST('TAKEPOS_FOOTER','alpha'),'chaine',0,'',$conf->entity); dol_syslog("admin/cashdesk: level ".GETPOST('level','alpha')); @@ -140,6 +143,44 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT && $conf->global->TAKEPOSCONNECTOR){ print ''; } +$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 $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices")." - ".$langs->trans("Header"), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'
'; +print ''; +$variablename='TAKEPOS_HEADER'; +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 "\n"; + +print ''; +print $form->textwithpicto($langs->trans("FreeLegalTextOnInvoices")." - ".$langs->trans("Footer"), $htmltext, 1, 'help', '', 0, 2, 'freetexttooltip').'
'; +print ''; +$variablename='TAKEPOS_FOOTER'; +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 "\n"; + print ''; print '
'; diff --git a/htdocs/takepos/receipt.php b/htdocs/takepos/receipt.php index 788e2391f14..5fcd0ba9922 100644 --- a/htdocs/takepos/receipt.php +++ b/htdocs/takepos/receipt.php @@ -51,9 +51,14 @@ $object->fetch($facid);

-'.$langs->trans("Phone").': '.$mysoc->phone; - ?> - +global->TAKEPOS_HEADER)) +{ + $newfreetext=make_substitutions($conf->global->TAKEPOS_HEADER,$substitutionarray); + echo $newfreetext; +} +?>

ref;

trans("Cashier: "); -echo $user->firstname.'
'.$mysoc->url.'
'; -echo '

'.$langs->trans("Thanks for your coming !").'
'; +$substitutionarray=getCommonSubstitutionArray($langs); +if (! empty($conf->global->TAKEPOS_FOOTER)) +{ + $newfreetext=make_substitutions($conf->global->TAKEPOS_FOOTER,$substitutionarray); + echo $newfreetext; +} ?>