X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=members%2Fmoremember.pl;h=4ccba007165c853e1f843258aa81a8b4db4d6c8d;hb=d350f6235c15cea78d3aee7be2e87a06c4bb95b9;hp=32541c9eda74cadf411b2b0abb9724de39f494fa;hpb=ef038b258ebfef315cea06bcf27d92eada86e9d7;p=koha_ffzg diff --git a/members/moremember.pl b/members/moremember.pl index 32541c9eda..4ccba00716 100755 --- a/members/moremember.pl +++ b/members/moremember.pl @@ -85,7 +85,9 @@ my $quickslip = 0; my $flagsrequired; if ($print eq "page") { $template_name = "members/moremember-print.tmpl"; - $flagsrequired = { borrowers => 1 }; + # circ staff who process checkouts but can't edit + # patrons still need to be able to access print view + $flagsrequired = { circulate => "circulate_remaining_permissions" }; } elsif ($print eq "slip") { $template_name = "members/moremember-receipt.tmpl"; # circ staff who process checkouts but can't edit @@ -251,7 +253,7 @@ if ( @borrowernumbers ) { } my $roaddetails = &GetRoadTypeDetails( $data->{'streettype'} ); my $today = DateTime->now( time_zone => C4::Context->tz); -$today->truncate(to => 'days'); +$today->truncate(to => 'day'); my @borrowers_with_issues; my $overdues_exist = 0; my $totalprice = 0; @@ -321,7 +323,7 @@ if ($borrowernumber) { } $getreserv{waitingposition} = $num_res->{'priority'}; $getreserv{suspend} = $num_res->{'suspend'}; - $getreserv{suspend_until} = C4::Dates->new( $num_res->{'suspend_until'}, "iso")->output("syspref");; + $getreserv{suspend_until} = $num_res->{'suspend_until'}; push( @reservloop, \%getreserv ); } @@ -398,6 +400,7 @@ if (C4::Context->preference('EnhancedMessagingPreferences')) { $template->param(messaging_form_inactive => 1); $template->param(SMSSendDriver => C4::Context->preference("SMSSendDriver")); $template->param(SMSnumber => defined $data->{'smsalertnumber'} ? $data->{'smsalertnumber'} : $data->{'mobile'}); + $template->param(TalkingTechItivaPhone => C4::Context->preference("TalkingTechItivaPhoneNotification")); } # in template => instutitional (A for Adult, C for children) @@ -405,7 +408,6 @@ $template->param( $data->{'categorycode'} => 1 ); $template->param( detailview => 1, AllowRenewalLimitOverride => C4::Context->preference("AllowRenewalLimitOverride"), - DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), CANDELETEUSER => $candeleteuser, roaddetails => $roaddetails, borrowernumber => $borrowernumber, @@ -421,16 +423,16 @@ $template->param( relissueloop => @relissuedata, overdues_exist => $overdues_exist, error => $error, - $error => 1, StaffMember => ($category_type eq 'S'), is_child => ($category_type eq 'C'), # reserveloop => \@reservedata, - dateformat => C4::Context->preference("dateformat"), - "dateformat_" . (C4::Context->preference("dateformat") || '') => 1, samebranch => $samebranch, quickslip => $quickslip, activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''), - AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds') ); + AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), + SuspendHoldsIntranet => C4::Context->preference('SuspendHoldsIntranet'), +); +$template->param( $error => 1 ) if $error; output_html_with_http_headers $input, $cookie, $template->output; @@ -454,6 +456,7 @@ sub build_issue_data { $issue->{date_due} = output_pref( $issue->{date_due} ); $issue->{issuedate} = output_pref( $issue->{issuedate} ) if defined $issue->{issuedate}; my $biblionumber = $issue->{biblionumber}; + $issue->{issuingbranchname} = GetBranchName($issue->{branchcode}); my %row = %{$issue}; $totalprice += $issue->{replacementprice}; @@ -491,7 +494,7 @@ sub build_issue_data { $row{red} = 1; } if ($issuedate) { - $issuedate->truncate( to => 'days' ); + $issuedate->truncate( to => 'day' ); if ( DateTime->compare( $issuedate, $today ) == 0 ) { $row{today} = 1; }