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

(-)a/admin/smart-rules.pl (-11 / +10 lines)
Lines 257-264 elsif ($op eq 'add') { Link Here
257
    my $firstremind  = $input->param('firstremind');
257
    my $firstremind  = $input->param('firstremind');
258
    my $chargeperiod = $input->param('chargeperiod');
258
    my $chargeperiod = $input->param('chargeperiod');
259
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
259
    my $chargeperiod_charge_at = $input->param('chargeperiod_charge_at');
260
    my $maxissueqty  = strip_non_numeric($input->param('maxissueqty'));
260
    my $maxissueqty = strip_non_numeric( scalar $input->param('maxissueqty') );
261
    my $maxonsiteissueqty  = strip_non_numeric($input->param('maxonsiteissueqty'));
261
    my $maxonsiteissueqty = strip_non_numeric( scalar $input->param('maxonsiteissueqty') );
262
    my $renewalsallowed  = $input->param('renewalsallowed');
262
    my $renewalsallowed  = $input->param('renewalsallowed');
263
    my $renewalperiod    = $input->param('renewalperiod');
263
    my $renewalperiod    = $input->param('renewalperiod');
264
    my $norenewalbefore  = $input->param('norenewalbefore');
264
    my $norenewalbefore  = $input->param('norenewalbefore');
Lines 267-283 elsif ($op eq 'add') { Link Here
267
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
267
    my $no_auto_renewal_after = $input->param('no_auto_renewal_after');
268
    $no_auto_renewal_after = '' if $no_auto_renewal_after =~ /^\s*$/;
268
    $no_auto_renewal_after = '' if $no_auto_renewal_after =~ /^\s*$/;
269
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || '';
269
    my $no_auto_renewal_after_hard_limit = $input->param('no_auto_renewal_after_hard_limit') || '';
270
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( $no_auto_renewal_after_hard_limit ) } if ( $no_auto_renewal_after_hard_limit );
270
    $no_auto_renewal_after_hard_limit = eval { dt_from_string( scalar $no_auto_renewal_after_hard_limit ) } if($no_auto_renewal_after_hard_limit);
271
    $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 );
271
    $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 );
272
    my $reservesallowed  = strip_non_numeric($input->param('reservesallowed'));
272
    my $reservesallowed  = strip_non_numeric( scalar $input->param('reservesallowed') );
273
    my $holds_per_record = strip_non_numeric($input->param('holds_per_record'));
273
    my $holds_per_record = strip_non_numeric( scalar $input->param('holds_per_record') );
274
    my $holds_per_day    = strip_non_numeric($input->param('holds_per_day'));
274
    my $holds_per_day    = strip_non_numeric( scalar $input->param('holds_per_day') );
275
    my $onshelfholds     = $input->param('onshelfholds') || 0;
275
    my $onshelfholds     = $input->param('onshelfholds') || 0;
276
    my $issuelength  = $input->param('issuelength');
276
    my $issuelength  = $input->param('issuelength');
277
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
277
    $issuelength = $issuelength eq q{} ? undef : $issuelength;
278
    my $lengthunit  = $input->param('lengthunit');
278
    my $lengthunit  = $input->param('lengthunit');
279
    my $hardduedate = $input->param('hardduedate') || undef;
279
    my $hardduedate = $input->param('hardduedate') || undef;
280
    $hardduedate = eval { dt_from_string( $input->param('hardduedate') ) } if ( $hardduedate );
280
    $hardduedate = eval { dt_from_string( scalar $input->param('hardduedate') ) } if ( $hardduedate );
281
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
281
    $hardduedate = output_pref( { dt => $hardduedate, dateonly => 1, dateformat => 'iso' } ) if ( $hardduedate );
282
    my $hardduedatecompare = $input->param('hardduedatecompare');
282
    my $hardduedatecompare = $input->param('hardduedatecompare');
283
    my $rentaldiscount = $input->param('rentaldiscount');
283
    my $rentaldiscount = $input->param('rentaldiscount');
Lines 333-345 elsif ($op eq 'add') { Link Here
333
}
333
}
334
elsif ($op eq "set-branch-defaults") {
334
elsif ($op eq "set-branch-defaults") {
335
    my $categorycode  = $input->param('categorycode');
335
    my $categorycode  = $input->param('categorycode');
336
    my $patron_maxissueqty   = strip_non_numeric($input->param('patron_maxissueqty'));
336
    my $patron_maxissueqty = strip_non_numeric( scalar $input->param('patron_maxissueqty') );
337
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
337
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
338
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
338
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
339
    my $holdallowed   = $input->param('holdallowed');
339
    my $holdallowed   = $input->param('holdallowed');
340
    my $hold_fulfillment_policy = $input->param('hold_fulfillment_policy');
340
    my $hold_fulfillment_policy = $input->param('hold_fulfillment_policy');
341
    my $returnbranch  = $input->param('returnbranch');
341
    my $returnbranch  = $input->param('returnbranch');
342
    my $max_holds = strip_non_numeric($input->param('max_holds'));
342
    my $max_holds = strip_non_numeric( scalar $input->param('max_holds') );
343
    $holdallowed =~ s/\s//g;
343
    $holdallowed =~ s/\s//g;
344
    $holdallowed = undef if $holdallowed !~ /^\d+/;
344
    $holdallowed = undef if $holdallowed !~ /^\d+/;
345
345
Lines 399-405 elsif ($op eq "set-branch-defaults") { Link Here
399
}
399
}
400
elsif ($op eq "add-branch-cat") {
400
elsif ($op eq "add-branch-cat") {
401
    my $categorycode  = $input->param('categorycode');
401
    my $categorycode  = $input->param('categorycode');
402
    my $patron_maxissueqty = strip_non_numeric($input->param('patron_maxissueqty'));
402
    my $patron_maxissueqty = strip_non_numeric( scalar $input->param('patron_maxissueqty') );
403
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
403
    my $patron_maxonsiteissueqty = $input->param('patron_maxonsiteissueqty');
404
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
404
    $patron_maxonsiteissueqty = strip_non_numeric($patron_maxonsiteissueqty);
405
    my $max_holds = $input->param('max_holds');
405
    my $max_holds = $input->param('max_holds');
406
- 

Return to bug 25440