effective_orders 4.0.0beta18 → 4.0.0beta19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99fab2e738f96640ce81580905a019e327a17d1f
-  data.tar.gz: 10df9e0cdbd1a91759f052e9d9ef29b961243c0b
+  metadata.gz: a3a90107c72d72ef85dfab8a2b966f46ec314b7b
+  data.tar.gz: 6f7bec9931f8ae15798f744009ad1adfc6806dde
 SHA512:
-  metadata.gz: 1d9640838c97542189694d7205bdca4f52fecc882b39f2897ef5c5b82a72a8c96ea46985ad45b54006d0949d61c5f0b74e0e53474addaff999b4c808a97d9678
-  data.tar.gz: 567a60b2ab48fd28c3ced00e1005888c4020ff8dc6231df804bdf3b44e9dff12c64f5d1ab3213e3b7cafd492a39e6aa38164ee6ac779e24d131991cdba53e624
+  metadata.gz: 38287717bee0633b5700b70dde6c55683c33e724c76d13a07ed1d02e4382715ec95a59eb9e6f82ae77d0ecd4ca52517dc8cb45955ab8de1c0f2e45868476fae3
+  data.tar.gz: b89ff8c3382b05081945c08497deb8c2c0b2bdb2ae3a577b0b22971e0b943ae2f94b016179025bf1e559c4afde316883778ee3188f03976de9e92c4d49966072

data/app/assets/javascripts/effective_orders/subscriptions.js.coffee

@@ -14,15 +14,21 @@ stripeSubscriptionHandler = (key, form) ->
         form.addClass('stripe-success').submit() # Submits the form. As this is a remote form, submits via JS
 
 # Hijack submit and get a stripe token
-$(document).on 'click', ".effective-orders-stripe-token-required[type='submit']", (event) ->
-  $form = $(event.currentTarget).closest('form')
+$(document).on 'click', ".effective-orders-stripe-token-required[type='submit'],[data-choose-stripe-plan-id]", (event) ->
+  $obj = $(event.currentTarget)
+  $form = $obj.closest('form')
 
   # Get stripe data payload
   stripe = $form.data('stripe')
   return unless stripe?
 
+  # If we're doing choose button mode
+  if $obj.data('choose-stripe-plan-id')
+    $form.find("input[name$='[stripe_plan_id]']").val($obj.data('choose-stripe-plan-id'))
+    return true unless $obj.hasClass('effective-orders-stripe-token-required')
+
   # Make sure there is a plan selected
-  selected_plan_id = $form.find("input[name$='[stripe_plan_id]']:checked").val() || ''
+  selected_plan_id = $form.find("input[name$='[stripe_plan_id]']:checked").val() || $form.find("input[name$='[stripe_plan_id]']").val() || ''
   return unless selected_plan_id.length > 0
 
   # Match plan

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta18'.freeze
+  VERSION = '4.0.0beta19'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0beta18
+  version: 4.0.0beta19
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-22 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails