From c76f13ee88b09cce735977e87f0f1da9f719e00d Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 18 Apr 2018 15:11:47 -0300
Subject: [PATCH] Bug 7910: Give feedack when the subscriptions have been
 renewed - useless?

This patch adds a message to the user to let them know the subscription
have been renewed successfully.
---
 .../prog/en/modules/serials/checkexpiration.tt     |  9 ++++---
 .../prog/en/modules/serials/subscription-renew.tt  | 29 ++++++++++++++--------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
index d2bf124cc9..a828f7012e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt
@@ -136,7 +136,11 @@
             $(".renew_subscription").on("click",function(e){
                 e.preventDefault();
                 var subscriptionid = $(this).data("subscriptionid");
-                popup( subscriptionid );
+                newin=window.open("/cgi-bin/koha/serials/subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
+            });
+            $('a.itemselection_action_renew').on("click", function(e){
+                e.preventDefault();
+                newin=window.open($(this).attr('href'),'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
             });
             function itemSelectionBuildRenewLink() {
                 var subscription_ids= new Array();
@@ -176,9 +180,6 @@
             });
 
         });
-        function popup(subscriptionid) {
-           newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
-        }
     </script>
 [% END %]
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
index 3639e57961..4a5fd2c285 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt
@@ -11,16 +11,16 @@
 <body id="ser_subscription-renew" class="ser">
     <div class="container-fluid">
 
-[% IF op == 'renew' %]
-  Subscription renewed.
-  
-<script type="text/javascript">
-//<![CDATA[
-  //opener.document.location.reload();
-  window.opener.location.reload(false);
-  self.close();
-  //]]>
-</script>
+[% IF op == 'renew' OR op =='multi_renew' %]
+    [% IF op == 'renew' %]
+        <span>Subscription renewed.<span>
+    [% ELSE %]
+        <span>Subscriptions renewed.<span>
+    [% END %]
+
+    <div id="closewindow">
+        <a class="btn btn-default btn-default close" href="#">Close</a>
+    </div>
 [% ELSE %]
       <div id="bd">
 <form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
@@ -46,6 +46,15 @@
 
 [% MACRO jsinclude BLOCK %]
     [% INCLUDE 'calendar.inc' %]
+    <script type="text/javascript">
+        $(document).ready(function(){
+            $(".close").on("click", function(e){
+                e.preventDefault();
+                window.opener.location.reload(false);
+                self.close();
+            });
+        });
+    </script>
 [% END %]
 
 [% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
-- 
2.11.0