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

(-)a/Koha/Patrons/Import.pm (-2 / +5 lines)
Lines 165-170 sub import_patrons { Link Here
165
        if ( defined($matchpoint) && ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) {
165
        if ( defined($matchpoint) && ( $matchpoint eq 'cardnumber' ) && ( $borrower{'cardnumber'} ) ) {
166
            $member = Koha::Patrons->find( { cardnumber => $borrower{'cardnumber'} } );
166
            $member = Koha::Patrons->find( { cardnumber => $borrower{'cardnumber'} } );
167
        }
167
        }
168
        elsif ( ($matchpoint eq 'userid') && ($borrower{'userid'}) ) {
169
            $member = Koha::Patrons->find( { userid => $borrower{userid} } );
170
        }
168
        elsif ($extended) {
171
        elsif ($extended) {
169
            if ( defined($matchpoint_attr_type) ) {
172
            if ( defined($matchpoint_attr_type) ) {
170
                foreach my $attr (@$patron_attributes) {
173
                foreach my $attr (@$patron_attributes) {
Lines 244-250 sub import_patrons { Link Here
244
                );
247
                );
245
                next LINE;
248
                next LINE;
246
            }
249
            }
247
            if ( $borrower{debarred} ) {
250
            # Don't add a new restriction if the existing 'combined' restriction matches this one
251
            if ( $borrower{debarred} && ( ( $borrower{debarred} ne $member->{debarred} ) || ( $borrower{debarredcomment} ne $member->{debarredcomment} ) ) ) {
248
252
249
                # Check to see if this debarment already exists
253
                # Check to see if this debarment already exists
250
                my $debarrments = GetDebarments(
254
                my $debarrments = GetDebarments(
251
- 

Return to bug 12598