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

(-)a/C4/SIP/ILS/Item.pm (-12 / +7 lines)
Lines 22-35 use C4::Circulation; Link Here
22
use C4::Members;
22
use C4::Members;
23
use C4::Reserves;
23
use C4::Reserves;
24
24
25
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
25
our $VERSION = 3.07.00.049;
26
27
BEGIN {
28
    $VERSION = 3.07.00.049;
29
	require Exporter;
30
	@ISA = qw(Exporter);
31
	@EXPORT_OK = qw();
32
}
33
26
34
=head1 EXAMPLE
27
=head1 EXAMPLE
35
28
Lines 140-146 my %fields = ( Link Here
140
);
133
);
141
134
142
sub next_hold {
135
sub next_hold {
143
    my $self = shift or return;
136
    my $self = shift;
144
    # use Data::Dumper; warn "next_hold() hold_shelf: " . Dumper($self->{hold_shelf}); warn "next_hold() pending_queue: " . $self->{pending_queue};
137
    # use Data::Dumper; warn "next_hold() hold_shelf: " . Dumper($self->{hold_shelf}); warn "next_hold() pending_queue: " . $self->{pending_queue};
145
    foreach (@{$self->hold_shelf}) {    # If this item was taken from the hold shelf, then that reserve still governs
138
    foreach (@{$self->hold_shelf}) {    # If this item was taken from the hold shelf, then that reserve still governs
146
        next unless ($_->{itemnumber} and $_->{itemnumber} == $self->{itemnumber});
139
        next unless ($_->{itemnumber} and $_->{itemnumber} == $self->{itemnumber});
Lines 168-174 sub hold_patron_id { Link Here
168
161
169
}
162
}
170
sub hold_patron_name {
163
sub hold_patron_name {
171
    my $self = shift or return;
164
    my $self = shift;
172
    my $borrowernumber = (@_ ? shift: $self->hold_patron_id()) or return;
165
    my $borrowernumber = (@_ ? shift: $self->hold_patron_id()) or return;
173
    my $holder = GetMember(borrowernumber=>$borrowernumber);
166
    my $holder = GetMember(borrowernumber=>$borrowernumber);
174
    unless ($holder) {
167
    unless ($holder) {
Lines 186-192 sub hold_patron_name { Link Here
186
}
179
}
187
180
188
sub hold_patron_bcode {
181
sub hold_patron_bcode {
189
    my $self = shift or return;
182
    my $self = shift;
190
    my $borrowernumber = (@_ ? shift: $self->hold_patron_id()) or return;
183
    my $borrowernumber = (@_ ? shift: $self->hold_patron_id()) or return;
191
    my $holder = GetMember(borrowernumber => $borrowernumber);
184
    my $holder = GetMember(borrowernumber => $borrowernumber);
192
    if ($holder) {
185
    if ($holder) {
Lines 257-265 sub sip_circulation_status { Link Here
257
}
250
}
258
251
259
sub sip_security_marker {
252
sub sip_security_marker {
253
    my $self = shift;
260
    return '02';	# FIXME? 00-other; 01-None; 02-Tattle-Tape Security Strip (3M); 03-Whisper Tape (3M)
254
    return '02';	# FIXME? 00-other; 01-None; 02-Tattle-Tape Security Strip (3M); 03-Whisper Tape (3M)
261
}
255
}
262
sub sip_fee_type {
256
sub sip_fee_type {
257
    my $self = shift;
263
    return '01';    # FIXME? 01-09 enumerated in spec.  We just use O1-other/unknown.
258
    return '01';    # FIXME? 01-09 enumerated in spec.  We just use O1-other/unknown.
264
}
259
}
265
260
Lines 354-360 sub _barcode_to_borrowernumber { Link Here
354
    return $member->{borrowernumber};
349
    return $member->{borrowernumber};
355
}
350
}
356
sub barcode_is_borrowernumber {    # because hold_queue only has borrowernumber...
351
sub barcode_is_borrowernumber {    # because hold_queue only has borrowernumber...
357
    my $self = shift;   # not really used
352
    my $self = shift;
358
    my $barcode = shift;
353
    my $barcode = shift;
359
    my $number  = shift or return;    # can't be zero
354
    my $number  = shift or return;    # can't be zero
360
    return unless defined $barcode; # might be 0 or 000 or 000000
355
    return unless defined $barcode; # might be 0 or 000 or 000000
(-)a/C4/SIP/ILS/Patron.pm (-17 / +13 lines)
Lines 23-35 use C4::Reserves; Link Here
23
use C4::Branch qw(GetBranchName);
23
use C4::Branch qw(GetBranchName);
24
use Digest::MD5 qw(md5_base64);
24
use Digest::MD5 qw(md5_base64);
25
25
26
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
26
our $VERSION = 3.07.00.049;
27
28
BEGIN {
29
    $VERSION = 3.07.00.049;
30
	@ISA = qw(Exporter);
31
	@EXPORT_OK = qw(invalid_patron);
32
}
33
27
34
our $kp;	# koha patron
28
our $kp;	# koha patron
35
29
Lines 253-259 sub drop_hold { Link Here
253
# from the SIP request.  Note those incoming values are 1-indexed, not 0-indexed.
247
# from the SIP request.  Note those incoming values are 1-indexed, not 0-indexed.
254
#
248
#
255
sub x_items {
249
sub x_items {
256
    my $self      = shift or return;
250
    my $self      = shift;
257
    my $array_var = shift or return;
251
    my $array_var = shift or return;
258
    my ($start, $end) = @_;
252
    my ($start, $end) = @_;
259
	$self->{$array_var} or return [];
253
	$self->{$array_var} or return [];
Lines 268-295 sub x_items { Link Here
268
# List of outstanding holds placed
262
# List of outstanding holds placed
269
#
263
#
270
sub hold_items {
264
sub hold_items {
271
    my $self = shift or return;
265
    my $self = shift;
272
    return $self->x_items('hold_items', @_);
266
    return $self->x_items('hold_items', @_);
273
}
267
}
274
268
275
sub overdue_items {
269
sub overdue_items {
276
    my $self = shift or return;
270
    my $self = shift;
277
    return $self->x_items('overdue_items', @_);
271
    return $self->x_items('overdue_items', @_);
278
}
272
}
279
sub charged_items {
273
sub charged_items {
280
    my $self = shift or return;
274
    my $self = shift;
281
    return $self->x_items('items', @_);
275
    return $self->x_items('items', @_);
282
}
276
}
283
sub fine_items {
277
sub fine_items {
284
    my $self = shift or return;
278
    my $self = shift;
285
    return $self->x_items('fine_items', @_);
279
    return $self->x_items('fine_items', @_);
286
}
280
}
287
sub recall_items {
281
sub recall_items {
288
    my $self = shift or return;
282
    my $self = shift;
289
    return $self->x_items('recall_items', @_);
283
    return $self->x_items('recall_items', @_);
290
}
284
}
291
sub unavail_holds {
285
sub unavail_holds {
292
    my $self = shift or return;
286
    my $self = shift;
293
    return $self->x_items('unavail_holds', @_);
287
    return $self->x_items('unavail_holds', @_);
294
}
288
}
295
289
Lines 321-336 sub inet_privileges { Link Here
321
}
315
}
322
316
323
sub fee_limit {
317
sub fee_limit {
324
    # my $self = shift;
318
    my $self = shift;
325
    return C4::Context->preference("noissuescharge") || 5;
319
    return C4::Context->preference("noissuescharge") || 5;
326
}
320
}
327
321
328
sub excessive_fees {
322
sub excessive_fees {
329
    my $self = shift or return;
323
    my $self = shift;
330
    return ($self->fee_amount and $self->fee_amount > $self->fee_limit);
324
    return ($self->fee_amount and $self->fee_amount > $self->fee_limit);
331
}
325
}
332
sub excessive_fines {
326
sub excessive_fines {
333
    my $self = shift or return;
327
    my $self = shift;
334
    return $self->excessive_fees;   # excessive_fines is the same thing as excessive_fees for Koha
328
    return $self->excessive_fees;   # excessive_fines is the same thing as excessive_fees for Koha
335
}
329
}
336
    
330
    
Lines 346-355 sub library_name { Link Here
346
#
340
#
347
341
348
sub invalid_patron {
342
sub invalid_patron {
343
    my $self = shift;
349
    return "Please contact library staff";
344
    return "Please contact library staff";
350
}
345
}
351
346
352
sub charge_denied {
347
sub charge_denied {
348
    my $self = shift;
353
    return "Please contact library staff";
349
    return "Please contact library staff";
354
}
350
}
355
351
(-)a/C4/SIP/ILS/Transaction/Checkin.pm (-1 / +1 lines)
Lines 17-23 use C4::Reserves qw( ModReserveAffect ); Link Here
17
use C4::Items qw( ModItemTransfer );
17
use C4::Items qw( ModItemTransfer );
18
use C4::Debug;
18
use C4::Debug;
19
19
20
our @ISA = qw(ILS::Transaction);
20
use parent qw(ILS::Transaction);
21
21
22
my %fields = (
22
my %fields = (
23
    magnetic => 0,
23
    magnetic => 0,
(-)a/C4/SIP/ILS/Transaction/Checkout.pm (-5 / +3 lines)
Lines 20-32 use C4::Circulation; Link Here
20
use C4::Members;
20
use C4::Members;
21
use C4::Reserves qw(ModReserveFill);
21
use C4::Reserves qw(ModReserveFill);
22
use C4::Debug;
22
use C4::Debug;
23
use parent qw(ILS::Transaction);
23
24
24
use vars qw($VERSION @ISA $debug);
25
our $debug;
25
26
26
BEGIN {
27
our $VERSION = 3.07.00.049;
27
    $VERSION = 3.07.00.049;
28
	@ISA = qw(ILS::Transaction);
29
}
30
28
31
# Most fields are handled by the Transaction superclass
29
# Most fields are handled by the Transaction superclass
32
my %fields = (
30
my %fields = (
(-)a/C4/SIP/ILS/Transaction/FeePayment.pm (-2 / +1 lines)
Lines 22-30 use strict; Link Here
22
22
23
use C4::Accounts qw(recordpayment);
23
use C4::Accounts qw(recordpayment);
24
use ILS;
24
use ILS;
25
use base qw(ILS::Transaction);
25
use parent qw(ILS::Transaction);
26
26
27
use vars qw($VERSION @ISA $debug);
28
27
29
our $debug   = 0;
28
our $debug   = 0;
30
our $VERSION = 3.07.00.049;
29
our $VERSION = 3.07.00.049;
(-)a/C4/SIP/ILS/Transaction/Hold.pm (-5 / +2 lines)
Lines 12-24 use ILS::Transaction; Link Here
12
use C4::Reserves;	# AddReserve
12
use C4::Reserves;	# AddReserve
13
use C4::Members;	# GetMember
13
use C4::Members;	# GetMember
14
use C4::Biblio;		# GetBiblioFromItemNumber GetBiblioItemByBiblioNumber
14
use C4::Biblio;		# GetBiblioFromItemNumber GetBiblioItemByBiblioNumber
15
use parent qw(ILS::Transaction);
15
16
16
use vars qw($VERSION @ISA);
17
17
18
BEGIN {
18
our $VERSION = 3.07.00.049;
19
    $VERSION = 3.07.00.049;
20
	    @ISA = qw(ILS::Transaction);
21
}
22
19
23
my %fields = (
20
my %fields = (
24
	expiration_date => 0,
21
	expiration_date => 0,
(-)a/C4/SIP/ILS/Transaction/Renew.pm (-1 / +1 lines)
Lines 12-18 use ILS; Link Here
12
use C4::Circulation;
12
use C4::Circulation;
13
use C4::Members;
13
use C4::Members;
14
14
15
use base qw(ILS::Transaction);
15
use parent qw(ILS::Transaction);
16
16
17
my %fields = (
17
my %fields = (
18
    renewal_ok => 0,
18
    renewal_ok => 0,
(-)a/C4/SIP/ILS/Transaction/RenewAll.pm (-2 / +1 lines)
Lines 12-18 use ILS::Item; Link Here
12
12
13
use C4::Members qw( GetMember );
13
use C4::Members qw( GetMember );
14
14
15
use base qw(ILS::Transaction::Renew);
15
use parent qw(ILS::Transaction::Renew);
16
16
17
my %fields = (
17
my %fields = (
18
    renewed   => [],
18
    renewed   => [],
19
- 

Return to bug 8429