Committer: vtroitsky
LJSUP-12403: Console commands with commercial promoU trunk/cgi-bin/LJ/Console/Command/SelfPromo.pm U trunk/cgi-bin/LJ/Pay/SelfPromo.pm
Modified: trunk/cgi-bin/LJ/Console/Command/SelfPromo.pm =================================================================== --- trunk/cgi-bin/LJ/Console/Command/SelfPromo.pm 2012-08-04 20:27:02 UTC (rev 12415) +++ trunk/cgi-bin/LJ/Console/Command/SelfPromo.pm 2012-08-05 22:08:35 UTC (rev 12416) @@ -70,7 +70,6 @@ LJ::statushistory_add( $object->owner, $admin, 'selfpromo', $message ); $slot->admin_cancel_promo( - 'slot' => $slot, 'object' => $object, 'admin' => $admin, 'refund' => $refund, Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm =================================================================== --- trunk/cgi-bin/LJ/Pay/SelfPromo.pm 2012-08-04 20:27:02 UTC (rev 12415) +++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm 2012-08-05 22:08:35 UTC (rev 12416) @@ -78,7 +78,7 @@ return; } - return unless $promoted_object->is_eligible($promoter, $reason_ref); + return unless $promoted_object->is_eligible($promoter, $reason_ref, slot => $slot); # TODO: Ensure that object is not promoting at the moment in all promos!!!! @@ -818,7 +818,7 @@ my $reason; - unless ( $promoted_object->is_eligible( $promoter, \$reason ) ) { + unless ( $promoted_object->is_eligible( $promoter, \$reason, slot => $slot ) ) { $promotion->deactivate( 'reason' => 'ineligible', 'details' => $reason,