From 4a6a0af489f4e65faa2bc8148353fdced5829ac3 Mon Sep 17 00:00:00 2001
From: Tom van Leeuwen <tom@vleeuwen.eu>
Date: Sun, 12 Apr 2020 02:10:45 +0200
Subject: [PATCH] honoring config option `force_ip_to_sysname` in bill creation
 and editing (#10382)

* honoring config option `force_ip_to_sysname` in bill creation and editing

* refactored variable name to match it in edit.inc.php

* forgot one variable

* and one more :S

* Update new_bill.inc.php

* Update edit.inc.php

* Update new_bill.inc.php

* Update edit.inc.php

* Update edit.inc.php

* Update edit.inc.php

Co-authored-by: Neil Lathwood <gh+n@laf.io>
Co-authored-by: Tony Murray <murraytony@gmail.com>
---
 includes/html/modal/new_bill.inc.php  | 14 ++++----------
 includes/html/pages/bill/edit.inc.php | 15 +++++----------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/includes/html/modal/new_bill.inc.php b/includes/html/modal/new_bill.inc.php
index a51dc009b5..12d6444071 100644
--- a/includes/html/modal/new_bill.inc.php
+++ b/includes/html/modal/new_bill.inc.php
@@ -41,16 +41,10 @@ if (Auth::user()->hasGlobalAdmin()) {
                 <div class="form-group">
                     <label class="col-sm-4 control-label" for="device">Device</label>
                     <div class="col-sm-8">
-                        <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)">
-                            <option value=''>Select a device</option>
-                            <?php
-                              $devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
-                            foreach ($devices as $device) {
-                                $selected = $device['device_id'] == $port_device_id ? " selected" : "";
-                                echo "<option value='${device['device_id']}' $selected>" . format_hostname($device) . "</option>\n";
-                            }
-                            ?>
-                        </select>
+                        <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)"></select>
+                        <script type="text/javascript">
+                            init_select2('#device', 'device', {}, <?php echo "{id: $port_device_id, text: '" . format_hostname($device) . "'}"; ?>);
+                        </script>
                     </div>
                 </div>
                 <div class="form-group">
diff --git a/includes/html/pages/bill/edit.inc.php b/includes/html/pages/bill/edit.inc.php
index adcf32ac93..dc2c891d38 100644
--- a/includes/html/pages/bill/edit.inc.php
+++ b/includes/html/pages/bill/edit.inc.php
@@ -136,6 +136,7 @@ if ($bill_data['bill_type'] == 'cdr') {
                 
                 <?php
             }
+            $port_device_id = -1;
             ?>
         </div>
 
@@ -149,16 +150,10 @@ if ($bill_data['bill_type'] == 'cdr') {
             <div class="form-group">
                 <label class="col-sm-2 control-label" for="device">Device</label>
                 <div class="col-sm-8">
-                    <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)">
-                        <option value=''>Select a device</option>
-                        <?php
-                          $devices = dbFetchRows('SELECT * FROM `devices` ORDER BY hostname');
-                        foreach ($devices as $device) {
-                            echo "<option value='${device['device_id']}'>${device['hostname']}</option>\n";
-                        }
-                          
-                        ?>
-                    </select>
+                    <select class="form-control input-sm" id="device" name="device" onchange="getInterfaceList(this)"></select>
+                    <script type="text/javascript">
+                        init_select2('#device', 'device', {}, <?php echo "{id: $port_device_id, text: '" . format_hostname($device) . "'}"; ?>);
+                    </script>
                 </div>
             </div>
             <div class="form-group">