[ljcom] r12741: LJSUP-13538: Refactoring of shop promo p...

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/cgi-bin/LJ/Pay/SelfPromo.pm

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2012-10-10 11:05:08 UTC (rev 12740)
+++ trunk/bin/upgrading/en_LJ.dat	2012-10-10 11:53:18 UTC (rev 12741)
@@ -10856,7 +10856,7 @@
 setting.journalpromo.ban.text=setting.journalpromo.ban.text
 
 journalpromo.announce=<a href="[[settings_url]]">Turn on promo</a> in your journal
-journalpromo.no_promotion=You can <a href="[[settings_url]]">change you journal promo settings</a>
+journalpromo.no_promotion=Specify <a href="[[settings_url]]">your entry</a> to show here in case of free slot.
 journalpromo.no_promotion.guest=<a href="[[shop_url]]">Buy promo</a> for mininal price.
 journalpromo.stripe.order=Order
 

Modified: trunk/cgi-bin/LJ/Pay/SelfPromo.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-10-10 11:05:08 UTC (rev 12740)
+++ trunk/cgi-bin/LJ/Pay/SelfPromo.pm	2012-10-10 11:53:18 UTC (rev 12741)
@@ -231,7 +231,7 @@
     # NOTES: 
     #   1. There might not be enought LJ tokens in the user's wallet, at the moment when transaction begins.
     #   2. 
- 
+    my $promotion;
     do {
         $class->debug_msg($slot, "delivering the cart/items");
         $class->debug_msg($slot,  "payid=" . $cart->get_payid );
@@ -245,7 +245,7 @@
 
         # Perform deliver: deactivate previous selfpromo object / return money to the previous promoter  / create new promotion object
 
-        $class->_deliver_item($slot, $item, $promoter, $current_promotion, $promoted_object);
+        $promotion = $class->_deliver_item($slot, $item, $promoter, $current_promotion, $promoted_object);
 
         $class->debug_msg($slot,
             "cart and item updated to be ready for delivery");
@@ -271,7 +271,8 @@
     # TODO: Move History into slot
     LJ::Pay::SelfPromo::History->update($slot);
 
-    return $cart;
+    $promotion->{buy_cart} = $cart;
+    return $promotion;
 }
 
 =item _deliver_item