From b6bfec5b7a26a17c649ce3aef9fa782a06cd3471 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Fri, 9 Mar 2012 12:21:23 +0100
Subject: [PATCH 2/2] Bug 5342: Followup: Delete all occurrences of preview

This feature is useless, apparently not used.
---
 .../prog/en/modules/serials/claims.tt              |   88 ++------------------
 serials/claims.pl                                  |   36 ++++-----
 2 files changed, 22 insertions(+), 102 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
index 520f031..3c10eef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tt
@@ -6,13 +6,13 @@
 <script type="text/JavaScript" language="JavaScript">
 //<![CDATA[
 	 $(document).ready(function() {
-		[% UNLESS ( preview ) %]$("#claimst").tablesorter({[% IF ( dateformat == 'metric' ) %]
-			dateFormat: 'uk',[% END %]
-			headers: { 0: { sorter: false },1:{sorter:false}}
-		});[% END %]
-	    $('#supplierid').change(function() {
-    	    $('#claims').submit();
-	    });
+        $("#claimst").tablesorter({[% IF ( dateformat == 'metric' ) %]
+            dateFormat: 'uk',[% END %]
+            headers: { 0: { sorter: false },1:{sorter:false}}
+        });
+        $('#supplierid').change(function() {
+            $('#claims').submit();
+        });
 
 	    // Case-insensitive version of jquery's contains function
 	    jQuery.extend(
@@ -138,24 +138,16 @@
 	    $("table#claimst tbody tr").show();
 	}
 
-	function popup(supplierid,serialid){
-		window.open('claims.pl?supplierid='+ supplierid +'&amp;serialid='+ serialid +'&amp;op=preview' ,'popup', 'width=600,height=400,toolbar=no,scrollbars=yes');
-	}
-
 //]]>
 </script>
 [% INCLUDE 'calendar.inc' %]
 </head>
 <body id="ser_claims" class="ser">
     [% INCLUDE 'header.inc' %]
-[% UNLESS ( preview ) %]
     [% INCLUDE 'serials-search.inc' %]
-[% END %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/serials/serials-home.pl">Serials</a> &rsaquo; Claims</div>
 
-[% UNLESS ( preview ) %]
-
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
@@ -338,77 +330,11 @@
     </fieldset>
 [% END %]
 
-[% ELSE %]
-
-<div id="doc" class="yui-t7">
-   <div id="bd">
-	
-[% IF ( supplierloop ) %]
-        [% FOREACH supplierloo IN supplierloop %]
-        [% IF ( supplierloo.name ) %]
-        <p><b>[% supplierloo.name %]</b><br />
-        [% END %]
-        [% IF ( supplierloo.postal ) %]
-        [% supplierloo.postal %]<br />
-        [% END %]
-        [% IF ( supplierloo.contphone ) %]
-        Ph: [% supplierloo.contphone %]<br />
-        [% END %]
-        [% IF ( supplierloo.contfax ) %]
-        Fax: [% supplierloo.contfax %]<br />
-        [% END %]
-        [% IF ( supplierloo.contemail ) %]
-        Email: [% supplierloo.contemail %]<br />
-        [% END %]
-        [% IF ( supplierloo.accountnumber ) %]
-        A/C: [% supplierloo.accountnumber %]</p>
-        [% END %]
-        [% IF ( supplierloo.contact ) %]
-        <p>Dear [% supplierloo.contact %]</p>
-        [% ELSE %]
-        <p>To whom it may concern</p>
-        [% END %]
-        <p>The following items have not been received from you and are now considered missing:</p>
-        [% END %]
-[% END %]
-        [% IF ( missingissues ) %]
-        <h3>Missing issues</h3>
-        <table>
-            <tr>
-                <td><b>Vendor<b></td>
-                <td><b>Title</b></td>
-                <td><b>Issue number</b></td>
-                <td><b>Missing since</b></td>
-            </tr>
-            [% FOREACH missingissue IN missingissues %]
-                <tr>
-                    <td>
-                    [% missingissue.name %]
-                    </td>
-                    <td>
-                    [% missingissue.Title |html %]
-                    </td>
-                    <td>
-                    [% missingissue.serialseq %]
-                    </td>
-                    <td>
-                    [% missingissue.planneddate %]
-                    </td>
-                </tr>
-            [% END %]
-        </table>
-        [% END %]
-
-<p class="noprint"><a href="#" onclick="window.print(); return false;">Print</a> &nbsp; <a href="#" class="close">Close</a></p>
-[% END %]
-
 </div>
 </div>
 
-[% UNLESS ( preview ) %]
 <div class="yui-b">
 [% INCLUDE 'serials-menu.inc' %]
 </div>
-[% END %]
 </div>
 [% INCLUDE 'intranet-bottom.inc' %]
diff --git a/serials/claims.pl b/serials/claims.pl
index 70fc5c2..5aed884 100755
--- a/serials/claims.pl
+++ b/serials/claims.pl
@@ -59,26 +59,21 @@ for my $s (@{$supplierlist} ) {
 my $branchloop = GetBranchesLoop();
 unshift @$branchloop, {value=> 'all',name=>''};
 
-my $preview=0;
-if($op && $op eq 'preview'){
-    $preview = 1;
-} else {
-    my @serialnums=$input->param('serialid');
-    if (@serialnums) { # i.e. they have been flagged to generate claims
-        my $err;
-        eval {
-            $err = SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
-            if ( not ref $err or not exists $err->{error} ) {
-               UpdateClaimdateIssues(\@serialnums);
-            }
-        };
-        if ( $@ ) {
-            $template->param(error_claim => $@);
-        } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
-            $template->{VARS}->{'error_claim'} = "no_email";
-        } else {
-            $template->{VARS}->{'info_claim'} = 1;
+my @serialnums=$input->param('serialid');
+if (@serialnums) { # i.e. they have been flagged to generate claims
+    my $err;
+    eval {
+        $err = SendAlerts('claimissues',\@serialnums,$input->param("letter_code"));
+        if ( not ref $err or not exists $err->{error} ) {
+           UpdateClaimdateIssues(\@serialnums);
         }
+    };
+    if ( $@ ) {
+        $template->param(error_claim => $@);
+    } elsif ( ref $err and exists $err->{error} and $err->{error} eq "no_email" ) {
+        $template->{VARS}->{'error_claim'} = "no_email";
+    } else {
+        $template->{VARS}->{'info_claim'} = 1;
     }
 }
 
@@ -102,13 +97,12 @@ $template->param(
         phone => $supplierinfo[0]->{phone},
         booksellerfax => $supplierinfo[0]->{booksellerfax},
         bookselleremail => $supplierinfo[0]->{bookselleremail},
-        preview => $preview,
         missingissues => \@missingissues,
         supplierid => $supplierid,
         claimletter => $claimletter,
         supplierloop => \@supplierinfo,
         branchloop   => $branchloop,
         dateformat    => C4::Context->preference("dateformat"),
-    	DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
+        DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
         );
 output_html_with_http_headers $input, $cookie, $template->output;
-- 
1.7.7.3