From aec1c177e34109eecfa7b4e890248698ddbfee07 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Mon, 6 Apr 2020 16:07:05 +0200 Subject: [PATCH 1/3] Order printer with 'Receipt printers' module --- htdocs/takepos/admin/terminal.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php index fa62aff1bc3..c83f57173e5 100644 --- a/htdocs/takepos/admin/terminal.php +++ b/htdocs/takepos/admin/terminal.php @@ -229,23 +229,31 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") { foreach ($printer->listprinters as $key => $value) { $printers[$value['rowid']] = $value['name']; } - print ''.$langs->trans("TakeposTerminalPrinterToUse").''; + print ''.$langs->trans("MainPrinterToUse").''; print ''; print $form->selectarray('TAKEPOS_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$terminal}), 1); print ''; + if ($conf->global->TAKEPOS_ORDER_PRINTERS) { + print ''.$langs->trans("OrderPrinterToUse").''; + print ''; + print $form->selectarray('TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER_TO_USE'.$terminal}), 1); + print ''; + } $printer->listPrintersTemplates(); $templates = array(); foreach ($printer->listprinterstemplates as $key => $value) { $templates[$value['rowid']] = $value['name']; } - print ''.$langs->trans("TakeposTerminalTemplateToUseForInvoicesTicket").''; + print ''.$langs->trans("MainTemplateToUse").''; print ''; print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$terminal}), 1); print ''; - print ''.$langs->trans("TakeposTerminalTemplateToUseForOrdersTicket").''; - print ''; - print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1); - print ''; + if ($conf->global->TAKEPOS_ORDER_PRINTERS) { + print ''.$langs->trans("OrderTemplateToUse").''; + print ''; + print $form->selectarray('TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal, $templates, (empty($conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_ORDERS'.$terminal}), 1); + print ''; + } } print ''.$langs->trans('CashDeskReaderKeyCodeForEnter').''; From 079bfafa26f822a4c963b642b9517554726b20ae Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Mon, 6 Apr 2020 16:14:01 +0200 Subject: [PATCH 2/3] Order printer langs --- htdocs/langs/en_US/cashdesk.lang | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/cashdesk.lang b/htdocs/langs/en_US/cashdesk.lang index f2bab886b64..85bdc978865 100644 --- a/htdocs/langs/en_US/cashdesk.lang +++ b/htdocs/langs/en_US/cashdesk.lang @@ -100,4 +100,8 @@ TakeposGroupSameProduct=Group same products lines StartAParallelSale=Start a new parallel sale ControlCashOpening=Control cash box at opening pos CloseCashFence=Close cash fence -CashReport=Cash report \ No newline at end of file +CashReport=Cash report +MainPrinterToUse=Main printer to use +OrderPrinterToUse=Order printer to use +MainTemplateToUse=Main template to use +OrderTemplateToUse=Order template to use \ No newline at end of file From bcfa7525786da28dad6772beccebef0a4c1650e3 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Mon, 6 Apr 2020 19:16:51 +0200 Subject: [PATCH 3/3] Fix label on 'Receipt printers' module --- htdocs/core/class/dolreceiptprinter.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 468cdf050bc..239372979e4 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -615,7 +615,7 @@ class dolReceiptPrinter extends Printer $spacestoadd = $nbcharactbyline - strlen($line->ref) - strlen($line->qty) - 10 - 1; $spaces = str_repeat(' ', $spacestoadd); $this->printer->text($line->ref.$spaces.$line->qty.' '.str_pad(price($line->total_ttc), 10, ' ', STR_PAD_LEFT)."\n"); - $this->printer->text(strip_tags(htmlspecialchars_decode($line->desc))."\n"); + $this->printer->text(strip_tags(htmlspecialchars_decode($line->product_label))."\n"); } break; case 'DOL_PRINT_OBJECT_TAX':