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

(-)a/Koha/Recall.pm (-1 / +1 lines)
Lines 485-491 sub set_cancelled { Link Here
485
    );
485
    );
486
486
487
    my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
487
    my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences(
488
        { borrowernumber => $self->patron_id, message_name => 'Recall_Cancelled' } );
488
        { borrowernumber => $self->patron_id, message_name => 'Recall_Canceled' } );
489
    while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
489
    while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ) {
490
        if ( $transport eq 'email' ) {
490
        if ( $transport eq 'email' ) {
491
            C4::Message->enqueue( $letter, $self->patron, 'email' );
491
            C4::Message->enqueue( $letter, $self->patron, 'email' );
(-)a/installer/data/mysql/atomicupdate/bug_30295-add_RECALL_MANUAL_CANCEL.pl (-5 / +5 lines)
Lines 9-15 return { Link Here
9
        my ( $dbh, $out ) = @$args{qw(dbh out)};
9
        my ( $dbh, $out ) = @$args{qw(dbh out)};
10
10
11
        $dbh->do(
11
        $dbh->do(
12
            q{ INSERT IGNORE INTO message_attributes (message_attribute_id, message_name, takes_days) VALUES (14, 'Recall_Cancelled', 0) }
12
            q{ INSERT IGNORE INTO message_attributes (message_attribute_id, message_name, takes_days) VALUES (14, 'Recall_Canceled', 0) }
13
        );
13
        );
14
14
15
        say_success( $out, "Added RECALL_MANUAL_CANCEL to message_attributes" );
15
        say_success( $out, "Added RECALL_MANUAL_CANCEL to message_attributes" );
Lines 20-34 return { Link Here
20
        say_success( $out, "Added RECALL_MANUAL_CANCEL to message_transports" );
20
        say_success( $out, "Added RECALL_MANUAL_CANCEL to message_transports" );
21
21
22
        $dbh->do(
22
        $dbh->do(
23
            q{ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES ('circulation','RECALL_MANUAL_CANCEL','','Recall has been cancelled','0','Recall has been cancelled','Dear [% borrower.firstname %] [% borrower.surname %],
23
            q{ INSERT IGNORE INTO `letter` (`module`, `code`, `branchcode`, `name`, `is_html`, `title`, `content`, `message_transport_type`) VALUES ('circulation','RECALL_MANUAL_CANCEL','','Recall has been canceled','0','Recall has been canceled','Dear [% borrower.firstname %] [% borrower.surname %],
24
24
25
We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled.
25
We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled.
26
26
27
Title: [% biblio.title %]
27
Title: [% biblio.title %]
28
Author: [% biblio.author %]
28
Author: [% biblio.author %]
29
Location: [% branch.branchname %]','sms'), ('circulation','RECALL_MANUAL_CANCEL','','Recall has been cancelled','0','Recall has been cancelled','Dear [% borrower.firstname %] [% borrower.surname %],
29
Location: [% branch.branchname %]','sms'), ('circulation','RECALL_MANUAL_CANCEL','','Recall has been canceled','0','Recall has been canceled','Dear [% borrower.firstname %] [% borrower.surname %],
30
30
31
We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled.
31
We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled.
32
32
33
Title: [% biblio.title %]
33
Title: [% biblio.title %]
34
Author: [% biblio.author %]
34
Author: [% biblio.author %]
(-)a/installer/data/mysql/en/mandatory/sample_notices.yml (-6 / +6 lines)
Lines 2725-2739 tables: Link Here
2725
        - module: circulation
2725
        - module: circulation
2726
          code: RECALL_MANUAL_CANCEL
2726
          code: RECALL_MANUAL_CANCEL
2727
          branchcode: ""
2727
          branchcode: ""
2728
          name: "Recall has been cancelled"
2728
          name: "Recall has been canceled"
2729
          is_html: 0
2729
          is_html: 0
2730
          title: "Recall has been cancelled"
2730
          title: "Recall has been canceled"
2731
          message_transport_type: email
2731
          message_transport_type: email
2732
          lang: default
2732
          lang: default
2733
          content:
2733
          content:
2734
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
2734
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
2735
            - ""
2735
            - ""
2736
            - "We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled."
2736
            - "We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled."
2737
            - ""
2737
            - ""
2738
            - "Title: [% biblio.title %]"
2738
            - "Title: [% biblio.title %]"
2739
            - "Author: [% biblio.author %]"
2739
            - "Author: [% biblio.author %]"
Lines 2742-2756 tables: Link Here
2742
        - module: circulation
2742
        - module: circulation
2743
          code: RECALL_MANUAL_CANCEL
2743
          code: RECALL_MANUAL_CANCEL
2744
          branchcode: ""
2744
          branchcode: ""
2745
          name: "Recall has been cancelled"
2745
          name: "Recall has been canceled"
2746
          is_html: 0
2746
          is_html: 0
2747
          title: "Recall has been cancelled"
2747
          title: "Recall has been canceled"
2748
          message_transport_type: sms
2748
          message_transport_type: sms
2749
          lang: default
2749
          lang: default
2750
          content:
2750
          content:
2751
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
2751
            - "Dear [% borrower.firstname %] [% borrower.surname %],"
2752
            - ""
2752
            - ""
2753
            - "We regret to inform you that the item you have recalled cannot be provided. Your recall was cancelled."
2753
            - "We regret to inform you that the item you have recalled cannot be provided. Your recall was canceled."
2754
            - ""
2754
            - ""
2755
            - "Title: [% biblio.title %]"
2755
            - "Title: [% biblio.title %]"
2756
            - "Author: [% biblio.author %]"
2756
            - "Author: [% biblio.author %]"
(-)a/installer/data/mysql/mandatory/sample_notices_message_attributes.sql (-1 / +1 lines)
Lines 14-17 values Link Here
14
(12, 'Recall_Waiting', 0),
14
(12, 'Recall_Waiting', 0),
15
(13, 'Recall_Requested', 0),
15
(13, 'Recall_Requested', 0),
16
(14, 'Patron_Expiry', 0),
16
(14, 'Patron_Expiry', 0),
17
(15, 'Recall_Cancelled', 0);
17
(15, 'Recall_Canceled', 0);
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (-2 / +2 lines)
Lines 57-64 Link Here
57
                        <span>Recall awaiting pickup</span>
57
                        <span>Recall awaiting pickup</span>
58
                    [% ELSIF ( messaging_preference.Recall_Requested ) %]
58
                    [% ELSIF ( messaging_preference.Recall_Requested ) %]
59
                        <span>Return recalled item</span>
59
                        <span>Return recalled item</span>
60
                    [% ELSIF ( messaging_preference.Recall_Cancelled ) %]
60
                    [% ELSIF ( messaging_preference.Recall_Canceled ) %]
61
                        <span>Recall cancelled</span>
61
                        <span>Recall canceled</span>
62
                    [% ELSE %]
62
                    [% ELSE %]
63
                        <span>Unknown</span>
63
                        <span>Unknown</span>
64
                    [% END %]
64
                    [% END %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (-3 / +2 lines)
Lines 110-117 Link Here
110
                                                        <span>Recall awaiting pickup</span>
110
                                                        <span>Recall awaiting pickup</span>
111
                                                    [% ELSIF ( messaging_preference.Recall_Requested ) %]
111
                                                    [% ELSIF ( messaging_preference.Recall_Requested ) %]
112
                                                        <span>Return recalled item</span>
112
                                                        <span>Return recalled item</span>
113
                                                    [% ELSIF ( messaging_preference.Recall_Cancelled ) %]
113
                                                    [% ELSIF ( messaging_preference.Recall_Canceled ) %]
114
                                                        <span>Recall cancelled</span>
114
                                                        <span>Recall canceled</span>
115
                                                    [% ELSE %]
115
                                                    [% ELSE %]
116
                                                        <span>Unknown</span>
116
                                                        <span>Unknown</span>
117
                                                    [% END %]</td
117
                                                    [% END %]</td
118
- 

Return to bug 30295