Lines 171-179
Link Here
|
171 |
<th>[% tp('purchase suggestion created by', 'Created by:') | html %]</th> |
171 |
<th>[% tp('purchase suggestion created by', 'Created by:') | html %]</th> |
172 |
<td>[% suggesteddate | $KohaDates %]</td> |
172 |
<td>[% suggesteddate | $KohaDates %]</td> |
173 |
<td> |
173 |
<td> |
174 |
[% IF ( suggestedby_borrowernumber ) %] |
174 |
[% IF ( suggestedby_patron.borrowernumber ) %] |
175 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> |
175 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> |
176 |
[% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %]) |
176 |
[% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %]) |
177 |
[% END %] |
177 |
[% END %] |
178 |
</td> |
178 |
</td> |
179 |
</tr> |
179 |
</tr> |
Lines 181-189
Link Here
|
181 |
<th>Managed by:</th> |
181 |
<th>Managed by:</th> |
182 |
<td>[% manageddate | $KohaDates %]</td> |
182 |
<td>[% manageddate | $KohaDates %]</td> |
183 |
<td> |
183 |
<td> |
184 |
[% IF ( managedby_borrowernumber ) %] |
184 |
[% IF ( managedby_patron.borrowernumber ) %] |
185 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_borrowernumber | uri %]">[% managedby_surname | html %], [% managedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> |
185 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% managedby_patron.borrowernumber | uri %]">[% managedby_patron.surname | html %], [% managedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> |
186 |
[% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) |
186 |
[% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) |
187 |
[% END %] |
187 |
[% END %] |
188 |
</td> |
188 |
</td> |
189 |
</tr> |
189 |
</tr> |
Lines 191-199
Link Here
|
191 |
<th>Accepted on:</th> |
191 |
<th>Accepted on:</th> |
192 |
<td>[% accepteddate | $KohaDates %]</td> |
192 |
<td>[% accepteddate | $KohaDates %]</td> |
193 |
<td> |
193 |
<td> |
194 |
[% IF ( acceptedby_borrowernumber ) %] |
194 |
[% IF ( acceptedby_patron.borrowernumber ) %] |
195 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> |
195 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> |
196 |
[% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %]) |
196 |
[% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %]) |
197 |
[% END %] |
197 |
[% END %] |
198 |
</td> |
198 |
</td> |
199 |
</tr> |
199 |
</tr> |
Lines 368-380
Link Here
|
368 |
<tr> |
368 |
<tr> |
369 |
<th><label for="suggesteddate">[% tp('purchase suggestion created by', 'Created by:') | html %]</label> </th> |
369 |
<th><label for="suggesteddate">[% tp('purchase suggestion created by', 'Created by:') | html %]</label> </th> |
370 |
<td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td> |
370 |
<td><input type="text" id="suggesteddate" name="suggesteddate" class="datepicker" size="10" maxlength="10" value="[% suggesteddate | $KohaDates %]"/>[% INCLUDE 'date-format.inc' %]</td> |
371 |
<td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_borrowernumber | uri %]">[% suggestedby_surname | html %], [% suggestedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( suggestedby_branchcode ) | html %] ([% suggestedby_description | html %])[% END %] |
371 |
<td><input type="hidden" id="suggestedby" name="suggestedby" value="[% suggestedby | html %]"/>[% IF ( suggestedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% suggestedby_patron.borrowernumber | uri %]">[% suggestedby_patron.surname | html %], [% suggestedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> [% Branches.GetName( suggestedby_patron.branchcode ) | html %] ([% suggestedby_patron.category.description | html %])[% END %] |
372 |
</td> |
372 |
</td> |
373 |
</tr> |
373 |
</tr> |
374 |
<tr> |
374 |
<tr> |
375 |
<th><label for="accepteddate">Accepted on:</label> </th> |
375 |
<th><label for="accepteddate">Accepted on:</label> </th> |
376 |
<td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> |
376 |
<td><input type="text" id="accepteddate" name="accepteddate" class="datepicker" size="10" maxlength="10" value="[% accepteddate | $KohaDates %]" />[% INCLUDE 'date-format.inc' %]</td> |
377 |
<td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_borrowernumber | uri %]">[% acceptedby_surname | html %], [% acceptedby_firstname | html %] ([% suggestedby_cardnumber | html %])</a> [% Branches.GetName( acceptedby_branchcode ) | html %] ([% acceptedby_description | html %])[% END %]</td> |
377 |
<td><input type="hidden" id="acceptedby" name="acceptedby" value="[% acceptedby | html %]"/>[% IF ( acceptedby_patron.borrowernumber ) %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% acceptedby_patron.borrowernumber | uri %]">[% acceptedby_patron.surname | html %], [% acceptedby_patron.firstname | html %] ([% suggestedby_patron.cardnumber | html %])</a> [% Branches.GetName( acceptedby_patron.branchcode ) | html %] ([% acceptedby_patron.category.description | html %])[% END %]</td> |
378 |
</tr> |
378 |
</tr> |
379 |
</tbody> |
379 |
</tbody> |
380 |
</table></li> |
380 |
</table></li> |
Lines 389-400
Link Here
|
389 |
<span id="managedby_name"> |
389 |
<span id="managedby_name"> |
390 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a> |
390 |
<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% logged_in_user.borrowernumber | uri %]">You</a> |
391 |
</span> |
391 |
</span> |
392 |
[% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %] |
392 |
[% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] |
393 |
| Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_branchcode ) | html %] ([% managedby_description | html %]) |
393 |
| Previously was [% INCLUDE 'patron-title.inc' patron=managedby_patron hide_patron_infos_if_needed=1 %] [% Branches.GetName( managedby_patron.branchcode ) | html %] ([% managedby_patron.category.description | html %]) |
394 |
[% END %] |
394 |
[% END %] |
395 |
<br /> |
395 |
<br /> |
396 |
<a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> |
396 |
<a id="edit_manager" class="new_window" href="#"><i class="fa fa-search"></i> Select manager</a> |
397 |
[% IF managedby_borrowernumber && logged_in_user.borrowernumber != managedby_borrowernumber %] |
397 |
[% IF managedby_patron.borrowernumber && logged_in_user.borrowernumber != managedby_patron.borrowernumber %] |
398 |
<a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> |
398 |
<a id="restore_previous_manager" href="#"><i class="fa fa-trash"></i> Keep existing manager</a> |
399 |
[% END %] |
399 |
[% END %] |
400 |
<input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> |
400 |
<input type="hidden" name="managedby" id="managedby" value="[% logged_in_user.borrowernumber | html %]" /> |
Lines 1034-1045
Link Here
|
1034 |
|
1034 |
|
1035 |
$("#managedby_name").empty(); |
1035 |
$("#managedby_name").empty(); |
1036 |
$("#managedby").val(''); |
1036 |
$("#managedby").val(''); |
1037 |
var borrowername = "[% managedby_firstname | html %] [% managedby_surname | html %]"; |
1037 |
var borrowername = "[% managedby_patron.firstname | html %] [% managedby_patron.surname | html %]"; |
1038 |
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl' |
1038 |
var managerlink = '<a href="/cgi-bin/koha/members/moremember.pl' |
1039 |
+ '?borrowernumber=[% managedby_borrowernumber | html %]">' |
1039 |
+ '?borrowernumber=[% managedby_patron.borrowernumber | html %]">' |
1040 |
+ borrowername + '</a>'; |
1040 |
+ borrowername + '</a>'; |
1041 |
$('#managedby_name').html(managerlink); |
1041 |
$('#managedby_name').html(managerlink); |
1042 |
$('#managedby').val([% managedby_borrowernumber | html %]); |
1042 |
$('#managedby').val([% managedby_patron.borrowernumber | html %]); |
1043 |
}); |
1043 |
}); |
1044 |
}); |
1044 |
}); |
1045 |
</script> |
1045 |
</script> |