From 71f09dc2d86a6e9670f1c7fb51bf84ac091e34fe Mon Sep 17 00:00:00 2001
From: "jove@bisquerra.com" <jove@bisquerra.com>
Date: Wed, 11 Nov 2020 21:51:32 +0100
Subject: [PATCH 1/2] Update receipt tab in TakePOS

---
 htdocs/takepos/admin/orderprinters.php |  2 ++
 htdocs/takepos/admin/receipt.php       | 16 ++++++----------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/htdocs/takepos/admin/orderprinters.php b/htdocs/takepos/admin/orderprinters.php
index c7ebbebffb7..3104f907eb2 100644
--- a/htdocs/takepos/admin/orderprinters.php
+++ b/htdocs/takepos/admin/orderprinters.php
@@ -215,6 +215,8 @@ if ($nbofentries > 0)
 	print '</table></td>';
 	print '</tr>';
 }
+print "</table>";
+print '<input type="submit" value="'.$langs->trans("Save").'"></form>';
 
 //Printer3
 print '<table class="liste nohover" width="100%">';
diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 0427e239792..3399b98b643 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -65,6 +65,8 @@ if (GETPOST('action', 'alpha') == 'set')
 } elseif (GETPOST('action', 'alpha') == 'setmethod')
 {
 	dolibarr_set_const($db, "TAKEPOS_PRINT_METHOD", GETPOST('value', 'alpha'), 'chaine', 0, '', $conf->entity);
+	// TakePOS connector require ReceiptPrinter module
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "takeposconnector" && !$conf->receiptprinter->enabled) activateModule("modReceiptPrinter");
 }
 
 
@@ -109,7 +111,7 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 print "</td></tr>\n";
 
 // Receipt printer module
-if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
+if ($conf->receiptprinter->enabled) {
 	print '<tr class="oddeven"><td>';
 	print $langs->trans('DolibarrReceiptPrinter');
 	print '<td>';
@@ -117,16 +119,10 @@ if ($conf->global->MAIN_FEATURES_LEVEL >= 1) {
 	print '<br>';
 	print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
 	print '</td><td class="right">';
-	if ($conf->receiptprinter->enabled) {
-		if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
-			print img_picto($langs->trans("Activated"), 'switch_on');
-		} else {
-			print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
-		}
+	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
+		print img_picto($langs->trans("Activated"), 'switch_on');
 	} else {
-		print '<span class="opacitymedium">';
-		print $langs->trans("ModuleReceiptPrinterMustBeEnabled");
-		print '</span>';
+		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
 	print "</td></tr>\n";
 }

From e68284871bc350ed0c9974080d12af7944a92404 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 12 Nov 2020 12:44:34 +0100
Subject: [PATCH 2/2] Update receipt.php

---
 htdocs/takepos/admin/receipt.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/htdocs/takepos/admin/receipt.php b/htdocs/takepos/admin/receipt.php
index 3399b98b643..00086bef5ca 100644
--- a/htdocs/takepos/admin/receipt.php
+++ b/htdocs/takepos/admin/receipt.php
@@ -111,21 +111,25 @@ if ($conf->global->TAKEPOS_PRINT_METHOD == "browser")
 print "</td></tr>\n";
 
 // Receipt printer module
+print '<tr class="oddeven"><td>';
+print $langs->trans('DolibarrReceiptPrinter');
+print '<td>';
+print $langs->trans('ReceiptPrinterMethodDescription');
+print '<br>';
+print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
+print '</td><td class="right">';
 if ($conf->receiptprinter->enabled) {
-	print '<tr class="oddeven"><td>';
-	print $langs->trans('DolibarrReceiptPrinter');
-	print '<td>';
-	print $langs->trans('ReceiptPrinterMethodDescription');
-	print '<br>';
-	print '<a href="'.DOL_URL_ROOT.'/admin/receiptprinter.php">'.$langs->trans("Setup").'</a>';
-	print '</td><td class="right">';
 	if ($conf->global->TAKEPOS_PRINT_METHOD == "receiptprinter") {
 		print img_picto($langs->trans("Activated"), 'switch_on');
 	} else {
 		print '<a class="reposition" href="'.$_SERVER["PHP_SELF"].'?action=setmethod&token='.newToken().'&value=receiptprinter">'.img_picto($langs->trans("Disabled"), 'switch_off').'</a>';
 	}
-	print "</td></tr>\n";
+} else {
+	print '<span class="opacitymedium">';
+	print $langs->trans("ModuleReceiptPrinterMustBeEnabled");
+	print '</span>';
 }
+print "</td></tr>\n";
 
 // TakePOS Connector
 print '<tr class="oddeven"><td>';