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

(-)a/Koha/Recall.pm (-9 / +9 lines)
Lines 29-35 Koha::Recall - Koha Recall Object class Link Here
29
29
30
=head1 API
30
=head1 API
31
31
32
=head2 Class Methods
32
=head2 Internal Methods
33
33
34
=cut
34
=cut
35
35
Lines 70-102 sub item { Link Here
70
    return $self->{_item};
70
    return $self->{_item};
71
}
71
}
72
72
73
=head3 borrower
73
=head3 patron
74
74
75
Returns the related Koha::Patron object for this recall
75
Returns the related Koha::Patron object for this recall
76
76
77
=cut
77
=cut
78
78
79
sub borrower {
79
sub patron {
80
80
81
    my ($self) = @_;
81
    my ($self) = @_;
82
82
83
    $self->{_borrower} ||= Koha::Patrons->find( $self->borrowernumber() );
83
    $self->{_patron} ||= Koha::Patrons->find( $self->borrowernumber() );
84
84
85
    return $self->{_borrower};
85
    return $self->{_patron};
86
}
86
}
87
87
88
=head3 branch
88
=head3 library
89
89
90
Returns the related Koha::Library object for this recall
90
Returns the related Koha::Library object for this recall
91
91
92
=cut
92
=cut
93
93
94
sub branch {
94
sub library {
95
    my ($self) = @_;
95
    my ($self) = @_;
96
96
97
    $self->{_branch} ||= Koha::Libraries->find( $self->branchcode() );
97
    $self->{_library} ||= Koha::Libraries->find( $self->branchcode() );
98
98
99
    return $self->{_branch};
99
    return $self->{_library};
100
}
100
}
101
101
102
=head3 checkout
102
=head3 checkout
(-)a/Koha/Recalls.pm (-1 / +1 lines)
Lines 30-36 Koha::Recalls - Koha Recalls Object Set class Link Here
30
30
31
=head1 API
31
=head1 API
32
32
33
=head2 Class Methods
33
=head2 Internal Methods
34
34
35
=cut
35
=cut
36
36
(-)a/circ/returns.pl (-1 / +1 lines)
Lines 191-197 if ( $query->param('reserve_id') ) { Link Here
191
191
192
if ( $query->param('recall_id') ){
192
if ( $query->param('recall_id') ){
193
    my $recall = Koha::Recalls->find(scalar $query->param('recall_id'));
193
    my $recall = Koha::Recalls->find(scalar $query->param('recall_id'));
194
    my $recall_borrower = $recall->borrower;
194
    my $recall_borrower = $recall->patron;
195
    my $item = Koha::Items->find($recall->itemnumber);
195
    my $item = Koha::Items->find($recall->itemnumber);
196
    my $biblio = Koha::Biblios->find($item->biblionumber);
196
    my $biblio = Koha::Biblios->find($item->biblionumber);
197
197
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc (-2 / +2 lines)
Lines 26-32 Link Here
26
                    </td>
26
                    </td>
27
                    <td class="recall-borrower">
27
                    <td class="recall-borrower">
28
                        <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
28
                        <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
29
                            [% recall.borrower.firstname %] [% recall.borrower.surname %] ([% recall.borrowernumber %])
29
                            [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
30
                        </a>
30
                        </a>
31
                    </td>
31
                    </td>
32
                    <td class="recall-title">
32
                    <td class="recall-title">
Lines 59-65 Link Here
59
                    </td>
59
                    </td>
60
60
61
                    <td class="recall-branch">
61
                    <td class="recall-branch">
62
                        [% recall.branch.branchname %]
62
                        [% recall.library.branchname %]
63
                    </td>
63
                    </td>
64
64
65
                    <td class="recall-status">
65
                    <td class="recall-status">
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-1 / +1 lines)
Lines 45-51 Link Here
45
                    </td>
45
                    </td>
46
46
47
                    <td class="recall-branch">
47
                    <td class="recall-branch">
48
                        [% recall.branch.branchname %]
48
                        [% recall.library.branchname %]
49
                    </td>
49
                    </td>
50
50
51
                    <td class="recall-status">
51
                    <td class="recall-status">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt (-2 / +2 lines)
Lines 58-64 Link Here
58
                                            </td>
58
                                            </td>
59
                                            <td class="recall-borrower">
59
                                            <td class="recall-borrower">
60
                                                <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
60
                                                <a class="recall-borrower" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">
61
                                                    [% recall.borrower.firstname %] [% recall.borrower.surname %] ([% recall.borrowernumber %])
61
                                                    [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %])
62
                                                </a>
62
                                                </a>
63
                                            </td>
63
                                            </td>
64
                                            <td class="recall-title">
64
                                            <td class="recall-title">
Lines 83-89 Link Here
83
                                                </a>
83
                                                </a>
84
                                            </td>
84
                                            </td>
85
                                            <td class="recall-branch">
85
                                            <td class="recall-branch">
86
                                                [% recall.branch.branchname %]
86
                                                [% recall.library.branchname %]
87
                                            </td>
87
                                            </td>
88
                                            <td class="recall-cancel">
88
                                            <td class="recall-cancel">
89
                                                <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
89
                                                <a class="btn btn-xs btn-default" id="cancel_recall" data-id="[% recall.recall_id %]"><i class="fa fa-times"></i> Cancel</a>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_waiting.tt (-7 / +7 lines)
Lines 75-84 Link Here
75
                                        </td>
75
                                        </td>
76
                                        <td>
76
                                        <td>
77
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.borrower.firstname %] [% recall.borrower.surname %]</a>
77
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.borrower.firstname %] [% recall.borrower.surname %]</a>
78
                                            [% IF ( recall.borrower.phone ) %]<br />[% recall.borrower.phone %][% END %]
78
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone %][% END %]
79
                                            [% IF ( recall.borrower.email ) %]<br /><a href="mailto:[% recall.borrower.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.borrower.email %]</a>[% END %]
79
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.patron.email %]</a>[% END %]
80
                                        </td>
80
                                        </td>
81
                                        <td>[% recall.branch.branchname %]</td>
81
                                        <td>[% recall.library.branchname %]</td>
82
                                        <td>
82
                                        <td>
83
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
83
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
84
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
84
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
Lines 122-132 Link Here
122
                                            <br><i>Barcode: [% recall.item.barcode %]</i>
122
                                            <br><i>Barcode: [% recall.item.barcode %]</i>
123
                                        </td>
123
                                        </td>
124
                                        <td>
124
                                        <td>
125
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.borrower.firstname %] [% recall.borrower.surname %]</a>
125
                                            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% recall.borrowernumber %]">[% recall.patron.firstname %] [% recall.patron.surname %]</a>
126
                                            [% IF ( recall.borrower.phone ) %]<br />[% recall.borrower.phone %][% END %]
126
                                            [% IF ( recall.patron.phone ) %]<br />[% recall.patron.phone %][% END %]
127
                                            [% IF ( recall.borrower.email ) %]<br /><a href="mailto:[% recall.borrower.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.borrower.email %]</a>[% END %]
127
                                            [% IF ( recall.patron.email ) %]<br /><a href="mailto:[% recall.patron.email %]?subject=Recall waiting: [% recall.biblio.title %]">[% recall.patron.email %]</a>[% END %]
128
                                        </td>
128
                                        </td>
129
                                        <td>[% recall.branch.branchname %]</td>
129
                                        <td>[% recall.library.branchname %]</td>
130
                                        <td>
130
                                        <td>
131
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
131
                                            <form action="/cgi-bin/koha/circ/recalls_waiting.pl" method="post">
132
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
132
                                                <input type="hidden" name="recall_id" value="[% recall.recall_id %]">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt (-1 / +1 lines)
Lines 549-555 Link Here
549
                        <li class="error">Patron's address is in doubt</li>
549
                        <li class="error">Patron's address is in doubt</li>
550
                    [% END %]
550
                    [% END %]
551
551
552
                    <h4><strong>Wait for pickup at</strong> [% recall.branch.branchname %]</h4>
552
                    <h4><strong>Wait for pickup at</strong> [% recall.library.branchname %]</h4>
553
553
554
                    <input type="hidden" name="itemnumber" value="[% recall.itemnumber %]" />
554
                    <input type="hidden" name="itemnumber" value="[% recall.itemnumber %]" />
555
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
555
                    <input type="hidden" name="borrowernumber" value="[% patron.borrowernumber %]" />
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-recalls.tt (-1 / +1 lines)
Lines 84-90 Link Here
84
                                            </td>
84
                                            </td>
85
                                            <td class="branch">
85
                                            <td class="branch">
86
                                                <span class="tdlabel">Pick up location:</span>
86
                                                <span class="tdlabel">Pick up location:</span>
87
                                                [% RECALL.branch.branchname %]
87
                                                [% RECALL.library.branchname %]
88
                                            </td>
88
                                            </td>
89
                                            <td class="status">
89
                                            <td class="status">
90
                                                <span class="tdlabel">Status:</span>
90
                                                <span class="tdlabel">Status:</span>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-1 / +1 lines)
Lines 845-851 Link Here
845
                                                </td>
845
                                                </td>
846
                                                <td class="branch">
846
                                                <td class="branch">
847
                                                    <span class="tdlabel">Pick up location:</span>
847
                                                    <span class="tdlabel">Pick up location:</span>
848
                                                    [% RECALL.branch.branchname %]
848
                                                    [% RECALL.library.branchname %]
849
                                                </td>
849
                                                </td>
850
                                                <td class="status">
850
                                                <td class="status">
851
                                                    <span class="tdlabel">Status:</span>
851
                                                    <span class="tdlabel">Status:</span>
(-)a/t/db_dependent/Koha/Recalls.t (-3 / +2 lines)
Lines 67-77 is( $recall->has_expired, 1, 'Recall has expired' ); Link Here
67
67
68
is( $biblio->{biblionumber}, $recall->biblio->biblionumber, 'Can access biblio from recall' );
68
is( $biblio->{biblionumber}, $recall->biblio->biblionumber, 'Can access biblio from recall' );
69
69
70
is( $patron->{borrowernumber}, $recall->borrower->borrowernumber, 'Can access borrower from recall' );
70
is( $patron->{borrowernumber}, $recall->patron->borrowernumber, 'Can access borrower from recall' );
71
71
72
is( $item->{itemnumber}, $recall->item->itemnumber, 'Can access item from recall' );
72
is( $item->{itemnumber}, $recall->item->itemnumber, 'Can access item from recall' );
73
73
74
is( $library->{branchcode}, $recall->branch->branchcode, 'Can access branch from recall' );
74
is( $library->{branchcode}, $recall->library->branchcode, 'Can access branch from recall' );
75
75
76
is( $checkout->{issue_id}, $recall->checkout->issue_id, 'Can access checkout from recall' );
76
is( $checkout->{issue_id}, $recall->checkout->issue_id, 'Can access checkout from recall' );
77
77
78
- 

Return to bug 19532