From 303313b168955dc01c3e36fbbea3bff8cdfde982 Mon Sep 17 00:00:00 2001
From: Laurent Dinclaux <laurent@gecka.nc>
Date: Wed, 8 Sep 2021 00:02:27 +1100
Subject: [PATCH] Takepos: set proper image directly when searching products
 Bypasses genimg/index.php that either redirects to viewimage.php or to
 nophoto.png. That was making lots of request to the server and excessive load
 on the database server, that queues them slowing down the UI.

---
 htdocs/takepos/ajax/ajax.php | 23 ++++++++++++++++++++++-
 htdocs/takepos/index.php     |  8 ++++++--
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/htdocs/takepos/ajax/ajax.php b/htdocs/takepos/ajax/ajax.php
index 30635c58b8c..dc8459be711 100644
--- a/htdocs/takepos/ajax/ajax.php
+++ b/htdocs/takepos/ajax/ajax.php
@@ -42,6 +42,7 @@ if (!defined('NOBROWSERNOTIF')) {
 
 require '../../main.inc.php'; // Load $user and permissions
 require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
+require_once DOL_DOCUMENT_ROOT."/product/class/product.class.php";
 
 $category = GETPOST('category', 'alphanohtml');	// Can be id of category or 'supplements'
 $action = GETPOST('action', 'aZ09');
@@ -119,6 +120,25 @@ if ($action == 'getProducts') {
 	if ($resql) {
 		$rows = array();
 		while ($obj = $db->fetch_object($resql)) {
+
+			$objProd = new Product($db);
+			$objProd->fetch($obj->rowid);
+			$image = $objProd->show_photos('product', $conf->product->multidir_output[$objProd->entity], 'small', 1);
+
+			preg_match('@src="([^"]+)"@', $image, $match);
+			$file = array_pop($match);
+
+			if ($file == "") {
+				$ig = '../public/theme/common/nophoto.png';
+			} else {
+				if (!defined('INCLUDE_PHONEPAGE_FROM_PUBLIC_PAGE')) {
+					$ig = $file.'&cache=1';
+
+				} else {
+					$ig = $file.'&cache=1&publictakepos=1&modulepart=product';
+				}
+			}
+
 			$rows[] = array(
 				'rowid' => $obj->rowid,
 				'ref' => $obj->ref,
@@ -127,7 +147,8 @@ if ($action == 'getProducts') {
 				'tobuy' => $obj->tobuy,
 				'barcode' => $obj->barcode,
 				'price' => $obj->price,
-			'object' => 'product'
+				'object' => 'product',
+				'img' => $ig,
 				//'price_formated' => price(price2num($obj->price, 'MU'), 1, $langs, 1, -1, -1, $conf->currency)
 			);
 		}
diff --git a/htdocs/takepos/index.php b/htdocs/takepos/index.php
index 377d5a7c6b6..f5d8a399132 100644
--- a/htdocs/takepos/index.php
+++ b/htdocs/takepos/index.php
@@ -549,7 +549,6 @@ function Search2(keyCodeForEnter) {
 
 		// temporization time to give time to type
 		if (search2_timer) {
-			console.log(search2_timer);
 			clearTimeout(search2_timer);
 		}
 
@@ -583,7 +582,12 @@ function Search2(keyCodeForEnter) {
 						$("#proprice" + i).html(data[i]['price_formated']);
 					}
 					$("#proimg" + i).attr("title", titlestring);
-					$("#proimg" + i).attr("src", "genimg/index.php?query=pro&id=" + data[i]['rowid']);
+					if( undefined !== data[i]['img']) {
+						$("#proimg" + i).attr("src", data[i]['img']);
+					}
+					else {
+						$("#proimg" + i).attr("src", "genimg/index.php?query=pro&id=" + data[i]['rowid']);
+					}
 					$("#prodiv" + i).data("rowid", data[i]['rowid']);
 					$("#prodiv" + i).data("iscat", 0);
 				}