журнал (shhh) wrote in changelog,
журнал
shhh
changelog

[ljcom] r12898: LJSUP-14234: Implement server part for s...

Committer: nnikulochkina
LJSUP-14234: Implement server part for shop payment pages
U   trunk/cgi-bin/LJ/Pay/Method/PayPal.pm
U   trunk/cgi-bin/LJ/Pay/Method/YandexMoney.pm
U   trunk/templates/Shop/method/paypal.tmpl
U   trunk/templates/Shop/method/sup_yandex.tmpl
Modified: trunk/cgi-bin/LJ/Pay/Method/PayPal.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/Method/PayPal.pm	2012-11-14 08:44:13 UTC (rev 12897)
+++ trunk/cgi-bin/LJ/Pay/Method/PayPal.pm	2012-11-14 09:18:23 UTC (rev 12898)
@@ -25,6 +25,8 @@
              url => $LJ::PAYPAL_URL,
              cart => $cart->get_cart_as_string,
              business => LJ::durl($LJ::PAYPAL_ACCT), ## some clever guy put escaped account name into config
+             paypal   => 1,
+             method   => code(),
            };
 }
 

Modified: trunk/cgi-bin/LJ/Pay/Method/YandexMoney.pm
===================================================================
--- trunk/cgi-bin/LJ/Pay/Method/YandexMoney.pm	2012-11-14 08:44:13 UTC (rev 12897)
+++ trunk/cgi-bin/LJ/Pay/Method/YandexMoney.pm	2012-11-14 09:18:23 UTC (rev 12898)
@@ -44,7 +44,11 @@
              sup_orderNumber => $cart->get_cart_as_string,
              customerNumber  => $cart->get_userid,
              exch_rate => sprintf("%.02f", $LJ::PAY_EXCHANGE_RATE{ru}),
-             map { $_ => $LJ::PAY_SUP_YANDEX_INFO{$_} } qw( shop_id scid project_id )
+             ( map { $_ => $LJ::PAY_SUP_YANDEX_INFO{$_} } qw( shop_id scid project_id )),
+             sup_yandex => 1,
+             method     => code(),
+             cart       => $cart->get_cart_as_string(),
+             amount     => $pmt_ruble_amt,
            };
 }
 

Modified: trunk/templates/Shop/method/paypal.tmpl
===================================================================
--- trunk/templates/Shop/method/paypal.tmpl	2012-11-14 08:44:13 UTC (rev 12897)
+++ trunk/templates/Shop/method/paypal.tmpl	2012-11-14 09:18:23 UTC (rev 12898)
@@ -1,3 +1,9 @@
+<TMPL_UNLESS dengionline_disabled>
+
+<TMPL_INCLUDE name="templates/Shop/DengiOnline/Confirm.tmpl">
+
+<TMPL_ELSE>
+
 <div class="b-paypalpay">
 	<TMPL_IF down>
 	    <h2><TMPL_VAR expr="ml('/pay/modify.bml.paypaldown.header')"></h2>
@@ -19,3 +25,5 @@
 	    </form>
 	</TMPL_IF>
 </div>
+
+</TMPL_UNLESS>
\ No newline at end of file

Modified: trunk/templates/Shop/method/sup_yandex.tmpl
===================================================================
--- trunk/templates/Shop/method/sup_yandex.tmpl	2012-11-14 08:44:13 UTC (rev 12897)
+++ trunk/templates/Shop/method/sup_yandex.tmpl	2012-11-14 09:18:23 UTC (rev 12898)
@@ -1,3 +1,8 @@
+<TMPL_UNLESS dengionline_disabled>
+
+<TMPL_INCLUDE name="templates/Shop/DengiOnline/Confirm.tmpl">
+
+<TMPL_ELSE>
 <div class="b-yandexpay">
 	<h2><TMPL_VAR expr="ml('/pay/yandex.bml.title')"></h2>
 	<p><TMPL_VAR expr="ml('/pay/yandex.bml.exchange_info', 'ruble_amt', rubles, 'exch_rate', exch_rate)"></p>
@@ -10,3 +15,4 @@
 	    <button type="submit"><TMPL_VAR expr="ml('pay.cart.btn.proceed_yandex')"></button>
 	</form>
 </div>
+</TMPL_UNLESS>
\ No newline at end of file

Tags: ljcom, nikulochkina, nnikulochkina, pm, tmpl
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