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

(-)a/C4/Reserves.pm (-2 / +16 lines)
Lines 1020-1026 sub ModReserve { Link Here
1020
                'borrowers', $hold_borrowernumber
1020
                'borrowers', $hold_borrowernumber
1021
            }
1021
            }
1022
        );
1022
        );
1023
        C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
1023
1024
        my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences({ borrowernumber => $hold_borrowernumber, message_name => 'Hold_Manually_Cancelled' });
1025
1026
        while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ){
1027
            if ( $transport eq 'email' ){
1028
                C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
1029
            }
1030
        }
1024
    } elsif ($rank =~ /^\d+/ and $rank > 0) {
1031
    } elsif ($rank =~ /^\d+/ and $rank > 0) {
1025
        logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->unblessed) )
1032
        logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->unblessed) )
1026
            if C4::Context->preference('HoldsLog');
1033
            if C4::Context->preference('HoldsLog');
Lines 1235-1241 sub ModReserveCancelAll { Link Here
1235
            'borrowers', $hold_borrowernumber
1242
            'borrowers', $hold_borrowernumber
1236
        }
1243
        }
1237
    );
1244
    );
1238
    C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
1245
1246
    my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences({ borrowernumber => $hold_borrowernumber, message_name => 'Hold_Manually_Cancelled' });
1247
1248
    while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ){
1249
        if ( $transport eq 'email' ){
1250
            C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
1251
        }
1252
    }
1239
1253
1240
    #step 2 launch the subroutine of the others reserves
1254
    #step 2 launch the subroutine of the others reserves
1241
    ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
1255
    ( $messages, $nextreservinfo ) = GetOtherReserves($itemnumber);
(-)a/circ/pendingreserves.pl (-2 / +16 lines)
Lines 73-79 if ( $op eq 'cancel_reserve' and $reserve_id ) { Link Here
73
                'borrowers', $hold_borrowernumber
73
                'borrowers', $hold_borrowernumber
74
            }
74
            }
75
        );
75
        );
76
        C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
76
77
        my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences({ borrowernumber => $hold_borrowernumber, message_name => 'Hold_Manually_Cancelled' });
78
79
        while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ){
80
            if ( $transport eq 'email' ){
81
                C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
82
            }
83
        }
77
    }
84
    }
78
} elsif ( $op =~ m|^mark_as_lost| ) {
85
} elsif ( $op =~ m|^mark_as_lost| ) {
79
    my $hold = Koha::Holds->find( $reserve_id );
86
    my $hold = Koha::Holds->find( $reserve_id );
Lines 152-158 if ( $op eq 'cancel_reserve' and $reserve_id ) { Link Here
152
                'borrowers', $hold_borrowernumber
159
                'borrowers', $hold_borrowernumber
153
            }
160
            }
154
        );
161
        );
155
        C4::Message->enqueue($letter, $patron->unblessed, 'email');
162
163
        my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences({ borrowernumber => $hold_borrowernumber, message_name => 'Hold_Manually_Cancelled' });
164
165
        while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ){
166
            if ( $transport eq 'email' ){
167
                C4::Message->enqueue($letter, $patron->unblessed, 'email');
168
            }
169
        }
156
    } elsif ( not $item ) {
170
    } elsif ( not $item ) {
157
        push @messages, { type => 'alert', code => 'hold_placed_at_biblio_level'};
171
        push @messages, { type => 'alert', code => 'hold_placed_at_biblio_level'};
158
    } # else the url parameters have been modified and the user is not allowed to continue
172
    } # else the url parameters have been modified and the user is not allowed to continue
(-)a/installer/data/mysql/atomicupdate/bug_20453-message_attributes.perl (+6 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{INSERT IGNORE INTO message_attributes (message_attribute_id, message_name, takes_days) VALUES (7, 'Hold_Manually_Cancelled', 0) });
4
5
    NewVersion( $DBversion, 20453, "Add Hold_Manually_Cancelled message attribute");
6
}
(-)a/installer/data/mysql/atomicupdate/bug_20453-message_transports.perl (+6 lines)
Line 0 Link Here
1
$DBversion = 'XXX';
2
if( CheckVersion( $DBversion ) ) {
3
    $dbh->do(q{INSERT IGNORE INTO message_transports (message_attribute_id, message_transport_type, is_digest, letter_module, letter_code, branchcode) VALUES (7, "email", 0, "reserves", "HOLD_MANUAL_CANCEL", null) });
4
5
    NewVersion( $DBversion, 20453, "Add HOLD_MANUAL_CANCEL message transport" );
6
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc (+1 lines)
Lines 20-25 Link Here
20
          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
20
          [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
21
          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
21
          [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
22
          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
22
          [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
23
          [% ELSIF ( messaging_preference.Hold_Manually_Cancelled ) %]Hold manually cancelled
23
          [% ELSE %]Unknown [% END %]</td>
24
          [% ELSE %]Unknown [% END %]</td>
24
      [% IF ( messaging_preference.takes_days ) %]
25
      [% IF ( messaging_preference.takes_days ) %]
25
      <td>
26
      <td>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-messaging.tt (+1 lines)
Lines 52-57 Link Here
52
                                              [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
52
                                              [% ELSIF ( messaging_preference.Hold_Filled ) %]Hold filled
53
                                              [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
53
                                              [% ELSIF ( messaging_preference.Item_Check_in ) %]Item check-in
54
                                              [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
54
                                              [% ELSIF ( messaging_preference.Item_Checkout ) %]Item checkout
55
                                              [% ELSIF ( messaging_preference.Hold_Manually_Cancelled ) %]Hold manually cancelled
55
                                              [% ELSE %]Unknown [% END %]</td>
56
                                              [% ELSE %]Unknown [% END %]</td>
56
                                        [% IF ( messaging_preference.takes_days ) %]
57
                                        [% IF ( messaging_preference.takes_days ) %]
57
                                            <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
58
                                            <td><select class="input-mini" name="[% messaging_preference.message_attribute_id | html %]-DAYS">
(-)a/reserve/request.pl (-2 / +8 lines)
Lines 123-129 if ( $action eq 'move' ) { Link Here
123
      'borrowers', $hold_borrowernumber
123
      'borrowers', $hold_borrowernumber
124
    }
124
    }
125
  );
125
  );
126
  C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
126
127
  my $messaging_preferences = C4::Members::Messaging::GetMessagingPreferences({ borrowernumber => $hold_borrowernumber, message_name => 'Hold_Manually_Cancelled' });
128
129
  while ( my ( $transport, $letter_code ) = each %{ $messaging_preferences->{transports} } ){
130
    if ( $transport eq 'email' ){
131
      C4::Message->enqueue($letter, $hold_borrower->unblessed, 'email');
132
    }
133
  }
127
} elsif ( $action eq 'setLowestPriority' ) {
134
} elsif ( $action eq 'setLowestPriority' ) {
128
  my $reserve_id = $input->param('reserve_id');
135
  my $reserve_id = $input->param('reserve_id');
129
  ToggleLowestPriority( $reserve_id );
136
  ToggleLowestPriority( $reserve_id );
130
- 

Return to bug 20453