lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14922 from andreubisquerra/develop

Browse Source 
TakePOS connector compatibility with RECEIPT PRINTERS module
This commit is contained in:
Laurent Destailleur 2020-10-05 16:38:56 +02:00 committed by GitHub
commit e5cdffcdec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/dolreceiptprinter.class.php
View File

@ -816,6 +816,7 @@ class dolReceiptPrinter extends Printer
if ($this->printer->connector instanceof DummyPrintConnector) if ($this->printer->connector instanceof DummyPrintConnector)
{ {
$data = $this->printer->connector->getData(); $data = $this->printer->connector->getData();
if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") echo base64_encode($data);
dol_syslog($data); dol_syslog($data);
} }
// Close and print // Close and print

16
htdocs/takepos/invoice.php
View File

@ -716,6 +716,7 @@ function Print(id, gift){
function TakeposPrinting(id){ function TakeposPrinting(id){
var receipt; var receipt;
console.log("TakeposPrinting" + id);
$.get("receipt.php?facid="+id, function(data, status){ $.get("receipt.php?facid="+id, function(data, status){
receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, ''); receipt=data.replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '');
$.ajax({ $.ajax({
@ -728,15 +729,12 @@ function TakeposPrinting(id){
function TakeposConnector(id){ function TakeposConnector(id){
console.log("TakeposConnector" + id); console.log("TakeposConnector" + id);
var invoice='<?php $.get("ajax/ajax.php?action=printinvoiceticket&term=<?php echo $_SESSION["takeposterminal"];?>&id="+id, function(data, status){
$data = json_encode($invoice); $.ajax({
$data = base64_encode($data); type: "POST",
echo $data; url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/printer/index.php',
?>'; data: 'invoice='+data
$.ajax({ });
type: "POST",
url: 'http://<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>:8111/print.php',
data: 'invoice='+invoice
}); });
} }