effective_orders 4.0.0beta14 → 4.0.0beta15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4208678ec4ca20f32750275db42bf93dd4d5606e
-  data.tar.gz: 1b7c3d7930f5a75517d53b0f5b1610f12971314a
+  metadata.gz: 9a0e364b3f29eb0d7dedd6924f79f88238e53f4e
+  data.tar.gz: 565609c4fe438073afae83e024d5293c8c74f573
 SHA512:
-  metadata.gz: 12370d62272535c8a329a4cfb57281cda436a8eb123853ca8e18ba2374fd1a75e2df8f1d28ece4c219229db57830540e0bc67473c88d4aa85f4c2f6c6069d494
-  data.tar.gz: 6fad409855c1437392583c3c694977e9e898be5c2667633261bd0941cec5caf092505ee62cb6415690f70b1fed1a1a7155d30b24765c7a7e7fe4dd3ec8567482
+  metadata.gz: 0f9da56ad6b265343c14085799645fa2317a0bae30cfd663798ce3e3c51fa12e77c3f5d5febf75b879c9a0d6bd4225895ffba43a70a4d47bd1705b09ed37b1d6
+  data.tar.gz: baf112b92894922d3dd4ca968430a1e39ec310e1b145990e580d057e55994e87ba640807556bd18c5edb8a720e8a9ce935e315593df77fe9372bb0b75c40ceda

data/app/controllers/effective/webhooks_controller.rb

@@ -21,7 +21,7 @@ module Effective
         (head(:bad_request) and return) if (params[:livemode] == false && Rails.env.production?)
       end
 
-      Rails.logger.info "STRIPE WEBHOOK: #{@event.type}"
+      Rails.logger.info "[STRIPE] webhook received: #{@event.type}"
 
       Effective::Customer.transaction do
         case @event.type
@@ -56,7 +56,7 @@ module Effective
         when 'customer.subscription.updated'
           send_email(:subscription_updated, customer)
         else
-          Rails.logger.info "[STRIPE WEBHOOK] Unhandled event type #{@event.type}"
+          Rails.logger.info "[STRIPE] webhook unhandled event type: #{@event.type}"
         end
       end
 

data/app/helpers/effective_subscriptions_helper.rb

@@ -19,6 +19,8 @@ module EffectiveSubscriptionsHelper
       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

data/app/models/concerns/acts_as_subscribable_buyer.rb

@@ -11,7 +11,7 @@ module ActsAsSubscribableBuyer
     has_one :customer, class_name: 'Effective::Customer'
 
     before_save(if: -> { persisted? && email_changed? && customer.present? }) do
-      Rails.logger.info "STRIPE CUSTOMER EMAIL UPDATE: #{customer.stripe_customer_id}"
+      Rails.logger.info "[STRIPE] update customer: #{customer.stripe_customer_id}"
       customer.stripe_customer.email = email
       customer.stripe_customer.description = to_s
       throw :abort unless (customer.stripe_customer.save rescue false)

data/app/models/effective/customer.rb

@@ -38,21 +38,21 @@ module Effective
 
     def stripe_customer
       @stripe_customer ||= if stripe_customer_id.present?
-        Rails.logger.info "STRIPE CUSTOMER RETRIEVE: #{stripe_customer_id}"
+        Rails.logger.info "[STRIPE] get customer: #{stripe_customer_id}"
         ::Stripe::Customer.retrieve(stripe_customer_id)
       end
     end
 
     def stripe_subscription
       @stripe_subscription ||= if stripe_subscription_id.present?
-        Rails.logger.info "STRIPE SUBSCRIPTION RETRIEVE: #{stripe_subscription_id}"
+        Rails.logger.info "[STRIPE] get subscription: #{stripe_subscription_id}"
         ::Stripe::Subscription.retrieve(stripe_subscription_id)
       end
     end
 
     def upcoming_invoice
       @upcoming_invoice ||= if stripe_customer_id.present? && stripe_subscription_id.present?
-        Rails.logger.info "STRIPE UPCOMING INVOICE RETRIEVE: #{stripe_customer_id}"
+        Rails.logger.info "[STRIPE] get upcoming invoice: #{stripe_customer_id}"
         ::Stripe::Invoice.upcoming(customer: stripe_customer_id) rescue nil
       end
     end

data/app/models/effective/subscripter.rb

@@ -75,7 +75,7 @@ module Effective
     # This should work even if the rest of the form doesn't. Careful with our transactions...
     def create_customer!
       if customer.stripe_customer.blank?
-        Rails.logger.info "STRIPE CUSTOMER CREATE: #{user.email}"
+        Rails.logger.info "[STRIPE] create customer: #{user.email}"
         customer.stripe_customer = Stripe::Customer.create(email: user.email, description: user.to_s, metadata: { user_id: user.id })
         customer.stripe_customer_id = customer.stripe_customer.id
         customer.save!
@@ -85,7 +85,7 @@ module Effective
     # Update stripe customer card
     def create_stripe_token!
       if stripe_token.present?
-        Rails.logger.info "STRIPE CUSTOMER SOURCE UPDATE #{stripe_token}"
+        Rails.logger.info "[STRIPE] update source: #{stripe_token}"
         customer.stripe_customer.source = stripe_token
         customer.stripe_customer.save
 
@@ -113,7 +113,7 @@ module Effective
       return unless plan.present?
       return if customer.stripe_subscription.present?
 
-      Rails.logger.info "STRIPE SUBSCRIPTION CREATE: #{items(metadata: false)}"
+      Rails.logger.info "[STRIPE] create subscription: #{items(metadata: false)}"
       customer.stripe_subscription = Stripe::Subscription.create(customer: customer.stripe_customer_id, items: items(metadata: false), metadata: metadata)
       customer.stripe_subscription_id = customer.stripe_subscription.id
 
@@ -125,7 +125,7 @@ module Effective
       return unless plan.present?
       return if customer.stripe_subscription.blank?
 
-      Rails.logger.info "STRIPE SUBSCRIPTION SYNC: #{customer.stripe_subscription_id} #{items}"
+      Rails.logger.info "[STRIPE] update subscription: #{customer.stripe_subscription_id} #{items}"
 
       if items.length == 0
         customer.stripe_subscription.delete
@@ -147,7 +147,7 @@ module Effective
         stripe_item.quantity = item[:quantity]
         stripe_item.metadata = item[:metadata]
 
-        Rails.logger.info " -> UPDATE: #{item[:plan]}"
+        Rails.logger.info " -> [STRIPE] update plan: #{item[:plan]}"
         stripe_item.save
       end
 
@@ -155,7 +155,7 @@ module Effective
       items.each do |item|
         next if customer.stripe_subscription.items.find { |stripe_item| item[:plan] == stripe_item['plan']['id'] }
 
-        Rails.logger.info " -> CREATE: #{item[:plan]}"
+        Rails.logger.info " -> [STRIPE] create plan: #{item[:plan]}"
         customer.stripe_subscription.items.create(plan: item[:plan], quantity: item[:quantity], metadata: item[:metadata])
       end
 
@@ -163,20 +163,20 @@ module Effective
       customer.stripe_subscription.items.each do |stripe_item|
         next if items.find { |item| item[:plan] == stripe_item['plan']['id'] }
 
-        Rails.logger.info " -> DELETE: #{stripe_item['plan']['id']}"
+        Rails.logger.info " -> [STRIPE] delete plan: #{stripe_item['plan']['id']}"
         stripe_item.delete
       end
 
       # Update metadata
       if customer.stripe_subscription.metadata.to_h != metadata
-        Rails.logger.info " -> METATADA: #{metadata}"
+        Rails.logger.info " -> [STRIPE] update metadata: #{metadata}"
         customer.stripe_subscription.metadata = metadata
         customer.stripe_subscription.save
       end
 
       # When upgrading a plan, invoice immediately.
       if quantity_increased
-        Rails.logger.info " -> QUANTITY INCREASED SO INVOICE GENERATED"
+        Rails.logger.info " -> [STRIPE] generate invoice"
         Stripe::Invoice.create(customer: customer.stripe_customer_id).pay
       end
 

data/lib/effective_orders.rb

@@ -169,11 +169,7 @@ module EffectiveOrders
     return {} unless (stripe? && subscriptions?)
 
     @stripe_plans ||= (
-      Rails.logger.info "STRIPE PLAN LIST"
-
-      # {"id":"plan_ChLx90ggbWvB8i","object":"plan","amount":100000,"billing_scheme":"per_unit","created":1523984756,"currency":"usd",
-      #{ }"interval":"year","interval_count":1,"livemode":false,"metadata":{},"nickname":"Yearly","product":"prod_ChLwW0XqdykIki",
-      #{ }"tiers":null,"tiers_mode":null,"transform_usage":null,"trial_period_days":null,"usage_type":"licensed"},
+      Rails.logger.info '[STRIPE] index plans'
 
       plans = Stripe::Plan.all.inject({}) do |h, plan|
         h[plan.id] = {

data/lib/effective_orders/version.rb

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

metadata

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