View | Details | Raw Unified | Return to bug 7910
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-4 / +5 lines)
Lines 136-142 Link Here
136
            $(".renew_subscription").on("click",function(e){
136
            $(".renew_subscription").on("click",function(e){
137
                e.preventDefault();
137
                e.preventDefault();
138
                var subscriptionid = $(this).data("subscriptionid");
138
                var subscriptionid = $(this).data("subscriptionid");
139
                popup( subscriptionid );
139
                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');
140
            });
141
            $('a.itemselection_action_renew').on("click", function(e){
142
                e.preventDefault();
143
                newin=window.open($(this).attr('href'),'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
140
            });
144
            });
141
            function itemSelectionBuildRenewLink() {
145
            function itemSelectionBuildRenewLink() {
142
                var subscription_ids= new Array();
146
                var subscription_ids= new Array();
Lines 176-184 Link Here
176
            });
180
            });
177
181
178
        });
182
        });
179
        function popup(subscriptionid) {
180
           newin=window.open("subscription-renew.pl?mode=popup&subscriptionid="+subscriptionid,'popup','width=590,height=440,toolbar=false,scrollbars=yes,resize=yes');
181
        }
182
    </script>
183
    </script>
183
[% END %]
184
[% END %]
184
185
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt (-11 / +19 lines)
Lines 11-26 Link Here
11
<body id="ser_subscription-renew" class="ser">
11
<body id="ser_subscription-renew" class="ser">
12
    <div class="container-fluid">
12
    <div class="container-fluid">
13
13
14
[% IF op == 'renew' %]
14
[% IF op == 'renew' OR op =='multi_renew' %]
15
  Subscription renewed.
15
    [% IF op == 'renew' %]
16
  
16
        <span>Subscription renewed.<span>
17
<script type="text/javascript">
17
    [% ELSE %]
18
//<![CDATA[
18
        <span>Subscriptions renewed.<span>
19
  //opener.document.location.reload();
19
    [% END %]
20
  window.opener.location.reload(false);
20
21
  self.close();
21
    <div id="closewindow">
22
  //]]>
22
        <a class="btn btn-default btn-default close" href="#">Close</a>
23
</script>
23
    </div>
24
[% ELSE %]
24
[% ELSE %]
25
      <div id="bd">
25
      <div id="bd">
26
<form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
26
<form name="f" action="/cgi-bin/koha/serials/subscription-renew.pl" method="post">
Lines 46-51 Link Here
46
46
47
[% MACRO jsinclude BLOCK %]
47
[% MACRO jsinclude BLOCK %]
48
    [% INCLUDE 'calendar.inc' %]
48
    [% INCLUDE 'calendar.inc' %]
49
    <script type="text/javascript">
50
        $(document).ready(function(){
51
            $(".close").on("click", function(e){
52
                e.preventDefault();
53
                window.opener.location.reload(false);
54
                self.close();
55
            });
56
        });
57
    </script>
49
[% END %]
58
[% END %]
50
59
51
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
60
[% INCLUDE 'intranet-bottom.inc' popup_window=1 %]
52
- 

Return to bug 7910