Attachment #135194 for bug #29012

View | Details | Raw Unified | Return to bug 29012
Collapse All | Expand All

Lines 2895-2901 sub CanBookBeRenewed { Link Here

(-)a/C4/Circulation.pm (-2 / +2 lines)
2895		2895
2896	return ( 0, "too_unseen" )	2896	return ( 0, "too_unseen" )
2897	if C4::Context->preference('UnseenRenewals') &&	2897	if C4::Context->preference('UnseenRenewals') &&
2898	$issuing_rule->{unseen_renewals_allowed} &&	2898	looks_like_number($issuing_rule->{unseen_renewals_allowed}) &&
2899	$issuing_rule->{unseen_renewals_allowed} <= $issue->unseen_renewals;	2899	$issuing_rule->{unseen_renewals_allowed} <= $issue->unseen_renewals;
2900		2900
2901	my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');	2901	my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
Lines 3138-3144 sub AddRenewal { Link Here
3138	rule_name => 'unseen_renewals_allowed'	3138	rule_name => 'unseen_renewals_allowed'
3139	}	3139	}
3140	);	3140	);
3141	if (!$seen && $rule && $rule->rule_value) {	3141	if (!$seen && $rule && looks_like_number($rule->rule_value)) {
3142	$unseen_renewals++;	3142	$unseen_renewals++;
3143	} else {	3143	} else {
3144	# If the renewal is seen, unseen should revert to 0	3144	# If the renewal is seen, unseen should revert to 0




    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
    my $renewalsallowed  = $input->param('renewalsallowed');
    my $unseen_renewals_allowed  = strip_non_numeric( scalar $input->param('unseen_renewals_allowed') ) // '';
    my $renewalperiod    = $input->param('renewalperiod');
    my $norenewalbefore  = $input->param('norenewalbefore');
    $norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;

    my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
    my $holds_per_day    = strip_non_numeric( scalar $input->param('holds_per_day') );
    my $onshelfholds     = $input->param('onshelfholds') || 0;
    my $issuelength  = $input->param('issuelength') || 0;
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
    my $daysmode = $input->param('daysmode');
    my $lengthunit  = $input->param('lengthunit');
    my $hardduedate = $input->param('hardduedate') || '';
    $hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
    my $hardduedatecompare = $input->param('hardduedatecompare');
    my $rentaldiscount = $input->param('rentaldiscount') || 0;
    my $opacitemholds = $input->param('opacitemholds') || 0;
    my $article_requests = $input->param('article_requests') || 'no';
    my $overduefinescap = $input->param('overduefinescap') || '';
    my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') || '') eq 'on';
    my $note = $input->param('note');
    my $decreaseloanholds = $input->param('decreaseloanholds') || '';
    my $recalls_allowed = $input->param('recalls_allowed');
    my $recalls_per_record = $input->param('recalls_per_record');
    my $on_shelf_recalls = $input->param('on_shelf_recalls');




use Modern::Perl;

return {
    bug_number => "29012",
    description => "Some rules are not saved when left blank while editing a 'rule' line in smart-rules.pl",
    up => sub {
        my ($args) = @_;
        my ($dbh, $out) = @$args{qw(dbh out)};
        my %default_rule_values = (
            issuelength             => 0,
            hardduedate             => '',
            unseenrenewalsallowed   => '',
            rentaldiscount          => 0,
            decreaseloanholds       => '',
        );
        while (my ($rule_name, $rule_value) = each (%default_rule_values)) {
            $dbh->do(q{
                INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value)
                    SELECT branchcode, categorycode, itemtype, ?, ? FROM circulation_rules cr
                        WHERE NOT EXISTS (
                            SELECT * FROM circulation_rules cr2
                                WHERE
                                    cr2.rule_name=?
                                    AND ( (cr2.branchcode=cr.branchcode) OR ( ISNULL(cr2.branchcode) AND ISNULL(cr.branchcode) ) )
                                    AND ( (cr2.categorycode=cr.categorycode) OR ( ISNULL(cr2.categorycode) AND ISNULL(cr.categorycode) ) )
                                    AND ( (cr2.itemtype=cr.itemtype) OR ( ISNULL(cr2.itemtype) AND ISNULL(cr.itemtype) ) )
                        )
                        GROUP BY branchcode, categorycode, itemtype
            }, undef, $rule_name, $rule_value, $rule_name);
        }
        say $out "Add default values for blank circulation rules that weren't saved to the database";
    },
}




        my $categorycode    = $input->param('categorycode');
        my $itemtype        = $input->param('itemtype');
        my $maxissueqty     = $input->param('maxissueqty');
        my $issuelength     = $input->param('issuelength') || 0;
        my $lengthunit      = $input->param('lengthunit');
        my $renewalsallowed = $input->param('renewalsallowed');
        my $renewalperiod   = $input->param('renewalperiod');

        my $onshelfholds    = $input->param('onshelfholds') || 0;
        $maxissueqty =~ s/\s//g;
        $maxissueqty = undef if $maxissueqty !~ /^\d+/;
        $issuelength = $issuelength eq q{} ? undef : $issuelength;

        my $params = {
            branchcode      => $branchcode,

                overduefinescap                  => "",
                rentaldiscount                   => 0,
                reservesallowed                  => $reservesallowed,
                suspension_chargeperiod          => 1,
                decreaseloanholds                => "",
                unseen_renewals_allowed          => "",
                recalls_allowed                  => undef,
                recalls_per_record               => undef,
                on_shelf_recalls                 => undef,

Lines 294-300 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt (-2 / +7 lines)
294	<td>[% suspension_chargeperiod \| html %]</td>	294	<td>[% suspension_chargeperiod \| html %]</td>
295	<td>[% renewalsallowed \| html %]</td>	295	<td>[% renewalsallowed \| html %]</td>
296	[% IF Koha.Preference('UnseenRenewals') %]	296	[% IF Koha.Preference('UnseenRenewals') %]
297	<td>[% unseenrenewalsallowed \| html %]</td>	297	<td>
		298	[% IF unseenrenewalsallowed.defined && unseenrenewalsallowed != '' %]
		299	[% unseenrenewalsallowed \| html %]
		300	[% ELSE %]
		301	<span>Unlimited</span>
		302	[% END %]
		303	</td>
298	[% END %]	304	[% END %]
299	<td>[% renewalperiod \| html %]</td>	305	<td>[% renewalperiod \| html %]</td>
300	<td>[% norenewalbefore \| html %]</td>	306	<td>[% norenewalbefore \| html %]</td>
301	-

Return to bug 29012

Lines 242-248 if ( $step == 5 ) { Link Here

(-)a/installer/onboarding.pl (-4 / +4 lines)
242	my $categorycode = $input->param('categorycode');	242	my $categorycode = $input->param('categorycode');
243	my $itemtype = $input->param('itemtype');	243	my $itemtype = $input->param('itemtype');
244	my $maxissueqty = $input->param('maxissueqty');	244	my $maxissueqty = $input->param('maxissueqty');
245	my $issuelength = $input->param('issuelength');	245	my $issuelength = $input->param('issuelength') \|\| 0;
246	my $lengthunit = $input->param('lengthunit');	246	my $lengthunit = $input->param('lengthunit');
247	my $renewalsallowed = $input->param('renewalsallowed');	247	my $renewalsallowed = $input->param('renewalsallowed');
248	my $renewalperiod = $input->param('renewalperiod');	248	my $renewalperiod = $input->param('renewalperiod');
Lines 252-258 if ( $step == 5 ) { Link Here
252	my $onshelfholds = $input->param('onshelfholds') \|\| 0;	252	my $onshelfholds = $input->param('onshelfholds') \|\| 0;
253	$maxissueqty =~ s/\s//g;	253	$maxissueqty =~ s/\s//g;
254	$maxissueqty = undef if $maxissueqty !~ /^\d+/;	254	$maxissueqty = undef if $maxissueqty !~ /^\d+/;
255	$issuelength = $issuelength eq q{} ? undef : $issuelength;
256		255
257	my $params = {	256	my $params = {
258	branchcode => $branchcode,	257	branchcode => $branchcode,
Lines 286-293 if ( $step == 5 ) { Link Here
286	overduefinescap => "",	285	overduefinescap => "",
287	rentaldiscount => 0,	286	rentaldiscount => 0,
288	reservesallowed => $reservesallowed,	287	reservesallowed => $reservesallowed,
289	suspension_chargeperiod => undef,	288	suspension_chargeperiod => 1,
290	decreaseloanholds => undef,	289	decreaseloanholds => "",
		290	unseen_renewals_allowed => "",
291	recalls_allowed => undef,	291	recalls_allowed => undef,
292	recalls_per_record => undef,	292	recalls_per_record => undef,
293	on_shelf_recalls => undef,	293	on_shelf_recalls => undef,

Lines 264-270 elsif ($op eq 'add') { Link Here

(-)a/admin/smart-rules.pl (-6 / +5 lines)
264	my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );	264	my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
265	my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );	265	my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
266	my $renewalsallowed = $input->param('renewalsallowed');	266	my $renewalsallowed = $input->param('renewalsallowed');
267	my $unseen_renewals_allowed = $input->param('unseen_renewals_allowed');	267	my $unseen_renewals_allowed = strip_non_numeric( scalar $input->param('unseen_renewals_allowed') ) // '';
268	my $renewalperiod = $input->param('renewalperiod');	268	my $renewalperiod = $input->param('renewalperiod');
269	my $norenewalbefore = $input->param('norenewalbefore');	269	my $norenewalbefore = $input->param('norenewalbefore');
270	$norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;	270	$norenewalbefore = '' if $norenewalbefore =~ /^\s*$/;
Lines 278-298 elsif ($op eq 'add') { Link Here
278	my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );	278	my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
279	my $holds_per_day = strip_non_numeric( scalar $input->param('holds_per_day') );	279	my $holds_per_day = strip_non_numeric( scalar $input->param('holds_per_day') );
280	my $onshelfholds = $input->param('onshelfholds') \|\| 0;	280	my $onshelfholds = $input->param('onshelfholds') \|\| 0;
281	my $issuelength = $input->param('issuelength');	281	my $issuelength = $input->param('issuelength') \|\| 0;
282	$issuelength = $issuelength eq q{} ? undef : $issuelength;
283	my $daysmode = $input->param('daysmode');	282	my $daysmode = $input->param('daysmode');
284	my $lengthunit = $input->param('lengthunit');	283	my $lengthunit = $input->param('lengthunit');
285	my $hardduedate = $input->param('hardduedate') \|\| undef;	284	my $hardduedate = $input->param('hardduedate') \|\| '';
286	$hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );	285	$hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );
287	$hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );	286	$hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
288	my $hardduedatecompare = $input->param('hardduedatecompare');	287	my $hardduedatecompare = $input->param('hardduedatecompare');
289	my $rentaldiscount = $input->param('rentaldiscount');	288	my $rentaldiscount = $input->param('rentaldiscount') \|\| 0;
290	my $opacitemholds = $input->param('opacitemholds') \|\| 0;	289	my $opacitemholds = $input->param('opacitemholds') \|\| 0;
291	my $article_requests = $input->param('article_requests') \|\| 'no';	290	my $article_requests = $input->param('article_requests') \|\| 'no';
292	my $overduefinescap = $input->param('overduefinescap') \|\| '';	291	my $overduefinescap = $input->param('overduefinescap') \|\| '';
293	my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') \|\| '') eq 'on';	292	my $cap_fine_to_replacement_price = ($input->param('cap_fine_to_replacement_price') \|\| '') eq 'on';
294	my $note = $input->param('note');	293	my $note = $input->param('note');
295	my $decreaseloanholds = $input->param('decreaseloanholds') \|\| undef;	294	my $decreaseloanholds = $input->param('decreaseloanholds') \|\| '';
296	my $recalls_allowed = $input->param('recalls_allowed');	295	my $recalls_allowed = $input->param('recalls_allowed');
297	my $recalls_per_record = $input->param('recalls_per_record');	296	my $recalls_per_record = $input->param('recalls_per_record');
298	my $on_shelf_recalls = $input->param('on_shelf_recalls');	297	my $on_shelf_recalls = $input->param('on_shelf_recalls');

Line 0 Link Here

(-)a/installer/data/mysql/atomicupdate/bug_29012.pl (+33 lines)
	1	use Modern::Perl;
	2
	3	return {
	4	bug_number => "29012",
	5	description => "Some rules are not saved when left blank while editing a 'rule' line in smart-rules.pl",
	6	up => sub {
	7	my ($args) = @_;
	8	my ($dbh, $out) = @$args{qw(dbh out)};
	9	my %default_rule_values = (
	10	issuelength => 0,
	11	hardduedate => '',
	12	unseenrenewalsallowed => '',
	13	rentaldiscount => 0,
	14	decreaseloanholds => '',
	15	);
	16	while (my ($rule_name, $rule_value) = each (%default_rule_values)) {
	17	$dbh->do(q{
	18	INSERT IGNORE INTO circulation_rules (branchcode, categorycode, itemtype, rule_name, rule_value)
	19	SELECT branchcode, categorycode, itemtype, ?, ? FROM circulation_rules cr
	20	WHERE NOT EXISTS (
	21	SELECT * FROM circulation_rules cr2
	22	WHERE
	23	cr2.rule_name=?
	24	AND ( (cr2.branchcode=cr.branchcode) OR ( ISNULL(cr2.branchcode) AND ISNULL(cr.branchcode) ) )
	25	AND ( (cr2.categorycode=cr.categorycode) OR ( ISNULL(cr2.categorycode) AND ISNULL(cr.categorycode) ) )
	26	AND ( (cr2.itemtype=cr.itemtype) OR ( ISNULL(cr2.itemtype) AND ISNULL(cr.itemtype) ) )
	27	)
	28	GROUP BY branchcode, categorycode, itemtype
	29	}, undef, $rule_name, $rule_value, $rule_name);
	30	}
	31	say $out "Add default values for blank circulation rules that weren't saved to the database";
	32	},
	33	}