Merge pull request #14922 from andreubisquerra/develop

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
2 changed files with 8 additions and 9 deletions

View File

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

View File

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