Attachment 37757 Details for Bug 13813 – Bug 13813 - Remove C4::Dates from C4/Members.pm

[patch] Bug 13813 - Remove C4::Dates from C4/Members.pm

Bug-13813---Remove-C4Dates-from-C4Memberspm.patch (text/plain), 3.08 KB, created by Marc Véron on 2015-04-13 14:50:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc Véron

Created: 2015-04-13 14:50:10 UTC

Size: 3.08 KB

patch

obsolete

>From 5ea0a026df49c33aa5ad5139747d5edc14295506 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc=20V=C3=A9ron?= <veron@veron.ch>
>Date: Fri, 13 Mar 2015 13:26:20 +0100
>Subject: [PATCH] Bug 13813 - Remove C4::Dates from C4/Members.pm
>
>This patch removes C4::Dates from C4/Members.pm
>
>Note: This patch can be tested independently from other patches in this Bug, but it depends on patches from Bug 13601
>
>To test:
>Make sure that patches from 13601 are applied
>Apply patch
>Check changes in code
>Make sure that following functionality works as before:
>- Add a patron
>- Renew patrons
>- Go to checkout page and create  message for patron
>
>Amended following comment #58 / MV
>There is one more DateTime->now() left on line 1825, this is not related to my changes.
>---
> C4/Members.pm |   12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
>diff --git a/C4/Members.pm b/C4/Members.pm
>index 4ca83b9..bb5aef0 100644
>--- a/C4/Members.pm
>+++ b/C4/Members.pm
>@@ -23,7 +23,6 @@ package C4::Members;
> use strict;
> #use warnings; FIXME - Bug 2505
> use C4::Context;
>-use C4::Dates qw(format_date_in_iso format_date);
> use String::Random qw( random_string );
> use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
> use C4::Log; # logaction
>@@ -864,12 +863,12 @@ sub AddMember {
> 
>     # add expiration date if it isn't already there
>     unless ( $data{'dateexpiry'} ) {
>-        $data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, C4::Dates->new()->output("iso") );
>+        $data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 }) );
>     }
> 
>     # add enrollment date if it isn't already there
>     unless ( $data{'dateenrolled'} ) {
>-        $data{'dateenrolled'} = C4::Dates->new()->output("iso");
>+        $data{'dateenrolled'} = output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>     }
> 
>     my $patron_category =
>@@ -1965,8 +1964,8 @@ sub ExtendMemberSubscriptionTo {
>     my $borrower = GetMember('borrowernumber'=>$borrowerid);
>     unless ($date){
>       $date = (C4::Context->preference('BorrowerRenewalPeriodBase') eq 'dateexpiry') ?
>-                                        C4::Dates->new($borrower->{'dateexpiry'}, 'iso')->output("iso") :
>-                                        C4::Dates->new()->output("iso");
>+                                        output_pref({ dt => dt_from_string( $borrower->{'dateexpiry'} ), dateformat => 'iso', dateonly =>1 }) :
>+                                        output_pref({ dt => dt_from_string, dateformat => 'iso', dateonly => 1 });
>       $date = GetExpiryDate( $borrower->{'categorycode'}, $date );
>     }
>     my $sth = $dbh->do(<<EOF);
>@@ -2364,8 +2363,7 @@ sub GetMessages {
>     my @results;
> 
>     while ( my $data = $sth->fetchrow_hashref ) {
>-        my $d = C4::Dates->new( $data->{message_date}, 'iso' );
>-        $data->{message_date_formatted} = $d->output;
>+        $data->{message_date_formatted} = output_pref({ dt => dt_from_string( $data->{message_date} ), dateformat => 'iso', dateonly => 1 });
>         push @results, $data;
>     }
>     return \@results;
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 13813: 36827 | 36828 | 36829 | 36830 | 36831 | 36832 | 36835 | 36836 | 36839 | 36845 | 36850 | 36851 | 36855 | 36857 | 36858 | 36859 | 36862 | 36863 | 36864 | 36865 | 36870 | 36871 | 36872 | 36878 | 36879 | 36880 | 36881 | 36882 | 36883 | 36884 | 36885 | 36886 | 36887 | 36888 | 36889 | 36890 | 36892 | 36893 | 36894 | 36895 | 36896 | 36897 | 36898 | 36899 | 36900 | 36901 | 36902 | 37227 | 37730 | 37731 | 37732 | 37736 | 37737 | 37746 | 37748 | 37749 | 37753 | 37754 | 37757 | 37762 | 37763 | 37764 | 37765 | 37766 | 37767 | 37768 | 37770 | 37810 | 37828 | 37835 | 37839 | 37840 | 37841 | 37842 | 37843 | 37853 | 37854 | 37855 | 37856 | 37857 | 37858 | 37859 | 37860 | 37861 | 37862 | 37863 | 37864 | 37865 | 37866 | 37867 | 37868 | 37869 | 37870 | 37871 | 37872 | 37873 | 37874 | 37875 | 37876 | 37877 | 37878 | 37879 | 37880 | 37881 | 37882 | 37883 | 37884 | 37885 | 37886 | 37887 | 37888 | 37889 | 37890 | 37891 | 39666 | 40894 | 42052 | 42175 | 42274 | 42286 | 42292 | 42293 | 42294