From 2a52c9bdfa5ff5d935170ba35041fbd08a63e20d Mon Sep 17 00:00:00 2001 From: Koustubha Kale Date: Wed, 9 Nov 2011 12:02:21 +0530 Subject: [PATCH 1/3] [Bug 6843] Renew membership from expiry date or from current date based on a syspref Content-Type: text/plain; charset="utf-8" This patch adds a system preference under Patron -> BorrowerRenewalPeriodBase Using this preference the patch allows to renewal of Patron account either from todays date or from existing expiry date in the patrons account. To test : Apply patch; Set System Preference BorrowerRenewalPeriodBase ( under Patron ) to "current membership expiry date"; Renew a patron; You will observe that patrons account expiry date has been calculated from previuos expiry date instead of today's date ( as is the default in Koha prior to this patch ). --- C4/Members.pm | 4 +++- installer/data/mysql/sysprefs.sql | 1 + installer/data/mysql/updatedatabase.pl | 9 +++++++++ .../prog/en/modules/admin/preferences/patrons.pref | 6 ++++++ 4 files changed, 19 insertions(+), 1 deletions(-) diff --git a/C4/Members.pm b/C4/Members.pm index 56718f0..6524b9f 100644 --- a/C4/Members.pm +++ b/C4/Members.pm @@ -1710,7 +1710,9 @@ sub ExtendMemberSubscriptionTo { my $dbh = C4::Context->dbh; my $borrower = GetMember('borrowernumber'=>$borrowerid); unless ($date){ - $date=POSIX::strftime("%Y-%m-%d",localtime()); + $date = (C4::Context->preference('BorrowerRenewalPeriodBase') eq 'dateexpiry') ? + C4::Dates->new($borrower->{'dateexpiry'}, 'iso')->output("iso") : + C4::Dates->new()->output("iso"); $date = GetExpiryDate( $borrower->{'categorycode'}, $date ); } my $sth = $dbh->do(<preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.06.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do(<