View | Details | Raw Unified | Return to bug 13813
Collapse All | Expand All

(-)a/C4/Members.pm (-8 / +5 lines)
Lines 23-29 package C4::Members; Link Here
23
use strict;
23
use strict;
24
#use warnings; FIXME - Bug 2505
24
#use warnings; FIXME - Bug 2505
25
use C4::Context;
25
use C4::Context;
26
use C4::Dates qw(format_date_in_iso format_date);
27
use String::Random qw( random_string );
26
use String::Random qw( random_string );
28
use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
27
use Date::Calc qw/Today Add_Delta_YM check_date Date_to_Days/;
29
use C4::Log; # logaction
28
use C4::Log; # logaction
Lines 865-876 sub AddMember { Link Here
865
864
866
    # add expiration date if it isn't already there
865
    # add expiration date if it isn't already there
867
    unless ( $data{'dateexpiry'} ) {
866
    unless ( $data{'dateexpiry'} ) {
868
        $data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, C4::Dates->new()->output("iso") );
867
        $data{'dateexpiry'} = GetExpiryDate( $data{'categorycode'}, output_pref({ dt => DateTime->now(), dateformat => 'iso', dateonly => 1 }) );
869
    }
868
    }
870
869
871
    # add enrollment date if it isn't already there
870
    # add enrollment date if it isn't already there
872
    unless ( $data{'dateenrolled'} ) {
871
    unless ( $data{'dateenrolled'} ) {
873
        $data{'dateenrolled'} = C4::Dates->new()->output("iso");
872
        $data{'dateenrolled'} = output_pref({ dt => DateTime->now(), dateformat => 'iso', dateonly => 1 });
874
    }
873
    }
875
874
876
    my $patron_category =
875
    my $patron_category =
Lines 1967-1974 sub ExtendMemberSubscriptionTo { Link Here
1967
    my $borrower = GetMember('borrowernumber'=>$borrowerid);
1966
    my $borrower = GetMember('borrowernumber'=>$borrowerid);
1968
    unless ($date){
1967
    unless ($date){
1969
      $date = (C4::Context->preference('BorrowerRenewalPeriodBase') eq 'dateexpiry') ?
1968
      $date = (C4::Context->preference('BorrowerRenewalPeriodBase') eq 'dateexpiry') ?
1970
                                        C4::Dates->new($borrower->{'dateexpiry'}, 'iso')->output("iso") :
1969
                                        output_pref({ dt => dt_from_string( $borrower->{'dateexpiry'} ), dateformat => 'iso', dateonly =>1 }) :
1971
                                        C4::Dates->new()->output("iso");
1970
                                        output_pref({ dt => DateTime->now(), dateformat => 'iso', dateonly => 1 });
1972
      $date = GetExpiryDate( $borrower->{'categorycode'}, $date );
1971
      $date = GetExpiryDate( $borrower->{'categorycode'}, $date );
1973
    }
1972
    }
1974
    my $sth = $dbh->do(<<EOF);
1973
    my $sth = $dbh->do(<<EOF);
Lines 2359-2366 sub GetMessages { Link Here
2359
    my @results;
2358
    my @results;
2360
2359
2361
    while ( my $data = $sth->fetchrow_hashref ) {
2360
    while ( my $data = $sth->fetchrow_hashref ) {
2362
        my $d = C4::Dates->new( $data->{message_date}, 'iso' );
2361
        $data->{message_date_formatted} = output_pref({ dt => dt_from_string( $data->{message_date} ), dateformat => 'iso', dateonly => 1 });
2363
        $data->{message_date_formatted} = $d->output;
2364
        push @results, $data;
2362
        push @results, $data;
2365
    }
2363
    }
2366
    return \@results;
2364
    return \@results;
2367
- 

Return to bug 13813