@@ -1179,6 +1180,64 @@
[% END %]
+ |
+
+ |
|
diff --git a/t/db_dependent/Koha/CirculationRules.t b/t/db_dependent/Koha/CirculationRules.t
index 7117484d20..8664505524 100755
--- a/t/db_dependent/Koha/CirculationRules.t
+++ b/t/db_dependent/Koha/CirculationRules.t
@@ -20,7 +20,7 @@
use Modern::Perl;
use Benchmark;
-use Test::More tests => 7;
+use Test::More tests => 8;
use Test::Deep qw( cmp_methods );
use Test::Exception;
@@ -161,7 +161,7 @@ subtest 'set_rule' => sub {
my $itemtype = $builder->build({ source => 'Itemtype' })->{'itemtype'};
subtest 'Correct call' => sub {
- plan tests => 4;
+ plan tests => 5;
Koha::CirculationRules->delete;
@@ -173,6 +173,14 @@ subtest 'set_rule' => sub {
} );
}, 'setting lostreturn with branch' );
+ lives_ok( sub {
+ Koha::CirculationRules->set_rule( {
+ branchcode => $branchcode,
+ rule_name => 'processingreturn',
+ rule_value => '',
+ } );
+ }, 'setting processingreturn with branch' );
+
lives_ok( sub {
Koha::CirculationRules->set_rule( {
branchcode => $branchcode,
@@ -203,7 +211,7 @@ subtest 'set_rule' => sub {
};
subtest 'Call with missing params' => sub {
- plan tests => 4;
+ plan tests => 5;
Koha::CirculationRules->delete;
@@ -214,6 +222,13 @@ subtest 'set_rule' => sub {
} );
}, qr/branchcode/, 'setting lostreturn without branch fails' );
+ throws_ok( sub {
+ Koha::CirculationRules->set_rule( {
+ rule_name => 'processingreturn',
+ rule_value => '',
+ } );
+ }, qr/branchcode/, 'setting processingreturn without branch fails' );
+
throws_ok( sub {
Koha::CirculationRules->set_rule( {
branchcode => $branchcode,
@@ -241,7 +256,7 @@ subtest 'set_rule' => sub {
};
subtest 'Call with extra params' => sub {
- plan tests => 3;
+ plan tests => 4;
Koha::CirculationRules->delete;
@@ -254,6 +269,15 @@ subtest 'set_rule' => sub {
} );
}, qr/categorycode/, 'setting lostreturn with categorycode fails' );
+ throws_ok( sub {
+ Koha::CirculationRules->set_rule( {
+ branchcode => $branchcode,
+ categorycode => $categorycode,
+ rule_name => 'processingreturn',
+ rule_value => '',
+ } );
+ }, qr/categorycode/, 'setting processingreturn with categorycode fails' );
+
throws_ok( sub {
Koha::CirculationRules->set_rule( {
branchcode => $branchcode,
@@ -801,6 +825,151 @@ subtest 'get_lostreturn_policy() tests' => sub {
$schema->storage->txn_rollback;
};
+subtest 'get_processingreturn_policy() tests' => sub {
+ plan tests => 7;
+
+ $schema->storage->txn_begin;
+
+ $schema->resultset('CirculationRule')->search()->delete;
+
+ my $default_rule_charge = $builder->build(
+ {
+ source => 'CirculationRule',
+ value => {
+ branchcode => undef,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 'charge'
+ }
+ }
+ );
+ my $branchcode = $builder->build( { source => 'Branch' } )->{branchcode};
+ my $specific_rule_false = $builder->build(
+ {
+ source => 'CirculationRule',
+ value => {
+ branchcode => $branchcode,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 0
+ }
+ }
+ );
+ my $branchcode2 = $builder->build( { source => 'Branch' } )->{branchcode};
+ my $specific_rule_refund = $builder->build(
+ {
+ source => 'CirculationRule',
+ value => {
+ branchcode => $branchcode2,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 'refund'
+ }
+ }
+ );
+ my $branchcode3 = $builder->build( { source => 'Branch' } )->{branchcode};
+ my $specific_rule_restore = $builder->build(
+ {
+ source => 'CirculationRule',
+ value => {
+ branchcode => $branchcode3,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 'restore'
+ }
+ }
+ );
+
+ # Make sure we have an unused branchcode
+ my $branchcode4 = $builder->build( { source => 'Branch' } )->{branchcode};
+ my $specific_rule_dummy = $builder->build(
+ {
+ source => 'CirculationRule',
+ value => {
+ branchcode => $branchcode4,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 'refund'
+ }
+ }
+ );
+ my $branch_without_rule = $specific_rule_dummy->{ branchcode };
+ Koha::CirculationRules
+ ->search(
+ {
+ branchcode => $branch_without_rule,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn',
+ rule_value => 'refund'
+ }
+ )
+ ->next
+ ->delete;
+
+ my $item = $builder->build_sample_item(
+ {
+ homebranch => $specific_rule_restore->{branchcode},
+ holdingbranch => $specific_rule_false->{branchcode}
+ }
+ );
+ my $params = {
+ return_branch => $specific_rule_refund->{ branchcode },
+ item => $item
+ };
+
+ # Specific rules
+ t::lib::Mocks::mock_preference( 'RefundLostOnReturnControl', 'CheckinLibrary' );
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 'refund','Specific rule for checkin branch is applied (refund)');
+
+ t::lib::Mocks::mock_preference( 'RefundLostOnReturnControl', 'ItemHomeBranch' );
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 'restore','Specific rule for home branch is applied (restore)');
+
+ t::lib::Mocks::mock_preference( 'RefundLostOnReturnControl', 'ItemHoldingBranch' );
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 0,'Specific rule for holding branch is applied (false)');
+
+ # Default rule check
+ t::lib::Mocks::mock_preference( 'RefundLostOnReturnControl', 'CheckinLibrary' );
+ $params->{return_branch} = $branch_without_rule;
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 'charge','No rule for branch, global rule applied (charge)');
+
+ # Change the default value just to try
+ Koha::CirculationRules->search({ branchcode => undef, rule_name => 'processingreturn' })->next->rule_value(0)->store;
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 0,'No rule for branch, global rule applied (false)');
+
+ # No default rule defined check
+ Koha::CirculationRules
+ ->search(
+ {
+ branchcode => undef,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'processingreturn'
+ }
+ )
+ ->next
+ ->delete;
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 'refund','No rule for branch, no default rule, fallback default (refund)');
+
+ # Fallback to ItemHoldBranch if CheckinLibrary is undefined
+ $params->{return_branch} = undef;
+ is( Koha::CirculationRules->get_processingreturn_policy( $params ),
+ 'restore','return_branch undefined, fallback to ItemHomeBranch rule (restore)');
+
+ $schema->storage->txn_rollback;
+};
+
sub _is_row_match {
my ( $rule, $expected, $message ) = @_;