From 129bf4781f834424858be6eef8fac11511a0a42d Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer@bsz-bw.de>
Date: Fri, 17 Mar 2023 08:59:42 +0000
Subject: [PATCH] Bug 32752: Use an include for displaying the serial status in
 the OPAC

This moves the existing status in the OPAC into an include.

To test:
* Add a subscription with issues in different status
* View the OPAC detail page of the record
* Verify that in the subscription tab the status display nicely
* Veriy that More details > Full history displays the status nicely too

Sponsored-by: The Research University in the Helmholtz Association (KIT)
Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../bootstrap/en/includes/serial-status.inc         | 12 ++++++++++++
 .../opac-tmpl/bootstrap/en/modules/opac-detail.tt   | 13 +------------
 .../bootstrap/en/modules/opac-full-serial-issues.tt | 13 +------------
 3 files changed, 14 insertions(+), 24 deletions(-)
 create mode 100644 koha-tmpl/opac-tmpl/bootstrap/en/includes/serial-status.inc

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/serial-status.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/serial-status.inc
new file mode 100644
index 0000000000..456171ecf2
--- /dev/null
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/serial-status.inc
@@ -0,0 +1,12 @@
+[% IF ( serial.status1 ) %]<span>Expected</span>[% END %]
+[% IF ( serial.status2 ) %]<span>Arrived</span>[% END %]
+[% IF ( serial.status3 ) %]<span>Late</span>[% END %]
+[% IF ( serial.status4 ) %]<span>Missing</span>[% END %]
+    [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %]
+    [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %]
+    [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %]
+    [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %]
+[% IF ( serial.status5 ) %]<span>Not available</span>[% END %]
+[% IF ( serial.status6 ) %]<span>Delete</span>[% END %]
+[% IF ( serial.status7 ) %]<span>Claimed</span>[% END %]
+[% IF ( serial.status8 ) %]<span>Stopped</span>[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index ae49613297..4ef51c19c4 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -767,18 +767,7 @@
                                                             <td class="publisheddate" data-order="[% latestserial.publisheddate | html %]">[% latestserial.publisheddate | $KohaDates %]</td>
                                                             <td class="planneddate" data-order="[% latestserial.planneddate | html %]">[% latestserial.planneddate | $KohaDates %]</td>
                                                             <td class="serial_status">
-                                                                [% IF (latestserial.status1 ) %]<span>Expected</span>[% END %]
-                                                                [% IF (latestserial.status2 ) %]<span>Arrived</span>[% END %]
-                                                                [% IF (latestserial.status3 ) %]<span>Late</span>[% END %]
-                                                                [% IF (latestserial.status4 ) %]<span>Missing</span>[% END %]
-                                                                    [% IF (latestserial.status41 ) %]<span>Missing (never received)</span>[% END %]
-                                                                    [% IF (latestserial.status42 ) %]<span>Missing (sold out)</span>[% END %]
-                                                                    [% IF (latestserial.status43 ) %]<span>Missing (damaged)</span>[% END %]
-                                                                    [% IF (latestserial.status44 ) %]<span>Missing (lost)</span>[% END %]
-                                                                [% IF (latestserial.status5 ) %]<span>Not issued</span>[% END %]
-                                                                [% IF (latestserial.status6 ) %]<span>Delete</span>[% END %]
-                                                                [% IF (latestserial.status7 ) %]<span>Claimed</span>[% END %]
-                                                                [% IF (latestserial.status8 ) %]<span>Stopped</span>[% END %]
+                                                                [% INCLUDE 'serial-status.inc' serial = latestserial %]
                                                             </td>
                                                             <td class="serial_notes">[% latestserial.notes | html %]</td>
                                                         </tr>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
index 3b24ba9087..758dfcbeec 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-full-serial-issues.tt
@@ -165,18 +165,7 @@
                                                 </td>
                                                 <td>[% serial.serialseq | html %]</td>
                                                 <td>
-                                                    [% IF ( serial.status1 ) %]<span>Expected</span>[% END %]
-                                                    [% IF ( serial.status2 ) %]<span>Arrived</span>[% END %]
-                                                    [% IF ( serial.status3 ) %]<span>Late</span>[% END %]
-                                                    [% IF ( serial.status4 ) %]<span>Missing</span>[% END %]
-                                                        [% IF ( serial.status41 ) %]<span>Missing (never received)</span>[% END %]
-                                                        [% IF ( serial.status42 ) %]<span>Missing (sold out)</span>[% END %]
-                                                        [% IF ( serial.status43 ) %]<span>Missing (damaged)</span>[% END %]
-                                                        [% IF ( serial.status44 ) %]<span>Missing (lost)</span>[% END %]
-                                                    [% IF ( serial.status5 ) %]<span>Not available</span>[% END %]
-                                                    [% IF ( serial.status6 ) %]<span>Delete</span>[% END %]
-                                                    [% IF ( serial.status7 ) %]<span>Claimed</span>[% END %]
-                                                    [% IF ( serial.status8 ) %]<span>Stopped</span>[% END %]
+                                                    [% INCLUDE 'serial-status.inc' serial = serial %]
                                                 </td>
                                                 <td class="subscriptionidfilterclass">[% serial.subscriptionid | html %]</td>
                                             </tr>
-- 
2.39.5