BEGIN {
# set the version for version checking
- $VERSION = 3.01;
+ $VERSION = 3.07.00.049;
require Exporter;
@ISA = qw(Exporter);
# subs to rename (and maybe merge some...)
push @EXPORT, qw(
&GetIssuesIteminfo
);
- #
- # &GetIssuingRules - delete.
- # use C4::Circulation::GetIssuingRule instead.
-
# subs to move to Members.pm
push @EXPORT, qw(
&CheckBorrowerDebarred
C<$chargename> is the chargename field from the applicable record in
the categoryitem table, whatever that is.
-C<$daycount> is the number of days between start and end dates, Calendar adjusted (where needed),
-minus any applicable grace period.
+C<$unitcount> is the number of chargeable units (days between start and end dates, Calendar adjusted where needed,
+minus any applicable grace period, or hours)
FIXME - What is chargename supposed to be ?
=cut
sub CalcFine {
- my ( $item, $bortype, $branchcode, $start_date, $end_date ) = @_;
- my $dbh = C4::Context->dbh;
- my $amount = 0;
- my $charge_duration;
+ my ( $item, $bortype, $branchcode, $due_dt, $end_date ) = @_;
+ my $start_date = $due_dt->clone();
# get issuingrules (fines part will be used)
- my $data = C4::Circulation::GetIssuingRule($bortype, $item->{itemtype}, $branchcode);
- if(C4::Context->preference('finesCalendar') eq 'noFinesWhenClosed') {
- my $calendar = Koha::Calendar->new( branchcode => $branchcode );
- $charge_duration = $calendar->days_between( $start_date, $end_date );
- } else {
- $charge_duration = $end_date - $start_date;
- }
- # correct for grace period.
+ my $itemtype = $item->{itemtype} || $item->{itype};
+ my $data = C4::Circulation::GetIssuingRule($bortype, $itemtype, $branchcode);
my $fine_unit = $data->{lengthunit};
$fine_unit ||= 'days';
- my $chargeable_units;
- if ($fine_unit eq 'hours') {
- $chargeable_units = $charge_duration->hours(); # TODO closed times???
- }
- else {
- $chargeable_units = $charge_duration->days;
- }
- my $days_minus_grace = $chargeable_units - $data->{firstremind};
- if ($data->{'chargeperiod'} && $days_minus_grace ) {
- $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents
+
+ my $chargeable_units = _get_chargeable_units($fine_unit, $start_date, $end_date, $branchcode);
+ my $units_minus_grace = $chargeable_units - $data->{firstremind};
+ my $amount = 0;
+ if ($data->{'chargeperiod'} && ($units_minus_grace > 0) ) {
+ if ( C4::Context->preference('FinesIncludeGracePeriod') ) {
+ $amount = int($chargeable_units / $data->{'chargeperiod'}) * $data->{'fine'};# TODO fine calc should be in cents
+ } else {
+ $amount = int($units_minus_grace / $data->{'chargeperiod'}) * $data->{'fine'};
+ }
} else {
- # a zero (or null) chargeperiod means no charge.
- }
- if(C4::Context->preference('maxFine') && ( $amount > C4::Context->preference('maxFine'))) {
- $amount = C4::Context->preference('maxFine');
+ # a zero (or null) chargeperiod or negative units_minus_grace value means no charge.
}
- return ($amount, $data->{chargename}, $days_minus_grace);
+ $amount = $data->{overduefinescap} if $data->{overduefinescap} && $amount > $data->{overduefinescap};
+ $debug and warn sprintf("CalcFine returning (%s, %s, %s, %s)", $amount, $data->{'chargename'}, $units_minus_grace, $chargeable_units);
+ return ($amount, $data->{'chargename'}, $units_minus_grace, $chargeable_units);
# FIXME: chargename is NEVER populated anywhere.
}
+=head2 _get_chargeable_units
+
+ _get_chargeable_units($unit, $start_date_ $end_date, $branchcode);
+
+return integer value of units between C<$start_date> and C<$end_date>, factoring in holidays for C<$branchcode>.
+
+C<$unit> is 'days' or 'hours' (default is 'days').
+
+C<$start_date> and C<$end_date> are the two DateTimes to get the number of units between.
+
+C<$branchcode> is the branch whose calendar to use for finding holidays.
+
+=cut
+
+sub _get_chargeable_units {
+ my ($unit, $dt1, $dt2, $branchcode) = @_;
+ my $charge_units = 0;
+ my $charge_duration;
+ if ($unit eq 'hours') {
+ if(C4::Context->preference('finesCalendar') eq 'noFinesWhenClosed') {
+ my $calendar = Koha::Calendar->new( branchcode => $branchcode );
+ $charge_duration = $calendar->hours_between( $dt1, $dt2 );
+ } else {
+ $charge_duration = $dt2->delta_ms( $dt1 );
+ }
+ if($charge_duration->in_units('hours') == 0 && $charge_duration->in_units('seconds') > 0){
+ return 1;
+ }
+ return $charge_duration->in_units('hours');
+ }
+ else { # days
+ if(C4::Context->preference('finesCalendar') eq 'noFinesWhenClosed') {
+ my $calendar = Koha::Calendar->new( branchcode => $branchcode );
+ $charge_duration = $calendar->days_between( $dt1, $dt2 );
+ } else {
+ $charge_duration = $dt2->delta_days( $dt1 );
+ }
+ return $charge_duration->in_units('days');
+ }
+}
+
+
=head2 GetSpecialHolidays
&GetSpecialHolidays($date_dues,$itemnumber);
# "REF" is Cash Refund
my $sth = $dbh->prepare(
"SELECT * FROM accountlines
- WHERE itemnumber=?
- AND borrowernumber=?
- AND accounttype IN ('FU','O','F','M')
- AND description like ? "
+ WHERE borrowernumber=?
+ AND accounttype IN ('FU','O','F','M')"
);
- $sth->execute( $itemnum, $borrowernumber, "%$due%" );
+ $sth->execute( $borrowernumber );
+ my $data;
+ my $total_amount_other = 0.00;
+ my $due_qr = qr/$due/;
+ # Cycle through the fines and
+ # - find line that relates to the requested $itemnum
+ # - accumulate fines for other items
+ # so we can update $itemnum fine taking in account fine caps
+ while (my $rec = $sth->fetchrow_hashref) {
+ if ($rec->{itemnumber} == $itemnum && $rec->{description} =~ /$due_qr/) {
+ if ($data) {
+ warn "Not a unique accountlines record for item $itemnum borrower $borrowernumber";
+ } else {
+ $data = $rec;
+ next;
+ }
+ }
+ $total_amount_other += $rec->{'amountoutstanding'};
+ }
+
+ if (my $maxfine = C4::Context->preference('MaxFine')) {
+ if ($total_amount_other + $amount > $maxfine) {
+ my $new_amount = $maxfine - $total_amount_other;
+ return if $new_amount <= 0.00;
+ warn "Reducing fine for item $itemnum borrower $borrowernumber from $amount to $new_amount - MaxFine reached";
+ $amount = $new_amount;
+ }
+ }
- if ( my $data = $sth->fetchrow_hashref ) {
+ if ( $data ) {
# we're updating an existing fine. Only modify if amount changed
# Note that in the current implementation, you cannot pay against an accruing fine
return 0;
}
-
-=head2 GetIssuingRules
-
-FIXME - This sub should be deprecated and removed.
-It ignores branch and defaults.
-
- $data = &GetIssuingRules($itemtype,$categorycode);
-
-Looks up for all issuingrules an item info
-
-C<$itemnumber> is a reference-to-hash whose keys are all of the fields
-from the borrowers and categories tables of the Koha database. Thus,
-
-C<$categorycode> contains information about borrowers category
-
-C<$data> contains all information about both the borrower and
-category he or she belongs to.
-=cut
-
-sub GetIssuingRules {
- warn "GetIssuingRules is deprecated: use GetIssuingRule from C4::Circulation instead.";
- my ($itemtype,$categorycode)=@_;
- my $dbh = C4::Context->dbh();
- my $query=qq|SELECT *
- FROM issuingrules
- WHERE issuingrules.itemtype=?
- AND issuingrules.categorycode=?
- |;
- my $sth = $dbh->prepare($query);
- # print $query;
- $sth->execute($itemtype,$categorycode);
- return $sth->fetchrow_hashref;
-}
-
-
sub ReplacementCost2 {
my ( $itemnum, $borrowernumber ) = @_;
my $dbh = C4::Context->dbh();
projects / koha.git / blobdiff