Attachment 125006 Details for Bug 27947 – Bug 27947: (follow-up) Add OPAC cancellation as new reason too

[patch] Bug 27947: (follow-up) Add OPAC cancellation as new reason too

Bug-27947-follow-up-Add-OPAC-cancellation-as-new-r.patch (text/plain), 6.78 KB, created by Martin Renvoize (ashimema) on 2021-09-17 16:16:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2021-09-17 16:16:30 UTC

Size: 6.78 KB

patch

obsolete

>From e0da4cfc6b4bb73622ea2a2d84aacaee709f152a Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 17 Sep 2021 09:06:08 +0000
>Subject: [PATCH] Bug 27947: (follow-up) Add OPAC cancellation as new reason
> too
>
>Something that currently comes up now already too:
>If the user cancels from the OPAC page, there is no reason in the notice.
>We could simply add one now.
>
>Test plan:
>Run dbrev to add the OPAC authval.
>Create new AR and cancel it from OPAC.
>Verify notice created for the user.
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> installer/data/mysql/atomicupdate/bug_27947.pl            | 8 ++++----
> installer/data/mysql/en/optional/auth_val.yml             | 4 ++++
> installer/data/mysql/fr-CA/facultatif/auth_val.sql        | 3 ++-
> .../data/mysql/fr-FR/1-Obligatoire/authorised_values.sql  | 3 ++-
> installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql       | 3 ++-
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt     | 2 +-
> 6 files changed, 15 insertions(+), 8 deletions(-)
>
>diff --git a/installer/data/mysql/atomicupdate/bug_27947.pl b/installer/data/mysql/atomicupdate/bug_27947.pl
>index 3905db87f0..de4eaf3404 100755
>--- a/installer/data/mysql/atomicupdate/bug_27947.pl
>+++ b/installer/data/mysql/atomicupdate/bug_27947.pl
>@@ -13,10 +13,10 @@ return {
>         say $out "Add AR_CANCELLATION category for authorised values";
> 
>         $dbh->do(q{
>-            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
>-        });
>-        $dbh->do(q{
>-            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>+            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES
>+                ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves'),
>+                ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request'),
>+                ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page')
>         });
>         say $out "Add AR_CANCELLATION authorised values";
> 
>diff --git a/installer/data/mysql/en/optional/auth_val.yml b/installer/data/mysql/en/optional/auth_val.yml
>index d2497d79db..6612ae4134 100644
>--- a/installer/data/mysql/en/optional/auth_val.yml
>+++ b/installer/data/mysql/en/optional/auth_val.yml
>@@ -309,3 +309,7 @@ tables:
>         - category: "AR_CANCELLATION"
>           authorised_value: "DAMAGED"
>           lib: "Item was found to be too damaged to fill article request"
>+
>+        - category: "AR_CANCELLATION"
>+          authorised_value: "OPAC"
>+          lib: "Cancelled from the OPAC user page"
>diff --git a/installer/data/mysql/fr-CA/facultatif/auth_val.sql b/installer/data/mysql/fr-CA/facultatif/auth_val.sql
>index c424c3a6c9..b03795e3c9 100644
>--- a/installer/data/mysql/fr-CA/facultatif/auth_val.sql
>+++ b/installer/data/mysql/fr-CA/facultatif/auth_val.sql
>@@ -93,4 +93,5 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA
> 
> -- article request cancellation
> INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
>-INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>\ No newline at end of file
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
>diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql
>index 8c70ff0602..fc305ca654 100644
>--- a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql
>+++ b/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql
>@@ -727,4 +727,5 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA
> 
> -- article request cancellation
> INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
>-INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>\ No newline at end of file
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
>diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
>index 86a502d448..f4e7001e3b 100644
>--- a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
>+++ b/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql
>@@ -112,4 +112,5 @@ INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA
> 
> -- article request cancellation
> INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
>-INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>\ No newline at end of file
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
>+INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>index 7d4464d4e3..e65f5af9bc 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt
>@@ -879,7 +879,7 @@
>                         if( result ){
>                             $.ajax({
>                                 type: "DELETE",
>-                                url: '/api/v1/public/patrons/'+borrowernumber+'/article_requests/'+article_request_id,
>+                                url: '/api/v1/public/patrons/'+borrowernumber+'/article_requests/'+article_request_id+'?cancellation_reason=OPAC',
>                                 success: function( data ) {
>                                     row.parents('tr').hide({
>                                         duration: 'slow',
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 27947: 124063 | 124064 | 124065 | 124849 | 124850 | 124851 | 124952 | 124953 | 124954 | 124955 | 124956 | 124993 | 124994 | 124995 | 124996 | 124997 | 124998 | 124999 | 125002 | 125003 | 125004 | 125005 | 125006 | 125007 | 125008 | 125009 | 125010 | 125016 | 125038 | 125039 | 125040 | 125041 | 125042 | 125043 | 125044 | 125045 | 125046 | 125047 | 125165 | 125166 | 125167 | 125168 | 125169 | 125170 | 125171 | 125172 | 125173 | 125174 | 125739 | 125740