effective_orders 1.6.5 → 1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0cabc11a1540a88ee03c9f24f9cb94c92caa2fa
-  data.tar.gz: fc21c6a4e480ed8f26ecdd573bc52bfd0158e50f
+  metadata.gz: 454888d9685c161b640cb1704d16ed37089a843b
+  data.tar.gz: e21c978af3d83dd4104a0b56929dc000f3daf8dc
 SHA512:
-  metadata.gz: 13f4e0de53ff90ae3e16d4ec953bcd0906273aeee46f801fcc95c76ce619aeea414e52c6bd91a6ea158284dcb5bb4f7afdb1d7e49a7cde79ff13567f82072c76
-  data.tar.gz: 34783651f411c842092b59469e8001258762e350de2f9c51ecd24a0a9535ab14b7663a52dd177f2c49968c00e1b9dbf7ddc6025b8399ad9e1626f5e49f5482bf
+  metadata.gz: b2bab5bcdf09101c8bd475e27c0db23e2cba18b52b4b8bc8247d20361eb5d8c5c0ae597a4eefeb1d5d1bda7d6143e55068914cedf42a967267e3bbcc0532f7c1
+  data.tar.gz: c8bf6d21f7f4e312c21a9693b246f8c81f5a525ab40c9d130c3398c3ac219141fb696e3b35366d77aacbe6acb794ce026e43f44de6a613d3dd33bb6585f78f8e

data/app/controllers/effective/carts_controller.rb

@@ -16,9 +16,9 @@ module Effective
       EffectiveOrders.authorized?(self, :destroy, @cart)
 
       if @cart.destroy
-        flash[:success] = 'Successfully emptied cart'
+        flash[:success] = 'Successfully emptied cart.'
       else
-        flash[:danger] = 'Unable to destroy cart'
+        flash[:danger] = 'Unable to destroy cart.'
       end
 
       request.referrer ? (redirect_to :back) : (redirect_to effective_orders.cart_path)
@@ -30,12 +30,12 @@ module Effective
       EffectiveOrders.authorized?(self, :update, current_cart)
 
       begin
-        raise "please select a valid #{add_to_cart_params[:purchasable_type] || 'item' }" unless @purchasable
+        raise "Please select a valid #{add_to_cart_params[:purchasable_type] || 'item' }." unless @purchasable
 
         current_cart.add_to_cart(@purchasable, [add_to_cart_params[:quantity].to_i, 1].max)
-        flash[:success] = 'Successfully added item to cart'
+        flash[:success] = 'Successfully added item to cart.'
       rescue EffectiveOrders::SoldOutException
-        flash[:warning] = 'This item is sold out'
+        flash[:warning] = 'This item is sold out.'
       rescue => e
         flash[:danger] = 'Unable to add item to cart: ' + e.message
       end
@@ -49,9 +49,9 @@ module Effective
       EffectiveOrders.authorized?(self, :update, current_cart)
 
       if @cart_item.destroy
-        flash[:success] = 'Successfully removed item from cart'
+        flash[:success] = 'Successfully removed item from cart.'
       else
-        flash[:danger] = 'Unable to remove item from cart'
+        flash[:danger] = 'Unable to remove item from cart.'
       end
 
       request.referrer ? (redirect_to :back) : (redirect_to effective_orders.cart_path)

data/app/controllers/effective/orders_controller.rb

@@ -56,7 +56,7 @@ module Effective
           @order.save!
 
           if @order.total == 0 && EffectiveOrders.allow_free_orders
-            order_purchased('zero-dollar order')
+            order_purchased('automatic purchase of free order.')
           else
             redirect_to(effective_orders.order_path(@order))
           end
@@ -64,7 +64,7 @@ module Effective
           return
         rescue => e
           Rails.logger.info e.message
-          flash.now[:danger] = "An error has ocurred. Please try again. Message: #{e.message}"
+          flash.now[:danger] = "An error has occurred: #{e.message}. Please try again."
           raise ActiveRecord::Rollback
         end
       end
@@ -118,7 +118,7 @@ module Effective
       if @order.send_order_receipt_to_buyer!
         flash[:success] = "Successfully resent order receipt to #{@order.user.email}"
       else
-        flash[:danger] = "Unable to send order receipt"
+        flash[:danger] = "Unable to send order receipt."
       end
 
       redirect_to(:back) rescue effective_orders.order_path(@order)
@@ -145,11 +145,15 @@ module Effective
         @order.purchase!(details)
         current_cart.try(:destroy)
 
-        flash[:success] = "Successfully purchased order"
+        if EffectiveOrders.mailer[:send_order_receipt_to_buyer]
+          flash[:success] = "Payment successful! Please check your email for a receipt."
+        else
+          flash[:success] = "Payment successful!"
+        end
 
         redirect_to (redirect_url.presence || effective_orders.order_purchased_path(':id')).gsub(':id', @order.to_param.to_s)
       rescue => e
-        flash[:danger] = "Unable to process your order.  Your card has not been charged.  Your Cart items have been restored.  Please try again.  Error Message: #{e.message}"
+        flash[:danger] = "An error occurred while processing your payment: #{e.message}.  Please try again."
         redirect_to (declined_redirect_url.presence || effective_orders.cart_path).gsub(':id', @order.to_param.to_s)
       end
     end
@@ -157,7 +161,7 @@ module Effective
     def order_declined(details = nil, redirect_url = nil)
       @order.decline!(details) rescue nil
 
-      flash[:danger] = "Unable to purchase order.  Your credit card was declined by the payment processor.  Your cart items have been restored.  Please try again."
+      flash[:danger] = "Payment was unsuccessful. Your credit card was declined by the payment processor. Please try again."
 
       redirect_to (redirect_url.presence || effective_orders.order_declined_path(@order)).gsub(':id', @order.id.to_s)
     end

data/app/controllers/effective/subscriptions_controller.rb

@@ -40,7 +40,7 @@ module Effective
       EffectiveOrders.authorized?(self, :create, @subscription)
 
       if @subscription.update_attributes(subscription_params) && (current_cart.find(@subscription).present? || current_cart.add(@subscription))
-        flash[:success] = "Successfully added subscription to cart"
+        flash[:success] = "Successfully added subscription to cart."
         redirect_to effective_orders.new_order_path
       else
         purchased_plans = @customer.subscriptions.purchased.map(&:stripe_plan_id)
@@ -75,7 +75,7 @@ module Effective
 
       EffectiveOrders.authorized?(self, :show, @subscription)
 
-      @invoices = @customer.stripe_customer.invoices.all.select do |invoice| 
+      @invoices = @customer.stripe_customer.invoices.all.select do |invoice|
         invoice.lines.any? { |line| line.id == @stripe_subscription.id }
       end
 

data/app/helpers/effective_orders_helper.rb

@@ -27,6 +27,25 @@ module EffectiveOrdersHelper
     end
   end
 
+  def order_checkout_label(processor = nil)
+    return 'Checkout' if (EffectiveOrders.single_payment_processor? && processor != :pretend)
+
+    case processor
+    when :free
+      'Checkout'
+    when :moneris
+      'Checkout with Moneris'
+    when :paypal
+      'Checkout with PayPal'
+    when :pretend  # The logic for this is in orders/views/_checkout_step_2.html.haml
+      EffectiveOrders.allow_pretend_purchase_in_production ? 'Purchase Order' : 'Purchase Order (development only)'
+    when :stripe
+      'Checkout with Stripe'
+    else
+      'Checkout'
+    end
+  end
+
   # This is called on the My Sales Page and is intended to be overridden in the app if needed
   def acts_as_purchasable_path(purchasable, action = :show)
     polymorphic_path(purchasable)

data/app/mailers/effective/orders_mailer.rb

@@ -18,8 +18,9 @@ module Effective
       @order = order
       @user = seller.user
       @order_items = order_items
+      @subject = receipt_to_seller_subject(order, order_items, seller.user)
 
-      mail(:to => @user.email, :subject => receipt_to_seller_subject(order, order_items, seller.user))
+      mail(:to => @user.email, :subject => @subject)
     end
 
     private
@@ -51,7 +52,7 @@ module Effective
         string_or_callable = self.instance_exec(order, order_items, seller, &string_or_callable)
       end
 
-      prefix_subject(string_or_callable.presence || "#{order_items.count} of your products #{order_items.count > 1 ? 'have' : 'has'} been purchased")
+      prefix_subject(string_or_callable.presence || "#{order_items.length} of your products #{order_items.length > 1 ? 'have' : 'has'} been purchased")
     end
 
     def prefix_subject(text)

data/app/models/effective/cart.rb

@@ -51,15 +51,15 @@ module Effective
     end
 
     def subtotal
-      cart_items.map(&:subtotal).sum
+      cart_items.map { |ci| ci.subtotal }.sum
     end
 
     def tax
-      cart_items.map(&:tax).sum
+      cart_items.map { |ci| ci.tax }.sum
     end
 
     def total
-      cart_items.map(&:total).sum
+      cart_items.map { |ci| ci.total }.sum
     end
   end
 end

data/app/views/admin/customers/index.html.haml

@@ -2,9 +2,14 @@
 
 %p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
 
-= render_datatable @datatable do
-  %p There are no customers
-
-- if @datatable.present?
-  %p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'
+- if @datatable.nil?
+  %p
+    Please install
+    = link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'
+    to see this page.
+- elsif @datatable.present?
+  = render_datatable @datatable
+- else
+  %p There are no customers present
 
+%p.text-right= link_to 'Stripe Dashboard: Customers', 'https://manage.stripe.com/customers', :class => 'btn btn-primary'

data/app/views/admin/order_items/index.html.haml

@@ -5,6 +5,7 @@
     Please install
     = link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'
     to see this page.
+- elsif @datatable.present?
+  = render_datatable @datatable
 - else
-  = render_datatable @datatable do
-    %p There are no order items
+  %p There are no order items present

data/app/views/admin/orders/index.html.haml

@@ -5,6 +5,7 @@
     Please install
     = link_to 'effective_datatables', 'https://github.com/code-and-effect/effective_datatables'
     to see this page.
+- elsif @datatable.present?
+  = render_datatable @datatable
 - else
-  = render_datatable @datatable do
-    %p There are no orders
+  %p There are no orders present

data/app/views/effective/carts/_cart.html.haml

@@ -2,7 +2,7 @@
   %table.table
     %thead
       %tr
-        %th.quantity Quantity
+        %th.quantity Qty
         %th.item Item
         %th.price Price
     %tbody
@@ -15,19 +15,23 @@
             = ' - '
             = link_to_remove_from_cart(item)
           %td.price
-            = price_to_currency(item.subtotal)
+            = price_to_currency(item.price)
       - if cart.empty?
         %tr
           %td.quantity
           %td.item There are no items in your shopping cart
           %td.price
     %tfoot
+      - if cart.tax > 0
+        %tr
+          %th.quantity
+          %th.subtotal Subtotal
+          %td.price.subtotal-price= price_to_currency(cart.subtotal)
+        %tr
+          %th.quantity
+          %th.tax Tax
+          %td.price.tax-price= price_to_currency(cart.tax)
       %tr
-        %th{:colspan => 2} Subtotal
-        %td.price= price_to_currency(cart.subtotal)
-      %tr
-        %th{:colspan => 2} Tax
-        %td.price= price_to_currency(cart.tax)
-      %tr
-        %th{:colspan => 2} Total Due
-        %td.price= price_to_currency(cart.total)
+        %th.quantity
+        %th.total Total Due
+        %td.price.total-price= price_to_currency(cart.total)

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

@@ -38,6 +38,6 @@
 
     .text-right
       - if order.total == 0 && EffectiveOrders.allow_free_orders
-        = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, :data => {'disable_with' => 'Processing...' }
+        = f.submit order_checkout_label(:free), :class => 'btn btn-primary pull-right', :rel => :nofollow, :data => {'disable_with' => 'Processing...' }
       - else
         = f.submit 'Save and Continue', :class => 'btn btn-primary pull-right', :rel => :nofollow, :data => {'disable_with' => 'Saving...' }

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

@@ -2,10 +2,10 @@
 
 .effective-order.effective-order-purchase-actions
   - if (Rails.env.production? == false && EffectiveOrders.allow_pretend_purchase_in_development)
-    = render :partial => '/effective/orders/pretend/form', locals: {label: 'Purchase Order (development only)', order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
+    = render :partial => '/effective/orders/pretend/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
 
   - if (Rails.env.production? == true && EffectiveOrders.allow_pretend_purchase_in_production)
-    = render :partial => '/effective/orders/pretend/form', locals: {label: 'Purchase Order', order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
+    = render :partial => '/effective/orders/pretend/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
 
   - if EffectiveOrders.moneris_enabled
     = render :partial => '/effective/orders/moneris/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}

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

@@ -25,7 +25,7 @@
                 = link_to 'download', item.purchased_download_url
               - else
                 = '-'
-          %td.price= price_to_currency(item.subtotal)
+          %td.price= price_to_currency(item.price)
 
     %tfoot
       - if order.tax > 0

data/app/views/effective/orders/moneris/_form.html.haml

@@ -44,4 +44,4 @@
     = hidden_field_tag(:ship_postal_code, address.postal_code)
     = hidden_field_tag(:ship_country, address.country)
 
-  = submit_tag 'Pay with Moneris', :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+  = submit_tag order_checkout_label(:moneris), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

data/app/views/effective/orders/paypal/_form.html.haml

@@ -2,4 +2,4 @@
   = hidden_field_tag :cmd, '_s-xclick'
   = hidden_field_tag :encrypted, paypal_encrypted_payload(order)
 
-  = submit_tag 'Pay with PayPal', :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+  = submit_tag order_checkout_label(:paypal), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

data/app/views/effective/orders/pretend/_form.html.haml

@@ -1,2 +1,2 @@
 = form_tag(effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), method: :post) do
-  = submit_tag label, :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }
+  = submit_tag order_checkout_label(:pretend), :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

data/app/views/effective/orders/stripe/_form.html.haml

@@ -4,4 +4,4 @@
   = simple_form_for(@stripe_charge || Effective::StripeCharge.new(order), (EffectiveOrders.simple_form_options || {}).merge(:url => effective_orders.stripe_charges_path)) do |f|
     = f.input :effective_order_id, :as => :hidden
     = f.input :token, :as => :hidden
-    = f.submit 'Pay with Stripe', :class => 'stripe-button', :data => {'disable_with' => 'Continuing...' }
+    = f.submit order_checkout_label(:stripe), :class => 'stripe-button', :data => {'disable_with' => 'Continuing...' }

data/app/views/effective/orders_mailer/order_receipt_to_seller.html.haml

@@ -21,10 +21,10 @@
       %tfoot
         %tr
           %th Subtotal
-          %td= price_to_currency(@order_items.sum(&:subtotal))
+          %td= price_to_currency(@order_items.map { |oi| oi.subtotal }.sum)
         %tr
           %th Tax
-          %td= price_to_currency(@order_items.sum(&:tax))
+          %td= price_to_currency(@order_items.map { |oi| oi.tax }.sum)
         %tr
           %th Total
-          %td= price_to_currency(@order_items.sum(&:total))
+          %td= price_to_currency(@order_items.map { |oi| oi.total }.sum)

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

@@ -7,4 +7,3 @@
     = f.submit 'Add to Cart', :class => 'btn btn-primary'
 - else
   %p No available Subscriptions
-  %p= link_to 'Home', root_url

data/lib/effective_orders.rb

@@ -96,6 +96,10 @@ module EffectiveOrders
     use_active_admin && defined?(ActiveAdmin)
   end
 
+  def self.single_payment_processor?
+    [moneris_enabled, paypal_enabled, stripe_enabled].select { |enabled| enabled }.length == 1
+  end
+
   class SoldOutException < Exception; end
   class AlreadyPurchasedException < Exception; end
   class AlreadyDeclinedException < Exception; end

data/lib/effective_orders/version.rb

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

data/lib/generators/effective_orders/install_generator.rb

@@ -19,6 +19,16 @@ module EffectiveOrders
         template "effective_orders.rb", "config/initializers/effective_orders.rb"
       end
 
+      def copy_mailer_preview
+        mailer_preview_path = (Rails.application.config.action_mailer.preview_path rescue nil)
+
+        if mailer_preview_path.present?
+          template 'effective_orders_mailer_preview.rb', File.join(mailer_preview_path, 'effective_orders_mailer_preview.rb')
+        else
+          puts "couldn't find action_mailer.preview_path.  Skipping effective_orders_mailer_preview."
+        end
+      end
+
       def create_migration_file
         @orders_table_name = ':' + EffectiveOrders.orders_table_name.to_s
         @order_items_table_name = ':' + EffectiveOrders.order_items_table_name.to_s

data/lib/generators/templates/effective_orders_mailer_preview.rb

@@ -0,0 +1,61 @@
+# In Rails 4.1 and above, visit:
+# http://localhost:3000/rails/mailers
+# to see a preview of the following 3 emails:
+
+class EffectiveOrdersMailerPreview < ActionMailer::Preview
+  def order_receipt_to_buyer
+    Effective::OrdersMailer.order_receipt_to_buyer(build_preview_order)
+  end
+
+  def order_receipt_to_admin
+    Effective::OrdersMailer.order_receipt_to_admin(build_preview_order)
+  end
+
+  # This email is only sent to sellers having sold items via StripeConnect
+  def order_receipt_to_seller
+    order = build_preview_order
+    Effective::OrdersMailer.order_receipt_to_seller(order, preview_customer, order.order_items)
+  end
+
+  protected
+
+  def build_preview_order
+    order = Effective::Order.new()
+    order.user = preview_user
+    preview_order_items.each { |atts| order.order_items.build(atts) }
+    order
+  end
+
+  private
+
+  # We're building Effective::OrderItems directly rather than creating acts_as_purchasable objects
+  # so that this mailer will not have to guess at your app's acts_as_purchasable objects
+  def preview_order_items
+    tax_rate = (EffectiveOrders.tax_rate_method.call(Object.new()) rescue -1)
+    tax_rate = 0.05 if tax_rate < 0.0
+
+    [
+      {title: 'Item One', quantity: 2, price: 999, tax_exempt: false, tax_rate: tax_rate},
+      {title: 'Item Two', quantity: 1, price: 25000, tax_exempt: false, tax_rate: tax_rate},
+      {title: 'Item Three', quantity: 1, price: 8999, tax_exempt: false, tax_rate: tax_rate},
+      {title: 'Item Four', quantity: 1, price: 100000, tax_exempt: false, tax_rate: tax_rate}
+    ]
+  end
+
+  def preview_user
+    User.new(email: 'buyer@example.com').tap do |user|
+      user.name = 'Valued Customer' if user.respond_to?(:name=)
+      user.full_name = 'Valued Customer' if user.respond_to?(:full_name=)
+
+      if user.respond_to?(:first_name=) && user.respond_to?(:last_name=)
+        user.first_name = 'Valued'
+        user.last_name = 'Customer'
+      end
+    end
+  end
+
+  def preview_customer
+    Effective::Customer.new(user: preview_user)
+  end
+
+end

data/spec/controllers/moneris_orders_controller_spec.rb

@@ -30,7 +30,7 @@ describe Effective::OrdersController, type: :controller do
 
   describe 'moneris_postback' do
     before do
-      subject.stub(:send_moneris_verify_request).and_return('')  # Dont actually make Moneris requests
+      allow(subject).to receive(:send_moneris_verify_request).and_return('') # Don't actually make Moneris requests
       sign_in order.user
     end
 
@@ -72,7 +72,7 @@ describe Effective::OrdersController, type: :controller do
 
     describe 'transaction verification step' do
       it 'marks the order as purchased when response code is valid' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 1}) # success
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 1}) # success
 
         post :moneris_postback, moneris_params
 
@@ -81,7 +81,7 @@ describe Effective::OrdersController, type: :controller do
       end
 
       it 'marks order declined when response_code = null' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 'null'}) # failure
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 'null'}) # failure
 
         post :moneris_postback, moneris_params
 
@@ -91,7 +91,7 @@ describe Effective::OrdersController, type: :controller do
       end
 
       it 'marks order declined when response_code blank' do
-        subject.stub(:parse_moneris_response).and_return({}) # failure
+        allow(subject).to receive(:parse_moneris_response).and_return({}) # failure
 
         post :moneris_postback, moneris_params
 
@@ -101,14 +101,14 @@ describe Effective::OrdersController, type: :controller do
       end
 
       it 'marks order declined when response_code = 0' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 0}) # failure
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 0}) # failure
         post :moneris_postback, moneris_params
         response.should redirect_to "/orders/#{order.to_param}/declined"
         assigns(:order).purchased?.should eq false
       end
 
       it 'marks order declined when response_code = 50' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 50}) # failure
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 50}) # failure
         post :moneris_postback, moneris_params
         response.should redirect_to "/orders/#{order.to_param}/declined"
         assigns(:order).purchased?.should eq false
@@ -117,13 +117,13 @@ describe Effective::OrdersController, type: :controller do
 
     describe 'redirect urls' do
       it 'redirects to the purchased_redirect_url on purchase' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 1}) # success
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 1}) # success
         post :moneris_postback, moneris_params.tap { |x| x[:rvar_purchased_redirect_url] = '/something' }
         response.should redirect_to '/something'
       end
 
       it 'redirects to the declined_redirect_url on decline' do
-        subject.stub(:parse_moneris_response).and_return({:response_code => 'null'}) # nope
+        allow(subject).to receive(:parse_moneris_response).and_return({:response_code => 'null'}) # failure
         post :moneris_postback, moneris_params.tap { |x| x[:rvar_declined_redirect_url] = '/something' }
         response.should redirect_to '/something'
       end

data/spec/controllers/orders_controller_spec.rb

@@ -52,7 +52,10 @@ describe Effective::OrdersController, type: :controller do
 
     it 'redirects if order total is less than minimum charge' do
       sign_in cart.user
-      Effective::CartItem.any_instance.stub(:price).and_return(10)
+
+      cart.cart_items.each do |cart_item|
+        cart_item.purchasable.update_column(:price, 10)
+      end
 
       get :new
 

data/spec/controllers/stripe_orders_controller_spec.rb

@@ -29,7 +29,7 @@ describe Effective::OrdersController, type: :controller do
       end
 
       it 'renders the :create action on validation failure' do
-        subject.should_not_receive(:process_stripe_charge)
+        expect(subject).not_to receive(:process_stripe_charge)
 
         post :stripe_charge, stripe_charge_params.tap { |x| x[:effective_stripe_charge]['token'] = nil }
 
@@ -58,7 +58,7 @@ describe Effective::OrdersController, type: :controller do
       end
 
       it 'calls process_stripe_charge when the stripe_charge form object is valid' do
-        subject.should_receive(:process_stripe_charge)
+        expect(subject).to receive(:process_stripe_charge)
         post :stripe_charge, stripe_charge_params
       end
 

data/spec/controllers/webhooks_controller_spec.rb

@@ -15,7 +15,7 @@ describe Effective::WebhooksController, type: :controller do
     let(:event) { StripeMock.mock_webhook_event('customer.subscription.created') }
 
     it 'retrieves the real event from Stripe based on passed ID' do
-      Stripe::Event.should_receive(:retrieve).with(event_hash[:id])
+      expect(Stripe::Event).to receive(:retrieve) { event_hash[:id] }
       post :stripe, event_hash
       response.code.should eq '200'
     end
@@ -96,7 +96,7 @@ describe Effective::WebhooksController, type: :controller do
       end
 
       it 'should invoke subscription_deleted_callback' do
-        controller.should_receive(:subscription_deleted_callback).with(kind_of(Stripe::Event)).once
+        expect(controller).to receive(:subscription_deleted_callback)
         post :stripe, event_hash
       end
     end
@@ -107,7 +107,7 @@ describe Effective::WebhooksController, type: :controller do
       end
 
       it 'should not invoke subscription_deleted_callback' do
-        controller.should_not_receive(:subscription_deleted_callback)
+        expect(controller).not_to receive(:subscription_deleted_callback)
         post :stripe, event_hash
       end
     end
@@ -124,7 +124,7 @@ describe Effective::WebhooksController, type: :controller do
           let(:subscription_mock) { double('subscription', status: 'active', start: 1383672652) }
           let(:subscriptions) { double('subscriptions', retrieve: subscription_mock) }
 
-          before { Stripe::Customer.should_receive(:retrieve).and_return(double('customer', subscriptions: subscriptions)) }
+          before { allow(Stripe::Customer).to receive(:retrieve).and_return(double('customer', subscriptions: subscriptions)) }
 
           it 'assigns the existing customer, if exists' do
             post :stripe, event_hash
@@ -144,7 +144,7 @@ describe Effective::WebhooksController, type: :controller do
           before { Stripe::Customer.should_receive(:retrieve).and_return(double('customer', subscriptions: subscriptions)) }
 
           it 'should not invoke subscription_renewed_callback' do
-            controller.should_not_receive(:subscription_renewed_callback)
+            expect(controller).not_to receive(:subscription_renewed_callback)
             post :stripe, event_hash
           end
         end
@@ -154,7 +154,7 @@ describe Effective::WebhooksController, type: :controller do
         let(:event) { StripeMock.mock_webhook_event('invoice.payment_succeeded.without_renewals') }
 
         it 'should not invoke subscription_renewed_callback' do
-          controller.should_not_receive(:subscription_renewed_callback)
+          expect(controller).not_to receive(:subscription_renewed_callback)
           post :stripe, event_hash
         end
       end
@@ -162,7 +162,7 @@ describe Effective::WebhooksController, type: :controller do
 
     context 'when customer does not exist' do
       it 'should not invoke subscription_renewed_callback' do
-        controller.should_not_receive(:subscription_renewed_callback)
+        expect(controller).not_to receive(:subscription_renewed_callback)
         post :stripe, event_hash
       end
     end

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

@@ -37,7 +37,7 @@ EffectiveOrders.setup do |config|
   config.obfuscate_order_ids = true
 
   # Silence the price deprecation warnings
-  config.silence_deprecation_warnings = false
+  config.silence_deprecation_warnings = true
 
   # Require these addresses when creating a new Order.  Works with effective_addresses gem
   config.require_billing_address = true

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

@@ -0,0 +1,189 @@
+# Use this setup block to configure all options available in SimpleForm.
+SimpleForm.setup do |config|
+  config.error_notification_class = 'alert alert-danger'
+  config.button_class = 'btn btn-primary'
+  config.boolean_label_class = nil
+
+  config.boolean_style = :nested
+  config.browser_validations = true
+
+  config.default_form_class = ''
+  config.default_wrapper = :vertical_form
+
+  config.wrapper_mappings = {
+    :boolean => :vertical_boolean,
+    :check_boxes => :vertical_radio_and_checkboxes,
+    :radio_buttons => :vertical_radio_and_checkboxes,
+
+    :horizontal_form => {
+      :boolean => :horizontal_boolean,
+      :check_boxes => :horizontal_radio_and_checkboxes,
+      :radio_buttons => :horizontal_radio_and_checkboxes
+    }
+  }
+
+
+  config.wrappers :vertical_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'control-label'
+
+    b.use :input
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'checkbox' do |ba|
+      ba.use :label_input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+    b.use :label_input, :class => 'control-label'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :vertical_inline_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'control-label'
+
+    b.wrapper tag: 'div', class: 'inline-radio-or-checkboxes' do |ba|
+      ba.use :input
+    end
+
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+  config.wrappers :horizontal_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :form_3columns, tag: 'div', class: 'col-sm-4' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'form-group', error_class: 'has-error' do |ba|
+      ba.use :label
+      ba.use :input, class: 'form-control'
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_file_input, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :readonly
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_boolean, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.wrapper tag: 'div', class: 'col-sm-offset-3 col-sm-9' do |wr|
+      wr.wrapper tag: 'div', class: 'checkbox' do |ba|
+        ba.use :label_input, class: 'col-sm-9'
+      end
+
+      wr.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      wr.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.use :input
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :horizontal_inline_radio_and_checkboxes, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.optional :readonly
+
+    b.use :label, class: 'col-sm-3 control-label'
+
+    b.wrapper tag: 'div', class: 'col-sm-9' do |ba|
+      ba.wrapper tag: 'div', :class => 'inline-radio-or-checkboxes' do |bb|
+        bb.use :input
+      end
+
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+    end
+  end
+
+  config.wrappers :inline_form, tag: 'div', class: 'form-group', error_class: 'has-error' do |b|
+    b.use :html5
+    b.use :placeholder
+    b.optional :maxlength
+    b.optional :pattern
+    b.optional :min_max
+    b.optional :readonly
+    b.use :label, class: 'sr-only'
+
+    b.use :input, class: 'form-control'
+    b.use :error, wrap_with: { tag: 'span', class: 'help-block' }
+    b.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
+  end
+
+end

data/spec/dummy/log/test.log

@@ -182,3 +182,26 @@
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.3ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.4ms)  SELECT MAX("orders"."id") FROM "orders"

data/spec/helpers/effective_orders_helper_spec.rb

@@ -11,11 +11,11 @@ describe EffectiveOrdersHelper, :type => :helper do
     end
 
     it 'raises an error when passed a decimal' do
-      expect { price_to_currency(10.00) }.to raise_exception
+      expect { price_to_currency(10.00) }.to raise_exception(Exception)
     end
 
     it 'raises an error when passed nil' do
-      expect { price_to_currency(nil) }.to raise_exception
+      expect { price_to_currency(nil) }.to raise_exception(Exception)
     end
   end
 end

data/spec/models/order_spec.rb

@@ -58,21 +58,21 @@ describe Effective::Order do
 
   describe 'minimum zero math' do
     it 'has a minimum order total of 0' do
-      order.order_items.each { |order_item| order_item.stub(:total).and_return(-1000) }
+      order.order_items.each { |order_item| allow(order_item).to receive(:total).and_return(-1000) }
 
       order.order_items.collect(&:total).sum.should eq -3000
       order.total.should eq 0
     end
 
     it 'has no minimum subtotal' do
-      order.order_items.each { |order_item| order_item.stub(:subtotal).and_return(-1000) }
+      order.order_items.each { |order_item| allow(order_item).to receive(:subtotal).and_return(-1000) }
 
       order.order_items.collect(&:subtotal).sum.should eq -3000
       order.subtotal.should eq -3000
     end
 
     it 'has a minimum order tax of 0.00' do
-      order.order_items.each { |order_item| order_item.stub(:tax).and_return(-1000) }
+      order.order_items.each { |order_item| allow(order_item).to receive(:tax).and_return(-1000) }
 
       order.order_items.collect(&:tax).sum.should eq -3000
       order.tax.should eq 0
@@ -112,21 +112,21 @@ describe Effective::Order do
     end
 
     it 'should be invalid when user is invalid' do
-      order.user.stub(:valid?).and_return(false)
+      allow(order.user).to receive(:valid?).and_return(false)
       order.valid?.should eq false
 
       order.errors[:user].present?.should eq true
     end
 
     it 'should be invalid when an order_item is invalid' do
-      order.order_items.first.stub(:valid?).and_return(false)
+      allow(order.order_items.first).to receive(:valid?).and_return(false)
       order.valid?.should eq false
 
       order.errors[:order_items].present?.should eq true
     end
 
     it 'should be invalid when less than the minimum charge' do
-      order.stub(:total).and_return(49)
+      allow(order).to receive(:total).and_return(49)
 
       order.valid?.should eq false
 
@@ -135,15 +135,15 @@ describe Effective::Order do
     end
 
     it 'should be valid when >= minimum charge' do
-      order.stub(:total).and_return(50)
+      allow(order).to receive(:total).and_return(50)
       order.valid?.should eq true
 
-      order.stub(:total).and_return(51)
+      allow(order).to receive(:total).and_return(51)
       order.valid?.should eq true
     end
 
     it 'should be valid for a free order' do
-      order.order_items.each { |order_item| order_item.stub(:total).and_return(0) }
+      order.order_items.each { |order_item| allow(order_item).to receive(:total).and_return(0) }
 
       order.valid?.should eq true
       order.errors[:total].present?.should eq false
@@ -203,12 +203,12 @@ describe Effective::Order do
     end
 
     it 'should return false when the Order is invalid' do
-      order.stub(:valid?).and_return(false)
-      expect { order.purchase!('by a test') }.to raise_exception
+      allow(order).to receive(:valid?).and_return(false)
+      expect { order.purchase!('by a test') }.to raise_exception(Exception)
     end
 
     it 'should return true when the Order is invalid and :validate => false is passed' do
-      order.stub(:valid?).and_return(false)
+      allow(order).to receive(:valid?).and_return(false)
       order.purchase!('by a test', :validate => false).should eq true
     end
 

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ ENV["RAILS_ENV"] ||= 'test'
 require File.expand_path("../dummy/config/environment", __FILE__)
 
 require 'rspec/rails'
-require 'rspec/autorun'
 require 'factory_girl_rails'
 require 'stripe_mock'
 require 'pry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.6.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -392,6 +392,7 @@ files:
 - lib/generators/effective_orders/upgrade_price_column_generator.rb
 - lib/generators/templates/README
 - lib/generators/templates/effective_orders.rb
+- lib/generators/templates/effective_orders_mailer_preview.rb
 - spec/controllers/carts_controller_spec.rb
 - spec/controllers/moneris_orders_controller_spec.rb
 - spec/controllers/orders_controller_spec.rb
@@ -427,6 +428,7 @@ files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/simple_form.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb
@@ -469,7 +471,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Quickly build an online store with carts, orders, automatic email receipts
@@ -507,6 +509,7 @@ test_files:
 - spec/dummy/config/initializers/inflections.rb
 - spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/simple_form.rb
 - spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/locales/en.yml
 - spec/dummy/config/routes.rb