NPO-Accounting/houdini
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix some Bess migration bugs

Browse source
This commit is contained in:
Eric 2020-06-18 17:14:50 -05:00 committed by Eric Schultz
parent ea049c43b5
commit d5fcab066c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/views/layouts/_app_data.html.erb
View file

@ -21,7 +21,7 @@ var app = {
, map_provider: "<%= Houdini.maps&.provider %>" , map_provider: "<%= Houdini.maps&.provider %>"
, map_provider_options: <%= Houdini.maps&.options ? raw(Houdini.maps.options.to_json) : {} %> , map_provider_options: <%= Houdini.maps&.options ? raw(Houdini.maps.options.to_json) : {} %>
, editor: "<%= Houdini.page_editor.editor%>" , editor: "<%= Houdini.page_editor.editor%>"
<% if Settings&.page_editor&.editor == 'froala' and Settings&.page_editor&.editor_options&.froala_key %>, froala_key: "<%= Houdini.page_editor.editor_options.froala_key %>"<% end %> <% if Houdini.page_editor&.editor == 'froala' and Houdini.page_editor&.editor_options&.froala_key %>, froala_key: "<%= Houdini.page_editor.editor_options.froala_key %>"<% end %>
<%if @nonprofit&.currency_symbol %>, currency_symbol: "<%= @nonprofit.currency_symbol%>"<% end %> <%if @nonprofit&.currency_symbol %>, currency_symbol: "<%= @nonprofit.currency_symbol%>"<% end %>
}; };

4
app/views/layouts/_javascripts.html.erb
View file

@ -4,14 +4,14 @@
<script src="https://cdn.polyfill.io/v1/polyfill.min.js"></script> <script src="https://cdn.polyfill.io/v1/polyfill.min.js"></script>
<%= render 'layouts/app_data' %> <%= render 'layouts/app_data' %>
<% if Houdini.payment_providers.stripe.stripe_proprietary_v2_js %> <% if Houdini.payment_providers.stripe.proprietary_v2_js %>
<script type="text/javascript" src="https://js.stripe.com/v2/"></script> <script type="text/javascript" src="https://js.stripe.com/v2/"></script>
<% else %> <% else %>
<%= javascript_pack_tag "page__stripe_wrapper" %> <%= javascript_pack_tag "page__stripe_wrapper" %>
<% end %> <% end %>
<script> <script>
Stripe.setPublishableKey("<%= Houdini.payment_providers.stripe.stripe_public_key %>"); Stripe.setPublishableKey("<%= Houdini.payment_providers.stripe.public_key %>");
window._csrf = "<%= form_authenticity_token %>"; window._csrf = "<%= form_authenticity_token %>";
</script> </script>