# You should have received a copy of the GNU General Public License
# along with Koha; if not, see <http://www.gnu.org/licenses>.
-use strict;
-use warnings;
+use Modern::Perl;
use CGI qw ( -utf8 );
use C4::Context;
use C4::Output;
use C4::Auth;
use C4::Koha;
use C4::Debug;
-use C4::Branch; # GetBranches
use Koha::DateUtils;
use Koha::Database;
use Koha::IssuingRule;
use Koha::RefundLostItemFeeRule;
use Koha::RefundLostItemFeeRules;
use Koha::Libraries;
+use Koha::CirculationRules;
+use Koha::Patron::Categories;
+use Koha::Caches;
my $input = CGI->new;
my $dbh = C4::Context->dbh;
my $branch = $input->param('branch');
unless ( $branch ) {
if ( C4::Context->preference('DefaultToLoggedInLibraryCircRules') ) {
- $branch = Koha::Libraries->search->count() == 1 ? undef : C4::Branch::mybranch();
+ $branch = Koha::Libraries->search->count() == 1 ? undef : C4::Context::mybranch();
}
else {
- $branch = C4::Branch::onlymine() ? ( C4::Branch::mybranch() || '*' ) : '*';
+ $branch = C4::Context::only_my_library() ? ( C4::Context::mybranch() || '*' ) : '*';
}
}
$branch = '*' if $branch eq 'NO_LIBRARY_SET';
my $op = $input->param('op') || q{};
my $language = C4::Languages::getlanguage();
+my $cache = Koha::Caches->get_instance;
+$cache->clear_from_cache( Koha::IssuingRules::GUESSED_ITEMTYPES_KEY );
+
if ($op eq 'delete') {
my $itemtype = $input->param('itemtype');
my $categorycode = $input->param('categorycode');
AND categorycode = ?");
$sth_delete->execute($branch, $categorycode);
}
+ Koha::CirculationRules->set_rule(
+ {
+ branchcode => $branch,
+ categorycode => $categorycode,
+ itemtype => undef,
+ rule_name => 'max_holds',
+ rule_value => undef,
+ }
+ );
}
elsif ($op eq 'delete-branch-item') {
my $itemtype = $input->param('itemtype');
my $finedays = $input->param('finedays');
my $maxsuspensiondays = $input->param('maxsuspensiondays');
$maxsuspensiondays = undef if $maxsuspensiondays eq q||;
+ my $suspension_chargeperiod = $input->param('suspension_chargeperiod') || 1;
my $firstremind = $input->param('firstremind');
my $chargeperiod = $input->param('chargeperiod');
my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
my $norenewalbefore = $input->param('norenewalbefore');
$norenewalbefore = undef if $norenewalbefore =~ /^\s*$/;
my $auto_renew = $input->param('auto_renew') eq 'yes' ? 1 : 0;
+ my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
+ $no_auto_renewal_after = undef if $no_auto_renewal_after =~ /^\s*$/;
+ my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || undef;
+ $no_auto_renewal_after_hard_limit = eval { dt_from_string( $input->param('no_auto_renewal_after_hard_limit') ) } if ( $no_auto_renewal_after_hard_limit );
+ $no_auto_renewal_after_hard_limit = output_pref( { dt => $no_auto_renewal_after_hard_limit, dateonly => 1, dateformat => 'iso' } ) if ( $no_auto_renewal_after_hard_limit );
my $reservesallowed = $input->param('reservesallowed');
my $holds_per_record = $input->param('holds_per_record');
my $onshelfholds = $input->param('onshelfholds') || 0;
my $hardduedatecompare = $input->param('hardduedatecompare');
my $rentaldiscount = $input->param('rentaldiscount');
my $opacitemholds = $input->param('opacitemholds') || 0;
+ my $article_requests = $input->param('article_requests') || 'no';
my $overduefinescap = $input->param('overduefinescap') || undef;
my $cap_fine_to_replacement_price = $input->param('cap_fine_to_replacement_price') eq 'on';
$debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price";
fine => $fine,
finedays => $finedays,
maxsuspensiondays => $maxsuspensiondays,
+ suspension_chargeperiod => $suspension_chargeperiod,
firstremind => $firstremind,
chargeperiod => $chargeperiod,
chargeperiod_charge_at => $chargeperiod_charge_at,
renewalperiod => $renewalperiod,
norenewalbefore => $norenewalbefore,
auto_renew => $auto_renew,
+ no_auto_renewal_after => $no_auto_renewal_after,
+ no_auto_renewal_after_hard_limit => $no_auto_renewal_after_hard_limit,
reservesallowed => $reservesallowed,
holds_per_record => $holds_per_record,
issuelength => $issuelength,
opacitemholds => $opacitemholds,
overduefinescap => $overduefinescap,
cap_fine_to_replacement_price => $cap_fine_to_replacement_price,
+ article_requests => $article_requests,
};
my $issuingrule = Koha::IssuingRules->find({categorycode => $bor, itemtype => $itemtype, branchcode => $br});
my $categorycode = $input->param('categorycode');
my $maxissueqty = $input->param('maxissueqty');
my $maxonsiteissueqty = $input->param('maxonsiteissueqty');
+ my $max_holds = $input->param('max_holds');
$maxissueqty =~ s/\s//g;
$maxissueqty = undef if $maxissueqty !~ /^\d+/;
$maxonsiteissueqty =~ s/\s//g;
$maxonsiteissueqty = undef if $maxonsiteissueqty !~ /^\d+/;
+ $max_holds =~ s/\s//g;
+ $max_holds = undef if $max_holds !~ /^\d+/;
if ($branch eq "*") {
if ($categorycode eq "*") {
FROM default_circ_rules");
my $sth_insert = $dbh->prepare(q|
INSERT INTO default_circ_rules
- (maxissueqty, maxonsiteissueqty)
- VALUES (?, ?)
+ (maxissueqty, maxonsiteissueqty, max_holds)
+ VALUES (?, ?, ?)
|);
my $sth_update = $dbh->prepare(q|
UPDATE default_circ_rules
SET maxissueqty = ?,
- maxonsiteissueqty = ?
+ maxonsiteissueqty = ?,
+ max_holds = ?
|);
$sth_search->execute();
my $res = $sth_search->fetchrow_hashref();
if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty);
+ $sth_update->execute( $maxissueqty, $maxonsiteissueqty );
} else {
- $sth_insert->execute($maxissueqty, $maxonsiteissueqty);
+ $sth_insert->execute( $maxissueqty, $maxonsiteissueqty );
}
+
+ Koha::CirculationRules->set_rule(
+ {
+ branchcode => undef,
+ categorycode => undef,
+ itemtype => undef,
+ rule_name => 'max_holds',
+ rule_value => $max_holds,
+ }
+ );
} else {
my $sth_search = $dbh->prepare("SELECT count(*) AS total
FROM default_borrower_circ_rules
WHERE categorycode = ?");
my $sth_insert = $dbh->prepare(q|
INSERT INTO default_borrower_circ_rules
- (categorycode, maxissueqty, maxonsiteissueqty)
- VALUES (?, ?, ?)
+ (categorycode, maxissueqty, maxonsiteissueqty, max_holds)
+ VALUES (?, ?, ?, ?)
|);
my $sth_update = $dbh->prepare(q|
UPDATE default_borrower_circ_rules
SET maxissueqty = ?,
- maxonsiteissueqty = ?
+ maxonsiteissueqty = ?,
+ max_holds = ?
WHERE categorycode = ?
|);
- $sth_search->execute($branch);
+ $sth_search->execute($categorycode);
my $res = $sth_search->fetchrow_hashref();
if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $categorycode);
+ $sth_update->execute( $maxissueqty, $maxonsiteissueqty, $categorycode );
} else {
- $sth_insert->execute($categorycode, $maxissueqty, $maxonsiteissueqty);
+ $sth_insert->execute( $categorycode, $maxissueqty, $maxonsiteissueqty );
}
+
+ Koha::CirculationRules->set_rule(
+ {
+ branchcode => undef,
+ categorycode => $categorycode,
+ itemtype => undef,
+ rule_name => 'max_holds',
+ rule_value => $max_holds,
+ }
+ );
}
} elsif ($categorycode eq "*") {
my $sth_search = $dbh->prepare("SELECT count(*) AS total
AND categorycode = ?");
my $sth_insert = $dbh->prepare(q|
INSERT INTO branch_borrower_circ_rules
- (branchcode, categorycode, maxissueqty, maxonsiteissueqty)
- VALUES (?, ?, ?, ?)
+ (branchcode, categorycode, maxissueqty, maxonsiteissueqty, max_holds)
+ VALUES (?, ?, ?, ?, ?)
|);
my $sth_update = $dbh->prepare(q|
UPDATE branch_borrower_circ_rules
SET maxissueqty = ?,
maxonsiteissueqty = ?
+ max_holds = ?
WHERE branchcode = ?
AND categorycode = ?
|);
$sth_search->execute($branch, $categorycode);
my $res = $sth_search->fetchrow_hashref();
if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $branch, $categorycode);
+ $sth_update->execute($maxissueqty, $maxonsiteissueqty, $max_holds, $branch, $categorycode);
} else {
- $sth_insert->execute($branch, $categorycode, $maxissueqty, $maxonsiteissueqty);
+ $sth_insert->execute($branch, $categorycode, $maxissueqty, $maxonsiteissueqty, $max_holds);
}
+
+ Koha::CirculationRules->set_rule(
+ {
+ branchcode => $branch,
+ categorycode => $categorycode,
+ itemtype => undef,
+ rule_name => 'max_holds',
+ rule_value => $max_holds,
+ }
+ );
}
}
elsif ($op eq "add-branch-item") {
defaultRefundRule => Koha::RefundLostItemFeeRules->_default_rule
);
-my $branches = GetBranches();
-my @branchloop;
-for my $thisbranch (sort { $branches->{$a}->{branchname} cmp $branches->{$b}->{branchname} } keys %$branches) {
- push @branchloop, {
- value => $thisbranch,
- selected => $thisbranch eq $branch,
- branchname => $branches->{$thisbranch}->{'branchname'},
- };
-}
-
-my $sth=$dbh->prepare("SELECT description,categorycode FROM categories ORDER BY description");
-$sth->execute;
-my @category_loop;
-while (my $data=$sth->fetchrow_hashref){
- push @category_loop,$data;
-}
+my $patron_categories = Koha::Patron::Categories->search({}, { order_by => ['description'] });
-$sth->finish;
my @row_loop;
-my @itemtypes = @{ GetItemTypes( style => 'array' ) };
-@itemtypes = sort { lc $a->{translated_description} cmp lc $b->{translated_description} } @itemtypes;
+my $itemtypes = Koha::ItemTypes->search_with_localization;
my $sth2 = $dbh->prepare("
SELECT issuingrules.*,
} else {
$row->{'hardduedate'} = 0;
}
+ if ($row->{no_auto_renewal_after_hard_limit}) {
+ my $dt = eval { dt_from_string( $row->{no_auto_renewal_after_hard_limit} ) };
+ $row->{no_auto_renewal_after_hard_limit} = eval { output_pref( { dt => $dt, dateonly => 1 } ) } if $dt;
+ }
+
push @row_loop, $row;
}
-$sth->finish;
my @sorted_row_loop = sort by_category_and_itemtype @row_loop;
foreach my $entry (@sorted_branch_cat_rules, @sorted_row_loop) {
$entry->{unlimited_maxissueqty} = 1 unless defined($entry->{maxissueqty});
$entry->{unlimited_maxonsiteissueqty} = 1 unless defined($entry->{maxonsiteissueqty});
+ $entry->{unlimited_max_holds} = 1 unless defined($entry->{max_holds});
}
@sorted_row_loop = sort by_category_and_itemtype @row_loop;
$template->param(default_rules => ($defaults ? 1 : 0));
-$template->param(categoryloop => \@category_loop,
- itemtypeloop => \@itemtypes,
+$template->param(
+ patron_categories => $patron_categories,
+ itemtypeloop => $itemtypes,
rules => \@sorted_row_loop,
- branchloop => \@branchloop,
- humanbranch => ($branch ne '*' ? $branches->{$branch}->{branchname} : ''),
+ humanbranch => ($branch ne '*' ? $branch : ''),
current_branch => $branch,
definedbranch => scalar(@sorted_row_loop)>0
);
projects / koha.git / blobdiff