sipwise
/
ngcp-panel
mirror of https://github.com/sipwise/ngcp-panel.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#21871 add "ratio" field to /api/customerbalances

Browse Source 
+ to be used by ngcp-credit-warning script exclusively.

Change-Id: Ia549e5dab2ef729b56a521c2793b2dd5a74474e2
changes/01/16001/3
Rene Krenn 8 years ago
parent fb85d949b8
commit 57c6cf58ea
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File

13
lib/NGCP/Panel/Form/Balance/CustomerBalanceAPI.pm
Unescape View File

@ -24,10 +24,21 @@ has_field 'free_time_spent' => (
},
);
has_field 'ratio' => (
type => 'Float',
required => 0,
#precision => 6,
#decimal_symbol => '.',
element_attr => {
rel => ['tooltip'],
title => ['The ratio to reduce free cash/time in the initial balance period (month), when the customer was created. Readonly.'],
},
);
has_block 'fields' => (
tag => 'div',
class => [qw/modal-body/],
render_list => [qw/cash_balance cash_debit free_time_balance free_time_spent/],
render_list => [qw/cash_balance cash_debit free_time_balance free_time_spent ratio/],
);
1;

7
lib/NGCP/Panel/Role/API/CustomerBalances.pm
Unescape View File

@ -51,6 +51,13 @@ sub hal_from_item {
$resource{cash_debit} = (delete $resource{cash_balance_interval}) / 100.0;
$resource{free_time_spent} = delete $resource{free_time_balance_interval};
my $contract_create = NGCP::Panel::Utils::DateTime::set_local_tz($item->contract->create_timestamp // $item->contract->modify_timestamp);
if (NGCP::Panel::Utils::DateTime::set_local_tz($item->start) <= $contract_create && (NGCP::Panel::Utils::DateTime::is_infinite_future($item->end) || NGCP::Panel::Utils::DateTime::set_local_tz($item->end) >= $contract_create)) {
$resource{ratio} = NGCP::Panel::Utils::ProfilePackages::get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($item->start),NGCP::Panel::Utils::DateTime::set_local_tz($item->end));
} else {
$resource{ratio} = 1.0;
}
my $hal = NGCP::Panel::Utils::DataHal->new(
links => [
NGCP::Panel::Utils::DataHalLink->new(

12
lib/NGCP/Panel/Utils/ProfilePackages.pm
Unescape View File

@ -634,10 +634,10 @@ sub _get_resized_balance_values {
if (NGCP::Panel::Utils::DateTime::set_local_tz($balance->start) <= $contract_create && (NGCP::Panel::Utils::DateTime::is_infinite_future($balance->end) || NGCP::Panel::Utils::DateTime::set_local_tz($balance->end) >= $contract_create)) {
my $bm = get_actual_billing_mapping(schema => $schema, contract => $contract, now => $contract_create); #now => $balance->start); #end); !?
my $profile = $bm->billing_mappings->first->billing_profile;
my $old_ratio = _get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($balance->start),NGCP::Panel::Utils::DateTime::set_local_tz($balance->end));
my $old_ratio = get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($balance->start),NGCP::Panel::Utils::DateTime::set_local_tz($balance->end));
my $old_free_cash = $old_ratio * ($profile->interval_free_cash // _DEFAULT_PROFILE_FREE_CASH);
my $old_free_time = $old_ratio * ($profile->interval_free_time // _DEFAULT_PROFILE_FREE_TIME);
my $new_ratio = _get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($balance->start),$etime);
my $new_ratio = get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($balance->start),$etime);
my $new_free_cash = $new_ratio * ($profile->interval_free_cash // _DEFAULT_PROFILE_FREE_CASH);
my $new_free_time = $new_ratio * ($profile->interval_free_time // _DEFAULT_PROFILE_FREE_TIME);
$cash_balance += $new_free_cash - $old_free_cash;
@ -670,7 +670,7 @@ sub _get_balance_values {
my $contract_create = NGCP::Panel::Utils::DateTime::set_local_tz($contract->create_timestamp // $contract->modify_timestamp);
$ratio = 1.0;
if (NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->start) <= $contract_create && NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->end) >= $contract_create) { #$last_balance->end is never +inf here
$ratio = _get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->start),NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->end));
$ratio = get_free_ratio($contract_create,NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->start),NGCP::Panel::Utils::DateTime::set_local_tz($last_balance->end));
}
my $old_free_cash = $ratio * ($last_profile->interval_free_cash // _DEFAULT_PROFILE_FREE_CASH);
$cash_balance = $last_balance->cash_balance;
@ -684,7 +684,7 @@ sub _get_balance_values {
$ratio = 1.0;
} else {
$cash_balance = (defined $initial_balance ? $initial_balance : _DEFAULT_INITIAL_BALANCE);
$ratio = _get_free_ratio($now,$stime, $etime);
$ratio = get_free_ratio($now,$stime, $etime);
}
my $free_cash = $ratio * ($profile->interval_free_cash // _DEFAULT_PROFILE_FREE_CASH);
@ -702,7 +702,7 @@ sub _get_balance_values {
}
sub _get_free_ratio {
sub get_free_ratio {
my ($now,$stime,$etime) = @_;
if (!NGCP::Panel::Utils::DateTime::is_infinite_future($etime)) {
my $ctime;
@ -829,7 +829,7 @@ sub _add_interval {
}
sub _add_second {
my ($dt,$skip_leap_seconds) = @_;
$dt->add(seconds => 1);
while ($skip_leap_seconds and $dt->second() >= 60) {

Write Preview
Loading…
Cancel
Save