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

(-)a/admin/smart-rules.pl (-11 / +10 lines)
Lines 261-268 elsif ($op eq 'add') { Link Here
261
    my $firstremind  = $input->param('firstremind');
261
    my $firstremind  = $input->param('firstremind');
262
    my $chargeperiod = $input->param('chargeperiod');
262
    my $chargeperiod = $input->param('chargeperiod');
263
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
263
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
264
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
264
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
265
    my $maxonsiteissueqty  = strip_non_numeric($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 $renewalperiod    = $input->param('renewalperiod');
267
    my $renewalperiod    = $input->param('renewalperiod');
268
    my $norenewalbefore  = $input->param('norenewalbefore');
268
    my $norenewalbefore  = $input->param('norenewalbefore');
Lines 271-288 elsif ($op eq 'add') { Link Here
271
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
271
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
272
    $no_auto_renewal_after = '' if $no_auto_renewal_after =~ /^\s*$/;
272
    $no_auto_renewal_after = '' if $no_auto_renewal_after =~ /^\s*$/;
273
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || '';
273
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || '';
274
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( $no_auto_renewal_after_hard_limit ) } if ( $no_auto_renewal_after_hard_limit );
274
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( scalar $no_auto_renewal_after_hard_limit ) } if ( $no_auto_renewal_after_hard_limit );
275
    $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 );
275
    $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 );
276
    my $reservesallowed  = strip_non_numeric($input->param('reservesallowed'));
276
    my $reservesallowed  = strip_non_numeric( scalar $input->param('reservesallowed') );
277
    my $holds_per_record = strip_non_numeric($input->param('holds_per_record'));
277
    my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
278
    my $holds_per_day    = strip_non_numeric($input->param('holds_per_day'));
278
    my $holds_per_day    = strip_non_numeric( scalar $input->param('holds_per_day') );
279
    my $onshelfholds     = $input->param('onshelfholds') || 0;
279
    my $onshelfholds     = $input->param('onshelfholds') || 0;
280
    my $issuelength  = $input->param('issuelength');
280
    my $issuelength  = $input->param('issuelength');
281
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
281
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
282
    my $daysmode = $input->param('daysmode');
282
    my $daysmode = $input->param('daysmode');
283
    my $lengthunit  = $input->param('lengthunit');
283
    my $lengthunit  = $input->param('lengthunit');
284
    my $hardduedate = $input->param('hardduedate') || undef;
284
    my $hardduedate = $input->param('hardduedate') || undef;
285
    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
285
    $hardduedate = eval { dt_from_string( scalar $hardduedate ) } if ( $hardduedate );
286
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
286
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
287
    my $hardduedatecompare = $input->param('hardduedatecompare');
287
    my $hardduedatecompare = $input->param('hardduedatecompare');
288
    my $rentaldiscount = $input->param('rentaldiscount');
288
    my $rentaldiscount = $input->param('rentaldiscount');
Lines 338-350 elsif ($op eq 'add') { Link Here
338
}
338
}
339
elsif ($op eq "set-branch-defaults") {
339
elsif ($op eq "set-branch-defaults") {
340
    my $categorycode  = $input->param('categorycode');
340
    my $categorycode  = $input->param('categorycode');
341
    my $patron_maxissueqty   = strip_non_numeric($input->param('patron_maxissueqty'));
341
    my $patron_maxissueqty = strip_non_numeric( scalar $input->param('patron_maxissueqty') );
342
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
342
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
343
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
343
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
344
    my $holdallowed   = $input->param('holdallowed');
344
    my $holdallowed   = $input->param('holdallowed');
345
    my $hold_fulfillment_policy = $input->param('hold_fulfillment_policy');
345
    my $hold_fulfillment_policy = $input->param('hold_fulfillment_policy');
346
    my $returnbranch  = $input->param('returnbranch');
346
    my $returnbranch  = $input->param('returnbranch');
347
    my $max_holds = strip_non_numeric($input->param('max_holds'));
347
    my $max_holds = strip_non_numeric( scalar $input->param('max_holds') );
348
    $holdallowed =~ s/\s//g;
348
    $holdallowed =~ s/\s//g;
349
    $holdallowed = undef if $holdallowed !~ /^\d+/;
349
    $holdallowed = undef if $holdallowed !~ /^\d+/;
350
350
Lines 404-410 elsif ($op eq "set-branch-defaults") { Link Here
404
}
404
}
405
elsif ($op eq "add-branch-cat") {
405
elsif ($op eq "add-branch-cat") {
406
    my $categorycode  = $input->param('categorycode');
406
    my $categorycode  = $input->param('categorycode');
407
    my $patron_maxissueqty = strip_non_numeric($input->param('patron_maxissueqty'));
407
    my $patron_maxissueqty = strip_non_numeric( scalar $input->param('patron_maxissueqty') );
408
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
408
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
409
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
409
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
410
    my $max_holds = $input->param('max_holds');
410
    my $max_holds = $input->param('max_holds');
411
- 

Return to bug 25440