Bugzilla – Attachment 92967 Details for
Bug 23586
Issuing rules failing in 19.05
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 23586: (follow-up) Clarify variable names
Bug-23586-follow-up-Clarify-variable-names.patch (text/plain), 4.53 KB, created by
Martin Renvoize (ashimema)
on 2019-09-19 13:50:33 UTC
(
hide
)
Description:
Bug 23586: (follow-up) Clarify variable names
Filename:
MIME Type:
Creator:
Martin Renvoize (ashimema)
Created:
2019-09-19 13:50:33 UTC
Size:
4.53 KB
patch
obsolete
>From 6aff84f55b4a90b7f832620841369bf8cc90ad2f Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Thu, 19 Sep 2019 14:48:45 +0100 >Subject: [PATCH] Bug 23586: (follow-up) Clarify variable names > >This patch updates the variable name '$branch' to '$branchcode' in a >number of places to make it clearer what the variable contains. >--- > C4/Circulation.pm | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-) > >diff --git a/C4/Circulation.pm b/C4/Circulation.pm >index fd0568ca43..9d8df029c2 100644 >--- a/C4/Circulation.pm >+++ b/C4/Circulation.pm >@@ -1170,7 +1170,7 @@ sub CanBookBeReturned { > > sub checkHighHolds { > my ( $item, $borrower ) = @_; >- my $branch = _GetCircControlBranch( $item, $borrower ); >+ my $branchcode = _GetCircControlBranch( $item, $borrower ); > my $item_object = Koha::Items->find( $item->{itemnumber} ); > > my $return_data = { >@@ -1228,10 +1228,10 @@ sub checkHighHolds { > > my $issuedate = DateTime->now( time_zone => C4::Context->tz() ); > >- my $calendar = Koha::Calendar->new( branchcode => $branch ); >+ my $calendar = Koha::Calendar->new( branchcode => $branchcode ); > > my $itype = $item_object->effective_itemtype; >- my $orig_due = C4::Circulation::CalcDateDue( $issuedate, $itype, $branch, $borrower ); >+ my $orig_due = C4::Circulation::CalcDateDue( $issuedate, $itype, $branchcode, $borrower ); > > my $decreaseLoanHighHoldsDuration = C4::Context->preference('decreaseLoanHighHoldsDuration'); > >@@ -1321,7 +1321,7 @@ sub AddIssue { > or return; # if we don't get an Item, abort. > my $item_unblessed = $item_object->unblessed; > >- my $branch = _GetCircControlBranch( $item_unblessed, $borrower ); >+ my $branchcode = _GetCircControlBranch( $item_unblessed, $borrower ); > > # get actual issuing if there is one > my $actualissue = $item_object->checkout; >@@ -1332,7 +1332,7 @@ sub AddIssue { > $datedue = AddRenewal( > $borrower->{'borrowernumber'}, > $item_object->itemnumber, >- $branch, >+ $branchcode, > $datedue, > $issuedate, # here interpreted as the renewal date > ); >@@ -1340,13 +1340,13 @@ sub AddIssue { > else { > unless ($datedue) { > my $itype = $item_object->effective_itemtype; >- $datedue = CalcDateDue( $issuedate, $itype, $branch, $borrower ); >+ $datedue = CalcDateDue( $issuedate, $itype, $branchcode, $borrower ); > > } > $datedue->truncate( to => 'minute' ); > > my $patron = Koha::Patrons->find( $borrower ); >- my $library = Koha::Libraries->find( $branch ); >+ my $library = Koha::Libraries->find( $branchcode ); > my $fees = Koha::Charges::Fees->new( > { > patron => $patron, >@@ -1387,7 +1387,7 @@ sub AddIssue { > my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule( > { categorycode => $borrower->{categorycode}, > itemtype => $item_object->effective_itemtype, >- branchcode => $branch >+ branchcode => $branchcode > } > ); > >@@ -1397,7 +1397,7 @@ sub AddIssue { > # Record in the database the fact that the book was issued. > unless ($datedue) { > my $itype = $item_object->effective_itemtype; >- $datedue = CalcDateDue( $issuedate, $itype, $branch, $borrower ); >+ $datedue = CalcDateDue( $issuedate, $itype, $branchcode, $borrower ); > > } > $datedue->truncate( to => 'minute' ); >@@ -1497,7 +1497,7 @@ sub AddIssue { > # Send a checkout slip. > my $circulation_alert = 'C4::ItemCirculationAlertPreference'; > my %conditions = ( >- branchcode => $branch, >+ branchcode => $branchcode, > categorycode => $borrower->{categorycode}, > item_type => $item_object->effective_itemtype, > notification => 'CHECKOUT', >@@ -1508,7 +1508,7 @@ sub AddIssue { > type => 'CHECKOUT', > item => $item_object->unblessed, > borrower => $borrower, >- branch => $branch, >+ branch => $branchcode, > } > ); > } >-- >2.20.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 23586
:
92966
| 92967