From 365ef90abcedea7a76d2448c306e2631d21dbf73 Mon Sep 17 00:00:00 2001 From: Ludovic Dupont Date: Fri, 16 Oct 2015 16:15:44 +0200 Subject: [PATCH 1/2] Bug fix reference loading and price computing --- ajax/dropdownReference.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/ajax/dropdownReference.php b/ajax/dropdownReference.php index f1e10eaaf2..2c30138015 100644 --- a/ajax/dropdownReference.php +++ b/ajax/dropdownReference.php @@ -35,11 +35,10 @@ if (isset($_POST["itemtype"])) { $query = "SELECT s.`plugin_order_references_id` as id, s.`price_taxfree`, s.`reference_code`, r.`name` FROM `glpi_plugin_order_references_suppliers` s - INNER JOIN `glpi_plugin_order_references` r - ON (s.`plugin_order_references_id` = r.`id`) - AND r.`is_active` = 1 - AND r.`is_deleted` = 0 - WHERE r.`itemtype` = '{$_POST['itemtype']}' AND s.`suppliers_id` = '{$_POST['suppliers_id']}' AND r.entities_id = '{$_POST['entities_id']}' + LEFT JOIN `glpi_plugin_order_references` r ON (s.`plugin_order_references_id` = r.`id` ) + WHERE s.`suppliers_id` = '{$_POST['suppliers_id']}' + AND r.`itemtype` = '{$_POST['itemtype']}' + AND r.entities_id = '{$_POST['entities_id']}' ORDER BY s.`reference_code`"; $result = $DB->query($query); $number = $DB->numrows($result); @@ -47,8 +46,7 @@ $values = array(0 => Dropdown::EMPTY_VALUE); if ($number) { while ($data = $DB->fetch_assoc($result)) { - $values[$data['id']] = $data['name']. - (!empty($data['reference_code'])?" (".$data['reference_code'].")":""); + $values[$data['id']] = $data['name']." - ".$data['reference_code']; } } Dropdown::showFromArray($_POST['fieldname'], $values, array('rand' => $_POST['rand'])); @@ -68,7 +66,6 @@ WHERE `plugin_order_references_id` = '{$_POST['reference_id']}'"; $result = $DB->query($query); $price = $DB->result($result, 0, 'price_taxfree'); - $price = Html::formatNumber($price); echo ''; } From 131cd1c75eb63687bd8d06416a066e05e7894c1e Mon Sep 17 00:00:00 2001 From: Ludovic Dupont Date: Fri, 16 Oct 2015 16:19:32 +0200 Subject: [PATCH 2/2] Fix reference loading --- ajax/dropdownReference.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ajax/dropdownReference.php b/ajax/dropdownReference.php index 2c30138015..9fdd566c9e 100644 --- a/ajax/dropdownReference.php +++ b/ajax/dropdownReference.php @@ -35,7 +35,10 @@ if (isset($_POST["itemtype"])) { $query = "SELECT s.`plugin_order_references_id` as id, s.`price_taxfree`, s.`reference_code`, r.`name` FROM `glpi_plugin_order_references_suppliers` s - LEFT JOIN `glpi_plugin_order_references` r ON (s.`plugin_order_references_id` = r.`id` ) + LEFT JOIN `glpi_plugin_order_references` r + ON (s.`plugin_order_references_id` = r.`id` + AND r.`is_active` = 1 + AND r.`is_deleted` = 0) WHERE s.`suppliers_id` = '{$_POST['suppliers_id']}' AND r.`itemtype` = '{$_POST['itemtype']}' AND r.entities_id = '{$_POST['entities_id']}'