if ($categorycode eq "*") {
my $sth_delete = $dbh->prepare("DELETE FROM default_circ_rules");
$sth_delete->execute();
- } else {
- my $sth_delete = $dbh->prepare("DELETE FROM default_borrower_circ_rules
- WHERE categorycode = ?");
- $sth_delete->execute($categorycode);
}
} elsif ($categorycode eq "*") {
my $sth_delete = $dbh->prepare("DELETE FROM default_branch_circ_rules
WHERE branchcode = ?");
$sth_delete->execute($branch);
- } else {
- my $sth_delete = $dbh->prepare("DELETE FROM branch_borrower_circ_rules
- WHERE branchcode = ?
- AND categorycode = ?");
- $sth_delete->execute($branch, $categorycode);
}
- Koha::CirculationRules->set_rule(
+ Koha::CirculationRules->set_rules(
{
- branchcode => $branch,
- categorycode => $categorycode,
+ categorycode => $categorycode eq '*' ? undef : $categorycode,
+ branchcode => $branch eq '*' ? undef : $branch,
itemtype => undef,
- rule_name => 'max_holds',
- rule_value => undef,
+ rules => {
+ max_holds => undef,
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ }
}
);
}
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';
+ my $note = $input->param('note');
$debug and warn "Adding $br, $bor, $itemtype, $fine, $maxissueqty, $maxonsiteissueqty, $cap_fine_to_replacement_price";
my $params = {
firstremind => $firstremind,
chargeperiod => $chargeperiod,
chargeperiod_charge_at => $chargeperiod_charge_at,
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
renewalsallowed => $renewalsallowed,
renewalperiod => $renewalperiod,
norenewalbefore => $norenewalbefore,
overduefinescap => $overduefinescap,
cap_fine_to_replacement_price => $cap_fine_to_replacement_price,
article_requests => $article_requests,
+ note => $note,
};
my $issuingrule = Koha::IssuingRules->find({categorycode => $bor, itemtype => $itemtype, branchcode => $br});
Koha::IssuingRule->new()->set($params)->store();
}
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => $bor,
+ itemtype => $itemtype,
+ branchcode => $br,
+ rules => {
+ maxissueqty => $maxissueqty,
+ maxonsiteissueqty => $maxonsiteissueqty,
+ }
+ }
+ );
+
}
elsif ($op eq "set-branch-defaults") {
my $categorycode = $input->param('categorycode');
- my $maxissueqty = $input->param('maxissueqty');
- my $maxonsiteissueqty = $input->param('maxonsiteissueqty');
+ my $patron_maxissueqty = $input->param('patron_maxissueqty');
+ my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
my $holdallowed = $input->param('holdallowed');
my $hold_fulfillment_policy = $input->param('hold_fulfillment_policy');
my $returnbranch = $input->param('returnbranch');
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+/;
+ $patron_maxissueqty =~ s/\s//g;
+ $patron_maxissueqty = '' if $patron_maxissueqty !~ /^\d+/;
+ $patron_maxonsiteissueqty =~ s/\s//g;
+ $patron_maxonsiteissueqty = '' if $patron_maxonsiteissueqty !~ /^\d+/;
$holdallowed =~ s/\s//g;
$holdallowed = undef if $holdallowed !~ /^\d+/;
$max_holds =~ s/\s//g;
my $sth_search = $dbh->prepare("SELECT count(*) AS total
FROM default_circ_rules");
my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
- (maxissueqty, maxonsiteissueqty, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?, ?)");
+ (holdallowed, hold_fulfillment_policy, returnbranch)
+ VALUES (?, ?, ?)");
my $sth_update = $dbh->prepare("UPDATE default_circ_rules
- SET maxissueqty = ?, maxonsiteissueqty = ?, holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?");
+ SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?");
$sth_search->execute();
my $res = $sth_search->fetchrow_hashref();
if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $holdallowed, $hold_fulfillment_policy, $returnbranch);
+ $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
} else {
- $sth_insert->execute($maxissueqty, $maxonsiteissueqty, $holdallowed, $hold_fulfillment_policy, $returnbranch);
+ $sth_insert->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
}
+
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rules => {
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
+ }
+ );
} else {
my $sth_search = $dbh->prepare("SELECT count(*) AS total
FROM default_branch_circ_rules
WHERE branchcode = ?");
my $sth_insert = $dbh->prepare("INSERT INTO default_branch_circ_rules
- (branchcode, maxissueqty, maxonsiteissueqty, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?, ?, ?)");
+ (branchcode, holdallowed, hold_fulfillment_policy, returnbranch)
+ VALUES (?, ?, ?, ?)");
my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
- SET maxissueqty = ?, maxonsiteissueqty = ?, holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
+ SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
WHERE branchcode = ?");
$sth_search->execute($branch);
my $res = $sth_search->fetchrow_hashref();
if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $holdallowed, $hold_fulfillment_policy, $returnbranch, $branch);
+ $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch, $branch);
} else {
- $sth_insert->execute($branch, $maxissueqty, $maxonsiteissueqty, $holdallowed, $hold_fulfillment_policy, $returnbranch);
+ $sth_insert->execute($branch, $holdallowed, $hold_fulfillment_policy, $returnbranch);
}
+
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => $branch,
+ rules => {
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
+ }
+ );
}
Koha::CirculationRules->set_rule(
{
}
elsif ($op eq "add-branch-cat") {
my $categorycode = $input->param('categorycode');
- my $maxissueqty = $input->param('maxissueqty');
- my $maxonsiteissueqty = $input->param('maxonsiteissueqty');
+ my $patron_maxissueqty = $input->param('patron_maxissueqty');
+ my $patron_maxonsiteissueqty = $input->param('patron_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+/;
+ $patron_maxissueqty =~ s/\s//g;
+ $patron_maxissueqty = '' if $patron_maxissueqty !~ /^\d+/;
+ $patron_maxonsiteissueqty =~ s/\s//g;
+ $patron_maxonsiteissueqty = '' if $patron_maxonsiteissueqty !~ /^\d+/;
$max_holds =~ s/\s//g;
$max_holds = undef if $max_holds !~ /^\d+/;
if ($branch eq "*") {
if ($categorycode eq "*") {
- #FIXME This block is will probably be never used
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM default_circ_rules");
- my $sth_insert = $dbh->prepare(q|
- INSERT INTO default_circ_rules
- (maxissueqty, maxonsiteissueqty)
- VALUES (?, ?)
- |);
- my $sth_update = $dbh->prepare(q|
- UPDATE default_circ_rules
- SET maxissueqty = ?,
- maxonsiteissueqty = ?,
- |);
-
- $sth_search->execute();
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute( $maxissueqty, $maxonsiteissueqty );
- } else {
- $sth_insert->execute( $maxissueqty, $maxonsiteissueqty );
- }
-
- Koha::CirculationRules->set_rule(
+ Koha::CirculationRules->set_rules(
{
- branchcode => undef,
categorycode => undef,
itemtype => undef,
- rule_name => 'max_holds',
- rule_value => $max_holds,
+ branchcode => undef,
+ rules => {
+ max_holds => $max_holds,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
}
);
} 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 ( ?, ?, ?)
- |);
- my $sth_update = $dbh->prepare(q|
- UPDATE default_borrower_circ_rules
- SET maxissueqty = ?,
- maxonsiteissueqty = ?,
- WHERE categorycode = ?
- |);
- $sth_search->execute($categorycode);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute( $maxissueqty, $maxonsiteissueqty, $categorycode );
- } else {
- $sth_insert->execute( $categorycode, $maxissueqty, $maxonsiteissueqty );
- }
-
- Koha::CirculationRules->set_rule(
+ Koha::CirculationRules->set_rules(
{
branchcode => undef,
categorycode => $categorycode,
itemtype => undef,
- rule_name => 'max_holds',
- rule_value => $max_holds,
+ rules => {
+ max_holds => $max_holds,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
}
);
}
} elsif ($categorycode eq "*") {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM default_branch_circ_rules
- WHERE branchcode = ?");
- my $sth_insert = $dbh->prepare(q|
- INSERT INTO default_branch_circ_rules
- (branchcode, maxissueqty, maxonsiteissueqty)
- VALUES (?, ?, ?)
- |);
- my $sth_update = $dbh->prepare(q|
- UPDATE default_branch_circ_rules
- SET maxissueqty = ?,
- maxonsiteissueqty = ?
- WHERE branchcode = ?
- |);
- $sth_search->execute($branch);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($maxissueqty, $maxonsiteissueqty, $branch);
- } else {
- $sth_insert->execute($branch, $maxissueqty, $maxonsiteissueqty);
- }
- } else {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM branch_borrower_circ_rules
- WHERE branchcode = ?
- AND categorycode = ?");
- my $sth_insert = $dbh->prepare(q|
- INSERT INTO branch_borrower_circ_rules
- (branchcode, categorycode, maxissueqty, maxonsiteissueqty)
- VALUES (?, ?, ?, ?)
- |);
- my $sth_update = $dbh->prepare(q|
- UPDATE branch_borrower_circ_rules
- SET maxissueqty = ?,
- maxonsiteissueqty = ?
- 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);
- } else {
- $sth_insert->execute($branch, $categorycode, $maxissueqty, $maxonsiteissueqty);
- }
-
- Koha::CirculationRules->set_rule(
+ Koha::CirculationRules->set_rules(
{
+ categorycode => undef,
+ itemtype => undef,
branchcode => $branch,
+ rules => {
+ max_holds => $max_holds,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
+ }
+ );
+ } else {
+ Koha::CirculationRules->set_rules(
+ {
categorycode => $categorycode,
itemtype => undef,
- rule_name => 'max_holds',
- rule_value => $max_holds,
+ branchcode => $branch,
+ rules => {
+ max_holds => $max_holds,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ }
}
);
}
my @sorted_row_loop = sort by_category_and_itemtype @row_loop;
-my $sth_branch_cat;
-if ($branch eq "*") {
- $sth_branch_cat = $dbh->prepare("
- SELECT default_borrower_circ_rules.*, categories.description AS humancategorycode
- FROM default_borrower_circ_rules
- JOIN categories USING (categorycode)
-
- ");
- $sth_branch_cat->execute();
-} else {
- $sth_branch_cat = $dbh->prepare("
- SELECT branch_borrower_circ_rules.*, categories.description AS humancategorycode
- FROM branch_borrower_circ_rules
- JOIN categories USING (categorycode)
- WHERE branch_borrower_circ_rules.branchcode = ?
- ");
- $sth_branch_cat->execute($branch);
-}
-
-my @branch_cat_rules = ();
-while (my $row = $sth_branch_cat->fetchrow_hashref) {
- push @branch_cat_rules, $row;
-}
-my @sorted_branch_cat_rules = sort { $a->{'humancategorycode'} cmp $b->{'humancategorycode'} } @branch_cat_rules;
-
-# note undef maxissueqty so that template can deal with them
-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});
- $entry->{unlimited_holds_per_day} = 1 unless defined($entry->{holds_per_day});
-}
-
-@sorted_row_loop = sort by_category_and_itemtype @row_loop;
-
my $sth_branch_item;
if ($branch eq "*") {
$sth_branch_item = $dbh->prepare("
$template->param(show_branch_cat_rule_form => 1);
$template->param(branch_item_rule_loop => \@sorted_branch_item_rules);
-$template->param(branch_cat_rule_loop => \@sorted_branch_cat_rules);
my $sth_defaults;
if ($branch eq "*") {
projects / koha.git / blobdiff