lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix search hook in takepos

Browse Source
This commit is contained in:
Laurent Destailleur 2022-05-24 12:59:27 +02:00
parent b8764c4804
commit 536f888ba2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/takepos/ajax/ajax.php
View File

@ -103,7 +103,7 @@ if ($action == 'getProducts') {
'rowid' => $thirdparty->id, 'rowid' => $thirdparty->id,
'name' => $thirdparty->name, 'name' => $thirdparty->name,
'barcode' => $thirdparty->barcode, 'barcode' => $thirdparty->barcode,
'object' => 'thirdparty' 'object' => 'thirdparty'
); );
echo json_encode($rows); echo json_encode($rows);
exit; exit;
@ -267,6 +267,7 @@ if ($action == 'getProducts') {
$resql = $db->query($sql); $resql = $db->query($sql);
if ($resql) { if ($resql) {
$rows = array(); $rows = array();
while ($obj = $db->fetch_object($resql)) { while ($obj = $db->fetch_object($resql)) {
$objProd = new Product($db); $objProd = new Product($db);
$objProd->fetch($obj->rowid); $objProd->fetch($obj->rowid);
@ -303,17 +304,23 @@ if ($action == 'getProducts') {
$parameters=array(); $parameters=array();
$parameters['row'] = $row; $parameters['row'] = $row;
$parameters['obj'] = $obj; $parameters['obj'] = $obj;
$reshook = $hookmanager->executeHooks('completeAjaxReturnArray', $parameters); $reshook = $hookmanager->executeHooks('completeAjaxReturnArray', $parameters);
if ($reshook > 0) { if ($reshook > 0) {
// replace // replace
$row = $hookmanager->resArray; if (count($hookmanager->resArray)) {
$row = $hookmanager->resArray;
} else {
$row = array();
}
} else { } else {
// add // add
$rows[] = $hookmanager->resArray; if (count($hookmanager->resArray)) {
$rows[] = $hookmanager->resArray;
}
$rows[] = $row;
} }
$rows[] = $row;
} }
echo json_encode($rows); echo json_encode($rows);
} else { } else {
echo 'Failed to search product : '.$db->lasterror(); echo 'Failed to search product : '.$db->lasterror();