effective_orders 1.6.4 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34511876560d7a99a31838f447cbfadc4a30c70c
-  data.tar.gz: a5d30c4367be050345e227f33790c39a82b04729
+  metadata.gz: b0cabc11a1540a88ee03c9f24f9cb94c92caa2fa
+  data.tar.gz: fc21c6a4e480ed8f26ecdd573bc52bfd0158e50f
 SHA512:
-  metadata.gz: 9509286115a6fdcb802c962b777aab0d4a6d8950c34620b11b48b7c0ec138e2e87892ffdddb07efb89de171c2a07565e7d1ac40c3b2bcdc456bfaa86c7ccbd42
-  data.tar.gz: 2dfca854a6115611fdfceb10629780a1128adc2f3a022cb4f49e44c96715f2f1bf171cfcc83ba1770d84f1c85f39d20b10e84691fee1a4a4e37033614a569fa2
+  metadata.gz: 13f4e0de53ff90ae3e16d4ec953bcd0906273aeee46f801fcc95c76ce619aeea414e52c6bd91a6ea158284dcb5bb4f7afdb1d7e49a7cde79ff13567f82072c76
+  data.tar.gz: 34783651f411c842092b59469e8001258762e350de2f9c51ecd24a0a9535ab14b7663a52dd177f2c49968c00e1b9dbf7ddc6025b8399ad9e1626f5e49f5482bf

data/README.md

@@ -487,6 +487,12 @@ If you are using effective_orders to roll your own custom payment workflow, you
 - `order_summary(order)` to display some quick details of an Order and its OrderItems.
 - `order_payment_to_html(order)` to display the payment processor details for an order's payment transaction.
 
+#### Send Order Receipts in the Background
+
+Emails will be sent immediately unless `config.mailer[:deliver_method] == :deliver_later`.
+
+If you are using [Delayed::Job](https://github.com/collectiveidea/delayed_job) to send emails in a background process then you should set the `delayed_job_deliver` option so that `config.mailer[:delayed_job_deliver] == true`.
+
 
 ### Effective::Order Model
 

data/app/helpers/effective_orders_helper.rb

@@ -116,7 +116,7 @@ module EffectiveOrdersHelper
               content_tag((options[:th] ? :th : :td), k) +
               content_tag(:td) do
                 if v.kind_of?(Hash)
-                  tableize_hash(v, options.merge(th: (options.key?(:sub_th) ? options[:sub_th] : options[:th])))
+                  tableize_order_payment(v, options.merge(th: (options.key?(:sub_th) ? options[:sub_th] : options[:th])))
                 elsif v.kind_of?(Array)
                   '[' + v.join(', ') + ']'
                 else

data/app/models/effective/customer.rb

@@ -40,10 +40,14 @@ module Effective
 
     def update_card!(token)
       if token.present? # Oh, so they want to use a new credit card...
-        stripe_customer.card = token  # This sets the default_card to the new card
+        if stripe_customer.respond_to?(:cards)
+          stripe_customer.card = token  # This sets the default_card to the new card
+        elsif stripe_customer.respond_to?(:sources)
+          stripe_customer.source = token
+        end
 
-        if stripe_customer.save && stripe_customer.default_card.present?
-          card = stripe_customer.cards.retrieve(stripe_customer.default_card)
+        if stripe_customer.save && default_card.present?
+          card = cards.retrieve(default_card)
 
           self.stripe_active_card = "**** **** **** #{card.last4} #{card.brand} #{card.exp_month}/#{card.exp_year}"
           self.save!
@@ -57,5 +61,24 @@ module Effective
       stripe_connect_access_token.present?
     end
 
+    private
+
+    def default_card
+      case
+      when stripe_customer.respond_to?(:default_card)
+        stripe_customer.default_card
+      when stripe_customer.respond_to?(:default_source)
+        stripe_customer.default_source
+      end
+    end
+
+    def cards
+      case
+      when stripe_customer.respond_to?(:cards)
+        stripe_customer.cards
+      when stripe_customer.respond_to?(:sources)
+        stripe_customer.sources
+      end
+    end
   end
 end

data/app/models/effective/order.rb

@@ -305,35 +305,36 @@ module Effective
 
     def send_order_receipt_to_admin!
       return false unless purchased? && EffectiveOrders.mailer[:send_order_receipt_to_admin]
-
-      if Rails.env.production?
-        (OrdersMailer.order_receipt_to_admin(self).deliver rescue false)
-      else
-        OrdersMailer.order_receipt_to_admin(self).deliver
-      end
+      send_email(:order_receipt_to_admin, self)
     end
 
     def send_order_receipt_to_buyer!
       return false unless purchased? && EffectiveOrders.mailer[:send_order_receipt_to_buyer]
 
-      if Rails.env.production?
-        (OrdersMailer.order_receipt_to_buyer(self).deliver rescue false)
-      else
-        OrdersMailer.order_receipt_to_buyer(self).deliver
-      end
+      send_email(:order_receipt_to_buyer, self)
     end
 
     def send_order_receipt_to_seller!
       return false unless purchased?(:stripe_connect) && EffectiveOrders.mailer[:send_order_receipt_to_seller]
 
       order_items.group_by(&:seller).each do |seller, order_items|
-        if Rails.env.production?
-          (OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver rescue false)
+        send_email(:order_receipt_to_seller, self, seller, order_items)
+      end
+    end
+
+  private
+
+    def send_email(email, *mailer_args)
+      begin
+        if EffectiveOrders.mailer[:delayed_job_deliver] && EffectiveOrders.mailer[:deliver_method] == :deliver_later
+          (OrdersMailer.delay.public_send(email, *mailer_args) rescue false)
         else
-          OrdersMailer.order_receipt_to_seller(self, seller, order_items).deliver
+          (OrdersMailer.public_send(email, *mailer_args).public_send(EffectiveOrders.mailer[:deliver_method]) rescue false)
         end
+      rescue => e
+        raise e unless Rails.env.production?
+        return false
       end
     end
-
   end
 end

data/app/views/effective/orders/_order_header.html.haml

@@ -2,7 +2,8 @@
   %h3 Acme Industries Inc.
   .row
     .col-sm-6
-      %p= mail_to EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'
+      - email_address = EffectiveOrders.mailer[:admin_email] || 'info@acmeindustries.com'
+      %p= mail_to u(email_address), email_address
       %p
         1234 Fake Street
         %br

data/lib/effective_orders.rb

@@ -61,8 +61,19 @@ module EffectiveOrders
   mattr_accessor :moneris
   mattr_accessor :stripe
 
+  mattr_accessor :deliver_method
+
   def self.setup
     yield self
+
+    unless mailer[:deliver_method].present?
+      self.mailer[:deliver_method] = case
+                            when Rails.gem_version >= Gem::Version.new('4.2')
+                              :deliver_now
+                            else
+                              :deliver
+                            end
+    end
   end
 
   def self.authorized?(controller, action, resource)

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.6.4'.freeze
+  VERSION = '1.6.5'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -144,7 +144,9 @@ EffectiveOrders.setup do |config|
     :subject_prefix => '[example]',
     :subject_for_admin_receipt => '',
     :subject_for_buyer_receipt => '',
-    :subject_for_seller_receipt => ''
+    :subject_for_seller_receipt => '',
+    :deliver_method => nil,
+    :delayed_job_deliver => false
   }
 
   # Moneris configuration

data/spec/controllers/carts_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Effective::CartsController do
+describe Effective::CartsController, type: :controller do
   routes { EffectiveOrders::Engine.routes }
 
   let(:user) { FactoryGirl.create(:user) }
@@ -77,7 +77,7 @@ describe Effective::CartsController do
         assigns(:cart).size.should eq 1
         assigns(:cart).find(product).present?.should eq true
 
-        sign_in user 
+        sign_in user
         controller.instance_variable_set(:@cart, nil) # This is what happens in a real RailsController. zzz.
 
         get :show
@@ -100,7 +100,7 @@ describe Effective::CartsController do
         assigns(:cart).size.should eq 1
         assigns(:cart).find(product).present?.should eq true
 
-        sign_in cart.user 
+        sign_in cart.user
         controller.instance_variable_set(:@cart, nil) # This is what happens in a real RailsController. zzz.
 
         get :show

data/spec/controllers/moneris_orders_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # We're testing the effective/providers/moneris.rb file, which is included into the OrdersController at runtime
 
-describe Effective::OrdersController do
+describe Effective::OrdersController, type: :controller do
   routes { EffectiveOrders::Engine.routes }
 
   let(:order) { FactoryGirl.create(:order) }

data/spec/controllers/orders_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Effective::OrdersController do
+describe Effective::OrdersController, type: :controller do
   routes { EffectiveOrders::Engine.routes }
 
   let(:purchased_order) { FactoryGirl.create(:purchased_order) }
@@ -288,7 +288,7 @@ describe Effective::OrdersController do
     let(:subscription) { cart_with_subscription.cart_items.find { |obj| obj.purchasable.kind_of?(Effective::Subscription)}.purchasable }
 
     let(:valid_order_with_new_subscription_coupon_attributes) do
-      valid_order_attributes.tap { |x| x[:effective_order]['order_items_attributes'] = {'0' => {"class"=>"Effective::Subscription", "stripe_coupon_id"=>"#{::Stripe::Coupon.create().id}", 'id' => "#{subscription.id}"}} }
+      valid_order_attributes.tap { |x| x[:effective_order]['order_items_attributes'] = {'0' => {"class"=>"Effective::Subscription", "stripe_coupon_id"=>"#{FactoryGirl.create(:stripe_coupon).id}", 'id' => "#{subscription.id}"}} }
     end
 
     before do

data/spec/controllers/stripe_orders_controller_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 # We're testing the effective/providers/stripe.rb file, which is included into the OrdersController at runtime
 
-describe Effective::OrdersController do
+describe Effective::OrdersController, type: :controller do
   routes { EffectiveOrders::Engine.routes }
 
   before { StripeMock.start }

data/spec/controllers/webhooks_controller_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Effective::WebhooksController do
+describe Effective::WebhooksController, type: :controller do
   routes { EffectiveOrders::Engine.routes }
 
   before { StripeMock.start }

data/spec/dummy/config/initializers/effective_orders.rb

@@ -137,7 +137,8 @@ EffectiveOrders.setup do |config|
     :subject_prefix => '[example]',
     :subject_for_admin_receipt => '',
     :subject_for_buyer_receipt => '',
-    :subject_for_seller_receipt => ''
+    :subject_for_seller_receipt => '',
+    :delayed_job_deliver => false
   }
 
   # Moneris configuration

data/spec/helpers/effective_orders_helper_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe EffectiveOrdersHelper do
+describe EffectiveOrdersHelper, :type => :helper do
   describe '#price_to_currency' do
     it 'converts an integer number of cents to a currency formatted string' do
       price_to_currency(1050).should eq '$10.50'

data/spec/models/order_spec.rb

@@ -165,8 +165,8 @@ describe Effective::Order do
     end
 
     it 'returns true when purchased twice' do
-      order.purchase!('first time')
-      order.purchase!('second time').should eq false
+      order.purchase!('first time by a test')
+      order.purchase!('second time by a test').should eq false
     end
 
     it 'sends emails to the admin, buyer and seller' do

data/spec/models/subscription_spec.rb

@@ -53,7 +53,7 @@ describe Effective::Subscription do
     it 'sets the stripe coupon' do
       subscription = Effective::Subscription.new()
 
-      coupon = ::Stripe::Coupon.create()
+      coupon = FactoryGirl.create(:stripe_coupon)
       subscription.stripe_coupon_id = coupon.id
       subscription.stripe_coupon.id.should eq coupon.id
     end
@@ -76,7 +76,7 @@ describe Effective::Subscription do
       subscription = Effective::Subscription.new()
 
       plan = ::Stripe::Plan.create(:id => 'stripe_plan', :name => 'Stripe Plan', :amount => 1000, :currency => 'USD', :interval => 'month')
-      coupon = ::Stripe::Coupon.create(:percent_off => 25)
+      coupon = FactoryGirl.create(:stripe_coupon, :percent_off => 25)
 
       subscription.stripe_plan_id = plan.id
       subscription.stripe_coupon_id = coupon.id
@@ -89,7 +89,7 @@ describe Effective::Subscription do
       subscription = Effective::Subscription.new()
 
       plan = ::Stripe::Plan.create(:id => 'stripe_plan', :name => 'Stripe Plan', :amount => 1000, :currency => 'USD', :interval => 'month')
-      coupon = ::Stripe::Coupon.create(:percent_off => nil, :amount_off => 100)
+      coupon = FactoryGirl.create(:stripe_coupon, :percent_off => nil, :amount_off => 100)
 
       subscription.stripe_plan_id = plan.id
       subscription.stripe_coupon_id = coupon.id

data/spec/spec_helper.rb

@@ -6,6 +6,7 @@ require 'rspec/rails'
 require 'rspec/autorun'
 require 'factory_girl_rails'
 require 'stripe_mock'
+require 'pry'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.

data/spec/support/factories.rb

@@ -42,7 +42,7 @@ FactoryGirl.define do
 
     before(:create) do |subscription|
       stripe_plan = Stripe::Plan.create(:id => "stripe_plan_#{subscription.object_id}", :name => 'Stripe Plan', :amount => 1000, :currency => 'USD', :interval => 'month')
-      stripe_coupon = Stripe::Coupon.create()
+      stripe_coupon = FactoryGirl.create(:stripe_coupon)
 
       subscription.stripe_plan_id = stripe_plan.id
       subscription.stripe_coupon_id = stripe_coupon.id
@@ -108,11 +108,15 @@ FactoryGirl.define do
   end
 
   factory :purchased_order, :parent => :order do
-    after(:create) { |order| order.purchase! }
+    after(:create) { |order| order.purchase!('by a test') }
   end
 
   factory :declined_order, :parent => :order do
     after(:create) { |order| order.decline! }
   end
 
+  factory :stripe_coupon, :class => Stripe::Coupon do
+    to_create {|c| c.save}
+    duration 'once'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.6.5
 platform: ruby
 authors:
 - Code and Effect