use Koha::IssuingRule;
use Koha::IssuingRules;
use Koha::Logger;
-use Koha::RefundLostItemFeeRule;
use Koha::RefundLostItemFeeRules;
use Koha::Libraries;
use Koha::CirculationRules;
my $categorycode = $input->param('categorycode');
$debug and warn "deleting $1 $2 $branch";
- my $sth_Idelete = $dbh->prepare("delete from issuingrules where branchcode=? and categorycode=? and itemtype=?");
- $sth_Idelete->execute($branch, $categorycode, $itemtype);
+ Koha::IssuingRules->find({
+ branchcode => $branch,
+ categorycode => $categorycode,
+ itemtype => $itemtype
+ })->delete;
+
}
elsif ($op eq 'delete-branch-cat') {
my $categorycode = $input->param('categorycode');
if ($branch eq "*") {
if ($categorycode eq "*") {
- my $sth_delete = $dbh->prepare("DELETE FROM default_circ_rules");
- $sth_delete->execute();
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => undef,
+ itemtype => undef,
+ rules => {
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ max_holds => undef,
+ }
+ }
+ );
+ } else {
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => $categorycode,
+ branchcode => undef,
+ itemtype => undef,
+ rules => {
+ max_holds => undef,
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ }
+ }
+ );
}
} elsif ($categorycode eq "*") {
- my $sth_delete = $dbh->prepare("DELETE FROM default_branch_circ_rules
- WHERE branchcode = ?");
- $sth_delete->execute($branch);
- }
- Koha::CirculationRules->set_rules(
- {
- categorycode => $categorycode eq '*' ? undef : $categorycode,
- branchcode => $branch eq '*' ? undef : $branch,
- itemtype => undef,
- rules => {
- max_holds => undef,
- maxissueqty => undef,
- maxonsiteissueqty => undef,
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => $branch,
+ itemtype => undef,
+ rules => {
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ max_holds => undef,
+ }
}
- }
- );
+ );
+ } else {
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => $categorycode,
+ branchcode => $branch,
+ itemtype => undef,
+ rules => {
+ max_holds => undef,
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ }
+ }
+ );
+ }
}
elsif ($op eq 'delete-branch-item') {
my $itemtype = $input->param('itemtype');
if ($branch eq "*") {
if ($itemtype eq "*") {
- my $sth_delete = $dbh->prepare("DELETE FROM default_circ_rules");
- $sth_delete->execute();
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => undef,
+ itemtype => undef,
+ rules => {
+ patron_maxissueqty => undef,
+ patron_maxonsiteissueqty => undef,
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ }
+ }
+ );
} else {
- my $sth_delete = $dbh->prepare("DELETE FROM default_branch_item_rules
- WHERE itemtype = ?");
- $sth_delete->execute($itemtype);
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => undef,
+ itemtype => $itemtype,
+ rules => {
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ }
+ }
+ );
}
} elsif ($itemtype eq "*") {
- my $sth_delete = $dbh->prepare("DELETE FROM default_branch_circ_rules
- WHERE branchcode = ?");
- $sth_delete->execute($branch);
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => $branch,
+ itemtype => undef,
+ rules => {
+ maxissueqty => undef,
+ maxonsiteissueqty => undef,
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ }
+ }
+ );
} else {
- my $sth_delete = $dbh->prepare("DELETE FROM branch_item_rules
- WHERE branchcode = ?
- AND itemtype = ?");
- $sth_delete->execute($branch, $itemtype);
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ branchcode => $branch,
+ itemtype => $itemtype,
+ rules => {
+ holdallowed => undef,
+ hold_fulfillment_policy => undef,
+ returnbranch => undef,
+ }
+ }
+ );
}
}
# save the values entered
$holds_per_day = undef if $holds_per_day !~ /^\d+/;
my $onshelfholds = $input->param('onshelfholds') || 0;
$maxissueqty =~ s/\s//g;
- $maxissueqty = undef if $maxissueqty !~ /^\d+/;
+ $maxissueqty = '' if $maxissueqty !~ /^\d+/;
$maxonsiteissueqty =~ s/\s//g;
- $maxonsiteissueqty = undef if $maxonsiteissueqty !~ /^\d+/;
+ $maxonsiteissueqty = '' if $maxonsiteissueqty !~ /^\d+/;
my $issuelength = $input->param('issuelength');
$issuelength = $issuelength eq q{} ? undef : $issuelength;
my $lengthunit = $input->param('lengthunit');
} else {
Koha::IssuingRule->new()->set($params)->store();
}
-
Koha::CirculationRules->set_rules(
{
categorycode => $bor,
}
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;
$max_holds = '' if $max_holds !~ /^\d+/;
if ($branch eq "*") {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM default_circ_rules");
- my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
- (holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE default_circ_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?");
-
- $sth_search->execute();
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
- } else {
- $sth_insert->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
-
Koha::CirculationRules->set_rules(
{
categorycode => undef,
itemtype => undef,
branchcode => undef,
rules => {
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
}
}
);
} 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, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
- WHERE branchcode = ?");
- $sth_search->execute($branch);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch, $branch);
- } else {
- $sth_insert->execute($branch, $holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
-
Koha::CirculationRules->set_rules(
{
categorycode => undef,
itemtype => undef,
branchcode => $branch,
rules => {
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
}
}
);
}
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+/;
branchcode => undef,
rules => {
max_holds => $max_holds,
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
}
}
);
itemtype => undef,
rules => {
max_holds => $max_holds,
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
}
}
);
branchcode => $branch,
rules => {
max_holds => $max_holds,
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
}
}
);
branchcode => $branch,
rules => {
max_holds => $max_holds,
- maxissueqty => $maxissueqty,
- maxonsiteissueqty => $maxonsiteissueqty,
+ patron_maxissueqty => $patron_maxissueqty,
+ patron_maxonsiteissueqty => $patron_maxonsiteissueqty,
}
}
);
if ($branch eq "*") {
if ($itemtype eq "*") {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM default_circ_rules");
- my $sth_insert = $dbh->prepare("INSERT INTO default_circ_rules
- (holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE default_circ_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?");
-
- $sth_search->execute();
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
- } else {
- $sth_insert->execute($holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => undef,
+ rules => {
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
+ }
+ }
+ );
} else {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM default_branch_item_rules
- WHERE itemtype = ?");
- my $sth_insert = $dbh->prepare("INSERT INTO default_branch_item_rules
- (itemtype, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE default_branch_item_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
- WHERE itemtype = ?");
- $sth_search->execute($itemtype);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch, $itemtype);
- } else {
- $sth_insert->execute($itemtype, $holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => $itemtype,
+ branchcode => undef,
+ rules => {
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
+ }
+ }
+ );
}
} elsif ($itemtype eq "*") {
- 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, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE default_branch_circ_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
- WHERE branchcode = ?");
- $sth_search->execute($branch);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch, $branch);
- } else {
- $sth_insert->execute($branch, $holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => $branch,
+ rules => {
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
+ }
+ }
+ );
} else {
- my $sth_search = $dbh->prepare("SELECT count(*) AS total
- FROM branch_item_rules
- WHERE branchcode = ?
- AND itemtype = ?");
- my $sth_insert = $dbh->prepare("INSERT INTO branch_item_rules
- (branchcode, itemtype, holdallowed, hold_fulfillment_policy, returnbranch)
- VALUES (?, ?, ?, ?, ?)");
- my $sth_update = $dbh->prepare("UPDATE branch_item_rules
- SET holdallowed = ?, hold_fulfillment_policy = ?, returnbranch = ?
- WHERE branchcode = ?
- AND itemtype = ?");
-
- $sth_search->execute($branch, $itemtype);
- my $res = $sth_search->fetchrow_hashref();
- if ($res->{total}) {
- $sth_update->execute($holdallowed, $hold_fulfillment_policy, $returnbranch, $branch, $itemtype);
- } else {
- $sth_insert->execute($branch, $itemtype, $holdallowed, $hold_fulfillment_policy, $returnbranch);
- }
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => $itemtype,
+ branchcode => $branch,
+ rules => {
+ holdallowed => $holdallowed,
+ hold_fulfillment_policy => $hold_fulfillment_policy,
+ returnbranch => $returnbranch,
+ }
+ }
+ );
}
}
elsif ( $op eq 'mod-refund-lost-item-fee-rule' ) {
if ( $refund eq '*' ) {
if ( $branch ne '*' ) {
# only do something for $refund eq '*' if branch-specific
- eval {
- # Delete it so it picks the default
- Koha::RefundLostItemFeeRules->find({
- branchcode => $branch
- })->delete;
- };
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => $branch,
+ rules => {
+ refund => undef
+ }
+ }
+ );
}
} else {
- my $refundRule =
- Koha::RefundLostItemFeeRules->find({
- branchcode => $branch
- }) // Koha::RefundLostItemFeeRule->new;
- $refundRule->set({
- branchcode => $branch,
- refund => $refund
- })->store;
+ Koha::CirculationRules->set_rules(
+ {
+ categorycode => undef,
+ itemtype => undef,
+ branchcode => $branch,
+ rules => {
+ refund => $refund
+ }
+ }
+ );
}
}
-my $refundLostItemFeeRule = Koha::RefundLostItemFeeRules->find({ branchcode => $branch });
+my $refundLostItemFeeRule = Koha::RefundLostItemFeeRules->find({ branchcode => ($branch eq '*') ? undef:$branch });
+
$template->param(
refundLostItemFeeRule => $refundLostItemFeeRule,
defaultRefundRule => Koha::RefundLostItemFeeRules->_default_rule
my @sorted_row_loop = sort by_category_and_itemtype @row_loop;
-my $sth_branch_item;
-if ($branch eq "*") {
- $sth_branch_item = $dbh->prepare("
- SELECT default_branch_item_rules.*,
- COALESCE( localization.translation, itemtypes.description ) AS translated_description
- FROM default_branch_item_rules
- JOIN itemtypes USING (itemtype)
- LEFT JOIN localization ON itemtypes.itemtype = localization.code
- AND localization.entity = 'itemtypes'
- AND localization.lang = ?
- ");
- $sth_branch_item->execute($language);
-} else {
- $sth_branch_item = $dbh->prepare("
- SELECT branch_item_rules.*,
- COALESCE( localization.translation, itemtypes.description ) AS translated_description
- FROM branch_item_rules
- JOIN itemtypes USING (itemtype)
- LEFT JOIN localization ON itemtypes.itemtype = localization.code
- AND localization.entity = 'itemtypes'
- AND localization.lang = ?
- WHERE branch_item_rules.branchcode = ?
- ");
- $sth_branch_item->execute($language, $branch);
-}
-
-my @branch_item_rules = ();
-while (my $row = $sth_branch_item->fetchrow_hashref) {
- push @branch_item_rules, $row;
-}
-my @sorted_branch_item_rules = sort { lc $a->{translated_description} cmp lc $b->{translated_description} } @branch_item_rules;
-
-# note undef holdallowed so that template can deal with them
-foreach my $entry (@sorted_branch_item_rules) {
- $entry->{holdallowed_any} = 1 if ( $entry->{holdallowed} == 2 );
- $entry->{holdallowed_same} = 1 if ( $entry->{holdallowed} == 1 );
-}
-
$template->param(show_branch_cat_rule_form => 1);
-$template->param(branch_item_rule_loop => \@sorted_branch_item_rules);
-
-my $sth_defaults;
-if ($branch eq "*") {
- $sth_defaults = $dbh->prepare("
- SELECT *
- FROM default_circ_rules
- ");
- $sth_defaults->execute();
-} else {
- $sth_defaults = $dbh->prepare("
- SELECT *
- FROM default_branch_circ_rules
- WHERE branchcode = ?
- ");
- $sth_defaults->execute($branch);
-}
-
-my $defaults = $sth_defaults->fetchrow_hashref;
-
-if ($defaults) {
- $template->param( default_holdallowed_none => 1 ) if ( $defaults->{holdallowed} == 0 );
- $template->param( default_holdallowed_same => 1 ) if ( $defaults->{holdallowed} == 1 );
- $template->param( default_holdallowed_any => 1 ) if ( $defaults->{holdallowed} == 2 );
- $template->param( default_hold_fulfillment_policy => $defaults->{hold_fulfillment_policy} );
- $template->param( default_maxissueqty => $defaults->{maxissueqty} );
- $template->param( default_maxonsiteissueqty => $defaults->{maxonsiteissueqty} );
- $template->param( default_returnbranch => $defaults->{returnbranch} );
-}
-
-$template->param(default_rules => ($defaults ? 1 : 0));
$template->param(
patron_categories => $patron_categories,
projects / koha-equinox.git / blobdiff