[Koha-cvs] koha/C4 Members.pm [dev_week]

[Cindy Murdock]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Cindy Murdock <clm>	07/04/19 20:13:40

Modified files:
	C4             : Members.pm 

Log message:
	Now uses Date::Calc instead of Date::Manip

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.6.2.6.2.1&r2=1.6.2.6.2.2

Patches:
Index: Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.6.2.6.2.1
retrieving revision 1.6.2.6.2.2
diff -u -b -r1.6.2.6.2.1 -r1.6.2.6.2.2
--- Members.pm	19 Apr 2007 15:02:27 -0000	1.6.2.6.2.1
+++ Members.pm	19 Apr 2007 20:13:40 -0000	1.6.2.6.2.2
@@ -22,7 +22,7 @@
 use strict;
 require Exporter;
 use C4::Context;
-use Date::Manip;
+use Date::Calc qw(Add_Delta_YM);
 use C4::Date;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
@@ -100,7 +100,7 @@
 	my $dbh = C4::Context->dbh;
 	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
 	# this doesn't save joining date to the db, but if joining date doesn't exist it calculates expiry from today
-        $data{'joining'} = &ParseDate("today") unless $data{'joining'}; 
+        $data{'joining'} = sprintf("%04d-%02d-%02d",Date::Calc::Today) unless $data{'joining'}; 
         $data{'joining'}=format_date_in_iso($data{'joining'});
 	# set expiry date if it doesn't exist
 	if ( (!$data{'expiry'}) || $data{'expiry'} eq '0000-00-00' || $data{'expiry'} eq 'NULL' || $data{'expiry'} eq '') {
@@ -108,7 +108,10 @@
                 $sth->execute($data{'categorycode'});
                 my ($enrolmentperiod) = $sth->fetchrow;
                 $enrolmentperiod = 12 unless ($enrolmentperiod);
-                $data{'expiry'} = &DateCalc($data{'joining'},"$enrolmentperiod years");
+    		my ($y,$m,$d)=split /-/,$data{'joining'};
+		foreach(Add_Delta_YM($y,$m,$d,$enrolmentperiod,0)){warn "$_\t";}
+		warn "".$enrolmentperiod;
+  	  	$data{'expiry'} = sprintf("%04d-%02d-%02d",Add_Delta_YM($y,$m,$d,$enrolmentperiod,0));
 	}
 	$data{'expiry'}=format_date_in_iso($data{'expiry'});
 	my $query="update borrowers set title='$data{'title'}',expiry='$data{'expiry'}',
@@ -140,7 +143,7 @@
 	my (%data) = @_;
 	my $dbh = C4::Context->dbh;
 	$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
-	$data{'joining'} = &ParseDate("today") unless $data{'joining'};
+	$data{'joining'} = sprintf("%04d-%02d-%02d",Date::Calc::Today) unless $data{'joining'};
 	$data{'joining'}=format_date_in_iso($data{'joining'});
 	# if expirydate is not set, calculate it from borrower category subscription duration
 	unless ($data{'expiry'}) {
@@ -148,7 +151,10 @@
 		$sth->execute($data{'categorycode'});
 		my ($enrolmentperiod) = $sth->fetchrow;
 		$enrolmentperiod = 12 unless ($enrolmentperiod);
-		$data{'expiry'} = &DateCalc($data{'joining'},"$enrolmentperiod years");
+    		my ($y,$m,$d)=split /-/,$data{'joining'};
+		foreach(Add_Delta_YM($y,$m,$d,$enrolmentperiod,0)){warn "$_\t";}
+		warn "".$enrolmentperiod;
+  	  	$data{'expiry'} = sprintf("%04d-%02d-%02d",Add_Delta_YM($y,$m,$d,$enrolmentperiod,0));
 	}
 	$data{'expiry'}=format_date_in_iso($data{'expiry'});
 # 	$data{'borrowernumber'}=NewBorrowerNumber();