gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 23355: Rename staff_id for manager_id 

This patch makes the parameter naming more consistent and also fixes the
tests (there was a missmatch on the parameter naming, and tests count
was incorrect).

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Tomas Cohen Arazi 2020-03-03 10:50:44 -03:00 committed by Martin Renvoize
parent d6684f13fc
commit dd44efbc84
No known key found for this signature in database
GPG Key ID: 422B469130441A0F
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Koha/Cash/Register.pm
View File

@ -209,6 +209,13 @@ sub drop_default {
=head3 add_cashup
my $action = $cash_register->add_cashup(
{
manager_id => $logged_in_user->id,
amount => $cash_register->outstanding_accountlines->total
}
);
Add a new cashup action to the till, returns the added action.
=cut
@ -219,7 +226,7 @@ sub add_cashup {
my $rs = $self->_result->add_to_cash_register_actions(
{
code => 'CASHUP',
manager_id => $params->{staff_id},
manager_id => $params->{manager_id},
amount => $params->{amount}
}
)->discard_changes;

4
pos/register.pl
View File

@ -73,8 +73,8 @@ else {
if ( $op eq 'cashup' ) {
$cash_register->add_cashup(
{
staff_id => $logged_in_user->id,
amount => $cash_register->outstanding_accountlines->total
manager_id => $logged_in_user->id,
amount => $cash_register->outstanding_accountlines->total
}
);
}

2
t/db_dependent/Koha/Account/Line.t
View File

@ -19,7 +19,7 @@
use Modern::Perl;
use Test::More tests => 8;
use Test::More tests => 11;
use Test::Exception;
use C4::Circulation qw/AddIssue AddReturn/;

6
t/db_dependent/Koha/Cash/Register.t
View File

@ -160,7 +160,7 @@ subtest 'cashup' => sub {
ok(
$cashup1 = $register->add_cashup(
{ user_id => $patron->id, amount => '12.00' }
{ manager_id => $patron->id, amount => '12.00' }
),
'call successfull'
);
@ -184,7 +184,7 @@ subtest 'cashup' => sub {
plan tests => 3;
my $cashup2 =
$register->add_cashup( { user_id => $patron->id, amount => '6.00' } );
$register->add_cashup( { manager_id => $patron->id, amount => '6.00' } );
my $last_cashup = $register->last_cashup;
is(
@ -220,7 +220,7 @@ subtest 'cashup' => sub {
is( $accountlines->count, 2, 'No cashup, all accountlines returned' );
my $cashup3 =
$register->add_cashup( { user_id => $patron->id, amount => '2.50' } );
$register->add_cashup( { manager_id => $patron->id, amount => '2.50' } );
$accountlines = $register->outstanding_accountlines;
is( $accountlines->count, 0, 'Cashup added, no accountlines returned' );