From d4d0ef12954d8700857f33af66abee05a4b70240 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Sun, 19 Jan 2020 16:16:59 +0100 Subject: [PATCH 1/3] Fix escpos DummyConnector --- htdocs/core/class/dolreceiptprinter.class.php | 20 ++++++++++++++----- .../escpos-php/src/Mike42/Escpos/Printer.php | 1 + 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/htdocs/core/class/dolreceiptprinter.class.php b/htdocs/core/class/dolreceiptprinter.class.php index 1d445614981..935561cf157 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -105,6 +105,7 @@ require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/autoload.php'; use Mike42\Escpos\PrintConnectors\FilePrintConnector; use Mike42\Escpos\PrintConnectors\NetworkPrintConnector; use Mike42\Escpos\PrintConnectors\WindowsPrintConnector; +use Mike42\Escpos\PrintConnectors\DummyPrintConnector; use Mike42\Escpos\CapabilityProfile; use Mike42\Escpos\Printer; use Mike42\Escpos\EscposImage; @@ -529,7 +530,13 @@ class dolReceiptPrinter extends Printer $this->printer->text("Most simple example\n"); $this->printer->feed(); $this->printer->cut(); - //print '
'.print_r($this->connector, true).'
'; + + // If is DummyPrintConnector send to log to debugging + if($this->printer->connector instanceof DummyPrintConnector) + { + $data = $this->printer->connector-> getData(); + dol_syslog($data); + } $this->printer->close(); } catch (Exception $e) { $this->errors[] = $e->getMessage(); @@ -713,9 +720,13 @@ class dolReceiptPrinter extends Printer break; } } - // Close and print - // uncomment next line to see content sent to printer - //print '
'.print_r($this->connector, true).'
'; + // If is DummyPrintConnector send to log to debugging + if($this->printer->connector instanceof DummyPrintConnector) + { + $data = $this->printer->connector->getData(); + dol_syslog($data); + } + // Close and print $this->printer->close(); } return $error; @@ -783,7 +794,6 @@ class dolReceiptPrinter extends Printer try { switch ($obj['fk_type']) { case 1: - require_once DOL_DOCUMENT_ROOT .'/includes/mike42/escpos-php/src/DummyPrintConnector.php'; $this->connector = new DummyPrintConnector(); break; case 2: diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php index 753d2ea8ad3..edc6ac91057 100644 --- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php +++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php @@ -17,6 +17,7 @@ use InvalidArgumentException; use Mike42\Escpos\PrintBuffers\PrintBuffer; use Mike42\Escpos\PrintBuffers\EscposPrintBuffer; use Mike42\Escpos\PrintConnectors\PrintConnector; +use Mike42\Escpos\PrintConnectors\DummyConnector; use Mike42\Escpos\CapabilityProfile; /** From dd1b1b03dd2faabeeac1474b70a3f05966876442 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Sun, 19 Jan 2020 16:29:31 +0100 Subject: [PATCH 2/3] Remove unnecessary namespace --- htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php | 1 - 1 file changed, 1 deletion(-) diff --git a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php index edc6ac91057..753d2ea8ad3 100644 --- a/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php +++ b/htdocs/includes/mike42/escpos-php/src/Mike42/Escpos/Printer.php @@ -17,7 +17,6 @@ use InvalidArgumentException; use Mike42\Escpos\PrintBuffers\PrintBuffer; use Mike42\Escpos\PrintBuffers\EscposPrintBuffer; use Mike42\Escpos\PrintConnectors\PrintConnector; -use Mike42\Escpos\PrintConnectors\DummyConnector; use Mike42\Escpos\CapabilityProfile; /** From 70362e7609089a60a2f2b4008053ef865885dc90 Mon Sep 17 00:00:00 2001 From: andreubisquerra Date: Sun, 19 Jan 2020 16:44:33 +0100 Subject: [PATCH 3/3] Fix travis --- 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 935561cf157..f32621f93ac 100644 --- a/htdocs/core/class/dolreceiptprinter.class.php +++ b/htdocs/core/class/dolreceiptprinter.class.php @@ -530,7 +530,7 @@ class dolReceiptPrinter extends Printer $this->printer->text("Most simple example\n"); $this->printer->feed(); $this->printer->cut(); - + // If is DummyPrintConnector send to log to debugging if($this->printer->connector instanceof DummyPrintConnector) {