- my $reserveborrowerinfo = GetMember( borrowernumber => $res->{'borrowernumber'} );
- if (C4::Context->preference('HidePatronName')){
- $reserve{'hidename'} = 1;
- $reserve{'cardnumber'} = $reserveborrowerinfo->{'cardnumber'};
- }
- $reserve{'expirationdate'} = format_date( $res->{'expirationdate'} )
- unless ( !defined($res->{'expirationdate'}) || $res->{'expirationdate'} eq '0000-00-00' );
- $reserve{'date'} = format_date( $res->{'reservedate'} );
- $reserve{'borrowernumber'} = $res->{'borrowernumber'};
- $reserve{'biblionumber'} = $res->{'biblionumber'};
- $reserve{'borrowernumber'} = $res->{'borrowernumber'};
- $reserve{'firstname'} = $reserveborrowerinfo->{'firstname'};
- $reserve{'surname'} = $reserveborrowerinfo->{'surname'};
- $reserve{'notes'} = $res->{'reservenotes'};
- $reserve{'wait'} =
- ( ( defined $res->{'found'} and $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) );
- $reserve{'constrainttypea'} = ( $res->{'constrainttype'} eq 'a' );
- $reserve{'constrainttypeo'} = ( $res->{'constrainttype'} eq 'o' );
- $reserve{'voldesc'} = $res->{'volumeddesc'};
- $reserve{'ccode'} = $res->{'ccode'};
- $reserve{'barcode'} = $res->{'barcode'};
- $reserve{'priority'} = $res->{'priority'};
- $reserve{'lowestPriority'} = $res->{'lowestPriority'};
- $reserve{'branchloop'} = GetBranchesLoop($res->{'branchcode'});
- $reserve{'optionloop'} = \@optionloop;
- $reserve{'suspend'} = $res->{'suspend'};
- $reserve{'suspend_until'} = $res->{'suspend_until'};
+ if ( C4::Context->preference('HidePatronName') ) {
+ $reserve{'hidename'} = 1;
+ $reserve{'cardnumber'} = $res->borrower()->cardnumber();
+ }
+ $reserve{'expirationdate'} = output_pref( { dt => dt_from_string( $res->expirationdate ), dateonly => 1 } )
+ unless ( !defined( $res->expirationdate ) || $res->expirationdate eq '0000-00-00' );
+ $reserve{'date'} = output_pref( { dt => dt_from_string( $res->reservedate ), dateonly => 1 } );
+ $reserve{'borrowernumber'} = $res->borrowernumber();
+ $reserve{'biblionumber'} = $res->biblionumber();
+ $reserve{'borrowernumber'} = $res->borrowernumber();
+ $reserve{'firstname'} = $res->borrower()->firstname();
+ $reserve{'surname'} = $res->borrower()->surname();
+ $reserve{'notes'} = $res->reservenotes();
+ $reserve{'waiting_date'} = $res->waitingdate();
+ $reserve{'waiting_until'} = $res->is_waiting() ? $res->waiting_expires_on() : undef;
+ $reserve{'ccode'} = $res->item() ? $res->item()->ccode() : undef;
+ $reserve{'barcode'} = $res->item() ? $res->item()->barcode() : undef;
+ $reserve{'priority'} = $res->priority();
+ $reserve{'lowestPriority'} = $res->lowestPriority();
+ $reserve{'optionloop'} = \@optionloop;
+ $reserve{'suspend'} = $res->suspend();
+ $reserve{'suspend_until'} = $res->suspend_until();
+ $reserve{'reserve_id'} = $res->reserve_id();
+ $reserve{itemtype} = $res->itemtype();
+ $reserve{branchcode} = $res->branchcode();
+