diff --git a/includes/billing.php b/includes/billing.php index 56ac500084..52a274cc2d 100644 --- a/includes/billing.php +++ b/includes/billing.php @@ -2,7 +2,6 @@ use LibreNMS\Config; - function format_bytes_billing($value) { return format_number($value, Config::get('billing.base')).'B'; diff --git a/includes/html/modal/new_bill.inc.php b/includes/html/modal/new_bill.inc.php index 190392fb41..8302540ad9 100644 --- a/includes/html/modal/new_bill.inc.php +++ b/includes/html/modal/new_bill.inc.php @@ -73,16 +73,15 @@ if (LegacyAuth::user()->hasGlobalAdmin()) { ' selected'); - $cdr = array('select_mbps' => ' selected'); - include 'includes/html/pages/bill/addoreditbill.inc.php'; +if (Config::get('billing.95th_default_agg') == 1) { + $bill_data['dir_95th'] = 'agg'; +} else { + $bill_data['dir_95th'] = 'in'; +} +$bill_data['bill_type'] = 'cdr'; +$quota = array('select_gb' => ' selected'); +$cdr = array('select_mbps' => ' selected'); +include 'includes/html/pages/bill/addoreditbill.inc.php'; ?>
diff --git a/includes/html/pages/bill/addoreditbill.inc.php b/includes/html/pages/bill/addoreditbill.inc.php index c1d9b91638..d48e047e1e 100644 --- a/includes/html/pages/bill/addoreditbill.inc.php +++ b/includes/html/pages/bill/addoreditbill.inc.php @@ -43,19 +43,19 @@