From e154413382f753dbaa14bfce96d208820195ec44 Mon Sep 17 00:00:00 2001 From: Henri-Damien LAURENT Date: Thu, 28 Jan 2010 09:22:42 +0100 Subject: [PATCH] Revert "MT2232 : members/notices.pl and members/messaging.pl are doing the same thing" This reverts commit 653de3c295b5b21ddfe11f0597b4ba7092f1effc. Should remove members/notices.pl instead --- .../prog/en/includes/circ-menu.inc | 3 + .../prog/en/includes/members-menu.inc | 3 + .../prog/en/modules/members/messaging.tmpl | 68 ++++++++++++ members/messaging.pl | 102 ++++++++++++++++++ 4 files changed, 176 insertions(+) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl create mode 100755 members/messaging.pl diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc index 8db64af45f..443e12bb58 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc @@ -66,6 +66,9 @@
  • ">Circulation History
  • &src=circ">Modification Log
  • + +
  • ">Messaging
  • +
  • ">Notices
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc index aebb2bfe20..513d415a53 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc @@ -7,6 +7,9 @@
  • ">Circulation History
  • ">Modification Log
  • + +
  • ">Messaging
  • + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl new file mode 100644 index 0000000000..75bec95196 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/messaging.tmpl @@ -0,0 +1,68 @@ + +Koha › Patrons › <!-- TMPL_IF NAME="unknowuser" -->Patron does not exist<!-- TMPL_ELSE -->Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)<!-- /TMPL_IF --> + + + + + + + + +
    + +
    +
    +
    + + +
    + +

    Userid / Password update failed

    +Insufficient privileges. +

    Other fields updated.

    + + +

    Unable to delete staff user

    +

    Insufficient privileges.

    + + +

    Unable to delete patrons from other libraries with current settings

    +

    Insufficient privileges.

    + + +

    Unable to delete patron:

    +

    Insufficient privileges.

    + +
    + +
    + +
    + This patron does not exist. +
    + + + + + + + + + + + + +
    Message Queue
    TypeSubjectStatusTime Prepared
    There is no record of any messages that have been sent to this patron.
    + +
    + + + + +
    +
    +
    + +
    +
    + diff --git a/members/messaging.pl b/members/messaging.pl new file mode 100755 index 0000000000..6390dad38b --- /dev/null +++ b/members/messaging.pl @@ -0,0 +1,102 @@ +#!/usr/bin/perl + +# Copyright 2008 LibLime +# +# This file is part of Koha. +# +# Koha is free software; you can redistribute it and/or modify it under the +# terms of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# +# Koha is distributed in the hope that it will be useful, but WITHOUT ANY +# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR +# A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along with +# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, +# Suite 330, Boston, MA 02111-1307 USA + + +use strict; +use warnings; + +use CGI; +use C4::Context; +use C4::Auth; +use C4::Output; +use C4::Members; +use C4::Members::Messaging; +use C4::Dates; +use C4::Reserves; +use C4::Circulation; +use C4::Koha; +use C4::Letters; +use C4::Biblio; +use C4::Reserves; +use C4::Branch; # GetBranchName + +use Data::Dumper; + +use vars qw($debug); + +BEGIN { + $debug = $ENV{DEBUG} || 0; +} + +my $dbh = C4::Context->dbh; + +my $query = CGI->new(); + +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => 'members/messaging.tmpl', + query => $query, + type => "intranet", + authnotrequired => 0, + flagsrequired => { borrowers => 1 }, + debug => 1, + } +); +my $borrowernumber = $query->param('borrowernumber'); +my $borrower = GetMember( 'borrowernumber' => $borrowernumber ); +my $branch = C4::Context->userenv->{'branch'}; + +$template->param( $borrower ); + +$borrower = GetMemberDetails( $borrowernumber ); + + + if ( $borrower->{'category_type'} eq 'C') { + my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' ); + my $cnt = scalar(@$catcodes); + $template->param( 'CATCODE_MULTI' => 1) if $cnt > 1; + $template->param( 'catcode' => $catcodes->[0]) if $cnt == 1; + } + +my ($picture, $dberror) = GetPatronImage($borrower->{'cardnumber'}); +$template->param( picture => 1 ) if $picture; + +# get some recent messages sent to this borrower for display: +my $message_queue = C4::Letters::GetQueuedMessages( { borrowernumber => $query->param('borrowernumber') } ); + +$template->param( messagingview => 1, + message_queue => $message_queue, + DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(), + borrowernumber => $borrowernumber, + branchcode => $borrower->{'branchcode'}, + branchname => GetBranchName($borrower->{'branchcode'}), + dateformat => C4::Context->preference("dateformat"), + categoryname => $borrower->{'description'}, + $borrower->{'categorycode'} => 1, +); + +#$messaging_preferences->{'SMSnumber'}{'value'} = defined $borrower->{'smsalertnumber'} +# ? $borrower->{'smsalertnumber'} : $borrower->{'mobile'}; + +$template->param( BORROWER_INFO => [ $borrower ], + messagingview => 1, + is_child => ($borrower->{'category_type'} eq 'C'), + ); + +output_html_with_http_headers $query, $cookie, $template->output; -- 2.20.1