Check whether the code comes pre-loaded with paid time.
Patch by afuna.
diffs (73 lines):
diff -r ec28cc4ade7b -r 46269e8ab69a cgi-bin/DW/InviteCodes.pm
--- a/cgi-bin/DW/InviteCodes.pm Sat Jun 06 03:48:12 2009 +0000
+++ b/cgi-bin/DW/InviteCodes.pm Sat Jun 06 04:01:55 2009 +0000
@@ -158,6 +158,28 @@ sub check_code {
return 0 if ( $u && $u->{statusvis} eq "S" );
return 1;
+}
+
+=head2 C<< $class->paid_status( code => $code ) >>
+
+Checks whether this code comes loaded with a paid account. Returns a
DW::Shop::Item::Account
+if yes; undef if not
+
+=cut
+
+sub paid_status {
+ my ($class, %opts) = @_;
+ my $code = $opts{code};
+
+ return undef unless DW::InviteCodes->check_code( code => $code );
+
+ my $itemidref;
+ if ( my $cart = DW::Shop::Cart->get_from_invite( $code, itemidref =>
\$itemidref ) ) {
+ my $item = $cart->get_item( $itemidref );
+ return $item if $item && $item->isa( 'DW::Shop::Item::Account' );
+ }
+
+ return undef;
}
=head2 C<< $object->use_code( user => $recipient ) >>
diff -r ec28cc4ade7b -r 46269e8ab69a
cgi-bin/LJ/Widget/CreateAccountProgressMeter.pm
--- a/cgi-bin/LJ/Widget/CreateAccountProgressMeter.pm Sat Jun 06 03:48:12
2009 +0000
+++ b/cgi-bin/LJ/Widget/CreateAccountProgressMeter.pm Sat Jun 06 04:01:55
2009 +0000
@@ -13,7 +13,10 @@ sub render_body {
my $u = LJ::get_effective_remote();
my $given_step = $opts{step} || 1;
- my @steps_to_show = !LJ::is_enabled( 'payments' ) || ( $given_step > 1 &&
$u && $u->is_paid ) ? ( 1, 2, 4 ) : ( 1..4 );
+ my @steps_to_show = !LJ::is_enabled( 'payments' )
+ || ( $LJ::USE_ACCT_CODES && $given_step == 1 &&
DW::InviteCodes->paid_status( code => $opts{code} ) )
+ || ( $given_step > 1 && $u && $u->is_paid )
+ ? ( 1, 2, 4 ) : ( 1..4 );
my $ret;
diff -r ec28cc4ade7b -r 46269e8ab69a htdocs/create.bml
--- a/htdocs/create.bml Sat Jun 06 03:48:12 2009 +0000
+++ b/htdocs/create.bml Sat Jun 06 04:01:55 2009 +0000
@@ -35,18 +35,20 @@ body<=
my %from_post;
my $code_valid = $LJ::USE_ACCT_CODES ? 0 : 1;
+ my $code;
if ( LJ::did_post() ) {
LJ::Widget->use_specific_form_fields( post => \%POST, widget =>
"CreateAccount", fields => [ qw( recaptcha_response_field
recaptcha_challenge_field ) ] )
if $LJ::HUMAN_CHECK{create} && LJ::is_enabled( 'recaptcha' );
%from_post = LJ::Widget->handle_post( \%POST, ( 'CreateAccount' ) );
} elsif ( $LJ::USE_ACCT_CODES ) {
- $code_valid = DW::InviteCodes->check_code( code => LJ::trim(
$GET{code} ) );
+ $code = LJ::trim( $GET{code} );
+ $code_valid = DW::InviteCodes->check_code( code => $code );
}
my $ret;
$ret .= "<div id='create-page'>";
- $ret .= LJ::Widget::CreateAccountProgressMeter->render( step => 1 );
+ $ret .= LJ::Widget::CreateAccountProgressMeter->render( step => 1, code =>
$code );
if ( !$code_valid && !$from_post{code_valid} ) {
$ret .= LJ::Widget::CreateAccountEnterCode->render( get => \%GET );
} else {
_______________________________________________
dw-changelog mailing list
[email protected]
http://lists.dwscoalition.org/mailman/listinfo/dw-changelog