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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-98 / +122 lines)
Lines 24-32 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 <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
27
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or
28
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
28
                [% ELSE %]
29
                [% ELSE %]
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>
30
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or
31
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
30
                [% END %]
32
                [% END %]
31
            </li>
33
            </li>
32
        [% END %]
34
        [% END %]
Lines 45-53 Link Here
45
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
47
                    <span>Patron's card expired on [% expiry | $KohaDates %]</span>
46
                [% END %]
48
                [% END %]
47
                [% IF ( moremember ) %]
49
                [% IF ( moremember ) %]
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>
50
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=member&amp;reregistration=y">Renew</a> or
51
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=member&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
49
                [% ELSE %]
52
                [% ELSE %]
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>
53
                    <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;reregistration=y">Renew</a> or
54
                    <a href="/cgi-bin/koha/members/memberentry.pl?op=edit_form&amp;destination=circ&amp;borrowernumber=[% patron.borrowernumber | uri %]">Edit details</a>
51
                [% END %]
55
                [% END %]
52
            </li>
56
            </li>
53
        [% END %]
57
        [% END %]
Lines 62-69 Link Here
62
                [% IF CAN_user_borrowers_edit_borrowers %]
66
                [% IF CAN_user_borrowers_edit_borrowers %]
63
                    <span>
67
                    <span>
64
                        <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Change password</a>
68
                        <a href="/cgi-bin/koha/members/member-password.pl?member=[% patron.borrowernumber | uri %]">Change password</a>
65
                        <span data-bs-toggle="tooltip" title="Resetting password will remove lock on account" data-bs-placement="right" class="fa fa-info-circle" />
69
                        <span data-bs-toggle="tooltip" title="Resetting password will remove lock on account" data-bs-placement="right" class="fa fa-info-circle"> </span>
66
                        or <a href="/cgi-bin/koha/members/setstatus.pl?borrowernumber=[% patron.borrowernumber | uri %]&amp;destination=circ&amp;resetloginattempts=y">Reset login attempts</a>
70
                        or <button class="btn btn-xs btn-default" class="reset-login" data-bs-toggle="modal" data-bs-target="#resetAttemptsModal"> <i class="fa fa-eraser"></i> Reset login attempts </button>
67
                    </span>
71
                    </span>
68
                [% END %]
72
                [% END %]
69
            </li>
73
            </li>
Lines 71-116 Link Here
71
75
72
        [% IF ( patron.gonenoaddress ) %]
76
        [% IF ( patron.gonenoaddress ) %]
73
            <li class="gonenoaddress blocker">
77
            <li class="gonenoaddress blocker">
74
                <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>
78
                <span title="gonenoaddress flag is set in patron record"><span class="circ-hlt">Address:</span> Patron's address flagged as in doubt</span>
79
                <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"
80
                    ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
81
                >
75
            </li>
82
            </li>
76
        [% END %]
83
        [% END %]
77
84
78
        [% IF ( patron.lost ) %]
85
        [% IF ( patron.lost ) %]
79
            <li class="lost blocker">
86
            <li class="lost blocker">
80
                <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>
87
                <span title="lost flag is set in patron record"><span class="circ-hlt">Lost: </span> Patron's card is flagged as lost</span>
88
                <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"
89
                    ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
90
                >
81
            </li>
91
            </li>
82
        [% END %]
92
        [% END %]
83
93
84
        [% IF ( userdebarred ) %]
94
        [% IF ( userdebarred ) %]
85
            <li class="userdebarred blocker">
95
            <li class="userdebarred blocker">
86
                <span class="circ-hlt"> Restricted since [% debarredsince | $KohaDates %]:</span> Patron's account is restricted
96
                <span class="circ-hlt"> Restricted since [% debarredsince | $KohaDates %]:</span> Patron's account is restricted
87
88
                [% IF ( userdebarreddate ) %]
97
                [% IF ( userdebarreddate ) %]
89
                    until [% userdebarreddate | $KohaDates %]
98
                    until [% userdebarreddate | $KohaDates %]
90
                [% END %]
99
                [% END %]
91
100
92
                [% IF ( debarredcomment ) %]
101
                [% IF ( debarredcomment ) %]
93
                    with the explanation: <br/>
102
                    with the explanation: <br />
94
                    <em>
103
                    <em>
95
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
104
                        [% IF debarredcomment.search('OVERDUES_PROCESS') %]
96
                            Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
105
                            Restriction added by overdues process [% debarredcomment.remove('OVERDUES_PROCESS ') | $raw | html_line_break %]
97
                        [% ELSE %]
106
                        [% ELSE %]
98
                            [% FOREACH restriction IN patron.restrictions %]
107
                            [% FOREACH restriction IN patron.restrictions %]
99
                                <div class="[% restriction.type.code | lower | html %]_restriction">
108
                                <div class="[% restriction.type.code | lower | html %]_restriction">
100
                                <span class="restriction_expiration">
109
                                    <span class="restriction_expiration">
101
                                [% IF restriction.expiration %]
110
                                        [% IF restriction.expiration %]
102
                                    [% restriction.expiration | $KohaDates %]
111
                                            [% restriction.expiration | $KohaDates %]
103
                                [% ELSE %]
112
                                        [% ELSE %]
104
                                    <strong>Indefinite</strong>
113
                                            <strong>Indefinite</strong>
105
                                [% END %]
114
                                        [% END %]
106
                                </span>
115
                                    </span>
107
                                <span class="restriction_detail">
116
                                    <span class="restriction_detail"> [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%] </span>
108
                                [%- restriction.type.display_text | html -%][%- IF restriction.comment -%]: [%- restriction.comment | html_line_break -%][%- END -%]
109
                                </span>
110
                                </div>
117
                                </div>
111
                            [% END %]
118
                            [% END %]
112
                        [% END %]
119
                        [% END %] </em
113
                    </em><br/>
120
                    ><br />
114
                [% END %]
121
                [% END %]
115
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="(new bootstrap.Tab($('#reldebarments-tab'))).show()"><i class="fa fa-ban"></i> View restrictions</a>
122
                <a class="btn btn-xs btn-default" href="#reldebarments-tab" onclick="(new bootstrap.Tab($('#reldebarments-tab'))).show()"><i class="fa fa-ban"></i> View restrictions</a>
116
            </li>
123
            </li>
Lines 119-132 Link Here
119
126
120
        [% IF ( odues ) %]
127
        [% IF ( odues ) %]
121
            <li class="odues blocker">
128
            <li class="odues blocker">
122
                <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>
129
                <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>
123
            </li>
130
            </li>
124
        [% END %]
131
        [% END %]
125
132
126
        [% IF return_claims.count > ClaimReturnedWarningThreshold %]
133
        [% IF return_claims.count > ClaimReturnedWarningThreshold %]
127
            <li class="return_claims blocker">
134
            <li class="return_claims blocker"> <span class="circ-hlt return-claims">Return claims:</span> Patron has [% return_claims.count | html %] RETURN CLAIMS </li>
128
                <span class="circ-hlt return-claims">Return claims:</span> Patron has [% return_claims.count | html %] RETURN CLAIMS
129
            </li>
130
        [% END %]
135
        [% END %]
131
136
132
        [% IF age_limitations %]
137
        [% IF age_limitations %]
Lines 160-168 Link Here
160
        [% IF ( charges_guarantees ) %]
165
        [% IF ( charges_guarantees ) %]
161
            <li class="charges_guarantees">
166
            <li class="charges_guarantees">
162
                <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
167
                <span class="circ-hlt">Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
163
                    [% IF noissues %]
168
                [% IF noissues %]
164
                        <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
169
                    <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span>
165
                    [% END %]
170
                [% END %]
166
            </li>
171
            </li>
167
        [% END %]
172
        [% END %]
168
173
Lines 177-183 Link Here
177
            </li>
182
            </li>
178
        [% END %]
183
        [% END %]
179
    </ul>
184
    </ul>
180
181
[% END # /F ( has_modifications || warndeparture... %]
185
[% END # /F ( has_modifications || warndeparture... %]
182
186
183
[% IF waiting_recalls.count %]
187
[% IF waiting_recalls.count %]
Lines 199-213 Link Here
199
                    [% IF ( w.pickup_library_id == logged_in_branchcode  ) %]
203
                    [% IF ( w.pickup_library_id == logged_in_branchcode  ) %]
200
                        <li>
204
                        <li>
201
                            <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>
202
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
206
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
203
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
207
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
204
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
205
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
208
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
206
                            <br />
209
                            <br />
207
                            <strong class="waitinghere">
210
                            <strong class="waitinghere"> [% SET expires_on = w.expiration_date %] Waiting here [% IF expires_on %]until [% expires_on | $KohaDates %][% END %] </strong>
208
                                [% SET expires_on = w.expiration_date %]
209
                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
210
                            </strong>
211
                        </li>
211
                        </li>
212
                    [% END %]
212
                    [% END %]
213
                [% END %]
213
                [% END %]
Lines 221-235 Link Here
221
                    [% IF ( w.pickup_library_id != logged_in_branchcode  ) %]
221
                    [% IF ( w.pickup_library_id != logged_in_branchcode  ) %]
222
                        <li>
222
                        <li>
223
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
223
                            <a href="/cgi-bin/koha/recalls/request.pl?biblionumber=[% w.biblio_id | uri %]">[% w.biblio.title | html %]</a>
224
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
224
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
225
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
225
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
226
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
227
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
226
                            <span>Recall placed on [% w.created_date | $KohaDates %].</span>
228
                            <br />
227
                            <br />
229
                            <strong>
228
                            <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>
230
                                [% SET expires_on = w.expiration_date %]
231
                                Waiting at [% Branches.GetName( w.pickup_library_id ) | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
232
                            </strong>
233
                        </li>
229
                        </li>
234
                    [% END %]
230
                    [% END %]
235
                [% END %]
231
                [% END %]
Lines 257-274 Link Here
257
                    [% IF ( w.branch.branchcode == logged_in_branchcode  ) %]
253
                    [% IF ( w.branch.branchcode == logged_in_branchcode  ) %]
258
                        <li>
254
                        <li>
259
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
255
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
260
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
256
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
261
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
257
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
262
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
263
                            <span class="holddate">Hold placed on [% w.reservedate | $KohaDates %].</span>
258
                            <span class="holddate">Hold placed on [% w.reservedate | $KohaDates %].</span>
264
                            <br />
259
                            <br />
265
                            <strong class="waitinghere">
260
                            <strong class="waitinghere"> [% SET expires_on = w.expirationdate %] Waiting here [% IF expires_on %]until [% expires_on | $KohaDates %][% END %]. </strong>
266
                                [% SET expires_on = w.expirationdate %]
261
                            <strong class="waitingsince"> Waiting here since [% w.waitingdate | $KohaDates %]. </strong>
267
                                Waiting here [% IF expires_on %] until [% expires_on | $KohaDates %][% END %].
268
                            </strong>
269
                            <strong class="waitingsince">
270
                                Waiting here since [% w.waitingdate | $KohaDates %].
271
                            </strong>
272
                        </li>
262
                        </li>
273
                    [% END %]
263
                    [% END %]
274
                [% END %]
264
                [% END %]
Lines 282-296 Link Here
282
                    [% IF ( w.branch.branchcode != logged_in_branchcode  ) %]
272
                    [% IF ( w.branch.branchcode != logged_in_branchcode  ) %]
283
                        <li>
273
                        <li>
284
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
274
                            <a href="/cgi-bin/koha/reserve/request.pl?biblionumber=[% w.biblio.biblionumber | uri %]">[% w.biblio.title | html %]</a>
285
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]),
275
                            ([% ItemTypes.GetDescription( w.item.effective_itemtype ) | html %]), [% IF ( w.biblio.author ) %]by [% w.biblio.author | html %][% END %]
286
                            [% IF ( w.biblio.author ) %] by [% w.biblio.author | html %] [% END %]
276
                            [% IF ( w.item.itemcallnumber ) %][[% w.item.itemcallnumber | html %]][% END %]
287
                            [% IF ( w.item.itemcallnumber ) %] [[% w.item.itemcallnumber | html %]] [% END %]
288
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
277
                            <span>Hold placed on [% w.reservedate | $KohaDates %].</span>
289
                            <br />
278
                            <br />
290
                            <strong>
279
                            <strong> [% SET expires_on = w.expirationdate %] Waiting at [% w.branch.branchname | html %] [% IF expires_on %]until [% expires_on | $KohaDates %][% END %] </strong>
291
                                [% SET expires_on = w.expirationdate %]
292
                                Waiting at [% w.branch.branchname | html %] [% IF expires_on %] until [% expires_on | $KohaDates %] [% END %]
293
                            </strong>
294
                        </li>
280
                        </li>
295
                    [% END %]
281
                    [% END %]
296
                [% END %]
282
                [% END %]
Lines 305-329 Link Here
305
        <div id="curbside_pickups" class="circmessage">
291
        <div id="curbside_pickups" class="circmessage">
306
            <h4>Curbside pickups scheduled here</h4>
292
            <h4>Curbside pickups scheduled here</h4>
307
            <ul>
293
            <ul>
308
            [% FOR cp IN curbside_pickups %]
294
                [% FOR cp IN curbside_pickups %]
309
                <li>On [% cp.scheduled_pickup_datetime | $KohaDates %]:
295
                    <li
310
                    [% SWITCH cp.status %]
296
                        >On [% cp.scheduled_pickup_datetime | $KohaDates %]:
311
                    [% CASE 'to-be-staged' %]
297
                        [% SWITCH cp.status %]
312
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=to-be-staged">
298
                        [% CASE 'to-be-staged' %]
313
                        To be staged</a>
299
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=to-be-staged"> To be staged</a>
314
                    [% CASE 'staged-and-ready' %]
300
                        [% CASE 'staged-and-ready' %]
315
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=staged-and-ready">
301
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=staged-and-ready"> Staged and ready</a>
316
                        Staged and ready</a>
302
                        [% CASE 'patron-is-outside' %]
317
                    [% CASE 'patron-is-outside' %]
303
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=patron-is-outside"> Patron is outside!</a>
318
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=patron-is-outside">
304
                        [% CASE 'delivered' %]
319
                        Patron is outside!</a>
305
                            <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=delivered-today"> Delivered</a>
320
                    [% CASE 'delivered' %]
306
                        [% CASE %]
321
                        <a href="/cgi-bin/koha/circ/curbside_pickups.pl?tab=delivered-today">
307
                            <span>Unknown status "[% cp.status | html %]"</span>
322
                        Delivered</a>
308
                        [% END %]
323
                    [% CASE %]<span>Unknown status "[% cp.status | html %]"</span>
309
                    </li>
324
                    [% END %]
310
                [% END %]
325
                </li>
326
            [% END %]
327
            </ul>
311
            </ul>
328
        </div>
312
        </div>
329
    [% END %]
313
    [% END %]
Lines 334-345 Link Here
334
        <h4>Notes</h4>
318
        <h4>Notes</h4>
335
        <ul>
319
        <ul>
336
            <li>
320
            <li>
337
                <span class="circ-hlt">
321
                <span class="circ-hlt"> [% patron.borrowernotes | $raw | html_line_break %] </span>
338
                    [% patron.borrowernotes | $raw | html_line_break %]
339
                </span>
340
            </li>
322
            </li>
341
        </ul>
323
        </ul>
342
    </div> <!-- /#circnotes -->
324
    </div>
325
    <!-- /#circnotes -->
343
[% END # /IF patron.borrowernotes %]
326
[% END # /IF patron.borrowernotes %]
344
327
345
[% IF ( patron_messages ) %]
328
[% IF ( patron_messages ) %]
Lines 356-362 Link Here
356
                        [% patron_message.message_date | $KohaDates %]
339
                        [% patron_message.message_date | $KohaDates %]
357
                        [% Branches.GetName( patron_message.branchcode ) | html %]
340
                        [% Branches.GetName( patron_message.branchcode ) | html %]
358
                        [% IF patron_message.manager_id %]
341
                        [% IF patron_message.manager_id %]
359
                            ( <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> )
342
                            (
343
                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron_message.manager_id | uri %]"
344
                                >[% patron_message.get_column('manager_firstname') | html %] [% patron_message.get_column('manager_surname') | html %]</a
345
                            >
346
                            )
360
                        [% END %]
347
                        [% END %]
361
                        <em>"[% patron_message.message | html | html_line_break %]"</em>
348
                        <em>"[% patron_message.message | html | html_line_break %]"</em>
362
                        [% IF patron_message.patron_read_date %]
349
                        [% IF patron_message.patron_read_date %]
Lines 365-386 Link Here
365
                    </span>
352
                    </span>
366
                    [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
353
                    [% IF patron_message.branchcode == Branches.GetLoggedInBranchcode OR Koha.Preference('AllowAllMessageDeletion') %]
367
                        [% IF moremember %]
354
                        [% IF moremember %]
368
                            <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>
355
                            <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
                            >
369
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
363
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
370
                                [% INCLUDE 'csrf-token.inc' %]
364
                                [% INCLUDE 'csrf-token.inc' %]
371
                                <input type="hidden" name="op" value="cud-delete">
365
                                <input type="hidden" name="op" value="cud-delete" />
372
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]">
366
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]" />
373
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]">
367
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]" />
374
                                <input type="hidden" name="from" value="moremember">
368
                                <input type="hidden" name="from" value="moremember" />
375
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
369
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
376
                            </form>
370
                            </form>
377
                        [% ELSE %]
371
                        [% ELSE %]
378
                            <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>
372
                            <a
373
                                id="#edit_message_form_[% patron_message.message_id | html %]"
374
                                class="btn btn-link edit_message"
375
                                href="#edit_message_form_[% patron_message.message_id | uri %]"
376
                                data-bs-target="#edit_message_form_[% patron_message.message_id | html %]"
377
                                data-bs-toggle="modal"
378
                                ><i class="fa-solid fa-pencil" aria-hidden="true"></i> Edit</a
379
                            >
379
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
380
                            <form action="/cgi-bin/koha/circ/del_message.pl" method="post">
380
                                [% INCLUDE 'csrf-token.inc' %]
381
                                [% INCLUDE 'csrf-token.inc' %]
381
                                <input type="hidden" name="op" value="cud-delete">
382
                                <input type="hidden" name="op" value="cud-delete" />
382
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]">
383
                                <input type="hidden" name="message_id" value="[% patron_message.message_id | html %]" />
383
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]">
384
                                <input type="hidden" name="borrowernumber" value="[% patron_message.borrowernumber | html %]" />
384
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
385
                                <button type="submit" class="btn btn-link delete_message"><i class="fa fa-trash-can"></i> Delete</button>
385
                            </form>
386
                            </form>
386
                        [% END %]
387
                        [% END %]
Lines 389-395 Link Here
389
            [% END %]
390
            [% END %]
390
        </ul>
391
        </ul>
391
        <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>
392
        <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>
392
    </div> <!-- /#messages -->
393
    </div>
394
    <!-- /#messages -->
393
395
394
    [% FOREACH pm IN patron_messages %]
396
    [% FOREACH pm IN patron_messages %]
395
        <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">
397
        <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 397-404 Link Here
397
                <div class="modal-content">
399
                <div class="modal-content">
398
                    <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="edit_message_form" name="message_f">
400
                    <form method="post" action="/cgi-bin/koha/circ/add_message.pl" id="edit_message_form" name="message_f">
399
                        [% INCLUDE 'csrf-token.inc' %]
401
                        [% INCLUDE 'csrf-token.inc' %]
400
                        <input type="hidden" name="op" value="cud-edit_message">
402
                        <input type="hidden" name="op" value="cud-edit_message" />
401
                        <input type="hidden" name="message_id" value="[% pm.message_id | html %]"/>
403
                        <input type="hidden" name="message_id" value="[% pm.message_id | html %]" />
402
                        <div class="modal-header">
404
                        <div class="modal-header">
403
                            <h1 class="modal-title">Edit message</h1>
405
                            <h1 class="modal-title">Edit message</h1>
404
                        </div>
406
                        </div>
Lines 422-428 Link Here
422
                                </label>
424
                                </label>
423
                            </div>
425
                            </div>
424
                            <div class="form-group">
426
                            <div class="form-group">
425
                                <textarea rows="3" class="modal-textarea" name="borrower_message" id="edit_borrower_message" >[% pm.message | html %]</textarea>
427
                                <textarea rows="3" class="modal-textarea" name="borrower_message" id="edit_borrower_message">[% pm.message | html %]</textarea>
426
                            </div>
428
                            </div>
427
                        </div>
429
                        </div>
428
                        <div class="modal-footer">
430
                        <div class="modal-footer">
Lines 435-437 Link Here
435
        </div>
437
        </div>
436
    [% END %]
438
    [% END %]
437
[% END # /IF patron_messages %]
439
[% END # /IF patron_messages %]
440
441
<div style="font-style:normal;" class="modal notesModal" id="resetAttemptsModal" tabindex="-1" role="dialog" aria-labelledby="resetAttemptsModalLabel">
442
    <div class="modal-dialog">
443
        <div class="modal-content">
444
            <div class="modal-header">
445
                <h1 class="modal-title" id="resetAttemptsLabel">Confirm reset</h1>
446
                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
447
            </div>
448
            <form id="cancel_modal_form" method="post" action="/cgi-bin/koha/members/setstatus.pl">
449
                [% INCLUDE 'csrf-token.inc' %]
450
                <input type="hidden" name="op" value="cud-reset_login_attempts" />
451
                <input type="hidden" name="destination" value="[% moremember ? 'member' : 'circ' | html %]" />
452
                <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber | uri %]" />
453
                <div class="modal-body"> This will allow the user to try again and login </div>
454
                <div class="modal-footer">
455
                    <button id="resetAttemptsModalConfirmBtn" type="submit" class="btn btn-primary">Confirm</button>
456
                    <button type="button" class="btn btn-default" data-bs-dismiss="modal">Close</button>
457
                </div>
458
            </form>
459
        </div>
460
    </div>
461
</div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt (+2 lines)
Lines 1220-1225 Link Here
1220
                });
1220
                });
1221
            [% END %]
1221
            [% END %]
1222
1222
1223
            /*
1223
            // Handle checkout for fast cataloging
1224
            // Handle checkout for fast cataloging
1224
            // Check the referrer to prevent csrf, fill and submit form
1225
            // Check the referrer to prevent csrf, fill and submit form
1225
            if (document.referrer.length) {
1226
            if (document.referrer.length) {
Lines 1235-1240 Link Here
1235
                displayProperty: 'name',
1236
                displayProperty: 'name',
1236
                placeholder: _("Select or type a reason"),
1237
                placeholder: _("Select or type a reason"),
1237
            });
1238
            });
1239
            */
1238
        });
1240
        });
1239
    </script>
1241
    </script>
1240
    [% INCLUDE 'str/members-menu.inc' %]
1242
    [% INCLUDE 'str/members-menu.inc' %]
(-)a/members/setstatus.pl (-7 / +6 lines)
Lines 35-45 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
my $op             = $input->param('op');
43
43
44
my $dbh = C4::Context->dbh;
44
my $dbh = C4::Context->dbh;
45
my $dateexpiry;
45
my $dateexpiry;
Lines 66-72 if ( $logged_in_user->can_see_patron_infos($patron) ) { Link Here
66
            }
66
            }
67
        }
67
        }
68
        $dateexpiry = $patron->renew_account;
68
        $dateexpiry = $patron->renew_account;
69
    } elsif ( $resetloginattempts eq 'y' ) {
69
    } elsif ( $op == "cud-reset_login_attempts" ) {
70
        $patron->login_attempts(0)->store;
70
        $patron->login_attempts(0)->store;
71
    } else {
71
    } else {
72
        my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
72
        my $sth = $dbh->prepare("UPDATE borrowers SET debarred = ?, debarredcomment = '' WHERE borrowernumber = ?");
73
- 

Return to bug 37512