From 64a7bbe0fd43fc43a93554058143d40f67a76364 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Fri, 27 Sep 2019 10:19:27 +0200
Subject: [PATCH] Move ajax file

---
 htdocs/takepos/{ => ajax}/ajax.php |  4 ++--
 htdocs/takepos/takepos.php         | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)
 rename htdocs/takepos/{ => ajax}/ajax.php (95%)

diff --git a/htdocs/takepos/ajax.php b/htdocs/takepos/ajax/ajax.php
similarity index 95%
rename from htdocs/takepos/ajax.php
rename to htdocs/takepos/ajax/ajax.php
index 1cb91f6edac..23d0db444e8 100644
--- a/htdocs/takepos/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -16,7 +16,7 @@
  */
 
 /**
- *	\file       htdocs/takepos/ajax.php
+ *	\file       htdocs/takepos/ajax/ajax.php
  *	\brief      Ajax search component for TakePos. It search products of a category.
  */
 
@@ -30,7 +30,7 @@ if (! defined('NOREQUIREMENU'))		define('NOREQUIREMENU', '1');
 if (! defined('NOREQUIREHTML'))		define('NOREQUIREHTML', '1');
 if (! defined('NOREQUIREAJAX'))		define('NOREQUIREAJAX', '1');
 
-require '../main.inc.php';	// Load $user and permissions
+require '../../main.inc.php';	// Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
 $category = GETPOST('category', 'alpha');
diff --git a/htdocs/takepos/takepos.php b/htdocs/takepos/takepos.php
index 97355d7c0e2..508b8f2c2c3 100644
--- a/htdocs/takepos/takepos.php
+++ b/htdocs/takepos/takepos.php
@@ -226,7 +226,8 @@ function MoreCategories(moreorless) {
 	ClearSearch();
 }
 
-function LoadProducts(position, issubcat=false) {
+// LoadProducts
+function LoadProducts(position, issubcat) {
 	console.log("LoadProducts");
 	var maxproduct = <?php echo ($MAXPRODUCT - 2); ?>;
 
@@ -251,7 +252,7 @@ function LoadProducts(position, issubcat=false) {
 	});
 
 	idata=0; //product data counter
-	$.getJSON('./ajax.php?action=getProducts&category='+currentcat, function(data) {
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&category='+currentcat, function(data) {
 		console.log("Call ajax.php (in LoadProducts) to get Products of category "+currentcat);
 
 		while (ishow < maxproduct) {
@@ -297,7 +298,7 @@ function MoreProducts(moreorless) {
 		if (pageproducts==0) return; //Return if no less pages
 		pageproducts=pageproducts-1;
 	}
-	$.getJSON('./ajax.php?action=getProducts&category='+currentcat, function(data) {
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=getProducts&category='+currentcat, function(data) {
 		console.log("Call ajax.php (in MoreProducts) to get Products of category "+currentcat);
 
 		if (typeof (data[(maxproduct * pageproducts)]) == "undefined" && moreorless=="more"){ // Return if no more pages
@@ -413,10 +414,11 @@ function New() {
 }
 
 function Search2() {
-	console.log("Search2");
+	console.log("Search2 Call ajax search to replace products");
 	pageproducts=0;
-	$.getJSON('./ajax.php?action=search&term='+$('#search').val(), function(data) {
-		for (i = 0; i < 30; i++) {
+	jQuery(".catwatermark").hide();
+	$.getJSON('<?php echo DOL_URL_ROOT ?>/takepos/ajax/ajax.php?action=search&term='+$('#search').val(), function(data) {
+		for (i = 0; i < <?php echo $MAXPRODUCT ?>; i++) {
 			if (typeof (data[i]) == "undefined"){
 				$("#prodesc"+i).text("");
 				$("#proimg"+i).attr("src","genimg/empty.png");