corrections that aren't corrections

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2 b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
index 1a631c9..adc1619 100644 (file)
--- a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
@@ -25,7 +25,7 @@
         <a href="[% mkurl(ctx.opac_root _ '/myopac/main', {}, 1) %]">[% l('Cancel') %]</a>
     [% ELSE %]
     <form method="post" id="payment_form"
-    [% IF use_stripe %]
+    [% IF ctx.use_stripe %]
     onsubmit="return stripe_onsubmit();"
     [% END %]
     >
@@ -36,7 +36,7 @@
         [% FOR xact IN CGI.param('xact_misc') %]
         <input type="hidden" name="xact_misc" value="[% xact | html %]" />
         [% END %]
-        [% IF use_stripe %]
+        [% IF ctx.use_stripe %]
         <input type="hidden" name="stripe_token" id="stripe_token" />
         [% END %]
         <table>
@@ -125,7 +125,7 @@
                 <tr>
                     <td>[% l('Credit Card #') %]</td>
                     <td><input type="number" maxlength="16" 
-                    [% IF use_stripe %]
+                    [% IF ctx.use_stripe %]
                     data-stripe="number"
                     [% ELSE %]
                     name="number"
@@ -136,7 +136,7 @@
                     <td>[% l('Security Code') %]</td>
                     <td>
                         <input type="number" size="4" maxlength="5" 
-                        [% IF use_stripe %]
+                        [% IF ctx.use_stripe %]
                         data-stripe="cvc"
                         [% ELSE %]
                         name="cvv2"
@@ -147,7 +147,7 @@
                     <td>[% l('Expiration Month') %]</td>
                     <td>
                         <select 
-                        [% IF use_stripe %]
+                        [% IF ctx.use_stripe %]
                         data-stripe="exp_month"
                         [% ELSE %]
                         name="expire_month"
@@ -172,11 +172,11 @@
                     <td>[% l('Expiration Year') %]</td>
                     <td>
                         <select 
-                        [% IF use_stripe %]
+                        [%- IF ctx.use_stripe %]
                         data-stripe="exp_year"
                         [% ELSE %]
                         name="expire_year"
-                        [% END %]
+                        [% END -%]
                         >
                         [% year = date.format(date.now, '%Y');
                         y = year;

diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index a8e571c..58ae426 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -17,7 +17,7 @@
         </style>
         [% END %]
         [% INCLUDE 'opac/parts/goog_analytics.tt2' %]
-        [% INCLUDE 'opac/parts/stripe.tt2' %]
+        [% PROCESS 'opac/parts/stripe.tt2' %]
 
     </head>
     <body[% IF want_dojo; ' class="tundra"'; END %]>

diff --git a/Open-ILS/src/templates/opac/parts/stripe.tt2 b/Open-ILS/src/templates/opac/parts/stripe.tt2
index feeba12..277ab53 100644 (file)
--- a/Open-ILS/src/templates/opac/parts/stripe.tt2
+++ b/Open-ILS/src/templates/opac/parts/stripe.tt2
@@ -1,7 +1,7 @@
 [%- PROCESS "opac/parts/header.tt2";
 IF myopac_main_page == "payment_form" AND
 ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.stripe.enabled') AND ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.default') == 'Stripe';
-    use_stripe = 1; %]
+    ctx.use_stripe = 1; %]
 
         <script type="text/javascript" src="https://js.stripe.com/v2/"></script> <!-- use an ou setting for this url? -->
         <script type="text/javascript">
@@ -9,7 +9,7 @@ ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.stripe.enabled') AND
         Stripe.setPublishableKey('[% ctx.get_org_setting(ctx.user.home_ou.id, 'credit.processor.stripe.pubkey') %]');
 
         function stripe_onsubmit() {
-            var form = document.getElementById("stripe_form");
+            var form = document.getElementById("payment_form");
             var button = document.getElementById("payment_submit");
 
             button.disabled = true;