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

MT#14255 initial balance_intervals catchup when starting at 1st of month

Browse Source 
Change-Id: I9f22ffc112386da1bdac5e3fedb5b69e4a09fcfa
changes/15/2715/1
Rene Krenn 10 years ago
parent 25f54603fb
commit 33e5f4e71f
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
lib/NGCP/Panel/Controller/API/Contracts.pm
Unescape View File

@ -235,7 +235,7 @@ sub POST :Allow {
$contract->billing_mappings->create($mapping);
}
$contract = $self->contract_by_id($c, $contract->id,1,$now);
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $contract,
#bm_actual => $contract->billing_mappings->find($contract->get_column('bmid')),
);

2
lib/NGCP/Panel/Controller/API/Customers.pm
Unescape View File

@ -294,7 +294,7 @@ sub POST :Allow {
$customer->billing_mappings->create($mapping);
}
$customer = $self->customer_by_id($c, $customer->id,$now);
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $customer,
#bm_actual => $customer->billing_mappings->find($customer->get_column('bmid')),
);

4
lib/NGCP/Panel/Controller/Contract.pm
Unescape View File

@ -373,7 +373,7 @@ sub peering_create :Chained('peering_list') :PathPart('create') :Args(0) {
'+as' => 'bmid',
})->first;
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $contract,
#bm_actual => $contract->billing_mappings->find($contract->get_column('bmid')),
);
@ -522,7 +522,7 @@ sub reseller_create :Chained('reseller_list') :PathPart('create') :Args(0) {
'+as' => 'bmid',
})->first;
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $contract,
#bm_actual => $contract->billing_mappings->find($contract->get_column('bmid')),
);

2
lib/NGCP/Panel/Controller/Customer.pm
Unescape View File

@ -209,7 +209,7 @@ sub create :Chained('list_customer') :PathPart('create') :Args(0) {
'+as' => 'bmid',
})->first;
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $contract,
#bm_actual => $contract->billing_mappings->find($contract->get_column('bmid')),
);

2
lib/NGCP/Panel/Controller/Reseller.pm
Unescape View File

@ -457,7 +457,7 @@ sub create_defaults :Path('create_defaults') :Args(0) :Does(ACL) :ACLDetachTo('/
%{ $defaults{admins} },
reseller_id => $r{resellers}->id,
});
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balance(c => $c,
NGCP::Panel::Utils::ProfilePackages::create_initial_contract_balances(c => $c,
contract => $r{contracts},
#bm_actual => $r{billing_mappings}->find($r{contracts}->get_column('bmid')),
);

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

@ -382,7 +382,7 @@ sub topup_contract_balance {
return $balance;
}
sub create_initial_contract_balance {
sub create_initial_contract_balances {
my %params = @_;
my($c,$contract,$now) = @params{qw/c contract now/};
@ -461,7 +461,9 @@ PREPARE_BALANCE_INITIAL:
});
$balance->discard_changes();
if ('hour' eq $interval_unit) {
if ('hour' eq $interval_unit
|| 'day' eq $interval_unit
|| 'week' eq $interval_unit) {
$balance = catchup_contract_balances(c => $c, contract => $contract, now => $now);
}

Write Preview
Loading…
Cancel
Save