From: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
Date: Thu, 19 Sep 2013 19:50:53 +0000 (-0400)
Subject: corrections to the corrections, now correct
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=64276416c20f17f618cf811d47280209b04e3614;p=working%2FEvergreen.git

corrections to the corrections, now correct

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 adc1619fac..29152e0f9f 100644
--- a/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main_payment_form.tt2
@@ -5,7 +5,11 @@
     myopac_main_page = "payment_form";
 
     last_chance = CGI.param("last_chance");
-%]
+
+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';
+    ctx.use_stripe = 1; "<!-- i just set it to 1 yay -->";
+END %]
 [% IF ctx.fines.balance_owed <= 0 %]
 <div>
     [% l("You either have no fines to pay or you have selected fines whose " _
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 58ae4263f3..442b5c46ce 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -16,9 +16,9 @@
             @import "[% ctx.media_prefix %]/js/dojo/dijit/themes/tundra/tundra.css";
         </style>
         [% END %]
+
         [% INCLUDE 'opac/parts/goog_analytics.tt2' %]
         [% PROCESS 'opac/parts/stripe.tt2' %]
-
     </head>
     <body[% IF want_dojo; ' class="tundra"'; END %]>
         [% content %] 
diff --git a/Open-ILS/src/templates/opac/parts/stripe.tt2 b/Open-ILS/src/templates/opac/parts/stripe.tt2
index 277ab53f17..ea4ca04a61 100644
--- a/Open-ILS/src/templates/opac/parts/stripe.tt2
+++ b/Open-ILS/src/templates/opac/parts/stripe.tt2
@@ -1,8 +1,5 @@
-[%- 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';
-    ctx.use_stripe = 1; %]
-
+[%- PROCESS "opac/parts/header.tt2" %]
+[% IF ctx.use_stripe %]
         <script type="text/javascript" src="https://js.stripe.com/v2/"></script> <!-- use an ou setting for this url? -->
         <script type="text/javascript">
         // This script is only displayed when logged in, so ctx.user.home_ou is always available