From e7511c343fdd2b57cefc76d0e5f2bb90cae7dc23 Mon Sep 17 00:00:00 2001
From: Chris Sharp <csharp@georgialibraries.org>
Date: Mon, 15 Aug 2016 14:13:02 -0400
Subject: [PATCH] LP#1306666 - Set item status to 'Canceled Transit' when
 transit is canceled.

I opened a separate bug report on this issue (bug 1613374) before realizing
bug 1306666 was reported.  This commit creates a new 'Canceled Transit' status
that signals to staff what happened to an item when a transit is aborted/canceled.

Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
---
 Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm    | 9 ++-------
 Open-ILS/src/perlmods/lib/OpenILS/Const.pm                       | 2 +-
 Open-ILS/src/sql/Pg/950.data.seed-values.sql                     | 1 +
 .../sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql    | 7 +++++++
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
index 22074384d3..f5bee54dea 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Circ/Transit.pm
@@ -239,18 +239,13 @@ sub __abort_transit {
         return $e->die_event unless $e->allowed('ABORT_REMOTE_TRANSIT', $e->requestor->ws_ou);
     }
 
-    # recover the copy status
-    $copy->status( $transit->copy_status );
+    # set the copy status to "Canceled Transit"
+    $copy->status( OILS_COPY_STATUS_CANCELED_TRANSIT );
     $copy->editor( $e->requestor->id );
     $copy->edit_date('now');
 
     my $holdtransit = $e->retrieve_action_hold_transit_copy($transit->id);
 
-    if( $holdtransit ) {
-        $logger->info("setting copy to reshelving on hold transit abort");
-        $copy->status( OILS_COPY_STATUS_RESHELVING );
-    }
-
     return $e->die_event unless $e->delete_action_transit_copy($transit);
     return $e->die_event unless $e->update_asset_copy($copy);
 
diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
index cd82e83c5c..c568d89e1e 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Const.pm
@@ -44,7 +44,7 @@ econst OILS_COPY_STATUS_DAMAGED       => 14;
 econst OILS_COPY_STATUS_ON_RESV_SHELF => 15;
 econst OILS_COPY_STATUS_LONG_OVERDUE  => 16;
 econst OILS_COPY_STATUS_LOST_AND_PAID => 17;
-
+econst OILS_COPY_STATUS_CANCELED_TRANSIT => 18;
 
 # ---------------------------------------------------------------------
 # Circ defaults for pre-cataloged copies
diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index c8960b1f22..43cedb1f7c 100644
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -328,6 +328,7 @@ INSERT INTO config.copy_status
 INSERT INTO config.copy_status
 (id, name, holdable, opac_visible, copy_active, restrict_copy_delete)
 VALUES (17, 'Lost and Paid', FALSE, FALSE, FALSE, TRUE);
+INSERT INTO config.copy_status(id,name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
 
 
 SELECT SETVAL('config.copy_status_id_seq'::TEXT, 100);
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
new file mode 100644
index 0000000000..0ce261eb23
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.canceled-transit-item-status.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+INSERT INTO config.copy_status (id, name) VALUES (18,oils_i18n_gettext(18, 'Canceled Transit', 'ccs', 'name'));
+
+COMMIT;
-- 
2.11.0