From 54944bd10299d8af3c698d50ac75839af45fa300 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 18 Apr 2018 15:11:47 -0300 Subject: [PATCH] Bug 7910: Give feedack when the subscriptions have been renewed MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This patch adds a message to the user to let them know the subscription have been renewed successfully. Signed-off-by: SÃ©verine QUEUNE Signed-off-by: Jonathan Druart --- .../en/modules/serials/checkexpiration.tt | 9 +++--- .../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'); - } [% 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 @@

-[% IF op == 'renew' %] - Subscription renewed. - - +[% IF op == 'renew' OR op =='multi_renew' %] + [% IF op == 'renew' %] + Subscription renewed. + [% ELSE %] + Subscriptions renewed. + [% END %] + +

+ Close +

[% ELSE %]