Skip to content
This repository has been archived by the owner on Apr 14, 2023. It is now read-only.

Update braintree client libs to v3.22.1 #118

Merged
merged 1 commit into from
Oct 11, 2017
Merged

Update braintree client libs to v3.22.1 #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ The following is a relatively bare-bones implementation to enable Apple Pay on t

```html
<% if current_store.braintree_configuration.apple_pay? %>
<script src="https://js.braintreegateway.com/web/3.14.0/js/apple-pay.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/apple-pay.min.js"></script>

<button id="apple-pay-button" class="apple-pay-button"></button>

Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/spree/backend/solidus_paypal_braintree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ $(function() {
if (!$paymentForm.length || !$hostedFields.length) { return; }

$.when(
$.getScript("https://js.braintreegateway.com/web/3.9.0/js/client.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.9.0/js/hosted-fields.min.js")
$.getScript("https://js.braintreegateway.com/web/3.22.1/js/client.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.22.1/js/hosted-fields.min.js")
).done(function() {
$hostedFields.each(function() {
var $this = $(this),
Expand Down
6 changes: 3 additions & 3 deletions app/assets/javascripts/spree/frontend/paypal_button.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
$(document).ready(function() {
if (document.getElementById("empty-cart")) {
$.when(
$.getScript("https://js.braintreegateway.com/web/3.14.0/js/client.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.14.0/js/paypal.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.14.0/js/data-collector.min.js")
$.getScript("https://js.braintreegateway.com/web/3.22.1/js/client.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.22.1/js/paypal.min.js"),
$.getScript("https://js.braintreegateway.com/web/3.22.1/js/data-collector.min.js")
).done(function() {
$('<script/>').attr({
'data-merchant' : "braintree",
Expand Down
10 changes: 5 additions & 5 deletions lib/views/frontend/spree/checkout/payment/_paypal_braintree.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
<% id = payment_method.id %>

<% content_for :head do %>
<script src="https://js.braintreegateway.com/web/3.14.0/js/client.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.14.0/js/data-collector.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/client.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/data-collector.min.js"></script>

<% if current_store.braintree_configuration.paypal? %>
<script src="https://js.braintreegateway.com/web/3.14.0/js/paypal.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/paypal.min.js"></script>
<% end %>

<% if current_store.braintree_configuration.credit_card? %>
<script src="https://js.braintreegateway.com/web/3.14.0/js/hosted-fields.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/hosted-fields.min.js"></script>
<% end %>

<% if current_store.braintree_configuration.apple_pay? %>
<script src="https://js.braintreegateway.com/web/3.14.0/js/apple-pay.min.js"></script>
<script src="https://js.braintreegateway.com/web/3.22.1/js/apple-pay.min.js"></script>
<% end %>

<%= javascript_include_tag "solidus_paypal_braintree/checkout" %>
Expand Down