TT#10963 cash_balance_interval not returned in euro

+ as stated per apidoc.
+ fields renamed to align with /api/balanceintervals

Change-Id: Iaba062f1ed8336861bc29f6e38ac6be8df5df91c
changes/68/11268/6
Rene Krenn 8 years ago
parent 0415bede80
commit 22bd45df4b

@ -119,7 +119,7 @@ has_field 'free_time_spent' => (
#required => 1,
element_attr => {
rel => ['tooltip'],
title => ['The free-time spent during this interval in EUR/USD/etc.']
title => ['The free-time spent during this interval in seconds.']
},
);

@ -4,32 +4,30 @@ use HTML::FormHandler::Moose;
extends 'NGCP::Panel::Form::Balance::CustomerBalance';
use Moose::Util::TypeConstraints;
has_field 'cash_balance_interval' => (
has_field 'cash_debit' => (
type => 'Money',
label => 'Cash Balance (Interval)',
required => 1,
inflate_method => sub { return $_[1] * 100 },
deflate_method => sub { return $_[1] / 100 },
#label => 'Cash Balance (Interval)',
#required => 1,
element_attr => {
rel => ['tooltip'],
title => ['The current cash balance of the customer in EUR/USD/etc for the current interval (Read-only).'],
title => ['The amount spent during the current interval in EUR/USD/etc (read-only).'],
},
);
has_field 'free_time_balance_interval' => (
has_field 'free_time_spent' => (
type => 'Integer',
label => 'Free-Time Balance',
required => 1,
#label => 'Free-Time Balance',
#required => 1,
element_attr => {
rel => ['tooltip'],
title => ['The current free-time balance of the customer for the current interval in seconds (Read-only).'],
title => ['The free-time spent during the current interval in seconds (read-only).'],
},
);
has_block 'fields' => (
tag => 'div',
class => [qw/modal-body/],
render_list => [qw/cash_balance cash_balance_interval free_time_balance free_time_balance_interval/],
render_list => [qw/cash_balance cash_debit free_time_balance free_time_spent/],
);
1;

@ -46,7 +46,11 @@ sub hal_from_item {
my ($self, $c, $item, $form) = @_;
my %resource = $item->get_inflated_columns;
#$resource{cash_balance} /= 100.0;
##$resource{cash_balance_interval} /= 100.0;
$resource{cash_balance} /= 100.0;
$resource{cash_debit} = (delete $resource{cash_balance_interval}) / 100.0;
$resource{free_time_spent} = delete $resource{free_time_balance_interval};
my $hal = Data::HAL->new(
links => [
@ -105,7 +109,7 @@ sub update_item {
new_cash_balance => $resource->{cash_balance} * 100.0);
$resource->{cash_balance} *= 100.0;
# silently forbid to update cash_balance_interval and free_time_balance_interval
# ignoring cash_debit and free_time_spent:
$item->update({
cash_balance => $resource->{cash_balance},
free_time_balance => $resource->{free_time_balance},

Loading…
Cancel
Save