diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 79d6277c761..83b31569a7b 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -155,7 +155,7 @@ print "\n";
if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
print '
| ';
- print $langs->trans("IPAddress").' ('.$langs->trans("TakeposConnectorNecesary").')';
+ print $langs->trans("URL")." / ".$langs->trans("IPAddress").' ('.$langs->trans("TakeposConnectorNecesary").')';
print ' | ';
print '';
print ' |
';
diff --git a/htdocs/takepos/css/colorful.css b/htdocs/takepos/css/colorful.css
index 298a29ce4cf..4df43a70334 100644
--- a/htdocs/takepos/css/colorful.css
+++ b/htdocs/takepos/css/colorful.css
@@ -31,3 +31,7 @@ tr.selected, tr.selected td {
.topnav{
background: rgb(0,0,0) !important;
}
+
+.fa-trash {
+ color: #fff !important;
+}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 4f5ef29bc70..39515e72d21 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -874,7 +874,8 @@ if ($conf->global->TAKEPOS_BAR_RESTAURANT)
if ($conf->global->TAKEPOS_BAR_RESTAURANT)
{
if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
- $menus[$r++] = array('title'=>''.$langs->trans("Receipt").'
', 'action'=>'TakeposPrinting(placeid);');
+ if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == TRUE) $menus[$r++] = array('title'=>''.$langs->trans("Receipt").'
', 'action'=>'TakeposConnector(placeid);');
+ else $menus[$r++] = array('title'=>''.$langs->trans("Receipt").'
', 'action'=>'TakeposPrinting(placeid);');
} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
$menus[$r++] = array('title'=>''.$langs->trans("Receipt").'
', 'action'=>'DolibarrTakeposPrinting(placeid);');
} else {
diff --git a/htdocs/takepos/invoice.php b/htdocs/takepos/invoice.php
index 95766802b76..c6d59323e6c 100644
--- a/htdocs/takepos/invoice.php
+++ b/htdocs/takepos/invoice.php
@@ -590,7 +590,8 @@ if ($action == "valid" || $action == "history")
}
$sectionwithinvoicelink .= '';
if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
- $sectionwithinvoicelink .= ' ';
+ if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == TRUE) $sectionwithinvoicelink .= ' ';
+ else $sectionwithinvoicelink .= ' ';
} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
$sectionwithinvoicelink .= ' ';
} else {
@@ -708,6 +709,20 @@ function TakeposPrinting(id){
});
});
}
+
+function TakeposConnector(id){
+ var invoice='';
+ $.ajax({
+ type: "POST",
+ url: 'global->TAKEPOS_PRINT_SERVER; ?>/print.php',
+ data: 'invoice='+invoice
+ });
+}
+
function DolibarrTakeposPrinting(id) {
console.log('Printing invoice ticket ' + id)
$.ajax({