From 822bab43c212b5828d62fafe2ddb7330a66b5d3a Mon Sep 17 00:00:00 2001 From: IP <92182391+IP-V15@users.noreply.github.com> Date: Fri, 8 Mar 2024 19:46:56 +0100 Subject: [PATCH 1/3] Update bill.class.php Add bill value in list option --- inc/bill.class.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/inc/bill.class.php b/inc/bill.class.php index f5382450a2..502df7adeb 100644 --- a/inc/bill.class.php +++ b/inc/bill.class.php @@ -214,7 +214,15 @@ public function rawSearchOptions() 'name' => __('Name'), 'datatype' => 'itemlink', ]; - + + $tab[] = [ + 'id' => 10, + 'table' => self::getTable(), + 'field' => 'value', + 'name' => __('Value'), + 'datatype' => 'decimal', + ]; + $tab[] = [ 'id' => 16, 'table' => self::getTable(), From 231f7bd44a92b7d94bbdf8127567102031dc9369 Mon Sep 17 00:00:00 2001 From: IP <92182391+IP-V15@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:36:21 +0200 Subject: [PATCH 2/3] Fix Order name value and add order id value --- inc/bill.class.php | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/inc/bill.class.php b/inc/bill.class.php index 502df7adeb..4c7fb797fc 100644 --- a/inc/bill.class.php +++ b/inc/bill.class.php @@ -200,11 +200,13 @@ public function rawSearchOptions() $tab[] = [ 'id' => 8, - 'table' => PluginOrderOrder::getTable(), - 'field' => 'name', - 'name' => __('Order', 'order'), - 'datatype' => 'itemlink', - 'itemlink_type' => 'PluginOrderOrder', + 'table' => 'glpi_plugin_order_bills', + 'field' => 'order_name', + 'name' => __('Order', 'order'), + 'datatype' => 'string', + 'nosearch' => true, + 'massiveaction' => false, + 'computation' => '(SELECT name FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', ]; $tab[] = [ @@ -215,13 +217,24 @@ public function rawSearchOptions() 'datatype' => 'itemlink', ]; - $tab[] = [ + $tab[] = [ 'id' => 10, 'table' => self::getTable(), 'field' => 'value', 'name' => __('Value'), 'datatype' => 'decimal', ]; + + $tab[] = [ + 'id' => '11', + 'table' => 'glpi_plugin_order_bills', + 'field' => 'order_name', + 'name' => __('Order ID', 'order'), + 'datatype' => 'string', + 'nosearch' => true, + 'massiveaction' => false, + 'computation' => '(SELECT num_order FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', + ]; $tab[] = [ 'id' => 16, From 972fc985a217346619ffbfa9db2388c5fbd2c804 Mon Sep 17 00:00:00 2001 From: IP <92182391+IP-V15@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:51:08 +0200 Subject: [PATCH 3/3] Update bill.class.php --- inc/bill.class.php | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/inc/bill.class.php b/inc/bill.class.php index 4c7fb797fc..ba670eb642 100644 --- a/inc/bill.class.php +++ b/inc/bill.class.php @@ -200,13 +200,13 @@ public function rawSearchOptions() $tab[] = [ 'id' => 8, - 'table' => 'glpi_plugin_order_bills', - 'field' => 'order_name', - 'name' => __('Order', 'order'), - 'datatype' => 'string', - 'nosearch' => true, - 'massiveaction' => false, - 'computation' => '(SELECT name FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', + 'table' => 'glpi_plugin_order_bills', + 'field' => 'order_name', + 'name' => __('Order', 'order'), + 'datatype' => 'string', + 'nosearch' => true, + 'massiveaction' => false, + 'computation' => '(SELECT name FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', ]; $tab[] = [ @@ -225,16 +225,16 @@ public function rawSearchOptions() 'datatype' => 'decimal', ]; - $tab[] = [ - 'id' => '11', - 'table' => 'glpi_plugin_order_bills', - 'field' => 'order_name', - 'name' => __('Order ID', 'order'), - 'datatype' => 'string', - 'nosearch' => true, - 'massiveaction' => false, - 'computation' => '(SELECT num_order FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', - ]; + $tab[] = [ + 'id' => '11', + 'table' => 'glpi_plugin_order_bills', + 'field' => 'order_name', + 'name' => __('Order ID', 'order'), + 'datatype' => 'string', + 'nosearch' => true, + 'massiveaction' => false, + 'computation' => '(SELECT num_order FROM glpi_plugin_order_orders WHERE glpi_plugin_order_orders.id = glpi_plugin_order_bills.plugin_order_orders_id)', + ]; $tab[] = [ 'id' => 16,