diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php
index 6cab6580a5a..ba636ac2569 100644
--- a/htdocs/core/class/dolreceiptprinter.class.php
+++ b/htdocs/core/class/dolreceiptprinter.class.php
@@ -815,7 +815,7 @@ class dolReceiptPrinter extends Printer
}
}
// If is DummyPrintConnector send to log to debugging
- if ($this->printer->connector instanceof DummyPrintConnector)
+ if ($this->printer->connector instanceof DummyPrintConnector || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector")
{
$data = $this->printer->connector->getData();
if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") echo base64_encode($data);
@@ -868,6 +868,11 @@ class dolReceiptPrinter extends Printer
public function initPrinter($printerid)
{
global $conf;
+ if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector"){
+ $this->connector = new DummyPrintConnector();
+ $this->printer = new Printer($this->connector, $this->profile);
+ return;
+ }
$error = 0;
$sql = 'SELECT rowid, name, fk_type, fk_profile, parameter';
$sql .= ' FROM '.MAIN_DB_PREFIX.'printer_receipt';
diff --git a/htdocs/takepos/admin/terminal.php b/htdocs/takepos/admin/terminal.php
index 108fdea0b64..d87e15d9ffe 100644
--- a/htdocs/takepos/admin/terminal.php
+++ b/htdocs/takepos/admin/terminal.php
@@ -221,32 +221,34 @@ if (!empty($conf->stock->enabled))
}
}
-if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter" || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
// Select printer to use with terminal
require_once DOL_DOCUMENT_ROOT.'/core/class/dolreceiptprinter.class.php';
$printer = new dolReceiptPrinter($db);
- $printer->listprinters();
- $printers = array();
- foreach ($printer->listprinters as $key => $value) {
- $printers[$value['rowid']] = $value['name'];
- }
- 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").' - '.$langs->trans("Printer").' 1 | ';
+ if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+ $printer->listprinters();
+ $printers = array();
+ foreach ($printer->listprinters as $key => $value) {
+ $printers[$value['rowid']] = $value['name'];
+ }
+ print '
| '.$langs->trans("MainPrinterToUse").' | ';
print '';
- print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}), 1);
- print ' |
';
- print '| '.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 2 | ';
- print '';
- print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
- print ' |
';
- print '| '.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 3 | ';
- print '';
- print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}), 1);
+ 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").' - '.$langs->trans("Printer").' 1 | ';
+ print '';
+ print $form->selectarray('TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER1_TO_USE'.$terminal}), 1);
+ print ' |
';
+ print '| '.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 2 | ';
+ print '';
+ print $form->selectarray('TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER2_TO_USE'.$terminal}), 1);
+ print ' |
';
+ print '| '.$langs->trans("OrderPrinterToUse").' - '.$langs->trans("Printer").' 3 | ';
+ print '';
+ print $form->selectarray('TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal, $printers, (empty($conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}) ? '0' : $conf->global->{'TAKEPOS_ORDER_PRINTER3_TO_USE'.$terminal}), 1);
+ print ' |
';
+ }
}
$printer->listPrintersTemplates();
$templates = array();
diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 531598668a7..1d49f985578 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -144,7 +144,7 @@ if ($action == 'getProducts') {
require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
$printer = new dolReceiptPrinter($db);
// check printer for terminal
- if ($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
+ if (($conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term} > 0 || $conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") && $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term} > 0) {
$object = new Facture($db);
$object->fetch($id);
$ret = $printer->sendToPrinter($object, $conf->global->{'TAKEPOS_TEMPLATE_TO_USE_FOR_INVOICES'.$term}, $conf->global->{'TAKEPOS_PRINTER_TO_USE'.$term});