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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-103 / +122 lines)
Lines 5-11 Link Here
5
[% SET return_claims = patron.return_claims %]
5
[% SET return_claims = patron.return_claims %]
6
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
6
[% SET logged_in_branchcode = Branches.GetLoggedInBranchcode() %]
7
7
8
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || charges || charges_guarantors_guarantees || charges_guarantees || credits ) %]
8
[% IF ( has_modifications || warndeparture || returnbeforeexpiry || expired || patron.gonenoaddress || patron.lost || userdebarred || odues || ( return_claims.count > ClaimReturnedWarningThreshold ) || age_limitations || limited_category || charges || charges_guarantors_guarantees || charges_guarantees || credits || patron.account_locked ) %]
9
    <h3>Attention</h3>
9
    <h3>Attention</h3>
10
    <ul>
10
    <ul>
11
        [% IF ( has_modifications ) %]
11
        [% IF ( has_modifications ) %]
Lines 24-34 Link Here
24
                <span class="circ-hlt">Expiration:</span>
24
                <span class="circ-hlt">Expiration:</span>
25
                <span>Patron's card expires on [% patron.dateexpiry | $KohaDates %].</span>
25
                <span>Patron's card expires on [% patron.dateexpiry | $KohaDates %].</span>
26
                [% IF ( moremember ) %]
26
                [% IF ( moremember ) %]
27
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or
27
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
28
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
29
                [% ELSE %]
28
                [% ELSE %]
30
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or
29
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
31
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
32
                [% END %]
30
                [% END %]
33
            </li>
31
            </li>
34
        [% END %]
32
        [% END %]
Lines 47-120 Link Here
47
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
45
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
48
                [% END %]
46
                [% END %]
49
                [% IF ( moremember ) %]
47
                [% IF ( moremember ) %]
50
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or
48
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
51
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
52
                [% ELSE %]
49
                [% ELSE %]
53
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or
50
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
54
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
55
                [% END %]
51
                [% END %]
56
            </li>
52
            </li>
57
        [% END %]
53
        [% END %]
58
54
55
        [% IF patron.account_locked %]
56
            [% IF patron.login_attempts < 0 %]
57
                <li class="blocker account_admin_locked">
58
                    <span class="circ-hlt">Locked: </span><span> Patron's account has been administratively locked</span>
59
                </li>
60
            [% ELSE %]
61
                <li class="blocker account_locked">
62
                <span class="circ-hlt">Locked: </span><span> Patron's account has been locked (due to [% patron.login_attempts | html %] failed login attempts)</span>
63
                [% IF CAN_user_borrowers_edit_borrowers %]
64
                    <span>
65
                        <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Change password</a>
66
                        or <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;resetloginattempts=y">Reset login attempts</a>
67
                    </span>
68
                [% END %]
69
                </li>
70
            [% END %]
71
        [% END %]
72
73
74
59
        [% IF ( patron.gonenoaddress ) %]
75
        [% IF ( patron.gonenoaddress ) %]
60
            <li class="gonenoaddress blocker">
76
            <li class="gonenoaddress blocker">
61
                <span title="gonenoaddress flag is set in patron record"><span class="circ-hlt">Address:</span> Patron's address flagged as in doubt</span>
77
                <span title="gonenoaddress flag is set in patron record"><span class="circ-hlt">Address:</span> Patron's address flagged as in doubt</span> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3#memberentry_account_flags"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
62
                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3#memberentry_account_flags"
63
                    ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
64
                >
65
            </li>
78
            </li>
66
        [% END %]
79
        [% END %]
67
80
68
        [% IF ( patron.lost ) %]
81
        [% IF ( patron.lost ) %]
69
            <li class="lost blocker">
82
            <li class="lost blocker">
70
                <span title="lost flag is set in patron record"><span class="circ-hlt">Lost: </span> Patron's card is flagged as lost</span>
83
                <span title="lost flag is set in patron record"><span class="circ-hlt">Lost: </span> Patron's card is flagged as lost</span> <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3#memberentry_account_flags"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
71
                <a class="btn btn-default btn-xs" href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;borrowernumber=[% patron.borrowernumber | uri %]&amp;step=3#memberentry_account_flags"
72
                    ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
73
                >
74
            </li>
84
            </li>
75
        [% END %]
85
        [% END %]
76
86
77
        [% IF ( userdebarred ) %]
87
        [% IF ( userdebarred ) %]
78
            <li class="userdebarred blocker">
88
            <li class="userdebarred blocker">
79
                <span class="circ-hlt"> Restricted since [% debarredsince | $KohaDates %]:</span> Patron's account is restricted
89
                <span class="circ-hlt"> Restricted since [% debarredsince | $KohaDates %]:</span> Patron's account is restricted
90
80
                [% IF ( userdebarreddate ) %]
91
                [% IF ( userdebarreddate ) %]
81
                    until [% userdebarreddate | $KohaDates %]
92
                    until [% userdebarreddate | $KohaDates %]
82
                [% END %]
93
                [% END %]
83
94
84
                [% IF ( debarredcomment ) %]
95
                [% IF ( debarredcomment ) %]
85
                    with the explanation: <br />
96
                    with the explanation: <br/>
86
                    <em>
97
                    <em>
87
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
98
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
88
                            Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
99
                            Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
89
                        [% ELSE %]
100
                        [% ELSE %]
90
                            [% FOREACH restriction IN patron.restrictions %]
101
                            [% FOREACH restriction IN patron.restrictions %]
91
                                <div class="[% restriction.type.code | lower | html %]_restriction">
102
                                <div class="[% restriction.type.code | lower | html %]_restriction">
92
                                    <span class="restriction_expiration">
103
                                <span class="restriction_expiration">
93
                                        [% IF restriction.expiration %]
104
                                [% IF restriction.expiration %]
94
                                            [% restriction.expiration | $KohaDates %]
105
                                    [% restriction.expiration | $KohaDates %]
95
                                        [% ELSE %]
106
                                [% ELSE %]
96
                                            <strong>Indefinite</strong>
107
                                    <strong>Indefinite</strong>
97
                                        [% END %]
108
                                [% END %]
98
                                    </span>
109
                                </span>
99
                                    <span class="restriction_detail"> [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%] </span>
110
                                <span class="restriction_detail">
111
                                [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%]
112
                                </span>
100
                                </div>
113
                                </div>
101
                            [% END %]
114
                            [% END %]
102
                        [% END %] </em
115
                        [% END %]
103
                    ><br />
116
                    </em><br/>
104
                [% END %]
117
                [% END %]
105
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="$('#reldebarments-tab').click()"><i class="fa fa-ban"></i> View restrictions</a>
118
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="$('#reldebarments-tab').click()"><i class="fa fa-ban"></i> View restrictions</a>
106
            </li>
119
            </li> <!-- /.blocker -->
107
            <!-- /.blocker -->
108
        [% END # /IF userdebarred %]
120
        [% END # /IF userdebarred %]
109
121
110
        [% IF ( odues ) %]
122
        [% IF ( odues ) %]
111
            <li class="odues blocker">
123
            <li class="odues blocker">
112
                <span class="circ-hlt">Overdues:</span> Patron has ITEMS OVERDUE <a href="#checkouts_panel" onclick="$('#issues-table-load-immediately').click(); $('#issues-table-load-immediately').click();">See highlighted items below </a>
124
                <span class="circ-hlt">Overdues:</span>  Patron has ITEMS OVERDUE <a href="#checkouts_panel" onclick="$('#issues-table-load-immediately').click(); $('#issues-table-load-immediately').click();">See highlighted items below </a>
113
            </li>
125
            </li>
114
        [% END %]
126
        [% END %]
115
127
116
        [% IF return_claims.count > ClaimReturnedWarningThreshold %]
128
        [% IF return_claims.count > ClaimReturnedWarningThreshold %]
117
            <li class="return_claims blocker"> <span class="circ-hlt return-claims">Return claims:</span> Patron has [% return_claims.count | html %] RETURN CLAIMS </li>
129
            <li class="return_claims blocker">
130
                <span class="circ-hlt return-claims">Return claims:</span> Patron has [% return_claims.count | html %] RETURN CLAIMS
131
            </li>
118
        [% END %]
132
        [% END %]
119
133
120
        [% IF age_limitations %]
134
        [% IF age_limitations %]
Lines 148-161 Link Here
148
        [% IF ( charges_guarantees ) %]
162
        [% IF ( charges_guarantees ) %]
149
            <li class="charges_guarantees">
163
            <li class="charges_guarantees">
150
                <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
164
                <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
151
                [% IF noissues %]
165
                    [% IF noissues %]
152
                    <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
166
                        <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
153
                [% END %]
167
                    [% END %]
154
            </li>
168
            </li>
155
        [% END %]
169
        [% END %]
156
170
157
        [% IF ( credits ) %]
171
        [% IF ( credits ) %]
158
            <li class="credits"> <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %]of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %] </li>
172
            <li class="credits">
173
                <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of <span class="credit"><strong>[% creditsamount | $Price %]</strong></span>[% END %]
174
            </li>
159
        [% END %]
175
        [% END %]
160
        [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
176
        [% IF (noissues && CAN_user_circulate_force_checkout && !moremember) %]
161
            <li>
177
            <li>
Lines 165-170 Link Here
165
            </li>
181
            </li>
166
        [% END %]
182
        [% END %]
167
    </ul>
183
    </ul>
184
168
[% END # /F ( has_modifications || warndeparture... %]
185
[% END # /F ( has_modifications || warndeparture... %]
169
186
170
[% IF waiting_recalls.count %]
187
[% IF waiting_recalls.count %]
Lines 186-196 Link Here
186
                    [% IF ( w.pickup_library_id == logged_in_branchcode  ) %]
203
                    [% IF ( w.pickup_library_id == logged_in_branchcode  ) %]
187
                        <li>
204
                        <li>
188
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
205
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
189
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
206
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
190
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
207
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
208
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
191
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
209
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
192
                            <br />
210
                            <br />
193
                            <strong class="waitinghere"> [% SET expires_on = w.expiration_date %] Waiting here [% IF expires_on %]until [% expires_on | $KohaDates %][% END %] </strong>
211
                            <strong class="waitinghere">
212
                                [% SET expires_on = w.expiration_date %]
213
                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
214
                            </strong>
194
                        </li>
215
                        </li>
195
                    [% END %]
216
                    [% END %]
196
                [% END %]
217
                [% END %]
Lines 204-214 Link Here
204
                    [% IF ( w.pickup_library_id != logged_in_branchcode  ) %]
225
                    [% IF ( w.pickup_library_id != logged_in_branchcode  ) %]
205
                        <li>
226
                        <li>
206
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
227
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
207
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
228
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
208
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
229
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
230
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
209
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
231
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
210
                            <br />
232
                            <br />
211
                            <strong> [% SET expires_on = w.expiration_date %] Waiting at [% Branches.GetName( w.pickup_library_id ) | html %] [% IF expires_on %]until [% expires_on | $KohaDates %][% END %] </strong>
233
                            <strong>
234
                                [% SET expires_on = w.expiration_date %]
235
                                Waiting at [% Branches.GetName( w.pickup_library_id ) | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
236
                            </strong>
212
                        </li>
237
                        </li>
213
                    [% END %]
238
                    [% END %]
214
                [% END %]
239
                [% END %]
Lines 236-247 Link Here
236
                    [% IF ( w.branch.branchcode == logged_in_branchcode  ) %]
261
                    [% IF ( w.branch.branchcode == logged_in_branchcode  ) %]
237
                        <li>
262
                        <li>
238
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
263
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
239
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
264
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
240
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
265
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
266
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
241
                            <span class="holddate">Hold placed on [% w.reservedate | $KohaDates %].</span>
267
                            <span class="holddate">Hold placed on [% w.reservedate | $KohaDates %].</span>
242
                            <br />
268
                            <br />
243
                            <strong class="waitinghere"> [% SET expires_on = w.expirationdate %] Waiting here [% IF expires_on %]until [% expires_on | $KohaDates %][% END %]. </strong>
269
                            <strong class="waitinghere">
244
                            <strong class="waitingsince"> Waiting here since [% w.waitingdate | $KohaDates %]. </strong>
270
                                [% SET expires_on = w.expirationdate %]
271
                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %][% END %].
272
                            </strong>
273
                            <strong class="waitingsince">
274
                                Waiting here since [% w.waitingdate | $KohaDates %].
275
                            </strong>
245
                        </li>
276
                        </li>
246
                    [% END %]
277
                    [% END %]
247
                [% END %]
278
                [% END %]
Lines 255-265 Link Here
255
                    [% IF ( w.branch.branchcode != logged_in_branchcode  ) %]
286
                    [% IF ( w.branch.branchcode != logged_in_branchcode  ) %]
256
                        <li>
287
                        <li>
257
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
288
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
258
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
289
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
259
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
290
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
291
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
260
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
292
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
261
                            <br />
293
                            <br />
262
                            <strong> [% SET expires_on = w.expirationdate %] Waiting at [% w.branch.branchname | html %] [% IF expires_on %]until [% expires_on | $KohaDates %][% END %] </strong>
294
                            <strong>
295
                                [% SET expires_on = w.expirationdate %]
296
                                Waiting at [% w.branch.branchname | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
297
                            </strong>
263
                        </li>
298
                        </li>
264
                    [% END %]
299
                    [% END %]
265
                [% END %]
300
                [% END %]
Lines 274-296 Link Here
274
        <div id="curbside_pickups" class="circmessage">
309
        <div id="curbside_pickups" class="circmessage">
275
            <h4>Curbside pickups scheduled here</h4>
310
            <h4>Curbside pickups scheduled here</h4>
276
            <ul>
311
            <ul>
277
                [% FOR cp IN curbside_pickups %]
312
            [% FOR cp IN curbside_pickups %]
278
                    <li
313
                <li>On [% cp.scheduled_pickup_datetime | $KohaDates %]:
279
                        >On [% cp.scheduled_pickup_datetime | $KohaDates %]:
314
                    [% SWITCH cp.status %]
280
                        [% SWITCH cp.status %]
315
                    [% CASE 'to-be-staged' %]
281
                        [% CASE 'to-be-staged' %]
316
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=to-be-staged">
282
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=to-be-staged"> To be staged</a>
317
                        To be staged</a>
283
                        [% CASE 'staged-and-ready' %]
318
                    [% CASE 'staged-and-ready' %]
284
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=staged-and-ready"> Staged and ready</a>
319
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=staged-and-ready">
285
                        [% CASE 'patron-is-outside' %]
320
                        Staged and ready</a>
286
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=patron-is-outside"> Patron is outside!</a>
321
                    [% CASE 'patron-is-outside' %]
287
                        [% CASE 'delivered' %]
322
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=patron-is-outside">
288
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=delivered-today"> Delivered</a>
323
                        Patron is outside!</a>
289
                        [% CASE %]
324
                    [% CASE 'delivered' %]
290
                            <span>Unknown status "[% cp.status | html %]"</span>
325
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=delivered-today">
291
                        [% END %]
326
                        Delivered</a>
292
                    </li>
327
                    [% CASE %]<span>Unknown status "[% cp.status | html %]"</span>
293
                [% END %]
328
                    [% END %]
329
                </li>
330
            [% END %]
294
            </ul>
331
            </ul>
295
        </div>
332
        </div>
296
    [% END %]
333
    [% END %]
Lines 301-311 Link Here
301
        <h4>Notes</h4>
338
        <h4>Notes</h4>
302
        <ul>
339
        <ul>
303
            <li>
340
            <li>
304
                <span class="circ-hlt"> [% patron.borrowernotes | $raw | html_line_break %] </span>
341
                <span class="circ-hlt">
342
                    [% patron.borrowernotes | $raw | html_line_break %]
343
                </span>
305
            </li>
344
            </li>
306
        </ul>
345
        </ul>
307
    </div>
346
    </div> <!-- /#circnotes -->
308
    <!-- /#circnotes -->
309
[% END # /IF patron.borrowernotes %]
347
[% END # /IF patron.borrowernotes %]
310
348
311
[% IF ( patron_messages ) %]
349
[% IF ( patron_messages ) %]
Lines 322-332 Link Here
322
                        [% patron_message.message_date | $KohaDates %]
360
                        [% patron_message.message_date | $KohaDates %]
323
                        [% Branches.GetName( patron_message.branchcode ) | html %]
361
                        [% Branches.GetName( patron_message.branchcode ) | html %]
324
                        [% IF patron_message.manager_id %]
362
                        [% IF patron_message.manager_id %]
325
                            (
363
                            ( <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]">[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a> )
326
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]"
327
                                >[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a
328
                            >
329
                            )
330
                        [% END %]
364
                        [% END %]
331
                        <em>"[% patron_message.message | html | html_line_break %]"</em>
365
                        <em>"[% patron_message.message | html | html_line_break %]"</em>
332
                        [% IF patron_message.patron_read_date %]
366
                        [% IF patron_message.patron_read_date %]
Lines 335-370 Link Here
335
                    </span>
369
                    </span>
336
                    [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
370
                    [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
337
                        [% IF moremember %]
371
                        [% IF moremember %]
338
                            <a
372
                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-bs-target="#edit_message_form_[% patron_message.message_id | html %]" data-bs-toggle="modal"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
339
                                id="#edit_message_form_[% patron_message.message_id | html %]"
340
                                class="btn btn-link edit_message"
341
                                href="#edit_message_form_[% patron_message.message_id | uri %]"
342
                                data-bs-target="#edit_message_form_[% patron_message.message_id | html %]"
343
                                data-bs-toggle="modal"
344
                                ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
345
                            >
346
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
373
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
347
                                [% INCLUDE 'csrf-token.inc' %]
374
                                [% INCLUDE 'csrf-token.inc' %]
348
                                <input type="hidden" name="op" value="cud-delete" />
375
                                <input type="hidden" name="op" value="cud-delete">
349
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]" />
376
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]">
350
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]" />
377
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]">
351
                                <input type="hidden" name="from" value="moremember" />
378
                                <input type="hidden" name="from" value="moremember">
352
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
379
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
353
                            </form>
380
                            </form>
354
                        [% ELSE %]
381
                        [% ELSE %]
355
                            <a
382
                            <a id="#edit_message_form_[% patron_message.message_id | html %]" class="btn btn-link edit_message" href="#edit_message_form_[% patron_message.message_id | uri %]" data-bs-target="#edit_message_form_[% patron_message.message_id | html %]" data-bs-toggle="modal"><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a>
356
                                id="#edit_message_form_[% patron_message.message_id | html %]"
357
                                class="btn btn-link edit_message"
358
                                href="#edit_message_form_[% patron_message.message_id | uri %]"
359
                                data-bs-target="#edit_message_form_[% patron_message.message_id | html %]"
360
                                data-bs-toggle="modal"
361
                                ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
362
                            >
363
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
383
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
364
                                [% INCLUDE 'csrf-token.inc' %]
384
                                [% INCLUDE 'csrf-token.inc' %]
365
                                <input type="hidden" name="op" value="cud-delete" />
385
                                <input type="hidden" name="op" value="cud-delete">
366
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]" />
386
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]">
367
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]" />
387
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]">
368
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
388
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
369
                            </form>
389
                            </form>
370
                        [% END %]
390
                        [% END %]
Lines 373-380 Link Here
373
            [% END %]
393
            [% END %]
374
        </ul>
394
        </ul>
375
        <a id="addnewmessageLabel" data-bs-target="#add_message_form" class="btn btn-link" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
395
        <a id="addnewmessageLabel" data-bs-target="#add_message_form" class="btn btn-link" data-bs-toggle="modal"><i class="fa fa-plus"></i> Add a new message</a>
376
    </div>
396
    </div> <!-- /#messages -->
377
    <!-- /#messages -->
378
397
379
    [% FOREACH pm IN patron_messages %]
398
    [% FOREACH pm IN patron_messages %]
380
        <div id="edit_message_form_[% pm.message_id | html %]" class="modal" tabindex="-1" aria-labelledby="#edit_message_form_[% patron_message.message_id | html %]" aria-hidden="true">
399
        <div id="edit_message_form_[% pm.message_id | html %]" class="modal" tabindex="-1" aria-labelledby="#edit_message_form_[% patron_message.message_id | html %]" aria-hidden="true">
Lines 382-389 Link Here
382
                <div class="modal-content">
401
                <div class="modal-content">
383
                    <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="edit_message_form" name="message_f">
402
                    <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="edit_message_form" name="message_f">
384
                        [% INCLUDE 'csrf-token.inc' %]
403
                        [% INCLUDE 'csrf-token.inc' %]
385
                        <input type="hidden" name="op" value="cud-edit_message" />
404
                        <input type="hidden" name="op" value="cud-edit_message">
386
                        <input type="hidden" name="message_id" value="[% pm.message_id | html %]" />
405
                        <input type="hidden" name="message_id" value="[% pm.message_id | html %]"/>
387
                        <div class="modal-header">
406
                        <div class="modal-header">
388
                            <h1 class="modal-title">Edit message</h1>
407
                            <h1 class="modal-title">Edit message</h1>
389
                        </div>
408
                        </div>
Lines 407-413 Link Here
407
                                </label>
426
                                </label>
408
                            </div>
427
                            </div>
409
                            <div class="form-group">
428
                            <div class="form-group">
410
                                <textarea rows="3" class="modal-textarea" name="borrower_message" id="edit_borrower_message">[% pm.message | html %]</textarea>
429
                                <textarea rows="3" class="modal-textarea" name="borrower_message" id="edit_borrower_message" >[% pm.message | html %]</textarea>
411
                            </div>
430
                            </div>
412
                        </div>
431
                        </div>
413
                        <div class="modal-footer">
432
                        <div class="modal-footer">
Lines 419-422 Link Here
419
            </div>
438
            </div>
420
        </div>
439
        </div>
421
    [% END %]
440
    [% END %]
422
[% END # /IF patron_messages %]
441
[% END # /IF patron_messages %]
(-)a/members/setstatus.pl (-5 / +8 lines)
Lines 35-44 my $input = CGI->new; Link Here
35
35
36
my ($loggedinuserid) = checkauth( $input, 0, { borrowers => 'edit_borrowers' }, 'intranet' );
36
my ($loggedinuserid) = checkauth( $input, 0, { borrowers => 'edit_borrowers' }, 'intranet' );
37
37
38
my $destination    = $input->param("destination") || '';
38
my $destination        = $input->param("destination") || '';
39
my $borrowernumber = $input->param('borrowernumber');
39
my $borrowernumber     = $input->param('borrowernumber');
40
my $status         = $input->param('status');
40
my $status             = $input->param('status');
41
my $reregistration = $input->param('reregistration') || '';
41
my $reregistration     = $input->param('reregistration')     || '';
42
my $resetloginattempts = $input->param('resetloginattempts') || '';
42
43
43
my $dbh = C4::Context->dbh;
44
my $dbh = C4::Context->dbh;
44
my $dateexpiry;
45
my $dateexpiry;
Lines 64-69 if ( $logged_in_user->can_see_patron_infos($patron) ) { Link Here
64
                $_->rethrow();
65
                $_->rethrow();
65
            }
66
            }
66
        }
67
        }
68
        $dateexpiry = $patron->renew_account;
69
    } elsif ( $resetloginattempts eq 'y' ) {
70
        $patron->login_attempts(0)->store;
67
    } else {
71
    } else {
68
        my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
72
        my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
69
        $sth->execute( $status, $borrowernumber );
73
        $sth->execute( $status, $borrowernumber );
70
- 

Return to bug 37512