wisest owl (wisest_owl) wrote in changelog,
wisest owl
wisest_owl
changelog

[ljcom] r7757: LJSUP-4585

Committer: gprochaev
LJSUP-4585


U   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/RecBillAble.pm
U   branches/shop/cgi-bin/LJ/Pay/Payment/PayItem.pm
U   branches/shop/htdocs/manage/account/modify.bml
U   branches/shop/ssldocs/manage/account/cc.bml
Modified: branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/RecBillAble.pm
===================================================================
--- branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/RecBillAble.pm	2009-10-07 08:34:50 UTC (rev 7756)
+++ branches/shop/cgi-bin/LJ/Pay/Payment/PayItem/RecBillAble.pm	2009-10-07 09:09:14 UTC (rev 7757)
@@ -12,6 +12,20 @@
     die;
 }
 
+sub get_list_item_base_price {
+    my $self = shift;
+    my $qty = shift;
+    my %list = @_;
+
+    my %price = ();
+    foreach my $item_name (keys %list) {
+        my $item = LJ::Pay::Payment::PayItem->new_memonly(item => $list{$item_name}->[0], subitem => $list{$item_name}->[1], qty => $qty);
+        $price{$item_name} = $item->get_item_base_price;
+    }
+
+    return \%price;
+}
+
 ##
 ## returns price for prolonging the existing item for
 ## recurrent billing

Modified: branches/shop/cgi-bin/LJ/Pay/Payment/PayItem.pm
===================================================================
--- branches/shop/cgi-bin/LJ/Pay/Payment/PayItem.pm	2009-10-07 08:34:50 UTC (rev 7756)
+++ branches/shop/cgi-bin/LJ/Pay/Payment/PayItem.pm	2009-10-07 09:09:14 UTC (rev 7757)
@@ -151,20 +151,6 @@
     return $self;
 }
 
-sub get_list_item_base_price {
-    my $self = shift;
-    my $qty = shift;
-    my %list = @_;
-
-    my %price = ();
-    foreach my $item_name (keys %list) {
-        my $item = LJ::Pay::Payment::PayItem->new_memonly(item => $list{$item_name}->[0], qty => $qty);
-        $price{$item_name} = $item->get_item_base_price( $list{$item_name}->[1] );
-    }
-
-    return \%price;
-}
-
 ##############################################################################
 # Class methods
 #

Modified: branches/shop/htdocs/manage/account/modify.bml
===================================================================
--- branches/shop/htdocs/manage/account/modify.bml	2009-10-07 08:34:50 UTC (rev 7756)
+++ branches/shop/htdocs/manage/account/modify.bml	2009-10-07 09:09:14 UTC (rev 7757)
@@ -90,7 +90,7 @@
 
     # period for PaidAccount and UserPic are same. so we're iterating by PaidAccount periods only.
     foreach (grep { defined $LJ::Pay::Payment::PayItem::PaidAccount::account{$_}->{amount_rec} } keys %LJ::Pay::Payment::PayItem::PaidAccount::account) {
-        $prices{$_} = LJ::Pay::Payment::PayItem->get_list_item_base_price ($_, %price_keys);
+        $prices{$_} = LJ::Pay::Payment::PayItem::RecBillAble->get_list_item_base_price ($_, %price_keys);
     }
 
     # make pricing info available to JS
@@ -298,7 +298,6 @@
         }
 
 
-
         # check coupon, adjust pricing
         $POST{coupon} = undef
             if $POST{remove_coupon};
@@ -349,7 +348,7 @@
             if ($disksize < $newsize) {
 
                 my $item = LJ::Pay::Payment::PayItem->new_memonly(item => 'diskquota', subitem => $newsize, qty => $curr_bill_interval, 
-                                                                  rcpt_id => $u->userid);
+                                                                  rcptid => $u->userid);
 
                 my @errs;
                 my $ca = $item->can_belong_to($pmt, \@errs, undef, "checkout", {'recurring' => 1});
@@ -591,7 +590,6 @@
         };
     };
 
-
     $body .= '<table class="paytbl"><tr><td class="content">';
 
     # Show the initial manage form

Modified: branches/shop/ssldocs/manage/account/cc.bml
===================================================================
--- branches/shop/ssldocs/manage/account/cc.bml	2009-10-07 08:34:50 UTC (rev 7756)
+++ branches/shop/ssldocs/manage/account/cc.bml	2009-10-07 09:09:14 UTC (rev 7757)
@@ -307,9 +307,6 @@
                 $pmt->insure_floor_amount;
                 my $payment = ($pmt->get_amount > 0) ? $pmt->get_amount : undef;
 
-                # get lock before attempting to charge card.
-                LJ::Pay::get_lock($u);
-
                 my $auth_return = $auth->(\$err, \$requestID, \$requestToken, $payment);
                 if ($auth_return == 0) {
                     $die->($err, 1);

Subscribe

  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments