From 16ab6ce800a10887e31890d772a6356b34759f72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Wed, 1 Dec 2021 10:26:24 +0100
Subject: [PATCH 1/6] No Category

---
 htdocs/takepos/index.php | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 8bd1c4dbca9..59205c638a6 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1186,13 +1186,22 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		print 'withhead';
-					} ?>">
+					} ?>"
+					<?php
+					if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+						print '';
+					}
+					?>>
 
 		<!--  Show categories -->
-		<div class="div4">
-	<?php
-	$count = 0;
-	while ($count < $MAXCATEG) {
+		<?php
+			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+				print '<div class="div4" style= "display: none;">';
+			} else {
+				print '<div class="div4">';
+			}
+			$count = 0;
+			while ($count < $MAXCATEG) {
 		?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
 				echo 'onclick="MoreCategories(\'less\');"';
@@ -1228,12 +1237,19 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5">
+		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print ' style="width:100%;"';
+		} ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		?>
-				<div class="wrapper2" id='prodiv<?php echo $count; ?>' <?php if ($count == ($MAXPRODUCT - 2)) {
+		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
+		} else {
+			print '<div class="wrapper2" id="prodiv'.$count.'" ';
+		}
+	?>
+				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php
 												} if ($count == ($MAXPRODUCT - 1)) {
 													?> onclick="MoreProducts('more');" <?php

From 9190581d0a67c48579860c6264be11afd1dc35fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Wed, 1 Dec 2021 10:45:56 +0100
Subject: [PATCH 2/6] No category

---
 htdocs/takepos/index.php | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 59205c638a6..1b9799efec4 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1186,12 +1186,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 	<div class="row2<?php if (empty($conf->global->TAKEPOS_HIDE_HEAD_BAR)) {
 		print 'withhead';
-					} ?>"
-					<?php
-					if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
-						print '';
-					}
-					?>>
+					} ?>">
 
 		<!--  Show categories -->
 		<?php

From cc3ef5a3fb162231945d752f52e3b5a94ab70921 Mon Sep 17 00:00:00 2001
From: stickler-ci <support@stickler-ci.com>
Date: Wed, 1 Dec 2021 09:53:28 +0000
Subject: [PATCH 3/6] Fixing style errors.

---
 htdocs/takepos/index.php | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1b9799efec4..9ac9ca39c36 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,14 +1190,14 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
-				print '<div class="div4" style= "display: none;">';
-			} else {
-				print '<div class="div4">';
-			}
+		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			print '<div class="div4" style= "display: none;">';
+		} else {
+			print '<div class="div4">';
+		}
 			$count = 0;
-			while ($count < $MAXCATEG) {
-		?>
+		while ($count < $MAXCATEG) {
+			?>
 			<div class="wrapper" <?php if ($count == ($MAXCATEG - 2)) {
 				echo 'onclick="MoreCategories(\'less\');"';
 								 } elseif ($count == ($MAXCATEG - 1)) {
@@ -1225,16 +1225,16 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 				<?php } ?>
 				<div class="catwatermark" id='catwatermark<?php echo $count; ?>'>...</div>
 			</div>
-		<?php
-		$count++;
-	}
-	?>
+			<?php
+			$count++;
+		}
+		?>
 		</div>
 
 		<!--  Show product -->
 		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
 			print ' style="width:100%;"';
-		} ?>>
+						 } ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
@@ -1243,14 +1243,14 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';
 		}
-	?>
+		?>
 				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php
-												} if ($count == ($MAXPRODUCT - 1)) {
-													?> onclick="MoreProducts('more');" <?php
-												} else {
-													echo 'onclick="ClickProduct('.$count.');"';
-												} ?>>
+				} if ($count == ($MAXPRODUCT - 1)) {
+					?> onclick="MoreProducts('more');" <?php
+				} else {
+					echo 'onclick="ClickProduct('.$count.');"';
+				} ?>>
 					<?php
 					if ($count == ($MAXPRODUCT - 2)) {
 						//echo '<img class="imgwrapper" src="img/arrow-prev-top.png" height="100%" id="proimg'.$count.'" />';

From c9ae805e7a76d420e64e2c3ea1c110ea00968ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Mon, 13 Dec 2021 10:43:02 +0100
Subject: [PATCH 4/6] Change constant

---
 htdocs/takepos/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 1b9799efec4..5797f52053d 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,7 +1190,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-			if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+			if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 				print '<div class="div4" style= "display: none;">';
 			} else {
 				print '<div class="div4">';
@@ -1232,13 +1232,13 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5"<?php if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 			print ' style="width:100%;"';
 		} ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_NO_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';

From 0c7cf34125e7342f022d076f50901e5983d935e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Mon, 13 Dec 2021 17:02:16 +0100
Subject: [PATCH 5/6] Change the name of the constant

---
 htdocs/takepos/index.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index d55d8901be5..77128f485bf 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1190,7 +1190,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 
 		<!--  Show categories -->
 		<?php
-		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="div4" style= "display: none;">';
 		} else {
 			print '<div class="div4">';
@@ -1232,13 +1232,13 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 		</div>
 
 		<!--  Show product -->
-		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		<div class="div5"<?php if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print ' style="width:100%;"';
 						 } ?>>
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_HIDE_CATEGORY == 1) {
+		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
 		} else {
 			print '<div class="wrapper2" id="prodiv'.$count.'" ';

From 649d5b009ec9ef73d3f76efdf71b25d3c070a093 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A9lina?= <melina@melina.altairis.net>
Date: Tue, 21 Dec 2021 10:10:28 +0100
Subject: [PATCH 6/6] Correction of a condition of the constant

---
 htdocs/takepos/index.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 77128f485bf..d39fa98e59c 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -1238,11 +1238,7 @@ if (!empty($conf->global->TAKEPOS_WEIGHING_SCALE)) {
 	<?php
 	$count = 0;
 	while ($count < $MAXPRODUCT) {
-		if ($conf->global->TAKEPOS_HIDE_CATEGORIES == 1) {
 			print '<div class="wrapper2" id="prodiv'.$count.'"  ';
-		} else {
-			print '<div class="wrapper2" id="prodiv'.$count.'" ';
-		}
 		?>
 				<?php if ($count == ($MAXPRODUCT - 2)) {
 					?> onclick="MoreProducts('less');" <?php