From b6247c8729ddc394055b324d9f9bcc158a6319cb Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 7 Dec 2012 07:48:05 -0500 Subject: [PATCH] Bug 9151 - Renewal notice according to patron alert preferences - QA Followup - Fix DB Revs & Grammar --- .../data/mysql/en/mandatory/sample_notices.sql | 1 + installer/data/mysql/updatedatabase.pl | 13 +++---------- .../en/modules/admin/preferences/circulation.pref | 4 ++-- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sample_notices.sql b/installer/data/mysql/en/mandatory/sample_notices.sql index 3d48400..4a58c3b 100644 --- a/installer/data/mysql/en/mandatory/sample_notices.sql +++ b/installer/data/mysql/en/mandatory/sample_notices.sql @@ -7,6 +7,7 @@ VALUES ('circulation','ODUE','Overdue Notice','Item Overdue','Dear <> items due'), ('circulation','PREDUE','Advance Notice of Item Due','Advance Notice of Item Due','Dear <> <>,\r\n\r\nThe following item will be due soon:\r\n\r\n<>, <> (<>)'), ('circulation','PREDUEDGST','Advance Notice of Item Due (Digest)','Advance Notice of Item Due','You have <> items due soon'), +('circulation','RENEWAL','Item Renewals','Item Renewals','The following items have been renewed:\r\n----\r\n<>\r\n----\r\nThank you for visiting <>.'); ('reserves', 'HOLD', 'Hold Available for Pickup', 'Hold Available for Pickup at <>', 'Dear <> <>,\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\nLocation: <>\r\n<>\r\n<>\r\n<>\r\n<> <>'), ('reserves', 'HOLD_PRINT', 'Hold Available for Pickup (print notice)', 'Hold Available for Pickup (print notice)', '<>\r\n<>\r\n<>\r\n\r\n\r\nChange Service Requested\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <>\r\n<>\r\n<> <>\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n\r\n<> <> <>\r\n\r\nYou have a hold available for pickup as of <>:\r\n\r\nTitle: <>\r\nAuthor: <>\r\nCopy: <>\r\n'), ('circulation','CHECKIN','Item Check-in (Digest)','Check-ins','The following items have been checked in:\r\n----\r\n<>\r\n----\r\nThank you.'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a1fd570..4ea778b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6134,24 +6134,17 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } -$DBversion = "XXXX"; +$DBversion = "3.11.00.XXX"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('RenewalSendNotice', '0', '', NULL, 'YesNo')"); $dbh->do(q{ INSERT INTO `letter` (`module`, `code`, `name`, `title`, `content`) VALUES - ('circulation','RENEWAL','Item Renewal','Renewals','The following items have been renew:\r\n----\r\n<>\r\n----\r\nThank you for visiting <>.'); + ('circulation','RENEWAL','Item Renewals','Item Renewals','The following items have been renewed:\r\n----\r\n<>\r\n----\r\nThank you for visiting <>.'); }); print "Upgrade to $DBversion done (Bug 9151 - Renewal notice according to patron alert preferences)\n"; SetVersion($DBversion); } -$DBversion = "XXXX"; -if ( C4::Context->preference('Version') < TransformToNum($DBversion) ) { - $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('RenewalSendNotice', '0', '', NULL, 'YesNo')"); - print "Upgrade to $DBversion done (Bug 9151 - System preference to controll the renewal notice sending)\n"; - SetVersion($DBversion); -} - - =head1 FUNCTIONS =head2 TableExists($table) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index f121133..f32b5b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -227,8 +227,8 @@ Circulation: choices: date_due: the old due date of the checkout. now: the current date. - - - - pref: RenewalSendNotice + - + - pref: RenewalSendNotice choices: yes: Send no: "Don't send" -- 1.7.2.5