effective_orders 4.4.7 → 4.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1292868ad11472eacfd9b3d03b373044bf2655c0f8d34db31819beb86a02bfb
-  data.tar.gz: d67604e57e3d44a36e04b15e7822a0c9495701faf5885353aa82065cd48c0755
+  metadata.gz: 9e201446ccdd9da7fa7afe58f64d9721438bfa2eb9d0f820dcab879c9f447204
+  data.tar.gz: 4db859784870c6e04572dcf53d9ed9cd6ecafd1a1cef1adc68bdb642d333fbba
 SHA512:
-  metadata.gz: 4cb72e5daa0673e071399792a4b5e92d1642c107b4bee7694ace594e3db7510754b8624105caa5d629704293a2e5211a35847d145d7690269900446150177faa
-  data.tar.gz: 0a641944b932a2d635a063d43a52742213cb4a1717b102f96aa97c6a303e62c14780e946e34f5d4f3c7a706dc31f39dcf1c83fc8c4762e09fbcdc5d1f5a1edea
+  metadata.gz: b8ea3eb173f2db102c4539bc08add41a15f399df5d9f24a88cdf116bf98ec37e07b75ae7de6a5476a4682fe91425de25d4ece1b10ac02655f03907bcae59be11
+  data.tar.gz: d5796fd79c659f9c25c8ac6389c101d1ccc4dc42a8b60e167c9ebad59fe46a652ce18955d871fffbfa607acae9076dad4700c63911ebbabb718f3a6e6353f82e

data/app/assets/javascripts/effective_orders/providers/stripe.js.coffee

@@ -0,0 +1,77 @@
+this.StripeForm ||= class StripeForm
+  constructor: ->
+    @form = null
+    @paymentIntent = null
+
+    @data = null
+    @stripe = null
+    @card = null
+
+  initialize: ->
+    @form = $('form[data-stripe-form]').first()
+    return false unless @form.length > 0
+
+    @paymentIntent = @form.find("input[name$='[payment_intent_id]']").first()
+    @data = @form.data('stripe-form')
+    @stripe = Stripe(@data.key)
+    @card = @stripe.elements().create('card', @style())
+
+    @mount()
+
+  style: ->
+    style: {
+      base: { color: '#32325d', fontSize: '16px', },
+      invalid: { color: '#dc3545', iconColor: '#dc3545' }
+    }
+
+  mount: ->
+    @card.mount('#stripe-card-element')
+
+    @card.addEventListener('change', (error) ->
+      $('#stripe-card-errors').text(if error.message then error.message else '')
+    )
+
+    @form.on('click', '[type=submit]', (event) => @submit(event))
+
+  submit: (event) ->
+    event.preventDefault()
+
+    payment = if @shouldUseNewCard() then @useNewCard() else @useExistingCard()
+
+    $.active = $.active + 1
+
+    payment.then((result) =>
+      if result.error
+        @errorPayment(result.error)
+      else if result.paymentIntent.status == 'succeeded'
+        @submitPayment(result.paymentIntent)
+    ).then((result) =>
+      $.active = $.active - 1
+    )
+
+  shouldUseNewCard: ->
+    @form.get(0).checkValidity() &&
+    @paymentIntent.val().length == 0 &&
+    (@data.token_required || @form.children('.collapse.show').length > 0)
+
+  useNewCard: ->
+    @stripe.confirmCardPayment(@data.client_secret, {
+      payment_method: {
+        card: @card,
+        billing_details: { email: @data.email }
+      },
+      setup_future_usage: 'off_session'
+    })
+
+  useExistingCard: ->
+    @stripe.confirmCardPayment(@data.client_secret, { payment_method: @data.payment_method })
+
+  submitPayment: (payment) ->
+    @paymentIntent.val(payment['id'])
+    @form.submit()
+
+  errorPayment: (error) ->
+    $('#stripe-card-errors').text(error.message)
+    EffectiveForm.invalidate(@form);
+
+$ -> (new StripeForm()).initialize()

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.4.7'.freeze
+  VERSION = '4.4.8'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.4.7
+  version: 4.4.8
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-24 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -121,7 +121,7 @@ files:
 - app/assets/images/effective_orders/stripe.png
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/customers.js.coffee
-- app/assets/javascripts/effective_orders/providers/stripe.js
+- app/assets/javascripts/effective_orders/providers/stripe.js.coffee
 - app/assets/javascripts/effective_orders/subscriptions.js.coffee
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_cart.scss

data/app/assets/javascripts/effective_orders/providers/stripe.js

@@ -1,101 +0,0 @@
-class StripeForm {
-  initialize() {
-    let $form = $('form[data-stripe-form]').first();
-    if ($form.length == 0) { return false; }
-
-    this.$form = $form;
-    this.$paymentIntentId = this.$form.find("input[name$='[payment_intent_id]']").first();
-
-    this.data = $form.data('stripe-form');
-    this.stripe = Stripe(this.data.key);
-    this.card = this.stripe.elements().create("card", { style: this.style() });
-
-    this.mount();
-  }
-
-  mount() {
-    this.card.mount("#stripe-card-element");
-
-    this.card.addEventListener('change', function ({ error }) {
-      if (error) {
-        $('#stripe-card-errors').text(error.message);
-      } else {
-        $('#stripe-card-errors').text('');
-      }
-    });
-
-    this.$form.on('click', '[type=submit]', (event) => { this.submit(event) });
-  }
-
-  shouldUseNewCard() {
-    let $newCardForm = this.$form.children('.collapse.show')
-
-    return (
-      this.$form.get(0).checkValidity() &&
-      (this.data.token_required || $newCardForm.length > 0) &&
-      this.$paymentIntentId.val().length == 0
-    )
-  }
-
-  submit(event) {
-    event.preventDefault();
-
-    let payment = this.shouldUseNewCard() ? this.useNewCard() : this.useExistingCard();
-
-    $.active = $.active + 1;
-
-    payment.then((result) => {
-      if (result.error) {
-        this.errorPayment(result.error)
-      } else if (result.paymentIntent.status == 'succeeded') {
-        this.submitPayment(result.paymentIntent);
-      }
-    }).then((result) => {
-      $.active = $.active - 1;
-    });
-  }
-
-  useExistingCard() {
-    return this.stripe.confirmCardPayment(this.data.client_secret, {
-      payment_method: this.data.payment_method
-    });
-  }
-
-  useNewCard() {
-    return this.stripe.confirmCardPayment(this.data.client_secret, {
-      payment_method: {
-        card: this.card,
-        billing_details: {
-          email: this.data.email
-        }
-      },
-      setup_future_usage: 'off_session'
-    });
-  }
-
-  errorPayment(error) {
-    $('#stripe-card-errors').text(error.message);
-    EffectiveForm.invalidate(this.$form);
-  }
-
-  submitPayment(payment) {
-    this.$paymentIntentId.val('' + payment['id']);
-    this.$form.submit();
-  }
-
-  style() {
-    return {
-      base: {
-        color: "#32325d",
-        fontSize: "16px",
-      },
-      invalid: {
-        color: "#dc3545",
-        iconColor: "#dc3545"
-      }
-    };
-  }
-
-}
-
-$(document).ready(function () { new StripeForm().initialize(); });