Bugzilla – Attachment 134308 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) Fixing errors and notices
Bug-3150-follow-up-Fixing-errors-and-notices.patch (text/plain), 7.52 KB, created by
Aleisha Amohia
on 2022-04-28 22:14:02 UTC
(
hide
)
Description:
Bug 3150: (follow-up) Fixing errors and notices
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2022-04-28 22:14:02 UTC
Size:
7.52 KB
patch
obsolete
>From de5e933fb585d88f3b3a9790395bf4a2065aa1f8 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Thu, 28 Apr 2022 22:11:49 +0000 >Subject: [PATCH] Bug 3150: (follow-up) Fixing errors and notices > >--- > basket/sendbasket.pl | 2 +- > .../mysql/atomicupdate/bug_3150_-_add_LIST_and_CART_notices.perl | 4 ++-- > installer/data/mysql/en/mandatory/sample_notices.yml | 8 ++++---- > installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql | 4 ++-- > opac/opac-sendbasket.pl | 2 +- > opac/opac-sendshelf.pl | 1 + > virtualshelves/sendshelf.pl | 2 +- > 7 files changed, 12 insertions(+), 11 deletions(-) > >diff --git a/basket/sendbasket.pl b/basket/sendbasket.pl >index e15a9a1067..ae4d6e6d9e 100755 >--- a/basket/sendbasket.pl >+++ b/basket/sendbasket.pl >@@ -65,7 +65,7 @@ if ( $email_add ) { > my $iso2709; > > foreach my $bib ( @bibs ) { >- my $biblio = Koha::Biblios->find( $biblionumber ) or next; >+ my $biblio = Koha::Biblios->find( $bib ) or next; > $iso2709 .= $biblio->metadata->record->as_usmarc(); > } > >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 >index efa111b2b7..3e97bba684 100644 >--- 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 >@@ -1,7 +1,7 @@ > $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 >-('catalog','LIST','','Send list',0,'Your list: [% listname | html %]',"Hi, >+('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/> >@@ -25,7 +25,7 @@ Please note that the attached file is a MARC bibliographic records file which ca > [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] > [% item.barcode | html %]</li>[% END %]</ul>[% END %] > <hr/></li>[% END %]</ol>", 'email','default' ), >- ('catalog','CART','','Send cart',0,'Your cart',"Hi, >+ ('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/> >diff --git a/installer/data/mysql/en/mandatory/sample_notices.yml b/installer/data/mysql/en/mandatory/sample_notices.yml >index 5fc591425a..1ca20fcfb9 100644 >--- a/installer/data/mysql/en/mandatory/sample_notices.yml >+++ b/installer/data/mysql/en/mandatory/sample_notices.yml >@@ -1633,11 +1633,11 @@ tables: > - "Waiting since: <<recalls.waitingdate>>" > - "Notes: <<recalls.recallnotes>>" > >- - module: catalog >+ - module: catalogue > code: LIST > branchcode: "" > name: "Send list" >- is_html: 0 >+ is_html: 1 > title: "Your list: [% listname | html %]" > message_transport_type: email > lang: default >@@ -1663,11 +1663,11 @@ tables: > - "[% 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 %]" > - "<hr/></li>[% END %]</ol>" > >- - module: catalog >+ - module: catalogue > code: CART > branchcode: "" > name: "Send cart" >- is_html: 0 >+ is_html: 1 > title: "Your cart" > message_transport_type: email > lang: default >diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >index 0be5a30552..6e856b6754 100644 >--- a/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >+++ b/installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql >@@ -504,7 +504,7 @@ INSERT IGNORE INTO letter (module, code, name, title, content, message_transport > [% END %] > ", 'email'); > >-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, >+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/> >@@ -528,7 +528,7 @@ Please note that the attached file is a MARC bibliographic records file which ca > [% IF item.itemcallnumber %]([% item.itemcallnumber | html %])[% END %] > [% item.barcode | html %]</li>[% END %]</ul>[% END %] > <hr/></li>[% END %]</ol>", 'email','default' ), >- ('catalog','CART','','Send cart',0,'Your cart',"Hi, >+ ('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/> >diff --git a/opac/opac-sendbasket.pl b/opac/opac-sendbasket.pl >index 179930e39c..0d6a59883e 100755 >--- a/opac/opac-sendbasket.pl >+++ b/opac/opac-sendbasket.pl >@@ -66,7 +66,7 @@ if ( $email_add ) { > my $iso2709; > > foreach my $bib ( @bibs ) { >- my $biblio = Koha::Biblios->find( $biblionumber ) or next; >+ my $biblio = Koha::Biblios->find( $bib ) or next; > $iso2709 .= $biblio->metadata->record->as_usmarc(); > }; > >diff --git a/opac/opac-sendshelf.pl b/opac/opac-sendshelf.pl >index acbe9a6465..bc466e2584 100755 >--- a/opac/opac-sendshelf.pl >+++ b/opac/opac-sendshelf.pl >@@ -78,6 +78,7 @@ if ( $shelf and $shelf->can_be_viewed( $borrowernumber ) ) { > my $contents = $shelf->get_contents; > my $iso2709; > >+ my @biblionumbers; > while ( my $content = $contents->next ) { > push @biblionumbers, $content->biblionumber; > my $biblio = Koha::Biblios->find($content->biblionumber); >diff --git a/virtualshelves/sendshelf.pl b/virtualshelves/sendshelf.pl >index f147af25a9..daa5ef6771 100755 >--- a/virtualshelves/sendshelf.pl >+++ b/virtualshelves/sendshelf.pl >@@ -69,7 +69,7 @@ if ($to_address) { > } > ); > >- my $patron = Koha:::Patrons->find( $borrowernumber ); >+ my $patron = Koha::Patrons->find( $borrowernumber ); > my $user_email = $patron->first_valid_email_address; > my $contents = $shelf->get_contents; > my @biblionumbers; >-- >2.11.0
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