effective_orders 4.0.0beta15 → 4.0.0beta16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0e364b3f29eb0d7dedd6924f79f88238e53f4e
-  data.tar.gz: 565609c4fe438073afae83e024d5293c8c74f573
+  metadata.gz: bfed4c5207c463fed6c3d0adfe543cdf6d7179b0
+  data.tar.gz: 34169145a782863e3714d19c623b023b8e93cd6c
 SHA512:
-  metadata.gz: 0f9da56ad6b265343c14085799645fa2317a0bae30cfd663798ce3e3c51fa12e77c3f5d5febf75b879c9a0d6bd4225895ffba43a70a4d47bd1705b09ed37b1d6
-  data.tar.gz: baf112b92894922d3dd4ca968430a1e39ec310e1b145990e580d057e55994e87ba640807556bd18c5edb8a720e8a9ce935e315593df77fe9372bb0b75c40ceda
+  metadata.gz: 4c6b21fb32445e76d6d8b4921d6f15923f8cd1c60c2aa969b605735d38ab3a95aed776ea3bc1c17cdcf95798a794ed0dfd7efabcc5662e13965f8c698ba30dfe
+  data.tar.gz: f219625d20fda0dbc0f2b8d1b085f9dc1a04391cfdeb8753dd8b1947ca58cb3c91126a540947d0f33697b923195003796a78719436350d02223e278017ebd136

data/app/helpers/effective_subscriptions_helper.rb

@@ -1,5 +1,19 @@
 module EffectiveSubscriptionsHelper
 
+  def render_plan(plan, subscribed: true)
+    render(render_plan_partial(plan), plan: plan, subscribed: subscribed)
+  end
+
+  def render_plan_partial(plan)
+    if lookup_context.template_exists?("effective/subscriptions/#{plan[:id].downcase}", [], true)
+      "effective/subscriptions/#{plan[:id].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
+    elsif lookup_context.template_exists?("effective/subscriptions/#{plan[:name].downcase}", [], true)
+      "effective/subscriptions/#{plan[:name].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
+    else
+      'effective/subscriptions/plan' # Render effective_orders default plan panel
+    end
+  end
+
   def stripe_plans_collection(form)
     raise 'expected an Effective::FormBuilder object' unless form.class.name == 'Effective::FormBuilder'
 
@@ -16,17 +30,7 @@ module EffectiveSubscriptionsHelper
     end
 
     plans.map do |plan|
-      partial = (
-        if lookup_context.template_exists?("effective/subscriptions/#{plan[:id].downcase}", [], true)
-          "effective/subscriptions/#{plan[:id].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
-        elsif lookup_context.template_exists?("effective/subscriptions/#{plan[:name].downcase}", [], true)
-          "effective/subscriptions/#{plan[:name].downcase}" # Render the app's views/effective/subscriptions/_gold.html.haml
-        else
-          'effective/subscriptions/plan' # Render effective_orders default plan panel
-        end
-      )
-
-      content = render(partial: partial, locals: {
+      content = render(partial: render_plan_partial(plan), locals: {
         f: form,
         plan: plan,
         selected: Array(form.object.stripe_plan_id).include?(plan[:id]),

data/app/views/effective/subscriptions/_subscription.html.haml

@@ -1,3 +1,3 @@
 .effective-radios.card-deck
   .card.active
-    = render 'effective/subscriptions/plan', plan: subscription.plan, subscribed: true
+    = render_plan(subscription.plan)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '4.0.0beta15'.freeze
+  VERSION = '4.0.0beta16'.freeze
 end

metadata

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