From bb1360dbeb46825fbbadc6dfa4d4229344fbd9dd Mon Sep 17 00:00:00 2001 From: wainuiwitikapark Date: Fri, 15 Nov 2024 00:57:43 +0000 Subject: [PATCH] Bug 38009: [WIP] Add a generate next button in serials receive page --- .../prog/en/includes/modals/generate_next.inc | 1 + .../intranet-tmpl/prog/en/modules/serials/serials-edit.tt | 3 +++ serials/serials-collection.pl | 8 +++++++- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc index 8d4594a76de..5895c417df1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/modals/generate_next.inc @@ -11,6 +11,7 @@ Do you really want to generate next serial? + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt index 644ce9d111c..d17cdef26b2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-edit.tt @@ -125,6 +125,9 @@ $(document).ready(function() { [% INCLUDE 'modals/serials_multi_receiving.inc' %] +
+[% INCLUDE 'modals/generate_next.inc' referrer="serials-edit" %] + [% IF internalnotes %]

Nonpublic note: [% internalnotes | html | html_line_break %]

[% END %]
[% INCLUDE 'csrf-token.inc' %] diff --git a/serials/serials-collection.pl b/serials/serials-collection.pl index 025bde2179e..99fe2e0f24e 100755 --- a/serials/serials-collection.pl +++ b/serials/serials-collection.pl @@ -48,6 +48,7 @@ my $biblionumber = $query->param('biblionumber'); my @subscriptionid = $query->multi_param('subscriptionid'); my $skip_issues = $query->param('skip_issues') || 0; my $count_forward = $skip_issues + 1; +my $referrer = $query->param('referrer'); @subscriptionid= uniq @subscriptionid; @subscriptionid= sort @subscriptionid; @@ -104,7 +105,12 @@ if($op eq 'cud-gennext' && @subscriptionid){ last if $nbissues == 1; last if HasSubscriptionExpired($subscriptionid) > 0; } - print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid); + if ($referrer eq "serials-edit") { + print $query->redirect('/cgi-bin/koha/serials/serials-edit.pl?subscriptionid='.$subscriptionid.'&serstatus=1,3'); + } + else { + print $query->redirect('/cgi-bin/koha/serials/serials-collection.pl?subscriptionid='.$subscriptionid); + } exit; } -- 2.39.5