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

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasket.tt (-28 / +78 lines)
Lines 3-42 Your cart Link Here
3
<END_SUBJECT>
3
<END_SUBJECT>
4
4
5
<HEADER>
5
<HEADER>
6
Hi,
6
<html>
7
<head>
8
<base href="[% OPACBaseURL %]"/>
9
</head>
10
<body>
11
<p>Hi,
12
</p>
13
<p>[% firstname %] [% surname %] sent you a cart from our online catalog.</p>
7
14
8
[% firstname %] [% surname %] sent you a cart from our online catalog.
15
<p>Please note that the attached file is a MARC bibliographic records file
9
10
Please note that the attached file is a MARC bibliographic records file
11
which can be imported into personal bibliographic software like EndNote,
16
which can be imported into personal bibliographic software like EndNote,
12
Reference Manager or ProCite.
17
Reference Manager or ProCite.</p>
13
<END_HEADER>
18
<END_HEADER>
14
19
15
<MESSAGE>
20
<MESSAGE>
16
---------------------------------------------
21
<hr/>
17
[% IF ( comment ) %]
18
[% comment %]
19
[% END %]
20
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %][% BIBLIO_RESULT.title %][% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %][% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
21
Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %][% IF ( BIBLIO_RESULT.author ) %]; [% END %][% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %][% END %][% END %][% END %][% END %][% IF ( BIBLIO_RESULT.ISBN ) %]
22
ISBN: [% BIBLIO_RESULT.ISBN %][% END %]
23
[% IF ( BIBLIO_RESULT.publishercode ) %]Published by: [% BIBLIO_RESULT.publishercode %][% END %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% END %][% BIBLIO_RESULT.publicationyear %][% IF ( BIBLIO_RESULT.pages ) %], [% END %][% BIBLIO_RESULT.pages %][% IF ( BIBLIO_RESULT.size ) %], [% END %][% BIBLIO_RESULT.size %][% IF ( BIBLIO_RESULT.collection ) %]
24
Collection: [% BIBLIO_RESULT.seriestitle %][% END %][% IF ( BIBLIO_RESULT.subject ) %]
25
Subject: [% BIBLIO_RESULT.subject %][% END %][% IF ( BIBLIO_RESULT.copyrightdate ) %]
26
Copyright year: [% BIBLIO_RESULT.copyrightdate %][% END %][% IF ( BIBLIO_RESULT.notes ) %]
27
Notes : [% BIBLIO_RESULT.notes %][% END %][% IF ( BIBLIO_RESULT.unititle ) %]
28
Unified title: [% BIBLIO_RESULT.unititle %][% END %][% IF ( BIBLIO_RESULT.serial ) %]
29
Serial: [% BIBLIO_RESULT.serial %][% END %][% IF ( BIBLIO_RESULT.dewey ) %]
30
Dewey: [% BIBLIO_RESULT.dewey %][% END %][% IF ( BIBLIO_RESULT.classification ) %]
31
Classification: [% BIBLIO_RESULT.classification %][% END %][% IF ( BIBLIO_RESULT.lccn ) %]
32
LCCN: [% BIBLIO_RESULT.lccn %][% END %][% IF ( BIBLIO_RESULT.url ) %]
33
URL : [% BIBLIO_RESULT.url %][% END %]
34
In the online catalog:
35
[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% BIBLIO_RESULT.biblionumber |url %]
36
Items : [% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
37
	[% ITEM_RESULT.branchname %] [% ITEM_RESULT.location %] [% IF ( ITEM_RESULT.itemcallnumber ) %]([% ITEM_RESULT.itemcallnumber %])[% END %] [% ITEM_RESULT.barcode %][% END %]
38
22
39
---------------------------------------------
23
[% IF ( comment ) %]
24
<p>[% comment %]</p>
25
<hr/>
26
[% END %]
40
27
28
<ol>
29
[% FOREACH BIBLIO_RESULT IN BIBLIO_RESULTS %]
30
<li>
31
<a href="[% OPACBaseURL %]/cgi-bin/koha/opac-detail.pl?biblionumber= [% BIBLIO_RESULT.biblionumber %]">[% BIBLIO_RESULT.title %]</a>
32
[% IF ( BIBLIO_RESULT.subtitle ) %] [% BIBLIO_RESULT.subtitle %][% END %]
33
<ul>
34
[% IF ( BIBLIO_RESULT.HASAUTHORS ) %]
35
<li>Author(s): [% IF ( BIBLIO_RESULT.author ) %][% BIBLIO_RESULT.author %][% END %][% IF ( BIBLIO_RESULT.MARCAUTHORS ) %][% IF ( BIBLIO_RESULT.author ) %]; [% END %][% FOREACH MARCAUTHOR IN BIBLIO_RESULT.MARCAUTHORS %][% FOREACH MARCAUTHOR_SUBFIELDS_LOO IN MARCAUTHOR.MARCAUTHOR_SUBFIELDS_LOOP %][% MARCAUTHOR_SUBFIELDS_LOO.separator %][% MARCAUTHOR_SUBFIELDS_LOO.value %][% END %][% UNLESS ( loop.last ) %]; [% ELSE %][% END %][% END %][% END %][% END %]</li>
36
[% IF ( BIBLIO_RESULT.ISBN ) %]
37
<li>ISBN: [% BIBLIO_RESULT.ISBN %]</li>
38
[% END %]
39
[% IF BIBLIO_RESULT.publishercode %]
40
<li>
41
Published by: [% BIBLIO_RESULT.publishercode %][% IF ( BIBLIO_RESULT.publicationyear ) %] in [% BIBLIO_RESULT.publicationyear %][% END %][% IF ( BIBLIO_RESULT.pages ) %], [% BIBLIO_RESULT.pages %][% END %][% IF BIBLIO_RESULT.size %], [% BIBLIO_RESULT.size %][% END %]
42
</li>
43
[% END %]
44
[% IF BIBLIO_RESULT.collection %]
45
<li>Collection: [% BIBLIO_RESULT.seriestitle %]</li>
46
[% END %]
47
[% IF ( BIBLIO_RESULT.subject ) %]
48
<li>Subject: [% BIBLIO_RESULT.subject %]<li>
49
[% END %]
50
[% IF ( BIBLIO_RESULT.copyrightdate ) %]
51
<li>Copyright year: [% BIBLIO_RESULT.copyrightdate %]</li>
52
[% END %]
53
[% IF ( BIBLIO_RESULT.notes ) %]
54
<li>Notes : [% BIBLIO_RESULT.notes %]</li>
41
[% END %]
55
[% END %]
56
[% IF ( BIBLIO_RESULT.unititle ) %]
57
<li>Unified title: [% BIBLIO_RESULT.unititle %]</li>
58
[% END %]
59
[% IF ( BIBLIO_RESULT.serial ) %]
60
<li>Serial: [% BIBLIO_RESULT.serial %]</li>
61
[% END %]
62
[% IF ( BIBLIO_RESULT.dewey ) %]
63
<li>Dewey: [% BIBLIO_RESULT.dewey %]</li>
64
[% END %]
65
[% IF ( BIBLIO_RESULT.classification ) %]
66
<li>Classification: [% BIBLIO_RESULT.classification %]</li>
67
[% END %]
68
[% IF ( BIBLIO_RESULT.lccn ) %]
69
<li>LCCN: [% BIBLIO_RESULT.lccn %]</li>
70
[% END %]
71
[% IF ( BIBLIO_RESULT.url ) %]
72
<li>URL : [% BIBLIO_RESULT.url %]</li>
73
[% END %]
74
<li>Items:
75
<ul>
76
[% FOREACH ITEM_RESULT IN BIBLIO_RESULT.ITEM_RESULTS %]
77
<li>
78
[% ITEM_RESULT.branchname %]
79
[% ITEM_RESULT.location %]
80
[% IF ITEM_RESULT.itemcallnumber %]([% ITEM_RESULT.itemcallnumber %])[% END %]
81
[% ITEM_RESULT.barcode %]
82
</li>
83
[% END %]
84
</ul>
85
</ul>
86
</li>
87
[% END %]
88
</ol>
89
</body>
90
</html>
42
<END_MESSAGE>
91
<END_MESSAGE>
92
(-)a/opac/opac-sendbasket.pl (-14 / +6 lines)
Lines 118-156 if ( $email_add ) { Link Here
118
    my $body;
118
    my $body;
119
119
120
    # Analysing information and getting mail properties
120
    # Analysing information and getting mail properties
121
    if ( $template_res =~ /<SUBJECT>\n(.*)\n<END_SUBJECT>/s ) {
121
    if ( $template_res =~ /<SUBJECT>\n(.*)\n?<END_SUBJECT>/s ) {
122
        $mail{'subject'} = $1;
122
        $mail{'subject'} = $1;
123
    }
123
    }
124
    else { $mail{'subject'} = "no subject"; }
124
    else { $mail{'subject'} = "no subject"; }
125
125
126
    my $email_header = "";
126
    my $email_header = "";
127
    if ( $template_res =~ /<HEADER>\n(.*)\n<END_HEADER>/s ) {
127
    if ( $template_res =~ /<HEADER>\n(.*)\n?<END_HEADER>/s ) {
128
        $email_header = $1;
128
        $email_header = $1;
129
    }
129
    }
130
130
131
    my $email_file = "basket.txt";
131
    my $email_file = "basket.txt";
132
    if ( $template_res =~ /<FILENAME>\n(.*)\n<END_FILENAME>/s ) {
132
    if ( $template_res =~ /<FILENAME>\n(.*)\n?<END_FILENAME>/s ) {
133
        $email_file = $1;
133
        $email_file = $1;
134
    }
134
    }
135
135
136
    if ( $template_res =~ /<MESSAGE>\n(.*)\n<END_MESSAGE>/s ) { $body = encode_qp($1); }
136
    if ( $template_res =~ /<MESSAGE>\n(.*)\n?<END_MESSAGE>/s ) { $body = $1; }
137
137
138
    my $boundary = "====" . time() . "====";
138
    my $boundary = "====" . time() . "====";
139
139
140
    #     $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
141
    #
142
    #     $email_header = encode_qp($email_header);
143
    #
144
    #     $boundary = "--".$boundary;
145
    #
146
    #     # Writing mail
147
    #     $mail{body} =
148
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
140
    $mail{'content-type'} = "multipart/mixed; boundary=\"$boundary\"";
149
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
141
    my $isofile = encode_base64(encode("UTF-8", $iso2709));
150
    $boundary = '--' . $boundary;
142
    $boundary = '--' . $boundary;
151
    $mail{body} = <<END_OF_BODY;
143
    $mail{body} = <<END_OF_BODY;
152
$boundary
144
$boundary
153
Content-Type: text/plain; charset="utf-8"
145
MIME-Version: 1.0
146
Content-Type: text/html; charset="UTF-8"
154
Content-Transfer-Encoding: quoted-printable
147
Content-Transfer-Encoding: quoted-printable
155
148
156
$email_header
149
$email_header
157
- 

Return to bug 8062