X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FMembers.pm;h=d8985bc06bcfe8006a32d64f4464e60d6392c779;hb=db776c34d23ddd0d4a78e83a983d5b0c906c188a;hp=8d3c3cffe7bee1f4f0da28feb3ce7555edcf2b29;hpb=9c6f634469de4364d71bc0eb7520d04ead61fd00;p=koha.git diff --git a/C4/Members.pm b/C4/Members.pm index 8d3c3cffe7..d8985bc06b 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -44,6 +44,7 @@ use Koha::Holds; use Koha::List::Patron; use Koha::Patrons; use Koha::Patron::Categories; +use Koha::Schema; our (@ISA,@EXPORT,@EXPORT_OK,$debug); @@ -59,35 +60,18 @@ BEGIN { @ISA = qw(Exporter); #Get data push @EXPORT, qw( - &Search - &GetMemberDetails - &GetMember - &GetMemberIssuesAndFines &GetPendingIssues &GetAllIssues &GetFirstValidEmailAddress &GetNoticeEmailAddress - &GetAge - &GetTitles - - &GetHideLostItemsPreference - &GetMemberAccountRecords - &GetBorNotifyAcctRecord - - GetBorrowerCategorycode &GetBorrowersToExpunge - &GetBorrowersWhoHaveNeverBorrowed - &GetBorrowersWithIssuesHistoryOlderThan - - &GetUpcomingMembershipExpires &IssueSlip - GetBorrowersWithEmail GetOverduesForPatron ); @@ -101,6 +85,7 @@ BEGIN { #Insert data push @EXPORT, qw( &AddMember + &AddMember_Auto &AddMember_Opac ); @@ -129,107 +114,6 @@ This module contains routines for adding, modifying and deleting members/patrons =head1 FUNCTIONS -=head2 GetMemberDetails - -($borrower) = &GetMemberDetails($borrowernumber, $cardnumber); - -Looks up a patron and returns information about him or her. If -C<$borrowernumber> is true (nonzero), C<&GetMemberDetails> looks -up the borrower by number; otherwise, it looks up the borrower by card -number. - -C<$borrower> is a reference-to-hash whose keys are the fields of the -borrowers table in the Koha database. In addition, -C<$borrower-E{flags}> is a hash giving more detailed information -about the patron. Its keys act as flags : - - if $borrower->{flags}->{LOST} { - # Patron's card was reported lost - } - -If the state of a flag means that the patron should not be -allowed to borrow any more books, then it will have a C key -with a true value. - -See patronflags for more details. - -C<$borrower-E{authflags}> is a hash giving more detailed information -about the top-level permissions flags set for the borrower. For example, -if a user has the "editcatalogue" permission, -C<$borrower-E{authflags}-E{editcatalogue}> will exist and have -the value "1". - -=cut - -sub GetMemberDetails { - my ( $borrowernumber, $cardnumber ) = @_; - my $dbh = C4::Context->dbh; - my $query; - my $sth; - if ($borrowernumber) { - $sth = $dbh->prepare(" - SELECT borrowers.*, - category_type, - categories.description, - categories.BlockExpiredPatronOpacActions, - reservefee, - enrolmentperiod - FROM borrowers - LEFT JOIN categories ON borrowers.categorycode=categories.categorycode - WHERE borrowernumber = ? - "); - $sth->execute($borrowernumber); - } - elsif ($cardnumber) { - $sth = $dbh->prepare(" - SELECT borrowers.*, - category_type, - categories.description, - categories.BlockExpiredPatronOpacActions, - reservefee, - enrolmentperiod - FROM borrowers - LEFT JOIN categories ON borrowers.categorycode = categories.categorycode - WHERE cardnumber = ? - "); - $sth->execute($cardnumber); - } - else { - return; - } - my $borrower = $sth->fetchrow_hashref; - return unless $borrower; - my ($amount) = GetMemberAccountRecords($borrower->{borrowernumber}); - $borrower->{'amountoutstanding'} = $amount; - # FIXME - patronflags calls GetMemberAccountRecords... just have patronflags return $amount - my $flags = patronflags( $borrower); - my $accessflagshash; - - $sth = $dbh->prepare("select bit,flag from userflags"); - $sth->execute; - while ( my ( $bit, $flag ) = $sth->fetchrow ) { - if ( $borrower->{'flags'} && $borrower->{'flags'} & 2**$bit ) { - $accessflagshash->{$flag} = 1; - } - } - $borrower->{'flags'} = $flags; - $borrower->{'authflags'} = $accessflagshash; - - # Handle setting the true behavior for BlockExpiredPatronOpacActions - $borrower->{'BlockExpiredPatronOpacActions'} = - C4::Context->preference('BlockExpiredPatronOpacActions') - if ( $borrower->{'BlockExpiredPatronOpacActions'} == -1 ); - - $borrower->{'is_expired'} = 0; - $borrower->{'is_expired'} = 1 if - defined($borrower->{dateexpiry}) && - $borrower->{'dateexpiry'} ne '0000-00-00' && - Date_to_Days( Today() ) > - Date_to_Days( split /-/, $borrower->{'dateexpiry'} ); - - return ($borrower); #, $flags, $accessflagshash); -} - =head2 patronflags $flags = &patronflags($patron); @@ -380,121 +264,20 @@ sub patronflags { } $flags{'ODUES'} = \%flaginfo; } - my @itemswaiting = C4::Reserves::GetReservesFromBorrowernumber( $patroninformation->{'borrowernumber'},'W' ); - my $nowaiting = scalar @itemswaiting; + + my $patron = Koha::Patrons->find( $patroninformation->{borrowernumber} ); + my $waiting_holds = $patron->holds->search({ found => 'W' }); + my $nowaiting = $waiting_holds->count; if ( $nowaiting > 0 ) { my %flaginfo; $flaginfo{'message'} = "Reserved items available"; - $flaginfo{'itemlist'} = \@itemswaiting; + $flaginfo{'itemlist'} = $waiting_holds->unblessed; $flags{'WAITING'} = \%flaginfo; } return ( \%flags ); } -=head2 GetMember - - $borrower = &GetMember(%information); - -Retrieve the first patron record meeting on criteria listed in the -C<%information> hash, which should contain one or more -pairs of borrowers column names and values, e.g., - - $borrower = GetMember(borrowernumber => id); - -C<&GetBorrower> returns a reference-to-hash whose keys are the fields of -the C table in the Koha database. - -FIXME: GetMember() is used throughout the code as a lookup -on a unique key such as the borrowernumber, but this meaning is not -enforced in the routine itself. - -=cut - -#' -sub GetMember { - my ( %information ) = @_; - if (exists $information{borrowernumber} && !defined $information{borrowernumber}) { - #passing mysql's kohaadmin?? Makes no sense as a query - return; - } - my $dbh = C4::Context->dbh; - my $select = - q{SELECT borrowers.*, categories.category_type, categories.description - FROM borrowers - LEFT JOIN categories on borrowers.categorycode=categories.categorycode WHERE }; - my $more_p = 0; - my @values = (); - for (keys %information ) { - if ($more_p) { - $select .= ' AND '; - } - else { - $more_p++; - } - - if (defined $information{$_}) { - $select .= "$_ = ?"; - push @values, $information{$_}; - } - else { - $select .= "$_ IS NULL"; - } - } - $debug && warn $select, " ",values %information; - my $sth = $dbh->prepare("$select"); - $sth->execute(@values); - my $data = $sth->fetchall_arrayref({}); - #FIXME interface to this routine now allows generation of a result set - #so whole array should be returned but bowhere in the current code expects this - if (@{$data} ) { - return $data->[0]; - } - - return; -} - -=head2 GetMemberIssuesAndFines - - ($overdue_count, $issue_count, $total_fines) = &GetMemberIssuesAndFines($borrowernumber); - -Returns aggregate data about items borrowed by the patron with the -given borrowernumber. - -C<&GetMemberIssuesAndFines> returns a three-element array. C<$overdue_count> is the -number of overdue items the patron currently has borrowed. C<$issue_count> is the -number of books the patron currently has borrowed. C<$total_fines> is -the total fine currently due by the borrower. - -=cut - -#' -sub GetMemberIssuesAndFines { - my ( $borrowernumber ) = @_; - my $dbh = C4::Context->dbh; - my $query = "SELECT COUNT(*) FROM issues WHERE borrowernumber = ?"; - - $debug and warn $query."\n"; - my $sth = $dbh->prepare($query); - $sth->execute($borrowernumber); - my $issue_count = $sth->fetchrow_arrayref->[0]; - - $sth = $dbh->prepare( - "SELECT COUNT(*) FROM issues - WHERE borrowernumber = ? - AND date_due < now()" - ); - $sth->execute($borrowernumber); - my $overdue_count = $sth->fetchrow_arrayref->[0]; - - $sth = $dbh->prepare("SELECT SUM(amountoutstanding) FROM accountlines WHERE borrowernumber = ?"); - $sth->execute($borrowernumber); - my $total_fines = $sth->fetchrow_arrayref->[0]; - - return ($overdue_count, $issue_count, $total_fines); -} - - =head2 ModMember my $success = ModMember(borrowernumber => $borrowernumber, @@ -509,6 +292,14 @@ true on success, or false on failure sub ModMember { my (%data) = @_; + + # trim whitespace from data which has some non-whitespace in it. + foreach my $field_name (keys(%data)) { + if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) { + $data{$field_name} =~ s/^\s*|\s*$//g; + } + } + # test to know if you must update or not the borrower password if (exists $data{password}) { if ($data{password} eq '****' or $data{password} eq '') { @@ -522,13 +313,12 @@ sub ModMember { } } - my $old_categorycode = GetBorrowerCategorycode( $data{borrowernumber} ); + my $old_categorycode = Koha::Patrons->find( $data{borrowernumber} )->categorycode; # get only the columns of a borrower my $schema = Koha::Database->new()->schema; my @columns = $schema->source('Borrower')->columns; my $new_borrower = { map { join(' ', @columns) =~ /$_/ ? ( $_ => $data{$_} ) : () } keys(%data) }; - delete $new_borrower->{flags}; $new_borrower->{dateofbirth} ||= undef if exists $new_borrower->{dateofbirth}; $new_borrower->{dateenrolled} ||= undef if exists $new_borrower->{dateenrolled}; @@ -597,6 +387,13 @@ sub AddMember { my $dbh = C4::Context->dbh; my $schema = Koha::Database->new()->schema; + # trim whitespace from data which has some non-whitespace in it. + foreach my $field_name (keys(%data)) { + if ( defined $data{$field_name} && $data{$field_name} =~ /\S/ ) { + $data{$field_name} =~ s/^\s*|\s*$//g; + } + } + # generate a proper login if none provided $data{'userid'} = Generate_Userid( $data{'borrowernumber'}, $data{'firstname'}, $data{'surname'} ) if ( $data{'userid'} eq '' || !Check_Userid( $data{'userid'} ) ); @@ -609,6 +406,12 @@ sub AddMember { $data{'dateenrolled'} = output_pref( { dt => dt_from_string, dateonly => 1, dateformat => 'iso' } ); } + if ( C4::Context->preference("autoMemberNum") ) { + if ( not exists $data{cardnumber} or not defined $data{cardnumber} or $data{cardnumber} eq '' ) { + $data{cardnumber} = fixup_cardnumber( $data{cardnumber} ); + } + } + my $patron_category = $schema->resultset('Category')->find( $data{'categorycode'} ); $data{'privacy'} = $patron_category->default_privacy() eq 'default' ? 1 @@ -628,6 +431,7 @@ sub AddMember { $data{'dateofbirth'} = undef if ( not $data{'dateofbirth'} ); $data{'debarred'} = undef if ( not $data{'debarred'} ); $data{'sms_provider_id'} = undef if ( not $data{'sms_provider_id'} ); + $data{'guarantorid'} = undef if ( not $data{'guarantorid'} ); # get only the columns of Borrower # FIXME Do we really need this check? @@ -800,7 +604,7 @@ Looks up what the patron with the given borrowernumber has borrowed. C<&GetPendingIssues> returns a reference-to-array where each element is a reference-to-hash; the keys are the fields from the C, C, and C tables. -The keys include C fields except marc and marcxml. +The keys include C fields. =cut @@ -820,7 +624,6 @@ sub GetPendingIssues { } } - # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance # FIXME: namespace collision: each table has "timestamp" fields. Which one is "timestamp" ? # FIXME: circ/ciculation.pl tries to sort by timestamp! # FIXME: namespace collision: other collisions possible. @@ -960,9 +763,10 @@ sub GetMemberAccountRecords { my $total = 0; while ( my $data = $sth->fetchrow_hashref ) { if ( $data->{itemnumber} ) { - my $biblio = GetBiblioFromItemNumber( $data->{itemnumber} ); - $data->{biblionumber} = $biblio->{biblionumber}; - $data->{title} = $biblio->{title}; + my $item = Koha::Items->find( $data->{itemnumber} ); + my $biblio = $item->biblio; + $data->{biblionumber} = $biblio->biblionumber; + $data->{title} = $biblio->title; } $acctlines[$numlines] = $data; $numlines++; @@ -1009,50 +813,6 @@ sub GetMemberAccountBalance { return ( $total, $total - $other_charges, $other_charges); } -=head2 GetBorNotifyAcctRecord - - ($total, $acctlines, $count) = &GetBorNotifyAcctRecord($params,$notifyid); - -Looks up accounting data for the patron with the given borrowernumber per file number. - -C<&GetBorNotifyAcctRecord> returns a three-element array. C<$acctlines> is a -reference-to-array, where each element is a reference-to-hash; the -keys are the fields of the C table in the Koha database. -C<$count> is the number of elements in C<$acctlines>. C<$total> is the -total amount outstanding for all of the account lines. - -=cut - -sub GetBorNotifyAcctRecord { - my ( $borrowernumber, $notifyid ) = @_; - my $dbh = C4::Context->dbh; - my @acctlines; - my $numlines = 0; - my $sth = $dbh->prepare( - "SELECT * - FROM accountlines - WHERE borrowernumber=? - AND notify_id=? - AND amountoutstanding != '0' - ORDER BY notify_id,accounttype - "); - - $sth->execute( $borrowernumber, $notifyid ); - my $total = 0; - while ( my $data = $sth->fetchrow_hashref ) { - if ( $data->{itemnumber} ) { - my $biblio = GetBiblioFromItemNumber( $data->{itemnumber} ); - $data->{biblionumber} = $biblio->{biblionumber}; - $data->{title} = $biblio->{title}; - } - $acctlines[$numlines] = $data; - $numlines++; - $total += int(100 * $data->{'amountoutstanding'}); - } - $total /= 100; - return ( $total, \@acctlines, $numlines ); -} - sub checkcardnumber { my ( $cardnumber, $borrowernumber ) = @_; @@ -1090,7 +850,9 @@ database column. =cut sub get_cardnumber_length { - my ( $min, $max ) = ( 0, 16 ); # borrowers.cardnumber is a nullable varchar(16) + my $borrower = Koha::Schema->resultset('Borrower'); + my $field_size = $borrower->result_source->column_info('cardnumber')->{size}; + my ( $min, $max ) = ( 0, $field_size ); # borrowers.cardnumber is a nullable varchar(20) $min = 1 if C4::Context->preference('BorrowerMandatoryField') =~ /cardnumber/; if ( my $cardnumber_length = C4::Context->preference('CardnumberLength') ) { # Is integer and length match @@ -1106,6 +868,7 @@ sub get_cardnumber_length { } } + $min = $max if $min > $max; return ( $min, $max ); } @@ -1121,20 +884,10 @@ addresses. sub GetFirstValidEmailAddress { my $borrowernumber = shift; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( "SELECT email, emailpro, B_email FROM borrowers where borrowernumber = ? "); - $sth->execute( $borrowernumber ); - my $data = $sth->fetchrow_hashref; - if ($data->{'email'}) { - return $data->{'email'}; - } elsif ($data->{'emailpro'}) { - return $data->{'emailpro'}; - } elsif ($data->{'B_email'}) { - return $data->{'B_email'}; - } else { - return ''; - } + my $borrower = Koha::Patrons->find( $borrowernumber ); + + return $borrower->first_valid_email_address(); } =head2 GetNoticeEmailAddress @@ -1166,162 +919,6 @@ sub GetNoticeEmailAddress { return $data->{'primaryemail'} || ''; } -=head2 GetUpcomingMembershipExpires - - my $expires = GetUpcomingMembershipExpires({ - branch => $branch, before => $before, after => $after, - }); - - $branch is an optional branch code. - $before/$after is an optional number of days before/after the date that - is set by the preference MembershipExpiryDaysNotice. - If the pref would be 14, before 2 and after 3, you will get all expires - from 12 to 17 days. - -=cut - -sub GetUpcomingMembershipExpires { - my ( $params ) = @_; - my $before = $params->{before} || 0; - my $after = $params->{after} || 0; - my $branch = $params->{branch}; - - my $dbh = C4::Context->dbh; - my $days = C4::Context->preference("MembershipExpiryDaysNotice") || 0; - my $date1 = dt_from_string->add( days => $days - $before ); - my $date2 = dt_from_string->add( days => $days + $after ); - $date1= output_pref({ dt => $date1, dateformat => 'iso', dateonly => 1 }); - $date2= output_pref({ dt => $date2, dateformat => 'iso', dateonly => 1 }); - - my $query = q| - SELECT borrowers.*, categories.description, - branches.branchname, branches.branchemail FROM borrowers - LEFT JOIN branches USING (branchcode) - LEFT JOIN categories USING (categorycode) - |; - if( $branch ) { - $query.= 'WHERE branchcode=? AND dateexpiry BETWEEN ? AND ?'; - } else { - $query.= 'WHERE dateexpiry BETWEEN ? AND ?'; - } - - my $sth = $dbh->prepare( $query ); - my @pars = $branch? ( $branch ): (); - push @pars, $date1, $date2; - $sth->execute( @pars ); - my $results = $sth->fetchall_arrayref( {} ); - return $results; -} - -=head2 GetBorrowerCategorycode - - $categorycode = &GetBorrowerCategoryCode( $borrowernumber ); - -Given the borrowernumber, the function returns the corresponding categorycode - -=cut - -sub GetBorrowerCategorycode { - my ( $borrowernumber ) = @_; - my $dbh = C4::Context->dbh; - my $sth = $dbh->prepare( qq{ - SELECT categorycode - FROM borrowers - WHERE borrowernumber = ? - } ); - $sth->execute( $borrowernumber ); - return $sth->fetchrow; -} - -=head2 GetAge - - $dateofbirth,$date = &GetAge($date); - -this function return the borrowers age with the value of dateofbirth - -=cut - -#' -sub GetAge{ - my ( $date, $date_ref ) = @_; - - if ( not defined $date_ref ) { - $date_ref = sprintf( '%04d-%02d-%02d', Today() ); - } - - my ( $year1, $month1, $day1 ) = split /-/, $date; - my ( $year2, $month2, $day2 ) = split /-/, $date_ref; - - my $age = $year2 - $year1; - if ( $month1 . $day1 > $month2 . $day2 ) { - $age--; - } - - return $age; -} # sub get_age - -=head2 SetAge - - $borrower = C4::Members::SetAge($borrower, $datetimeduration); - $borrower = C4::Members::SetAge($borrower, '0015-12-10'); - $borrower = C4::Members::SetAge($borrower, $datetimeduration, $datetime_reference); - - eval { $borrower = C4::Members::SetAge($borrower, '015-1-10'); }; - if ($@) {print $@;} #Catch a bad ISO Date or kill your script! - -This function sets the borrower's dateofbirth to match the given age. -Optionally relative to the given $datetime_reference. - -@PARAM1 koha.borrowers-object -@PARAM2 DateTime::Duration-object as the desired age - OR a ISO 8601 Date. (To make the API more pleasant) -@PARAM3 DateTime-object as the relative date, defaults to now(). -RETURNS The given borrower reference @PARAM1. -DIES If there was an error with the ISO Date handling. - -=cut - -#' -sub SetAge{ - my ( $borrower, $datetimeduration, $datetime_ref ) = @_; - $datetime_ref = DateTime->now() unless $datetime_ref; - - if ($datetimeduration && ref $datetimeduration ne 'DateTime::Duration') { - if ($datetimeduration =~ /^(\d{4})-(\d{2})-(\d{2})/) { - $datetimeduration = DateTime::Duration->new(years => $1, months => $2, days => $3); - } - else { - die "C4::Members::SetAge($borrower, $datetimeduration), datetimeduration not a valid ISO 8601 Date!\n"; - } - } - - my $new_datetime_ref = $datetime_ref->clone(); - $new_datetime_ref->subtract_duration( $datetimeduration ); - - $borrower->{dateofbirth} = $new_datetime_ref->ymd(); - - return $borrower; -} # sub SetAge - -=head2 GetHideLostItemsPreference - - $hidelostitemspref = &GetHideLostItemsPreference($borrowernumber); - -Returns the HideLostItems preference for the patron category of the supplied borrowernumber -C<&$hidelostitemspref>return value of function, 0 or 1 - -=cut - -sub GetHideLostItemsPreference { - my ($borrowernumber) = @_; - my $dbh = C4::Context->dbh; - my $query = "SELECT hidelostitems FROM borrowers,categories WHERE borrowers.categorycode = categories.categorycode AND borrowernumber = ?"; - my $sth = $dbh->prepare($query); - $sth->execute($borrowernumber); - my $hidelostitems = $sth->fetchrow; - return $hidelostitems; -} - =head2 GetBorrowersToExpunge $borrowers = &GetBorrowersToExpunge( @@ -1416,98 +1013,6 @@ sub GetBorrowersToExpunge { return \@results; } -=head2 GetBorrowersWhoHaveNeverBorrowed - - $results = &GetBorrowersWhoHaveNeverBorrowed - -This function get all borrowers who have never borrowed. - -I<$result> is a ref to an array which all elements are a hasref. - -=cut - -sub GetBorrowersWhoHaveNeverBorrowed { - my $filterbranch = shift || - ((C4::Context->preference('IndependentBranches') - && C4::Context->userenv - && !C4::Context->IsSuperLibrarian() - && C4::Context->userenv->{branch}) - ? C4::Context->userenv->{branch} - : ""); - my $dbh = C4::Context->dbh; - my $query = " - SELECT borrowers.borrowernumber,max(timestamp) as latestissue - FROM borrowers - LEFT JOIN issues ON borrowers.borrowernumber = issues.borrowernumber - WHERE issues.borrowernumber IS NULL - "; - my @query_params; - if ($filterbranch && $filterbranch ne ""){ - $query.=" AND borrowers.branchcode= ?"; - push @query_params,$filterbranch; - } - warn $query if $debug; - - my $sth = $dbh->prepare($query); - if (scalar(@query_params)>0){ - $sth->execute(@query_params); - } - else { - $sth->execute; - } - - my @results; - while ( my $data = $sth->fetchrow_hashref ) { - push @results, $data; - } - return \@results; -} - -=head2 GetBorrowersWithIssuesHistoryOlderThan - - $results = &GetBorrowersWithIssuesHistoryOlderThan($date) - -this function get all borrowers who has an issue history older than I<$date> given on input arg. - -I<$result> is a ref to an array which all elements are a hashref. -This hashref is containt the number of time this borrowers has borrowed before I<$date> and the borrowernumber. - -=cut - -sub GetBorrowersWithIssuesHistoryOlderThan { - my $dbh = C4::Context->dbh; - my $date = shift ||POSIX::strftime("%Y-%m-%d",localtime()); - my $filterbranch = shift || - ((C4::Context->preference('IndependentBranches') - && C4::Context->userenv - && !C4::Context->IsSuperLibrarian() - && C4::Context->userenv->{branch}) - ? C4::Context->userenv->{branch} - : ""); - my $query = " - SELECT count(borrowernumber) as n,borrowernumber - FROM old_issues - WHERE returndate < ? - AND borrowernumber IS NOT NULL - "; - my @query_params; - push @query_params, $date; - if ($filterbranch){ - $query.=" AND branchcode = ?"; - push @query_params, $filterbranch; - } - $query.=" GROUP BY borrowernumber "; - warn $query if $debug; - my $sth = $dbh->prepare($query); - $sth->execute(@query_params); - my @results; - - while ( my $data = $sth->fetchrow_hashref ) { - push @results, $data; - } - return \@results; -} - =head2 IssueSlip IssueSlip($branchcode, $borrowernumber, $quickslip) @@ -1562,6 +1067,9 @@ sub IssueSlip { # FIXME Check callers before removing this statement #return unless $borrowernumber; + my $patron = Koha::Patrons->find( $borrowernumber ); + return unless $patron; + my @issues = @{ GetPendingIssues($borrowernumber) }; for my $issue (@issues) { @@ -1575,46 +1083,58 @@ sub IssueSlip { } } - # Sort on timestamp then on issuedate (useful for tests and could be if modified in a batch + # Sort on timestamp then on issuedate then on issue_id + # useful for tests and could be if modified in a batch @issues = sort { - my $s = $b->{timestamp} <=> $a->{timestamp}; - $s == 0 ? - $b->{issuedate} <=> $a->{issuedate} : $s; + $b->{timestamp} <=> $a->{timestamp} + or $b->{issuedate} <=> $a->{issuedate} + or $b->{issue_id} <=> $a->{issue_id} } @issues; - my ($letter_code, %repeat); + my ($letter_code, %repeat, %loops); if ( $quickslip ) { $letter_code = 'ISSUEQSLIP'; - %repeat = ( - 'checkedout' => [ map { + my @checkouts = map { 'biblio' => $_, 'items' => $_, 'biblioitems' => $_, 'issues' => $_, - }, grep { $_->{'now'} } @issues ], + }, grep { $_->{'now'} } @issues; + %repeat = ( + checkedout => \@checkouts, # History syntax + ); + %loops = ( + issues => [ map { $_->{issues}{itemnumber} } @checkouts ], # TT syntax ); } else { + my @checkouts = map { + 'biblio' => $_, + 'items' => $_, + 'biblioitems' => $_, + 'issues' => $_, + }, grep { !$_->{'overdue'} } @issues; + my @overdues = map { + 'biblio' => $_, + 'items' => $_, + 'biblioitems' => $_, + 'issues' => $_, + }, grep { $_->{'overdue'} } @issues; + my $news = GetNewsToDisplay( "slip", $branch ); + my @news = map { + $_->{'timestamp'} = $_->{'newdate'}; + { opac_news => $_ } + } @$news; $letter_code = 'ISSUESLIP'; - %repeat = ( - 'checkedout' => [ map { - 'biblio' => $_, - 'items' => $_, - 'biblioitems' => $_, - 'issues' => $_, - }, grep { !$_->{'overdue'} } @issues ], - - 'overdue' => [ map { - 'biblio' => $_, - 'items' => $_, - 'biblioitems' => $_, - 'issues' => $_, - }, grep { $_->{'overdue'} } @issues ], - - 'news' => [ map { - $_->{'timestamp'} = $_->{'newdate'}; - { opac_news => $_ } - } @{ GetNewsToDisplay("slip",$branch) } ], + %repeat = ( + checkedout => \@checkouts, + overdue => \@overdues, + news => \@news, + ); + %loops = ( + issues => [ map { $_->{issues}{itemnumber} } @checkouts ], + overdues => [ map { $_->{issues}{itemnumber} } @overdues ], + opac_news => [ map { $_->{opac_news}{idnew} } @news ], ); } @@ -1622,39 +1142,28 @@ sub IssueSlip { module => 'circulation', letter_code => $letter_code, branchcode => $branch, + lang => $patron->lang, tables => { 'branches' => $branch, 'borrowers' => $borrowernumber, }, repeat => \%repeat, + loops => \%loops, ); } -=head2 GetBorrowersWithEmail - - ([$borrnum,$userid], ...) = GetBorrowersWithEmail('me@example.com'); - -This gets a list of users and their basic details from their email address. -As it's possible for multiple user to have the same email address, it provides -you with all of them. If there is no userid for the user, there will be an -C there. An empty list will be returned if there are no matches. +=head2 AddMember_Auto =cut -sub GetBorrowersWithEmail { - my $email = shift; +sub AddMember_Auto { + my ( %borrower ) = @_; - my $dbh = C4::Context->dbh; + $borrower{'cardnumber'} ||= fixup_cardnumber(); - my $query = "SELECT borrowernumber, userid FROM borrowers WHERE email=?"; - my $sth=$dbh->prepare($query); - $sth->execute($email); - my @result = (); - while (my $ref = $sth->fetch) { - push @result, $ref; - } - die "Failure searching for borrowers by email address: $sth->errstr" if $sth->err; - return @result; + $borrower{'borrowernumber'} = AddMember(%borrower); + + return ( %borrower ); } =head2 AddMember_Opac @@ -1672,11 +1181,9 @@ sub AddMember_Opac { $borrower{'password'} = $password; } - $borrower{'cardnumber'} = fixup_cardnumber( $borrower{'cardnumber'} ); - - my $borrowernumber = AddMember(%borrower); + %borrower = AddMember_Auto(%borrower); - return ( $borrowernumber, $borrower{'password'} ); + return ( $borrower{'borrowernumber'}, $borrower{'password'} ); } =head2 DeleteExpiredOpacRegistrations