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

(-)a/C4/Members.pm (-7 / +13 lines)
Lines 387-392 sub AddMember { Link Here
387
    my $dbh = C4::Context->dbh;
387
    my $dbh = C4::Context->dbh;
388
    my $schema = Koha::Database->new()->schema;
388
    my $schema = Koha::Database->new()->schema;
389
389
390
    my $category = Koha::Patron::Categories->find( $data{categorycode} );
391
    unless ($category) {
392
        Koha::Exceptions::BadParameter->throw(
393
            error => 'Invalid parameter passed',
394
            parameter => 'categorycode'
395
        );
396
    }
397
390
    # trim whitespace from data which has some non-whitespace in it.
398
    # trim whitespace from data which has some non-whitespace in it.
391
    foreach my $field_name (keys(%data)) {
399
    foreach my $field_name (keys(%data)) {
392
        if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) {
400
        if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) {
Lines 399-405 sub AddMember { Link Here
399
      if ( $data{'userid'} eq '' || !Check_Userid( $data{'userid'} ) );
407
      if ( $data{'userid'} eq '' || !Check_Userid( $data{'userid'} ) );
400
408
401
    # add expiration date if it isn't already there
409
    # add expiration date if it isn't already there
402
    $data{dateexpiry} ||= Koha::Patron::Categories->find( $data{categorycode} )->get_expiry_date;
410
    $data{dateexpiry} ||= $category->get_expiry_date;
403
411
404
    # add enrollment date if it isn't already there
412
    # add enrollment date if it isn't already there
405
    unless ( $data{'dateenrolled'} ) {
413
    unless ( $data{'dateenrolled'} ) {
Lines 412-423 sub AddMember { Link Here
412
        }
420
        }
413
    }
421
    }
414
422
415
    my $patron_category = $schema->resultset('Category')->find( $data{'categorycode'} );
416
    $data{'privacy'} =
423
    $data{'privacy'} =
417
        $patron_category->default_privacy() eq 'default' ? 1
424
        $category->default_privacy() eq 'default' ? 1
418
      : $patron_category->default_privacy() eq 'never'   ? 2
425
      : $category->default_privacy() eq 'never'   ? 2
419
      : $patron_category->default_privacy() eq 'forever' ? 0
426
      : $category->default_privacy() eq 'forever' ? 0
420
      :                                                    undef;
427
      :                                             undef;
421
428
422
    $data{'privacy_guarantor_checkouts'} = 0 unless defined( $data{'privacy_guarantor_checkouts'} );
429
    $data{'privacy_guarantor_checkouts'} = 0 unless defined( $data{'privacy_guarantor_checkouts'} );
423
430
424
- 

Return to bug 19841