http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=6810
--- Comment #69 from M. Tompsett <[email protected]> --- Comment on attachment 40667 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=40667 Bug 6810: Squashed Amit Gupta's patches Review of attachment 40667: --> (http://bugs.koha-community.org/bugzilla3/page.cgi?id=splinter.html&bug=6810&attachment=40667) ----------------------------------------------------------------- ::: C4/Members.pm @@ +42,4 @@ > use Koha::AuthUtils qw(hash_password); > use Koha::Database; > use Module::Load; > +use DateTime::Duration; Why make it more complex here... @@ +1491,4 @@ > > sub GetUpcomingMembershipExpires { > my $dbh = C4::Context->dbh; > + my $days = DateTime::Duration->new(days => > C4::Context->preference("MembershipExpiryDaysNotice") || 0); and here... @@ +1491,5 @@ > > sub GetUpcomingMembershipExpires { > my $dbh = C4::Context->dbh; > + my $days = DateTime::Duration->new(days => > C4::Context->preference("MembershipExpiryDaysNotice") || 0); > + my $dateexpiry = output_pref({ dt => (dt_from_string() + $days), > dateformat => 'iso', dateonly => 1 }); -- Why not keep the ->add(days => $days): my $dateexpiry = output_pref({ dt => (dt_from_string()->add( days => $days)), dateformat => 'iso', dateonly => 1 }); -- dt_from_string passes back a DateTime object, just like DateTime->now(). -- Though, this gives me an idea to improve one of my patches. DOH! @@ -1489,5 @@ > > sub GetUpcomingMembershipExpires { > my $dbh = C4::Context->dbh; > - my $days = C4::Context->preference("MembershipExpiryDaysNotice") || 0; > - my $dateexpiry = DateTime->now()->add(days => $days)->ymd(); ... if the ->add(days => $days) part was working here? ::: installer/data/mysql/de-DE/mandatory/sample_notices.sql @@ +136,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Benachrichtigung bei > Zugang', 'Bestelltes Medium ist eingetroffen', 'Liebe/r > <<borrowers.firstname>> <<borrowers.surname>>,\n\nDie Bestellung > <<aqorders.ordernumber>> (<<biblio.title>>) ist eingetroffen und wird > bearbeitet.\n\nIhr Bibliotheksteam', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) Why did you exclude the message_transport_type? Plus, if you added is_html to the INSERT above this one (and added the appropriate default value of 0 in the VALUES list), you could have used commas, instead of a whole new INSERT. ::: installer/data/mysql/en/mandatory/sample_notices.sql @@ +155,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email') > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/es-ES/mandatory/sample_notices.sql @@ +150,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/fr-FR/1-Obligatoire/sample_notices.sql @@ +151,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/it-IT/necessari/notices.sql @@ +148,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/nb-NO/1-Obligatorisk/sample_notices.sql @@ +170,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/pl-PL/mandatory/sample_notices.sql @@ +148,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/ru-RU/mandatory/sample_notices.sql @@ +150,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: installer/data/mysql/uk-UA/mandatory/sample_notices.sql @@ +149,5 @@ > > INSERT INTO letter(module, code, branchcode, name, title, content, > message_transport_type) > +VALUES ('acquisition', 'ACQ_NOTIF_ON_RECEIV', '', 'Notification on > receiving', 'Order received', 'Dear <<borrowers.firstname>> > <<borrowers.surname>>,\n\n The order <<aqorders.ordernumber>> > (<<biblio.title>>) has been received.\n\nYour library.', 'email'); > + > +INSERT INTO letter(module, code, branchcode, name, title, is_html, content) As above. ::: misc/cronjobs/membership_expiry.pl @@ +30,5 @@ > +0 1 * * * membership_expiry.pl -c > + > +=head1 DESCRIPTION > + > +This script send memberships expires reminder notices to be sent to This script sends membership expiry reminder notices to patrons. @@ +31,5 @@ > + > +=head1 DESCRIPTION > + > +This script send memberships expires reminder notices to be sent to > +patrons. It queues them in the message queue, which is processed by It queues them in the message queue, which is processed by -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] http://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
