Skip to content

Commit 0b3342b

Browse files
committed
Merged request spree-contrib#255
2 parents ff22989 + b7348e7 commit 0b3342b

2 files changed

Lines changed: 59 additions & 6 deletions

File tree

app/views/spree/checkout/payment/braintree_vzero/_payment.html.erb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,14 +90,15 @@
9090
<script src="https://js.braintreegateway.com/web/3.54.1/js/three-d-secure.min.js"></script>
9191
<% elsif dropin %>
9292
<script src='https://js.braintreegateway.com/web/dropin/1.20.4/js/dropin.min.js'></script>
93+
<% elsif paypal%>
94+
<script src="https://js.braintreegateway.com/v2/braintree.js"></script>
95+
<script src="https://js.braintreegateway.com/js/braintree-2.32.1.min.js"></script>
96+
97+
<%= render partial: 'spree/checkout/payment/braintree_vzero/paypal', locals: { payment_method: payment_method } %>
9398
<% end %>
9499

95-
<% if payment_method.try(:preferred_3dsecure) == "true" %>
100+
<% if hosted || dropin %>
96101
<%= render partial: 'spree/checkout/payment/braintree_vzero/three_d_secure',
97-
locals: { payment_method: payment_method, hosted: hosted, dropin: dropin }
98-
%>
99-
<% else %>
100-
<%= render partial: 'spree/checkout/payment/braintree_vzero/non_three_d_secure',
101-
locals: { payment_method: payment_method, hosted: hosted, dropin: dropin }
102+
locals: { payment_method: payment_method, hosted: hosted, dropin: dropin }
102103
%>
103104
<% end %>
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
<script type="text/javascript">
2+
if(document.readyState !== 'loading') {
3+
setupBraintreePayPal()
4+
} else {
5+
window.addEventListener('DOMContentLoaded', setupBraintreePayPal);
6+
}
7+
8+
function setupBraintreePayPal() {
9+
var payButton = document.getElementsByClassName('checkout-content-save-continue-button')[0];
10+
11+
braintree.setup("<%= payment_method.client_token(current_order) %>", "paypal", {
12+
headless: true,
13+
container: "paypal-container",
14+
singleUse: <%= payment_method.preferred_store_payments_in_vault.eql?('do_not_store') %>,
15+
amount: <%= @order.total %>,
16+
currency: "<%= current_currency %>",
17+
locale: "en_us",
18+
enableShippingAddress: false,
19+
enableBillingAddress: false,
20+
shippingAddressOverride: {}, //TODO: pass shipping address to PayPal
21+
displayName: "<%= payment_method.preferred_paypal_display_name %>",
22+
<% if payment_method.preferred_advanced_fraud_tools %>
23+
dataCollector: {
24+
kount: {
25+
environment: "<%= payment_method.preferred_server %>"
26+
<% if (kount_id = payment_method.preferred_kount_merchant_id).present? %>
27+
,
28+
merchantId: "<%= kount_id %>"
29+
<% end %>
30+
}
31+
},
32+
<% end %>
33+
34+
onReady: function (integration) {
35+
SpreeBraintreeVzero.deviceData = integration.deviceData;
36+
37+
payButton.addEventListener('click', function(event) {
38+
event.preventDefault();
39+
payButton.setAttribute('disabled', 'disabled');
40+
41+
integration.paypal.initAuthFlow();
42+
});
43+
},
44+
45+
onPaymentMethodReceived: function (result) {
46+
SpreeBraintreeVzero.addDeviceData();
47+
48+
//TODO: handle result - save nonce
49+
}
50+
});
51+
}
52+
</script>

0 commit comments

Comments
 (0)