[Patches] [PATCH] Bug 5347: Follow up - Fix warnings, check/uncheck all and

[koha-patchbot at kohaaloha.com]

From: Katrin Fischer <Katrin.Fischer.83 at web.de>
Date: Fri, 30 Dec 2011 01:56:21 +0100
Subject: [PATCH] Bug 5347: Follow up - Fix warnings, check/uncheck all and
 makes error message translatable

This patch fixes some minor problems found in late order management:

1) Silences 2 warns in Letters.pm
After patch is applied no more warns should show up in the logs.

2) Fixes check/uncheck all
When limiting on one vendor the checkbox in the last header column
was doing nothing. I changed the checkbox to 2 links 'check all' and
'uncheck all' as it's done in other templates.

3) Email has been sent.
The message was hardcoded into the lateorders.pl file and not translatable.
I moved it to the template and changed the wording slightly.

Note: The error message 'The bookseller has no email' comes from
Letters.pm. I didn't change that, because I was not sure where it is
used. The error message as is can not be translated and should be
moved into the templates too.
---
 C4/Letters.pm                                      |    4 ++--
 acqui/lateorders.pl                                |    2 +-
 .../prog/en/modules/acqui/lateorders.tt            |   11 +++++++----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/C4/Letters.pm b/C4/Letters.pm
index 5cde41d..5e3089b 100644
--- a/C4/Letters.pm
+++ b/C4/Letters.pm
@@ -393,7 +393,7 @@ sub SendAlerts {
                 'Content-Type' => 'text/plain; charset="utf8"',
             );
             sendmail(%mail) or carp $Mail::Sendmail::error;
-            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}";
+            warn "sending to $mail{To} From $mail{From} subj $mail{Subject} Mess $mail{Message}" if $debug;
             if ( C4::Context->preference("LetterLog") ) {
                 logaction( "ACQUISITION", "Send Acquisition claim letter", "", "order list : " . join( ",", @$externalid ) . "\n$innerletter->{title}\n$innerletter->{content}" ) if $type eq 'claimacquisition';
                 logaction( "ACQUISITION", "CLAIM ISSUE", undef, "To=" . $mail{To} . " Title=" . $innerletter->{title} . " Content=" . $innerletter->{content} ) if $type eq 'claimissues';
@@ -402,7 +402,7 @@ sub SendAlerts {
             die "This bookseller has no email\n";
         }
 
-        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}";
+        warn "sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess $innerletter->{content}" if $debug;
     }
 
     # send an "account details" notice to a newly created user
diff --git a/acqui/lateorders.pl b/acqui/lateorders.pl
index 2482ffb..998899e 100755
--- a/acqui/lateorders.pl
+++ b/acqui/lateorders.pl
@@ -85,7 +85,7 @@ if ($op and $op eq "send_alert"){
     if ( $@ ) {
         $template->param(error_claim => $@);
     } else {
-        $template->param(info_claim => "Emails have been sent");
+        $template->{VARS}->{'info_claim'} = 1;
     }
 }
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
index 8227722..5ce1fae 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
@@ -1,6 +1,7 @@
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha › Acquisitions › Late orders</title>
 [% INCLUDE 'doc-head-close.inc' %]
+<script type="text/javascript" src="[% themelang %]/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
 <script type="text/javascript">
 //<![CDATA[
 $(document).ready(function() {
@@ -12,6 +13,8 @@ $(document).ready(function() {
             $("input:checkbox[name=claim_for]").attr('disabled', false);
         }
     });
+    $('#CheckAll').click(function(){ $("#late_orders td").checkCheckboxes();});
+    $('#CheckNone').click(function(){ $("#late_orders td").unCheckCheckboxes();});
 });
 //]]>
 </script>
@@ -35,7 +38,7 @@ $(document).ready(function() {
     <div class="error">[% error_claim %]</div>
 [% END %]
 [% IF info_claim %]
-    <div class="info">[% info_claim %]</div>
+    <div class="info">Email has been sent.</div>
 [% END %]
 [% IF ( lateorders ) %]
 <form action="lateorders.pl" name="claim" method="post">
@@ -50,7 +53,7 @@ $(document).ready(function() {
 	  </select>
 	</p>
 	[% END %]
-    <table>
+    <table id="late_orders">
         <tr>
             <th>Order Date</th>
             <th>Vendor</th>
@@ -61,7 +64,7 @@ $(document).ready(function() {
             <th>Claimed date</th>
             <!-- TMPL_IF name="Supplier" -->
             [% IF Supplier %]
-                <th><input type="checkbox" id="checkAll"></th>
+                <th><a id="CheckAll" href="#">Check all</a><br /><a id="CheckNone" href="#">Uncheck all</a></th>
             [% ELSE %]
                 <th></th>
             [% END %]
@@ -103,7 +106,7 @@ $(document).ready(function() {
             <td>[% lateorder.claimed_date %]</td>
             <td>
                 [% UNLESS lateorder.budget_lock %]
-                    <input type="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
+                    <input type="checkbox" class="checkbox" name="claim_for" value="[% lateorder.ordernumber %]"  supplierid="[% lateorder.supplierid %]"/>
                 [% END %]
              </td>
             </td>
-- 
1.7.5.4