Bugzilla – Attachment 146864 Details for
Bug 3150
Move emails for sending cart and list contents into notices tool
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 3150: (follow-up) Use get_marc_contributors
Bug-3150-follow-up-Use-getmarccontributors.patch (text/plain), 16.90 KB, created by
Katrin Fischer
on 2023-02-17 16:23:46 UTC
(
hide
)
Description:
Bug 3150: (follow-up) Use get_marc_contributors
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2023-02-17 16:23:46 UTC
Size:
16.90 KB
patch
obsolete
>From 874676b5c3a23fa21bffac90ca6f6d175b67b164 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Mon, 13 Feb 2023 14:16:43 +1300 >Subject: [PATCH] Bug 3150: (follow-up) Use get_marc_contributors > >--- > .../bug_3150_-_add_LIST_and_CART_notices.perl | 54 ---------------- > .../bug_3150_-_add_LIST_and_CART_notices.pl | 62 +++++++++++++++++++ > .../mysql/en/mandatory/sample_notices.yml | 4 +- > 3 files changed, 64 insertions(+), 56 deletions(-) > delete mode 100644 installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl > create mode 100644 installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl > >diff --git a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl b/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl >deleted file mode 100644 >index b376d6c6cd..0000000000 >--- a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl >+++ /dev/null >@@ -1,54 +0,0 @@ >-$DBversion = 'XXX'; >-if( CheckVersion( $DBversion ) ) { >- $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES >-('catalogue','LIST','','Send list',1,'Your list: [% listname | html %]',"Hi, >-[% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]. >-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. >-<hr/>[% comment | html %]<hr/> >-<ol>[% FOREACH biblio IN biblios %]<li> >- [% biblio.title | html %] >- [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %] >- [% biblio.part_number | html %] [% biblio.part_name | html %] >- [% 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 %] >- [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %] >- [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %] >- [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %] >- [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %] >- [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %] >- [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %] >- [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %] >- [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %] >- [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %] >- [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %] >- [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >- [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] >- [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] >- [% item.barcode | html %]</li>[% END %]</ul>[% END %] >-<hr/></li>[% END %]</ol>", 'email','default' ), >- ('catalogue','CART','','Send cart',1,'Your cart',"Hi, >-[% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog. >-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. >-<hr/>[% comment | html %]<hr/> >-<ol>[% FOREACH biblio IN biblios %]<li> >- [% biblio.title | html %] >- [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %] >- [% biblio.part_number | html %] [% biblio.part_name | html %] >- [% 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 %] >- [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %] >- [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %] >- [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %] >- [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %] >- [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %] >- [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %] >- [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %] >- [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %] >- [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %] >- [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %] >- [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >- [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] >- [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] >- [% item.barcode | html %]</li>[% END %]</ul>[% END %] >-<hr/></li>[% END %]</ol>",'email','default') }); >- >- NewVersion( $DBversion, 3150, 'Add LIST and CART notices' ); >-} >diff --git a/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl b/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl >new file mode 100644 >index 0000000000..bb74efe2b8 >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.pl >@@ -0,0 +1,62 @@ >+use Modern::Perl; >+ >+return { >+ bug_number => "3150", >+ description => "Add LIST and CART notices", >+ up => sub { >+ my ($args) = @_; >+ my ($dbh, $out) = @$args{qw(dbh out)}; >+ >+ $dbh->do(q{ INSERT IGNORE INTO letter (module, code, branchcode, name, is_html, title, content, message_transport_type, lang) VALUES >+ ('catalogue','LIST','','Send list',1,'Your list: [% listname | html %]',"Hi, >+ [% borrower.firstname | html %] [% borrower.surname | html %] sent you a list from our online catalog called: [% listname | html %]. >+ 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. >+ <hr/>[% comment | html %]<hr/> >+ <ol>[% FOREACH biblio IN biblios %]<li> >+ [% biblio.title | html %] >+ [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %] >+ [% biblio.part_number | html %] [% biblio.part_name | html %] >+ [% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %] >+ [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %] >+ [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %] >+ [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %] >+ [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %] >+ [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %] >+ [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %] >+ [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %] >+ [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %] >+ [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %] >+ [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %] >+ [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] >+ [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] >+ [% item.barcode | html %]</li>[% END %]</ul>[% END %] >+ <hr/></li>[% END %]</ol>", 'email','default' ), >+ ('catalogue','CART','','Send cart',1,'Your cart',"Hi, >+ [% borrower.firstname | html %] [% borrower.surname | html %] sent you a cart from our online catalog. >+ 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. >+ <hr/>[% comment | html %]<hr/> >+ <ol>[% FOREACH biblio IN biblios %]<li> >+ [% biblio.title | html %] >+ [% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %] >+ [% biblio.part_number | html %] [% biblio.part_name | html %] >+ [% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %] >+ [% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %] >+ [% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %] >+ [% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %] >+ [% IF ( biblio.copyrightdate ) %]Copyright year: [% biblio.copyrightdate | html %][% END %] >+ [% IF ( biblio.notes ) %]Notes: [% biblio.notes | html %][% END %] >+ [% IF ( biblio.unititle ) %]Unified title: [% biblio.unititle | html %][% END %] >+ [% IF ( biblio.serial ) %]Serial: [% biblio.serial | html %][% END %] >+ [% IF ( biblioitem.lccn ) %]LCCN: [% biblioitem.lccn | html %][% END %] >+ [% IF ( biblioitem.url ) %]URL: [% biblioitem.url | html %][% END %] >+ [% SET OPACBaseURL = Koha.Preference('OPACBaseURL') %][% IF ( OPACBaseURL ) %]In online catalog: [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% biblio.biblionumber | html %][% END %] >+ [% IF ( biblio.items.count > 0 ) %]Items: <ul>[% FOREACH item IN biblio.items %]<li>[% Branches.GetName( item.holdingbranch ) | html %] >+ [% AuthorisedValues.GetDescriptionByKohaField( kohafield => 'items.location', authorised_value => item.location ) | html %] >+ [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] >+ [% item.barcode | html %]</li>[% END %]</ul>[% END %] >+ <hr/></li>[% END %]</ol>",'email','default') }); >+ >+ say $out "Add LIST and CART notices"; >+ }, >+}; >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 665d5306e7..a7e47c3719 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -2128,7 +2128,7 @@ tables: > - "<ol>[% FOREACH biblio IN biblios %]<li>" > - "[% biblio.title | html %]" > - "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]" >- - "[% 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 %]" >+ - "[% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]" > - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]" > - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]" > - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]" >@@ -2159,7 +2159,7 @@ tables: > - "<ol>[% FOREACH biblio IN biblios %]<li>" > - "[% biblio.title | html %]" > - "[% IF ( biblio.subtitle ) %][% FOREACH subtitle IN biblio.subtitle.split(' | ') %][% subtitle | html %][% END %][% END %][% biblio.part_number | html %] [% biblio.part_name | html %]" >- - "[% 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 %]" >+ - "[% IF ( biblio.author || biblio.get_marc_contributors ) %]Author(s): [% IF ( biblio.author ) %][% biblio.author | html %][% END %][% IF ( biblio.get_marc_contributors ) %][% IF ( biblio.author ) %]; [% END %][% FOREACH author IN biblio.get_marc_contributors %][% FOREACH subfield IN author.MARCAUTHOR_SUBFIELDS_LOOP %][% subfield.separator | html %][% subfield.value | html %][% END %][% UNLESS ( loop.last ) %];[% END %][% END %][% END %][% END %]" > - "[% SET biblioitem = biblio.biblioitem %][% IF ( biblioitem.isbn ) %]ISBN: [% FOREACH isbn IN biblioitem.isbn %][% isbn | html %][% UNLESS ( loop.last ) %]; [% END %][% END %][% END %]" > - "[% IF ( biblioitem.publishercode ) %]Published by: [% biblioitem.publishercode | html %][% IF ( biblioitem.publicationyear ) %] in [% biblioitem.publicationyear | html %][% END %][% IF ( biblioitem.pages ) %], [% biblioitem.pages | html %][% END %][% END %]" > - "[% IF ( biblio.seriestitle ) %]Collection: [% biblio.seriestitle | html %][% END %]" >-- >2.30.2
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 3150
:
114127
|
114545
|
114579
|
114582
|
117237
|
118313
|
120477
|
120478
|
121026
|
121027
|
121037
|
121038
|
123020
|
123021
|
123022
|
125225
|
125226
|
125227
|
125379
|
126544
|
126545
|
126546
|
126547
|
130150
|
130151
|
130152
|
130153
|
134304
|
134305
|
134306
|
134307
|
134308
|
134477
|
137690
|
137691
|
137692
|
137693
|
137694
|
137716
|
137717
|
137718
|
137719
|
137720
|
137878
|
140246
|
140247
|
140248
|
140249
|
140250
|
140251
|
140252
|
140253
|
140254
|
140255
|
140256
|
140257
|
140258
|
140259
|
145229
|
145230
|
145231
|
145232
|
145233
|
145234
|
145676
|
145677
|
145678
|
145679
|
145680
|
145681
|
146560
|
146561
|
146562
|
146563
|
146564
|
146565
|
146566
|
146858
|
146859
|
146860
|
146861
|
146862
|
146863
|
146864
|
146865
|
146866
|
146867
|
146987
|
147423
|
147868
|
147869
|
147870
|
147871
|
147872
|
147873
|
147874
|
147875
|
147876
|
147877
|
147878
|
147879
|
147880
|
148045
|
148170
|
148171
|
148172
|
148173
|
148174
|
148175
|
148176
|
148177
|
148178
|
148179
|
148180
|
148181
|
148182
|
148183
|
148184
|
148185