From 78b43ddb1f19ffa7ccd0cd4983fcdbf3774ae4f1 Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Sat, 11 Apr 2020 22:19:36 +0200
Subject: [PATCH] TakePOS connector update

---
 htdocs/takepos/admin/receipt.php |  2 +-
 htdocs/takepos/css/colorful.css  |  4 ++++
 htdocs/takepos/index.php         |  3 ++-
 htdocs/takepos/invoice.php       | 17 ++++++++++++++++-
 4 files changed, 23 insertions(+), 3 deletions(-)

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 "</tr>\n";
 
 if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
 	print '<tr class="oddeven value"><td>';
-	print $langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
+	print $langs->trans("URL")." / ".$langs->trans("IPAddress").' (<a href="http://en.takepos.com/connector" target="_blank">'.$langs->trans("TakeposConnectorNecesary").'</a>)';
 	print '<td colspan="2">';
 	print '<input type="text" size="20" id="TAKEPOS_PRINT_SERVER" name="TAKEPOS_PRINT_SERVER" value="'.$conf->global->TAKEPOS_PRINT_SERVER.'">';
 	print '</td></tr>';
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'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
+			if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == TRUE) $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposConnector(placeid);');
+			else $menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', 'action'=>'TakeposPrinting(placeid);');
 		} elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 			$menus[$r++] = array('title'=>'<span class="fa fa-receipt paddingrightonly"></span><div class="trunc">'.$langs->trans("Receipt").'</div>', '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 .= '</span>';
     if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector") {
-         $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+         if (filter_var($conf->global->TAKEPOS_PRINT_SERVER, FILTER_VALIDATE_URL) == TRUE) $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposConnector('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
+		 else $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="TakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
     } elseif ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
         $sectionwithinvoicelink .= ' <button id="buttonprint" type="button" onclick="DolibarrTakeposPrinting('.$placeid.');">'.$langs->trans('PrintTicket').'</button>';
     } else {
@@ -708,6 +709,20 @@ function TakeposPrinting(id){
         });
     });
 }
+
+function TakeposConnector(id){
+	var invoice='<?php
+	$data=json_encode($invoice);
+	$data=base64_encode($data);
+	echo $data;
+	?>';
+    $.ajax({
+        type: "POST",
+        url: '<?php print $conf->global->TAKEPOS_PRINT_SERVER; ?>/print.php',
+        data: 'invoice='+invoice
+    });
+}
+
 function DolibarrTakeposPrinting(id) {
     console.log('Printing invoice ticket ' + id)
     $.ajax({