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

(-)a/basket/sendbasket.pl (-2 / +5 lines)
Lines 57-63 if ( $email_add ) { Link Here
57
            token  => scalar $query->param('csrf_token'),
57
            token  => scalar $query->param('csrf_token'),
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
62
62
    my $comment = $query->param('comment');
63
    my $comment = $query->param('comment');
63
64
Lines 72-77 if ( $email_add ) { Link Here
72
    if ( !defined $iso2709 ) {
73
    if ( !defined $iso2709 ) {
73
        carp "Error sending mail: empty basket";
74
        carp "Error sending mail: empty basket";
74
        $template->param( error => 1 );
75
        $template->param( error => 1 );
76
    } elsif ( !defined $user_email or $user_email eq '' ) {
77
        carp "Error sending mail: sender's email address is invalid";
78
        $template->param( error => 1 );
75
    } else {
79
    } else {
76
        my %loops = (
80
        my %loops = (
77
            biblio => \@bibs,
81
            biblio => \@bibs,
Lines 99-105 if ( $email_add ) { Link Here
99
            content => Encode::encode("UTF-8", $iso2709),
103
            content => Encode::encode("UTF-8", $iso2709),
100
        };
104
        };
101
105
102
        my $user_email = $patron->first_valid_email_address || C4::Context->preference('KohaAdminEmailAddress');
103
        C4::Letters::EnqueueLetter({
106
        C4::Letters::EnqueueLetter({
104
            letter => $letter,
107
            letter => $letter,
105
            message_transport_type => 'email',
108
            message_transport_type => 'email',
(-)a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl (-216 / +48 lines)
Lines 1-222 Link Here
1
$DBversion = 'XXX';
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES
3
    $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES
4
        ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"<p>Hi,</p>
4
('catalog','LIST','','Send list',0,'Your list: [% listname | html %]',"Hi,
5
<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].</p>
5
[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].
6
<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>
6
Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.
7
<hr/>
7
<hr/>[% comment | html %]<hr/>
8
<p>[% comment | html %]</p>
8
<ol>[% FOREACH biblio IN biblios %]<li>
9
<hr/>
9
    [% biblio.title | html %]
10
<ol>
10
    [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %]
11
[% FOREACH biblio IN biblios %]
11
    [% biblio.part_number | html %] [% biblio.part_name | html %]
12
    <li>
12
    [% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]
13
        <span>
13
    [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]
14
            [% biblio.title | html %]
14
    [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]
15
            [% IF ( biblio.subtitle ) %]
15
    [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]
16
                [% FOREACH subtitle IN biblio.subtitle.split(' | ') %]
16
    [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]
17
                    [% subtitle | html %]
17
    [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]
18
                [% END %]
18
    [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]
19
            [% END %]
19
    [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]
20
            [% biblio.part_number | html %] [% biblio.part_name | html %]
20
    [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]
21
        </span>
21
    [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]
22
        <p>
22
    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]
23
            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %]
23
    [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %]
24
                <span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]
24
    [% item.location | html %]
25
                [% IF ( biblio.get_authors_from_MARC ) %]
25
    [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
26
                    [% IF ( biblio.author ) %]; [% END %]
26
    [% item.barcode | html %]</li>[% END %]</ul>[% END %]
27
                    [% FOREACH author IN biblio.get_authors_from_MARC %]
27
<hr/></li>[% END %]</ol>", 'email','default' ),
28
                        [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]
28
        ('catalog','CART','','Send cart',0,'Your cart',"Hi,
29
                            [% subfield.separator | html %][% subfield.value | html %]
29
[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog.
30
                        [% END %]
30
Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.
31
                        [% UNLESS ( loop.last ) %];[% END %]
31
<hr/>[% comment | html %]<hr/>
32
                    [% END %]
32
<ol>[% FOREACH biblio IN biblios %]<li>
33
                [% END %]
33
    [% biblio.title | html %]
34
                </span><br/>
34
    [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %]
35
            [% END %]
35
    [% biblio.part_number | html %] [% biblio.part_name | html %]
36
            [% SET biblioitem = biblio.biblioitem %]
36
    [% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]
37
            [% IF ( biblioitem.isbn ) %]
37
    [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]
38
                <span>
38
    [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]
39
                    ISBN: [% FOREACH isbn IN biblioitem.isbn %]
39
    [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]
40
                        [% isbn | html %]
40
    [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]
41
                        [% UNLESS ( loop.last ) %]; [% END %]
41
    [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]
42
                    [% END %]
42
    [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]
43
                </span><br/>
43
    [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]
44
            [% END %]
44
    [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]
45
            [% IF ( biblioitem.publishercode ) %]
45
    [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]
46
                <span>
46
    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]
47
                    Published by: [% biblioitem.publishercode | html %]
47
    [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %]
48
                    [% IF ( biblioitem.publicationyear ) %]
48
    [% item.location | html %]
49
                        in [% biblioitem.publicationyear | html %]
49
    [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
50
                    [% END %]
50
    [% item.barcode | html %]</li>[% END %]</ul>[% END %]
51
                    [% IF ( biblioitem.pages ) %]
51
<hr/></li>[% END %]</ol>",'email','default') });
52
                        , [% biblioitem.pages | html %]
53
                    [% END %]
54
                </span><br/>
55
            [% END %]
56
            [% IF ( biblio.seriestitle ) %]
57
                <span>
58
                    Collection: [% biblio.seriestitle | html %]
59
                </span><br/>
60
            [% END %]
61
            [% IF ( biblio.copyrightdate ) %]
62
                <span>
63
                    Copyright year: [% biblio.copyrightdate | html %]
64
                </span><br/>
65
            [% END %]
66
            [% IF ( biblio.notes ) %]
67
                <span>
68
                    Notes: [% biblio.notes | html %]
69
                </span><br/>
70
            [% END %]
71
            [% IF ( biblio.unititle ) %]
72
                <span>
73
                    Unified title: [% biblio.unititle | html %]
74
                </span><br/>
75
            [% END %]
76
            [% IF ( biblio.serial ) %]
77
                <span>
78
                    Serial: [% biblio.serial | html %]
79
                </span><br/>
80
            [% END %]
81
            [% IF ( biblioitem.lccn ) %]
82
                <span>
83
                    LCCN: [% biblioitem.lccn | html %]
84
                </span><br/>
85
            [% END %]
86
            [% IF ( biblioitem.url ) %]
87
                <span>
88
                    URL: [% biblioitem.url | html %]
89
                </span>
90
            [% END %]
91
        </p>
92
        [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]
93
        [% IF ( OPACBaseURL ) %]
94
            <p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>
95
        [% END %]
96
        [% IF ( biblio.items.count > 0 ) %]
97
            <p>Items:
98
                <ul>
99
                    [% FOREACH item IN biblio.items %]<li>
100
                        [% item.holding_branch.branchname | html %]
101
                        [% item.location | html %]
102
                        [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
103
                        [% item.barcode | html %]
104
                    </li>[% END %]
105
                </ul>
106
            </p>
107
        [% END %]
108
        <hr/>
109
    </li>
110
[% END %]
111
</ol>", 'email','default' ),
112
        ('catalog','CART','','Send cart',1,'Your cart',"<p>Hi,</p>
113
<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog.</p>
114
<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>
115
<hr/>
116
<p>[% comment | html %]</p>
117
<hr/>
118
<ol>
119
[% FOREACH biblio IN biblios %]
120
    <li>
121
        <span>
122
            [% biblio.title | html %]
123
            [% IF ( biblio.subtitle ) %]
124
                [% FOREACH subtitle IN biblio.subtitle.split(' | ') %]
125
                    [% subtitle | html %]
126
                [% END %]
127
            [% END %]
128
            [% biblio.part_number | html %] [% biblio.part_name | html %]
129
        </span>
130
        <p>
131
            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %]
132
                <span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]
133
                [% IF ( biblio.get_authors_from_MARC ) %]
134
                    [% IF ( biblio.author ) %]; [% END %]
135
                    [% FOREACH author IN biblio.get_authors_from_MARC %]
136
                        [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]
137
                            [% subfield.separator | html %][% subfield.value | html %]
138
                        [% END %]
139
                        [% UNLESS ( loop.last ) %];[% END %]
140
                    [% END %]
141
                [% END %]
142
                </span><br/>
143
            [% END %]
144
            [% SET biblioitem = biblio.biblioitem %]
145
            [% IF ( biblioitem.isbn ) %]
146
                <span>
147
                    ISBN: [% FOREACH isbn IN biblioitem.isbn %]
148
                        [% isbn | html %]
149
                        [% UNLESS ( loop.last ) %]; [% END %]
150
                    [% END %]
151
                </span><br/>
152
            [% END %]
153
            [% IF ( biblioitem.publishercode ) %]
154
                <span>
155
                    Published by: [% biblioitem.publishercode | html %]
156
                    [% IF ( biblioitem.publicationyear ) %]
157
                        in [% biblioitem.publicationyear | html %]
158
                    [% END %]
159
                    [% IF ( biblioitem.pages ) %]
160
                        , [% biblioitem.pages | html %]
161
                    [% END %]
162
                </span><br/>
163
            [% END %]
164
            [% IF ( biblio.seriestitle ) %]
165
                <span>
166
                    Collection: [% biblio.seriestitle | html %]
167
                </span><br/>
168
            [% END %]
169
            [% IF ( biblio.copyrightdate ) %]
170
                <span>
171
                    Copyright year: [% biblio.copyrightdate | html %]
172
                </span><br/>
173
            [% END %]
174
            [% IF ( biblio.notes ) %]
175
                <span>
176
                    Notes: [% biblio.notes | html %]
177
                </span><br/>
178
            [% END %]
179
            [% IF ( biblio.unititle ) %]
180
                <span>
181
                    Unified title: [% biblio.unititle | html %]
182
                </span><br/>
183
            [% END %]
184
            [% IF ( biblio.serial ) %]
185
                <span>
186
                    Serial: [% biblio.serial | html %]
187
                </span><br/>
188
            [% END %]
189
            [% IF ( biblioitem.lccn ) %]
190
                <span>
191
                    LCCN: [% biblioitem.lccn | html %]
192
                </span><br/>
193
            [% END %]
194
            [% IF ( biblioitem.url ) %]
195
                <span>
196
                    URL: [% biblioitem.url | html %]
197
                </span>
198
            [% END %]
199
        </p>
200
        [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]
201
        [% IF ( OPACBaseURL ) %]
202
            <p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>
203
        [% END %]
204
        [% IF ( biblio.items.count > 0 ) %]
205
            <p>Items:
206
                <ul>
207
                    [% FOREACH item IN biblio.items %]<li>
208
                        [% item.holding_branch.branchname | html %]
209
                        [% item.location | html %]
210
                        [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
211
                        [% item.barcode | html %]
212
                    </li>[% END %]
213
                </ul>
214
            </p>
215
        [% END %]
216
        <hr/>
217
    </li>
218
[% END %]
219
</ol>",'email','default') });
220
52
221
    NewVersion( $DBversion, 3150, 'Add LIST and CART notices' );
53
    NewVersion( $DBversion, 3150, 'Add LIST and CART notices' );
222
}
54
}
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-216 / +41 lines)
Lines 1576-1809 tables: Link Here
1576
          code: LIST
1576
          code: LIST
1577
          branchcode: ""
1577
          branchcode: ""
1578
          name: "Send list"
1578
          name: "Send list"
1579
          is_html: 1
1579
          is_html: 0
1580
          title: "Your list: [% listname | html %]"
1580
          title: "Your list: [% listname | html %]"
1581
          message_transport_type: email
1581
          message_transport_type: email
1582
          lang: default
1582
          lang: default
1583
          content:
1583
          content:
1584
            - "<p>Hi,</p>"
1584
            - "Hi,"
1585
            - "<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].</p>"
1585
            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]."
1586
            - "<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>"
1586
            - "Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite."
1587
            - "<hr/>"
1587
            - "<hr/>[% comment | html %]<hr/>"
1588
            - "<p>[% comment | html %]</p>"
1588
            - "<ol>[% FOREACH biblio IN biblios %]<li>"
1589
            - "<hr/>"
1590
            - "<ol>"
1591
            - "[% FOREACH biblio IN biblios %]"
1592
            - "<li>"
1593
            - "<span>"
1594
            - "[% biblio.title | html %]"
1589
            - "[% biblio.title | html %]"
1595
            - "[% IF ( biblio.subtitle ) %]"
1590
- "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]"
1596
            - "[% FOREACH subtitle IN biblio.subtitle.split(' | ') %]"
1591
            - "[% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]"
1597
            - "[% subtitle | html %]"
1592
            - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]"
1598
            - "[% END %]"
1593
            - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]"
1599
            - "[% END %]"
1594
            - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]"
1600
            - "[% biblio.part_number | html %] [% biblio.part_name | html %]"
1595
            - "[% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]"
1601
            - "</span>"
1596
            - "[% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]"
1602
            - "<p>"
1597
            - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]"
1603
            - "[% IF ( biblio.author || biblio.get_authors_from_MARC ) %]"
1598
            - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]"
1604
            - "<span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]"
1599
            - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]"
1605
            - "[% IF ( biblio.get_authors_from_MARC ) %]"
1600
            - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]"
1606
            - "[% IF ( biblio.author ) %]; [% END %]"
1601
            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]"
1607
            - "[% FOREACH author IN biblio.get_authors_from_MARC %]"
1602
            - "[% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %][% item.location | html %][% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %][% item.barcode | html %]</li>[% END %]</ul>[% END %]"
1608
            - "[% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]"
1603
            - "<hr/></li>[% END %]</ol>"
1609
            - "[% subfield.separator | html %][% subfield.value | html %]"
1610
            - "[% END %]"
1611
            - "[% UNLESS ( loop.last ) %];[% END %]"
1612
            - "[% END %]"
1613
            - "[% END %]"
1614
            - "</span><br/>"
1615
            - "[% END %]"
1616
            - "[% SET biblioitem = biblio.biblioitem %]"
1617
            - "[% IF ( biblioitem.isbn ) %]"
1618
            - "<span>"
1619
            - "ISBN: [% FOREACH isbn IN biblioitem.isbn %]"
1620
            - "[% isbn | html %]"
1621
            - "[% UNLESS ( loop.last ) %]; [% END %]"
1622
            - "[% END %]"
1623
            - "</span><br/>"
1624
            - "[% END %]"
1625
            - "[% IF ( biblioitem.publishercode ) %]"
1626
            - "<span>"
1627
            - "Published by: [% biblioitem.publishercode | html %]"
1628
            - "[% IF ( biblioitem.publicationyear ) %]"
1629
            - "in [% biblioitem.publicationyear | html %]"
1630
            - "[% END %]"
1631
            - "[% IF ( biblioitem.pages ) %]"
1632
            - ", [% biblioitem.pages | html %]"
1633
            - "[% END %]"
1634
            - "</span><br/>"
1635
            - "[% END %]"
1636
            - "[% IF ( biblio.seriestitle ) %]"
1637
            - "<span>"
1638
            - "Collection: [% biblio.seriestitle | html %]"
1639
            - "</span><br/>"
1640
            - "[% END %]"
1641
            - "[% IF ( biblio.copyrightdate ) %]"
1642
            - "<span>"
1643
            - "Copyright year: [% biblio.copyrightdate | html %]"
1644
            - "</span><br/>"
1645
            - "[% END %]"
1646
            - "[% IF ( biblio.notes ) %]"
1647
            - "<span>"
1648
            - "Notes: [% biblio.notes | html %]"
1649
            - "</span><br/>"
1650
            - "[% END %]"
1651
            - "[% IF ( biblio.unititle ) %]"
1652
            - "<span>"
1653
            - "Unified title: [% biblio.unititle | html %]"
1654
            - "</span><br/>"
1655
            - "[% END %]"
1656
            - "[% IF ( biblio.serial ) %]"
1657
            - "<span>"
1658
            - "Serial: [% biblio.serial | html %]"
1659
            - "</span><br/>"
1660
            - "[% END %]"
1661
            - "[% IF ( biblioitem.lccn ) %]"
1662
            - "<span>"
1663
            - "LCCN: [% biblioitem.lccn | html %]"
1664
            - "</span><br/>"
1665
            - "[% END %]"
1666
            - "[% IF ( biblioitem.url ) %]"
1667
            - "<span>"
1668
            - "URL: [% biblioitem.url | html %]"
1669
            - "</span>"
1670
            - "[% END %]"
1671
            - "</p>"
1672
            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]"
1673
            - "[% IF ( OPACBaseURL ) %]"
1674
            - "<p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>"
1675
            - "[% END %]"
1676
            - "[% IF ( biblio.items.count > 0 ) %]"
1677
            - "<p>Items:"
1678
            - "<ul>"
1679
            - "[% FOREACH item IN biblio.items %]<li>"
1680
            - "[% item.holding_branch.branchname | html %]"
1681
            - "[% item.location | html %]"
1682
            - "[% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]"
1683
            - "[% item.barcode | html %]"
1684
            - "</li>[% END %]"
1685
            - "</ul>"
1686
            - "</p>"
1687
            - "[% END %]"
1688
            - "<hr/>"
1689
            - "</li>"
1690
            - "[% END %]"
1691
            - "</ol>"
1692
1604
1693
        - module: catalog
1605
        - module: catalog
1694
          code: CART
1606
          code: CART
1695
          branchcode: ""
1607
          branchcode: ""
1696
          name: "Send cart"
1608
          name: "Send cart"
1697
          is_html: 1
1609
          is_html: 0
1698
          title: "Your cart"
1610
          title: "Your cart"
1699
          message_transport_type: email
1611
          message_transport_type: email
1700
          lang: default
1612
          lang: default
1701
          content:
1613
          content:
1702
            - "<p>Hi,</p>"
1614
            - "Hi,"
1703
            - "<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog.</p>"
1615
            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog."
1704
            - "<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>"
1616
            - "[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]."
1705
            - "<hr/>"
1617
            - "Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite."
1706
            - "<p>[% comment | html %]</p>"
1618
            - "<hr/>[% comment | html %]<hr/>"
1707
            - "<hr/>"
1619
            - "<ol>[% FOREACH biblio IN biblios %]<li>"
1708
            - "<ol>"
1709
            - "[% FOREACH biblio IN biblios %]"
1710
            - "<li>"
1711
            - "<span>"
1712
            - "[% biblio.title | html %]"
1620
            - "[% biblio.title | html %]"
1713
            - "[% IF ( biblio.subtitle ) %]"
1621
- "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]"
1714
            - "[% FOREACH subtitle IN biblio.subtitle.split(' | ') %]"
1622
            - "[% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]"
1715
            - "[% subtitle | html %]"
1623
            - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]"
1716
            - "[% END %]"
1624
            - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]"
1717
            - "[% END %]"
1625
            - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]"
1718
            - "[% biblio.part_number | html %] [% biblio.part_name | html %]"
1626
            - "[% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]"
1719
            - "</span>"
1627
            - "[% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]"
1720
            - "<p>"
1628
            - "[% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]"
1721
            - "[% IF ( biblio.author || biblio.get_authors_from_MARC ) %]"
1629
            - "[% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]"
1722
            - "<span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]"
1630
            - "[% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]"
1723
            - "[% IF ( biblio.get_authors_from_MARC ) %]"
1631
            - "[% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]"
1724
            - "[% IF ( biblio.author ) %]; [% END %]"
1632
            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]"
1725
            - "[% FOREACH author IN biblio.get_authors_from_MARC %]"
1633
            - "[% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %][% item.location | html %][% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %][% item.barcode | html %]</li>[% END %]</ul>[% END %]"
1726
            - "[% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]"
1634
            - "<hr/></li>[% END %]</ol>"
1727
            - "[% subfield.separator | html %][% subfield.value | html %]"
1728
            - "[% END %]"
1729
            - "[% UNLESS ( loop.last ) %];[% END %]"
1730
            - "[% END %]"
1731
            - "[% END %]"
1732
            - "</span><br/>"
1733
            - "[% END %]"
1734
            - "[% SET biblioitem = biblio.biblioitem %]"
1735
            - "[% IF ( biblioitem.isbn ) %]"
1736
            - "<span>"
1737
            - "ISBN: [% FOREACH isbn IN biblioitem.isbn %]"
1738
            - "[% isbn | html %]"
1739
            - "[% UNLESS ( loop.last ) %]; [% END %]"
1740
            - "[% END %]"
1741
            - "</span><br/>"
1742
            - "[% END %]"
1743
            - "[% IF ( biblioitem.publishercode ) %]"
1744
            - "<span>"
1745
            - "Published by: [% biblioitem.publishercode | html %]"
1746
            - "[% IF ( biblioitem.publicationyear ) %]"
1747
            - "in [% biblioitem.publicationyear | html %]"
1748
            - "[% END %]"
1749
            - "[% IF ( biblioitem.pages ) %]"
1750
            - ", [% biblioitem.pages | html %]"
1751
            - "[% END %]"
1752
            - "</span><br/>"
1753
            - "[% END %]"
1754
            - "[% IF ( biblio.seriestitle ) %]"
1755
            - "<span>"
1756
            - "Collection: [% biblio.seriestitle | html %]"
1757
            - "</span><br/>"
1758
            - "[% END %]"
1759
            - "[% IF ( biblio.copyrightdate ) %]"
1760
            - "<span>"
1761
            - "Copyright year: [% biblio.copyrightdate | html %]"
1762
            - "</span><br/>"
1763
            - "[% END %]"
1764
            - "[% IF ( biblio.notes ) %]"
1765
            - "<span>"
1766
            - "Notes: [% biblio.notes | html %]"
1767
            - "</span><br/>"
1768
            - "[% END %]"
1769
            - "[% IF ( biblio.unititle ) %]"
1770
            - "<span>"
1771
            - "Unified title: [% biblio.unititle | html %]"
1772
            - "</span><br/>"
1773
            - "[% END %]"
1774
            - "[% IF ( biblio.serial ) %]"
1775
            - "<span>"
1776
            - "Serial: [% biblio.serial | html %]"
1777
            - "</span><br/>"
1778
            - "[% END %]"
1779
            - "[% IF ( biblioitem.lccn ) %]"
1780
            - "<span>"
1781
            - "LCCN: [% biblioitem.lccn | html %]"
1782
            - "</span><br/>"
1783
            - "[% END %]"
1784
            - "[% IF ( biblioitem.url ) %]"
1785
            - "<span>"
1786
            - "URL: [% biblioitem.url | html %]"
1787
            - "</span>"
1788
            - "[% END %]"
1789
            - "</p>"
1790
            - "[% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]"
1791
            - "[% IF ( OPACBaseURL ) %]"
1792
            - "<p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>"
1793
            - "[% END %]"
1794
            - "[% IF ( biblio.items.count > 0 ) %]"
1795
            - "<p>Items:"
1796
            - "<ul>"
1797
            - "[% FOREACH item IN biblio.items %]<li>"
1798
            - "[% item.holding_branch.branchname | html %]"
1799
            - "[% item.location | html %]"
1800
            - "[% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]"
1801
            - "[% item.barcode | html %]"
1802
            - "</li>[% END %]"
1803
            - "</ul>"
1804
            - "</p>"
1805
            - "[% END %]"
1806
            - "<hr/>"
1807
            - "</li>"
1808
            - "[% END %]"
1809
            - "</ol>"
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql (-216 / +48 lines)
Lines 476-694 INSERT IGNORE INTO letter (module, code, name, title, content, message_transport Link Here
476
[% END %]
476
[% END %]
477
", 'email');
477
", 'email');
478
478
479
INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"<p>Hi,</p>
479
INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES ('catalog','LIST','','Send list',1,'Your list: [% listname | html %]',"Hi,
480
<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].</p>
480
[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %].
481
<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>
481
Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.
482
<hr/>
482
<hr/>[% comment | html %]<hr/>
483
<p>[% comment | html %]</p>
483
<ol>[% FOREACH biblio IN biblios %]<li>
484
<hr/>
484
    [% biblio.title | html %]
485
<ol>
485
    [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %]
486
[% FOREACH biblio IN biblios %]
486
    [% biblio.part_number | html %] [% biblio.part_name | html %]
487
    <li>
487
    [% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]
488
        <span>
488
    [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]
489
            [% biblio.title | html %]
489
    [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]
490
            [% IF ( biblio.subtitle ) %]
490
    [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]
491
                [% FOREACH subtitle IN biblio.subtitle.split(' | ') %]
491
    [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]
492
                    [% subtitle | html %]
492
    [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]
493
                [% END %]
493
    [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]
494
            [% END %]
494
    [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]
495
            [% biblio.part_number | html %] [% biblio.part_name | html %]
495
    [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]
496
        </span>
496
    [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]
497
        <p>
497
    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]
498
            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %]
498
    [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %]
499
                <span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]
499
    [% item.location | html %]
500
                [% IF ( biblio.get_authors_from_MARC ) %]
500
    [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
501
                    [% IF ( biblio.author ) %]; [% END %]
501
    [% item.barcode | html %]</li>[% END %]</ul>[% END %]
502
                    [% FOREACH author IN biblio.get_authors_from_MARC %]
502
<hr/></li>[% END %]</ol>", 'email','default' ),
503
                        [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]
503
        ('catalog','CART','','Send cart',0,'Your cart',"Hi,
504
                            [% subfield.separator | html %][% subfield.value | html %]
504
[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog.
505
                        [% END %]
505
Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.
506
                        [% UNLESS ( loop.last ) %];[% END %]
506
<hr/>[% comment | html %]<hr/>
507
                    [% END %]
507
<ol>[% FOREACH biblio IN biblios %]<li>
508
                [% END %]
508
    [% biblio.title | html %]
509
                </span><br/>
509
    [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %]
510
            [% END %]
510
    [% biblio.part_number | html %] [% biblio.part_name | html %]
511
            [% SET biblioitem = biblio.biblioitem %]
511
    [% IF ( biblio.author || biblio.get_marc_authors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_authors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_authors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]
512
            [% IF ( biblioitem.isbn ) %]
512
    [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]
513
                <span>
513
    [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]
514
                    ISBN: [% FOREACH isbn IN biblioitem.isbn %]
514
    [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]
515
                        [% isbn | html %]
515
    [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %]
516
                        [% UNLESS ( loop.last ) %]; [% END %]
516
    [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %]
517
                    [% END %]
517
    [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %]
518
                </span><br/>
518
    [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %]
519
            [% END %]
519
    [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %]
520
            [% IF ( biblioitem.publishercode ) %]
520
    [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %]
521
                <span>
521
    [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %]
522
                    Published by: [% biblioitem.publishercode | html %]
522
    [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% item.holding_branch.branchname | html %]
523
                    [% IF ( biblioitem.publicationyear ) %]
523
    [% item.location | html %]
524
                        in [% biblioitem.publicationyear | html %]
524
    [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
525
                    [% END %]
525
    [% item.barcode | html %]</li>[% END %]</ul>[% END %]
526
                    [% IF ( biblioitem.pages ) %]
526
<hr/></li>[% END %]</ol>",'email','default');
527
                        , [% biblioitem.pages | html %]
528
                    [% END %]
529
                </span><br/>
530
            [% END %]
531
            [% IF ( biblio.seriestitle ) %]
532
                <span>
533
                    Collection: [% biblio.seriestitle | html %]
534
                </span><br/>
535
            [% END %]
536
            [% IF ( biblio.copyrightdate ) %]
537
                <span>
538
                    Copyright year: [% biblio.copyrightdate | html %]
539
                </span><br/>
540
            [% END %]
541
            [% IF ( biblio.notes ) %]
542
                <span>
543
                    Notes: [% biblio.notes | html %]
544
                </span><br/>
545
            [% END %]
546
            [% IF ( biblio.unititle ) %]
547
                <span>
548
                    Unified title: [% biblio.unititle | html %]
549
                </span><br/>
550
            [% END %]
551
            [% IF ( biblio.serial ) %]
552
                <span>
553
                    Serial: [% biblio.serial | html %]
554
                </span><br/>
555
            [% END %]
556
            [% IF ( biblioitem.lccn ) %]
557
                <span>
558
                    LCCN: [% biblioitem.lccn | html %]
559
                </span><br/>
560
            [% END %]
561
            [% IF ( biblioitem.url ) %]
562
                <span>
563
                    URL: [% biblioitem.url | html %]
564
                </span>
565
            [% END %]
566
        </p>
567
        [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]
568
        [% IF ( OPACBaseURL ) %]
569
            <p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>
570
        [% END %]
571
        [% IF ( biblio.items.count > 0 ) %]
572
            <p>Items:
573
                <ul>
574
                    [% FOREACH item IN biblio.items %]<li>
575
                        [% item.holding_branch.branchname | html %]
576
                        [% item.location | html %]
577
                        [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
578
                        [% item.barcode | html %]
579
                    </li>[% END %]
580
                </ul>
581
            </p>
582
        [% END %]
583
        <hr/>
584
    </li>
585
[% END %]
586
</ol>", 'email','default' ),
587
('catalog','CART','','Send cart',1,'Your cart',"<p>Hi,</p>
588
<p>[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog.</p>
589
<p>Please note that the attached file is a MARC bibliographic records file which can be imported into personal bibliographic software like EndNote, Reference Manager or ProCite.</p>
590
<hr/>
591
<p>[% comment | html %]</p>
592
<hr/>
593
<ol>
594
[% FOREACH biblio IN biblios %]
595
    <li>
596
        <span>
597
            [% biblio.title | html %]
598
            [% IF ( biblio.subtitle ) %]
599
                [% FOREACH subtitle IN biblio.subtitle.split(' | ') %]
600
                    [% subtitle | html %]
601
                [% END %]
602
            [% END %]
603
            [% biblio.part_number | html %] [% biblio.part_name | html %]
604
        </span>
605
        <p>
606
            [% IF ( biblio.author || biblio.get_authors_from_MARC ) %]
607
                <span>Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %]
608
                [% IF ( biblio.get_authors_from_MARC ) %]
609
                    [% IF ( biblio.author ) %]; [% END %]
610
                    [% FOREACH author IN biblio.get_authors_from_MARC %]
611
                        [% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %]
612
                            [% subfield.separator | html %][% subfield.value | html %]
613
                        [% END %]
614
                        [% UNLESS ( loop.last ) %];[% END %]
615
                    [% END %]
616
                [% END %]
617
                </span><br/>
618
            [% END %]
619
            [% SET biblioitem = biblio.biblioitem %]
620
            [% IF ( biblioitem.isbn ) %]
621
                <span>
622
                    ISBN: [% FOREACH isbn IN biblioitem.isbn %]
623
                        [% isbn | html %]
624
                        [% UNLESS ( loop.last ) %]; [% END %]
625
                    [% END %]
626
                </span><br/>
627
            [% END %]
628
            [% IF ( biblioitem.publishercode ) %]
629
                <span>
630
                    Published by: [% biblioitem.publishercode | html %]
631
                    [% IF ( biblioitem.publicationyear ) %]
632
                        in [% biblioitem.publicationyear | html %]
633
                    [% END %]
634
                    [% IF ( biblioitem.pages ) %]
635
                        , [% biblioitem.pages | html %]
636
                    [% END %]
637
                </span><br/>
638
            [% END %]
639
            [% IF ( biblio.seriestitle ) %]
640
                <span>
641
                    Collection: [% biblio.seriestitle | html %]
642
                </span><br/>
643
            [% END %]
644
            [% IF ( biblio.copyrightdate ) %]
645
                <span>
646
                    Copyright year: [% biblio.copyrightdate | html %]
647
                </span><br/>
648
            [% END %]
649
            [% IF ( biblio.notes ) %]
650
                <span>
651
                    Notes: [% biblio.notes | html %]
652
                </span><br/>
653
            [% END %]
654
            [% IF ( biblio.unititle ) %]
655
                <span>
656
                    Unified title: [% biblio.unititle | html %]
657
                </span><br/>
658
            [% END %]
659
            [% IF ( biblio.serial ) %]
660
                <span>
661
                    Serial: [% biblio.serial | html %]
662
                </span><br/>
663
            [% END %]
664
            [% IF ( biblioitem.lccn ) %]
665
                <span>
666
                    LCCN: [% biblioitem.lccn | html %]
667
                </span><br/>
668
            [% END %]
669
            [% IF ( biblioitem.url ) %]
670
                <span>
671
                    URL: [% biblioitem.url | html %]
672
                </span>
673
            [% END %]
674
        </p>
675
        [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %]
676
        [% IF ( OPACBaseURL ) %]
677
            <p>In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %]</p>
678
        [% END %]
679
        [% IF ( biblio.items.count > 0 ) %]
680
            <p>Items:
681
                <ul>
682
                    [% FOREACH item IN biblio.items %]<li>
683
                        [% item.holding_branch.branchname | html %]
684
                        [% item.location | html %]
685
                        [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %]
686
                        [% item.barcode | html %]
687
                    </li>[% END %]
688
                </ul>
689
            </p>
690
        [% END %]
691
        <hr/>
692
    </li>
693
[% END %]
694
</ol>",'email','default');
(-)a/opac/opac-sendbasket.pl (-1 / +4 lines)
Lines 59-64 if ( $email_add ) { Link Here
59
    });
59
    });
60
60
61
    my $patron = Koha::Patrons->find( $borrowernumber );
61
    my $patron = Koha::Patrons->find( $borrowernumber );
62
    my $user_email = $patron->first_valid_email_address;
62
63
63
    my $comment    = $query->param('comment');
64
    my $comment    = $query->param('comment');
64
65
Lines 73-78 if ( $email_add ) { Link Here
73
    if ( !defined $iso2709 ) {
74
    if ( !defined $iso2709 ) {
74
        carp "Error sending mail: empty basket";
75
        carp "Error sending mail: empty basket";
75
        $template->param( error => 1 );
76
        $template->param( error => 1 );
77
    } elsif ( !defined $user_email or $user_email eq '' ) {
78
        carp "Error sending mail: sender's email address is invalid";
79
        $template->param( error => 1 );
76
    } else {
80
    } else {
77
        my %loops = (
81
        my %loops = (
78
            biblio => \@bibs,
82
            biblio => \@bibs,
Lines 100-106 if ( $email_add ) { Link Here
100
            content => Encode::encode("UTF-8", $iso2709),
104
            content => Encode::encode("UTF-8", $iso2709),
101
        };
105
        };
102
106
103
        my $user_email = $patron->first_valid_email_address || C4::Context->preference('KohaAdminEmailAddress');
104
        C4::Letters::EnqueueLetter({
107
        C4::Letters::EnqueueLetter({
105
            letter => $letter,
108
            letter => $letter,
106
            message_transport_type => 'email',
109
            message_transport_type => 'email',
(-)a/opac/opac-sendshelf.pl (-2 / +5 lines)
Lines 75-81 if ( $email ) { Link Here
75
    );
75
    );
76
76
77
    my $patron = Koha::Patrons->find( $borrowernumber );
77
    my $patron = Koha::Patrons->find( $borrowernumber );
78
78
    my $user_email = $patron->first_valid_email_address;
79
    my $shelf = Koha::Virtualshelves->find( $shelfid );
79
    my $shelf = Koha::Virtualshelves->find( $shelfid );
80
    my $contents = $shelf->get_contents;
80
    my $contents = $shelf->get_contents;
81
    my $iso2709;
81
    my $iso2709;
Lines 89-94 if ( $email ) { Link Here
89
    if ( !defined $iso2709 ) {
89
    if ( !defined $iso2709 ) {
90
        carp "Error sending mail: empty list";
90
        carp "Error sending mail: empty list";
91
        $template->param( error => 1 );
91
        $template->param( error => 1 );
92
    } elsif ( !defined $user_email or $user_email eq '' ) {
93
        carp "Error sending mail: sender's email address is invalid";
94
        $template->param( error => 1 );
92
    } else {
95
    } else {
93
         my %loops = (
96
         my %loops = (
94
             biblio => \@biblionumbers,
97
             biblio => \@biblionumbers,
Lines 122-128 if ( $email ) { Link Here
122
            message_transport_type => 'email',
125
            message_transport_type => 'email',
123
            borrowernumber => $patron->borrowernumber,
126
            borrowernumber => $patron->borrowernumber,
124
            to_address => $email,
127
            to_address => $email,
125
            reply_address => $patron->first_valid_email_address,
128
            reply_address => $user_email,
126
            attachments => [$attachment],
129
            attachments => [$attachment],
127
        });
130
        });
128
131
(-)a/virtualshelves/sendshelf.pl (-2 / +5 lines)
Lines 65-70 if ($to_address) { Link Here
65
    );
65
    );
66
66
67
    my $patron = Koha:::Patrons->find( $borrowernumber );
67
    my $patron = Koha:::Patrons->find( $borrowernumber );
68
    my $user_email = $patron->first_valid_email_address;
68
    my $shelf = Koha::Virtualshelves->find( $shelfid );
69
    my $shelf = Koha::Virtualshelves->find( $shelfid );
69
    my $contents = $shelf->get_contents;
70
    my $contents = $shelf->get_contents;
70
    my @biblionumbers;
71
    my @biblionumbers;
Lines 79-84 if ($to_address) { Link Here
79
    if ( !defined $iso2709 ) {
80
    if ( !defined $iso2709 ) {
80
        carp "Error sending mail: empty basket";
81
        carp "Error sending mail: empty basket";
81
        $template->param( error => 1 );
82
        $template->param( error => 1 );
83
    } elsif ( !defined $user_email or $user_email eq '' ) {
84
        carp "Error sending mail: sender's email address is invalid";
85
        $template->param( error => 1 );
82
    } else {
86
    } else {
83
        my %loops = (
87
        my %loops = (
84
            biblio => \@biblionumbers,
88
            biblio => \@biblionumbers,
Lines 112-118 if ($to_address) { Link Here
112
            message_transport_type => 'email',
116
            message_transport_type => 'email',
113
            borrowernumber => $patron->borrowernumber,
117
            borrowernumber => $patron->borrowernumber,
114
            to_address => $to_address,
118
            to_address => $to_address,
115
            reply_address => $patron->first_valid_email_address,
119
            reply_address => $user_email,
116
            attachments => [$attachment],
120
            attachments => [$attachment],
117
        });
121
        });
118
122
119
- 

Return to bug 3150