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

(-)a/basket/sendbasket.pl (-1 / +1 lines)
Lines 58-64 if ($email_add) { Link Here
58
      );
58
      );
59
59
60
    my $patron     = Koha::Patrons->find($borrowernumber);
60
    my $patron     = Koha::Patrons->find($borrowernumber);
61
    my $user_email = $patron->first_valid_email_address;
61
    my $user_email = $patron->notice_email_address;
62
62
63
    my $comment = $query->param('comment');
63
    my $comment = $query->param('comment');
64
64
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc (-3 / +3 lines)
Lines 54-62 Link Here
54
                </td>
54
                </td>
55
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %]</a>
55
                <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% reserveloo.borrower.borrowernumber | uri %]">[% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %]</a>
56
                    [% IF ( reserveloo.borrower.phone ) %]<br /><span class="patron_phone">[% reserveloo.borrower.phone | html %]</span>[% END %]
56
                    [% IF ( reserveloo.borrower.phone ) %]<br /><span class="patron_phone">[% reserveloo.borrower.phone | html %]</span>[% END %]
57
                    [% IF ( reserveloo.borrower.first_valid_email_address ) %]
57
                    [% IF ( reserveloo.borrower.notice_email_address ) %]
58
                        <span class="patron_email"><br /><a href="mailto:[% reserveloo.borrower.first_valid_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]">
58
                        <span class="patron_email"><br /><a href="mailto:[% reserveloo.borrower.notice_email_address | uri %]?subject=[% "Hold waiting: " | uri %][% reserveloo.biblio.title | uri %]">
59
                        [% reserveloo.borrower.first_valid_email_address | html %]</a></span>
59
                        [% reserveloo.borrower.notice_email_address | html %]</a></span>
60
                    [% END %]
60
                    [% END %]
61
                </td>
61
                </td>
62
                <td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td>
62
                <td>[% Branches.GetName( reserveloo.item.homebranch ) | html %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tt (-3 / +3 lines)
Lines 72-82 Link Here
72
                            [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
72
                            [% reser.patron.surname | html %][%IF ( reser.patron.firstname ) %], [% reser.patron.firstname | html %][% END %]
73
                        </a>
73
                        </a>
74
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
74
                        [% IF ( reser.patron.phone ) %]<br />[% reser.patron.phone | html %][% END %]
75
                            [% IF ( reser.patron.first_valid_email_address ) %]
75
                            [% IF ( reser.patron.notice_email_address ) %]
76
                                <br />
76
                                <br />
77
                                [% BLOCK subject %]Hold:[% END %]
77
                                [% BLOCK subject %]Hold:[% END %]
78
                                <a href="mailto:[% reser.patron.first_valid_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
78
                                <a href="mailto:[% reser.patron.notice_email_address | uri %]?subject=[% INCLUDE subject %] [% reser.title | uri %]">
79
                                    [% reser.patron.first_valid_email_address | html %]
79
                                    [% reser.patron.notice_email_address | html %]
80
                                </a>
80
                                </a>
81
                            [% END %]
81
                            [% END %]
82
                        [% ELSIF ( reser.recall ) %]
82
                        [% ELSIF ( reser.recall ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/clubs/clubs-tab.tt (-1 / +1 lines)
Lines 55-61 Link Here
55
                    <td>[% c.name | html %]</td>
55
                    <td>[% c.name | html %]</td>
56
                    <td>[% c.description | html %]</td>
56
                    <td>[% c.description | html %]</td>
57
                    <td>
57
                    <td>
58
                        [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.first_valid_email_address ) %]
58
                        [% IF !c.club_template.is_email_required || ( c.club_template.is_email_required && borrower.notice_email_address ) %]
59
                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id | html%])">
59
                            <button class="btn btn-xs btn-default" onclick="loadEnrollmentForm([% c.id | html%])">
60
                                <i class="fa fa-plus" aria-hidden="true"></i> Enroll
60
                                <i class="fa fa-plus" aria-hidden="true"></i> Enroll
61
                            </button>
61
                            </button>
(-)a/opac/opac-sendbasket.pl (-3 / +2 lines)
Lines 48-54 my ( $template, $borrowernumber, $cookie ) = get_template_and_user( Link Here
48
my $bib_list  = $query->param('bib_list') || '';
48
my $bib_list  = $query->param('bib_list') || '';
49
my $email_add = $query->param('email_add');
49
my $email_add = $query->param('email_add');
50
50
51
if ($email_add) {
51
if ( $email_add ) {
52
    die "Wrong CSRF token"
52
    die "Wrong CSRF token"
53
      unless Koha::Token->new->check_csrf(
53
      unless Koha::Token->new->check_csrf(
54
        {
54
        {
Lines 58-64 if ($email_add) { Link Here
58
      );
58
      );
59
59
60
    my $patron     = Koha::Patrons->find($borrowernumber);
60
    my $patron     = Koha::Patrons->find($borrowernumber);
61
    my $user_email = $patron->first_valid_email_address;
61
    my $user_email = $patron->notice_email_address;
62
62
63
    my $comment = $query->param('comment');
63
    my $comment = $query->param('comment');
64
64
65
- 

Return to bug 33223