solidus_stripe 2.0.0 → 3.2.1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_stripe
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-03 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -36,14 +36,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -91,12 +91,20 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- app/assets/javascripts/solidus_stripe/stripe-init.js
-- app/assets/javascripts/solidus_stripe/stripe-init/base.js
+- app/assets/javascripts/spree/frontend/solidus_stripe.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-cart-page-checkout.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-elements.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-init.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-payment-intents.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-payment-request-button-shared.js
+- app/assets/javascripts/spree/frontend/solidus_stripe/stripe-payment.js
 - app/controllers/solidus_stripe/intents_controller.rb
 - app/controllers/solidus_stripe/payment_request_controller.rb
 - app/controllers/spree/stripe_controller.rb
+- app/decorators/models/spree/order_update_attributes_decorator.rb
+- app/decorators/models/spree/payment_decorator.rb
 - app/models/solidus_stripe/address_from_params_service.rb
+- app/models/solidus_stripe/create_intents_order_service.rb
 - app/models/solidus_stripe/prepare_order_for_payment_service.rb
 - app/models/solidus_stripe/shipping_rates_service.rb
 - app/models/spree/payment_method/stripe_credit_card.rb
@@ -119,10 +127,9 @@ files:
 - lib/views/frontend/spree/checkout/existing_payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/_stripe.html.erb
 - lib/views/frontend/spree/checkout/payment/v2/_javascript.html.erb
-- lib/views/frontend/spree/checkout/payment/v3/_elements_js.html.erb
+- lib/views/frontend/spree/checkout/payment/v3/_elements.html.erb
 - lib/views/frontend/spree/checkout/payment/v3/_form_elements.html.erb
 - lib/views/frontend/spree/checkout/payment/v3/_intents.html.erb
-- lib/views/frontend/spree/checkout/payment/v3/_intents_js.html.erb
 - lib/views/frontend/spree/checkout/payment/v3/_stripe.html.erb
 - lib/views/frontend/spree/orders/_stripe_payment_request_button.html.erb
 - solidus_stripe.gemspec
@@ -132,6 +139,7 @@ files:
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
 - spec/spec_helper.rb
+- spec/support/solidus_address_helper.rb
 homepage: https://solidus.io
 licenses:
 - BSD-3
@@ -165,3 +173,4 @@ test_files:
 - spec/models/solidus_stripe/shipping_rates_service_spec.rb
 - spec/models/spree/payment_method/stripe_credit_card_spec.rb
 - spec/spec_helper.rb
+- spec/support/solidus_address_helper.rb

data/app/assets/javascripts/solidus_stripe/stripe-init.js

@@ -1 +0,0 @@
-//= require ./stripe-init/base

data/app/assets/javascripts/solidus_stripe/stripe-init/base.js

@@ -1,180 +0,0 @@
-window.SolidusStripe = window.SolidusStripe || {};
-
-SolidusStripe.paymentMethod = {
-  config: $('[data-stripe-config').data('stripe-config'),
-  requestShipping: false
-}
-
-var authToken = $('meta[name="csrf-token"]').attr('content');
-
-var stripe = Stripe(SolidusStripe.paymentMethod.config.publishable_key)
-var elements = stripe.elements({locale: 'en'});
-
-var element = $('#payment_method_' + SolidusStripe.paymentMethod.config.id);
-var form = element.parents('form');
-var errorElement = form.find('#card-errors');
-var submitButton = form.find('input[type="submit"]');
-
-function stripeTokenHandler(token) {
-  var baseSelector = `<input type='hidden' class='stripeToken' name='payment_source[${SolidusStripe.paymentMethod.config.id}]`;
-
-  element.append(`${baseSelector}[gateway_payment_profile_id]' value='${token.id}'/>`);
-  element.append(`${baseSelector}[last_digits]' value='${token.card.last4}'/>`);
-  element.append(`${baseSelector}[month]' value='${token.card.exp_month}'/>`);
-  element.append(`${baseSelector}[year]' value='${token.card.exp_year}'/>`);
-  form.find('input#cc_type').val(mapCC(token.card.brand || token.card.type));
-};
-
-function initElements() {
-  var style = {
-    base: {
-      color: 'black',
-      fontFamily: '"Helvetica Neue", Helvetica, sans-serif',
-      fontSmoothing: 'antialiased',
-      fontSize: '14px',
-      '::placeholder': {
-        color: 'silver'
-      }
-    },
-    invalid: {
-      color: 'red',
-      iconColor: 'red'
-    }
-  };
-
-  elements.create('cardExpiry', {style: style}).mount('#card_expiry');
-  elements.create('cardCvc', {style: style}).mount('#card_cvc');
-
-  var cardNumber = elements.create('cardNumber', {style: style});
-  cardNumber.mount('#card_number');
-
-  return cardNumber;
-}
-
-function setUpPaymentRequest(config, onPrButtonMounted) {
-  if (typeof config !== 'undefined') {
-    var paymentRequest = stripe.paymentRequest({
-      country: config.country,
-      currency: config.currency,
-      total: {
-        label: config.label,
-        amount: config.amount
-      },
-      requestPayerName: true,
-      requestPayerEmail: true,
-      requestShipping: config.requestShipping,
-      shippingOptions: [
-      ]
-    });
-
-    var prButton = elements.create('paymentRequestButton', {
-      paymentRequest: paymentRequest
-    });
-
-    paymentRequest.canMakePayment().then(function(result) {
-      var id = 'payment-request-button';
-
-      if (result) {
-        prButton.mount('#' + id);
-      } else {
-        document.getElementById(id).style.display = 'none';
-      }
-      if (typeof onPrButtonMounted === 'function') {
-        onPrButtonMounted(id, result);
-      }
-    });
-
-    paymentRequest.on('paymentmethod', function(result) {
-      errorElement.text('').hide();
-      handlePayment(result);
-    });
-
-    paymentRequest.on('shippingaddresschange', function(ev) {
-      fetch('/stripe/shipping_rates', {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({
-          authenticity_token: authToken,
-          shipping_address: ev.shippingAddress
-        })
-      }).then(function(response) {
-        return response.json();
-      }).then(function(result) {
-        if (result.error) {
-          showError(result.error);
-          return false;
-        } else {
-          ev.updateWith({
-            status: 'success',
-            shippingOptions: result.shipping_rates
-          });
-        }
-      });
-    });
-
-    return paymentRequest;
-  }
-};
-
-function handleServerResponse(response, payment) {
-  if (response.error) {
-      showError(response.error);
-      completePaymentRequest(payment, 'fail');
-  } else if (response.requires_action) {
-    stripe.handleCardAction(
-      response.stripe_payment_intent_client_secret
-    ).then(function(result) {
-      if (result.error) {
-        showError(result.error.message);
-      } else {
-        fetch('/stripe/confirm_intents', {
-          method: 'POST',
-          headers: { 'Content-Type': 'application/json' },
-          body: JSON.stringify({
-            spree_payment_method_id: SolidusStripe.paymentMethod.config.id,
-            stripe_payment_intent_id: result.paymentIntent.id,
-            authenticity_token: authToken
-          })
-        }).then(function(confirmResult) {
-          return confirmResult.json();
-        }).then(handleServerResponse);
-      }
-    });
-  } else {
-    completePaymentRequest(payment, 'success');
-    submitPayment(payment);
-  }
-}
-
-function completePaymentRequest(payment, state) {
-  if (payment && typeof payment.complete === 'function') {
-    payment.complete(state);
-  }
-}
-
-function showError(error) {
-  errorElement.text(error).show();
-
-  if (submitButton.length) {
-    setTimeout(function() {
-      $.rails.enableElement(submitButton[0]);
-      submitButton.removeAttr('disabled').removeClass('disabled');
-    }, 100);
-  }
-};
-
-function mapCC(ccType) {
-  if (ccType === 'MasterCard') {
-    return 'mastercard';
-  } else if (ccType === 'Visa') {
-    return 'visa';
-  } else if (ccType === 'American Express') {
-    return 'amex';
-  } else if (ccType === 'Discover') {
-    return 'discover';
-  } else if (ccType === 'Diners Club') {
-    return 'dinersclub';
-  } else if (ccType === 'JCB') {
-    return 'jcb';
-  }
-};

data/lib/views/frontend/spree/checkout/payment/v3/_elements_js.html.erb

@@ -1,28 +0,0 @@
-<script>
-  // Stripe V3 elements specific JS code
-
-  var cardNumber = initElements();
-
-  cardNumber.addEventListener('change', function(event) {
-    if (event.error) {
-      showError(event.error.message);
-    } else {
-      errorElement.hide().text('');
-    }
-  });
-
-  form.bind('submit', function(event) {
-    if (element.is(':visible')) {
-      event.preventDefault();
-
-      stripe.createToken(cardNumber).then(function(result) {
-        if (result.error) {
-          showError(result.error.message);
-        } else {
-          stripeTokenHandler(result.token);
-          form[0].submit();
-        }
-      });
-    }
-  });
-</script>

data/lib/views/frontend/spree/checkout/payment/v3/_intents_js.html.erb

@@ -1,48 +0,0 @@
-<script>
-  // Stripe Intents JS code
-
-  var cardNumber = initElements();
-  var paymentRequest = setUpPaymentRequest(SolidusStripe.paymentMethod.config.payment_request);
-
-  form.bind('submit', function(event) {
-    if (element.is(':visible')) {
-      event.preventDefault();
-
-      errorElement.text('').hide();
-
-      stripe.createPaymentMethod(
-        'card',
-        cardNumber
-      ).then(function(result) {
-        handlePayment(result);
-      });
-    }
-  });
-
-  function handlePayment(payment) {
-    if (payment.error) {
-      showError(payment.error.message);
-    } else {
-      stripeTokenHandler(payment.paymentMethod);
-      fetch('/stripe/confirm_intents', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json'
-        },
-        body: JSON.stringify({
-          spree_payment_method_id: SolidusStripe.paymentMethod.config.id,
-          stripe_payment_method_id: payment.paymentMethod.id,
-          authenticity_token: authToken
-        })
-      }).then(function(response) {
-        response.json().then(function(json) {
-          handleServerResponse(json, payment);
-        })
-      });
-    }
-  };
-
-  function submitPayment(_payment) {
-    form.unbind('submit').submit();
-  }
-</script>