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

(-)a/installer/data/mysql/atomicupdate/bug_27947.pl (-4 / +4 lines)
Lines 13-22 return { Link Here
13
        say $out "Add AR_CANCELLATION category for authorised values";
13
        say $out "Add AR_CANCELLATION category for authorised values";
14
14
15
        $dbh->do(q{
15
        $dbh->do(q{
16
            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
16
            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES
17
        });
17
                ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves'),
18
        $dbh->do(q{
18
                ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request'),
19
            INSERT IGNORE INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
19
                ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page')
20
        });
20
        });
21
        say $out "Add AR_CANCELLATION authorised values";
21
        say $out "Add AR_CANCELLATION authorised values";
22
22
(-)a/installer/data/mysql/en/optional/auth_val.yml (+4 lines)
Lines 309-311 tables: Link Here
309
        - category: "AR_CANCELLATION"
309
        - category: "AR_CANCELLATION"
310
          authorised_value: "DAMAGED"
310
          authorised_value: "DAMAGED"
311
          lib: "Item was found to be too damaged to fill article request"
311
          lib: "Item was found to be too damaged to fill article request"
312
313
        - category: "AR_CANCELLATION"
314
          authorised_value: "OPAC"
315
          lib: "Cancelled from the OPAC user page"
(-)a/installer/data/mysql/fr-CA/facultatif/auth_val.sql (-1 / +2 lines)
Lines 93-96 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA Link Here
93
93
94
-- article request cancellation
94
-- article request cancellation
95
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
95
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
96
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
96
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
97
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
(-)a/installer/data/mysql/fr-FR/1-Obligatoire/authorised_values.sql (-1 / +2 lines)
Lines 727-730 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA Link Here
727
727
728
-- article request cancellation
728
-- article request cancellation
729
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
729
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
730
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
730
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
731
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
(-)a/installer/data/mysql/nb-NO/2-Valgfritt/auth_val.sql (-1 / +2 lines)
Lines 112-115 INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('HOLD_CA Link Here
112
112
113
-- article request cancellation
113
-- article request cancellation
114
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
114
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','NOT_FOUND','Item could not be located on shelves');
115
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
115
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','DAMAGED','Item was found to be too damaged to fill article request');
116
INSERT INTO authorised_values (category, authorised_value, lib) VALUES ('AR_CANCELLATION','OPAC','Cancelled from the OPAC user page');
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +1 lines)
Lines 879-885 Link Here
879
                        if( result ){
879
                        if( result ){
880
                            $.ajax({
880
                            $.ajax({
881
                                type: "DELETE",
881
                                type: "DELETE",
882
                                url: '/api/v1/public/patrons/'+borrowernumber+'/article_requests/'+article_request_id,
882
                                url: '/api/v1/public/patrons/'+borrowernumber+'/article_requests/'+article_request_id+'?cancellation_reason=OPAC',
883
                                success: function( data ) {
883
                                success: function( data ) {
884
                                    row.parents('tr').hide({
884
                                    row.parents('tr').hide({
885
                                        duration: 'slow',
885
                                        duration: 'slow',
886
- 

Return to bug 27947