effective_orders 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f869116475dda7d252b6202a1384be1bb181f7bf
-  data.tar.gz: d0288050d30d8915e2a3b255c5405e8ef9ed8567
+  metadata.gz: f9fa7393376be54a691baf0c759f4facf0ad65f8
+  data.tar.gz: 23ecc5ef071404acf15b5825f4d0d52c11d40e98
 SHA512:
-  metadata.gz: 81e62b3d4520668550b0d993c4c14f0c0c26d80bd6f8be7c26537e4555af3376d3e1a061948cf1132045a684fd0a81f2cf2a0ca4b935a170176b5a8485cf684c
-  data.tar.gz: b35df012dc37eb2b2391c661947d6238b5333839c7d777ca2cdff0573b0c476b5c248043be21503deb3460d1150259ed7a5db6222fb4aae5d27de5410de3fbf0
+  metadata.gz: 08e2d17111c520e4f222eebce38f9c24d7954da10270c8017531d83f21c756f1189b4f963ace2f61d93894105e203a79401483a93bea32e787742cf03986e142
+  data.tar.gz: 81aed4009f266646b8e60824c431f1beff5ada601550d83e66af90998c878434ab1a5d8a878c93192bda8f59574e5013c14efd6f030ba374bf984a90d4df2669

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

@@ -3,11 +3,16 @@ stripeCheckoutHandler = (key, form) ->
     key: key
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").prop('disabled', false)
+        form.find("input[type='submit']").removeProp('disabled')
+        $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))
+
         alert("An error ocurred when contacting Stripe.  Your card has not been charged.  Please refresh the page and try again. #{token.error.message}")
       else
-        form.find("input[type='submit']").prop('disabled', true)
         form.find('input#effective_stripe_charge_token').val('' + token['id'])
+
+        form.find("input[type='submit']").prop('disabled', true)
+        $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
+
         form.submit()
 
 $(document).on 'click', "#effective-orders-new-charge-form form input[type='submit']", (event) ->
@@ -17,10 +22,13 @@ $(document).on 'click', "#effective-orders-new-charge-form form input[type='subm
   form = obj.find('form').first()
 
   form.find("input[type='submit']").prop('disabled', true)
+  $('input[data-disable-with]').each -> try $.rails.disableFormElement($(this))
 
   stripeCheckoutHandler(obj.data('stripe-publishable-key'), form).open
     name: obj.data('site-title')
     email: obj.data('user-email')
     description: obj.data('description')
     amount: obj.data('amount')
-    closed: -> form.find("input[type='submit']").prop('disabled', false)
+    closed: ->
+      form.find("input[type='submit']").removeProp('disabled')
+      $('input[data-disable-with]').each -> try $.rails.enableFormElement($(this))

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

@@ -3,7 +3,7 @@ stripeCheckoutHandler = (key, form) ->
     key: key
     token: (token, args) ->
       if token.error
-        form.find("input[type='submit']").prop('disabled', false)
+        form.find("input[type='submit']").removeProp('disabled')
         alert("An error ocurred when contacting Stripe.  Your card has not been charged.  Please refresh the page and try again. #{token.error.message}")
       else
         form.find("input[type='submit']").prop('disabled', true)
@@ -25,4 +25,4 @@ $(document).on 'click', "#effective-orders-new-subscription-form form input[type
       email: obj.data('user-email')
       description: plan.text()
       panelLabel: 'Start Subscription'
-      closed: -> form.find("input[type='submit']").prop('disabled', false)
+      closed: -> form.find("input[type='submit']").removeProp('disabled')

data/app/controllers/effective/orders_controller.rb

@@ -38,7 +38,7 @@ module Effective
 
       if EffectiveOrders.require_shipping_address
         if @order.shipping_address_same_as_billing? && @order.billing_address.present?
-          @order.shipping_address ||= @order.billing_address
+          @order.shipping_address = @order.billing_address
         end
       end
 
@@ -91,15 +91,13 @@ module Effective
     # Purchases is an Order History page.  List of purchased orders
     def my_purchases
       @orders = Order.purchased_by(current_user)
-
-      EffectiveOrders.authorized?(self, :index, Effective::Order)
+      EffectiveOrders.authorized?(self, :index, Effective::Order.new(user: current_user))
     end
 
     # Sales is a list of what products beign sold by me have been purchased
     def my_sales
       @order_items = OrderItem.sold_by(current_user)
-
-      EffectiveOrders.authorized?(self, :index, Effective::Order)
+      EffectiveOrders.authorized?(self, :index, Effective::Order.new(user: current_user))
     end
 
     # Thank you for Purchasing this Order.  This is where a successfully purchased order ends up
@@ -128,11 +126,17 @@ module Effective
     end
 
     def pretend_purchase
-      if (Rails.env.development? || Rails.env.test?) || EffectiveOrders.allow_pretend_purchase_in_production
-        @order = Order.find(params[:id])
-        EffectiveOrders.authorized?(self, :update, @order)
+      @order = Order.find(params[:id])
+      EffectiveOrders.authorized?(self, :update, @order)
+
+      if (Rails.env.production? == false && EffectiveOrders.allow_pretend_purchase_in_development)
         order_purchased('for pretend', params[:purchased_redirect_url], params[:declined_redirect_url])
       end
+
+      if (Rails.env.production? == true && EffectiveOrders.allow_pretend_purchase_in_production)
+        order_purchased('for pretend', params[:purchased_redirect_url], params[:declined_redirect_url])
+      end
+
     end
 
     protected
@@ -181,7 +185,7 @@ module Effective
         when 'my_purchases' ; 'Order History'
         when 'my_sales'     ; 'Sales History'
         when 'purchased'    ; 'Thank You'
-        when 'declined'     ; 'Unable to process payment'
+        when 'declined'     ; 'Payment Declined'
         when 'show'         ; 'Order Receipt'
         else 'Checkout'
       end

data/app/controllers/effective/providers/moneris.rb

@@ -16,6 +16,11 @@ module Effective
         purchased_redirect_url = params.delete(:rvar_purchased_redirect_url)
         declined_redirect_url = params.delete(:rvar_declined_redirect_url)
 
+        if @order.purchased?  # Fallback to a success condition of the Order is already purchased
+          order_purchased(params, purchased_redirect_url)
+          return
+        end
+
         if params[:result].to_s == '1' && params[:transactionKey].present?
           verify_params = parse_moneris_response(send_moneris_verify_request(params[:transactionKey])) || {}
 

data/app/controllers/effective/providers/paypal.rb

@@ -13,7 +13,9 @@ module Effective
         EffectiveOrders.authorized?(self, :update, @order)
 
         if @order.present?
-          if params[:payment_status] == 'Completed' && params[:custom] == EffectiveOrders.paypal[:secret]
+          if @order.purchased?
+            order_purchased(params)
+          elsif (params[:payment_status] == 'Completed' && params[:custom] == EffectiveOrders.paypal[:secret])
             order_purchased(params)
           else
             order_declined(params)

data/app/helpers/effective_orders_helper.rb

@@ -104,4 +104,28 @@ module EffectiveOrdersHelper
   alias_method :render_purchases, :render_order_history
   alias_method :render_my_purchases, :render_order_history
 
+  # Used by the _payment_details partial
+  def tableize_hash(hash, options = {class: 'table table-bordered'})
+    if hash.present? && hash.kind_of?(Hash)
+      content_tag(:table, options[:class]) do
+        hash.map do |k, v|
+          content_tag(:tr) do
+            content_tag((options[:th] ? :th : :td), k) +
+            content_tag(:td) do
+              if v.kind_of?(Hash)
+                tableize_hash(v, options.merge({:class => 'table table-bordered', :th => (options.key?(:sub_th) ? options[:sub_th] : options[:th])}))
+              elsif v.kind_of?(Array)
+                '[' + v.join(', ') + ']'
+              else
+                v
+              end
+            end
+          end
+        end.join('').html_safe
+      end.html_safe
+    else
+      hash.to_s.html_safe
+    end
+  end
+
 end

data/app/models/concerns/acts_as_purchasable.rb

@@ -66,7 +66,7 @@ module ActsAsPurchasable
   end
 
   def title
-    self[:title] || 'ActsAsPurchasable'
+    self[:title] || to_s
   end
 
   def tax_exempt

data/app/models/effective/order.rb

@@ -56,8 +56,8 @@ module Effective
       self.save_shipping_address = true
       self.shipping_address_same_as_billing = true
 
+      self.user = (items.delete(:user) if items.kind_of?(Hash)) || user
       add_to_order(items) if items.present?
-      self.user = user if user.present?
     end
 
     def add(item, quantity = 1)
@@ -94,6 +94,8 @@ module Effective
     alias_method :add_to_order, :add
 
     def user=(user)
+      return if user.nil?
+
       super
 
       # Copy user addresses into this order if they are present
@@ -195,7 +197,7 @@ module Effective
     def purchase!(payment_details = nil, opts = {})
       opts = {validate: true, email: true}.merge(opts)
 
-      return true if purchased?
+      return false if purchased?
       raise EffectiveOrders::AlreadyDeclinedException.new('order already declined') if (declined? && opts[:validate])
 
       success = false
@@ -222,7 +224,7 @@ module Effective
     end
 
     def decline!(payment_details = nil)
-      return true if declined?
+      return false if declined?
 
       raise EffectiveOrders::AlreadyPurchasedException.new('order already purchased') if purchased?
 

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

@@ -1,11 +1,2 @@
 = render :partial => 'effective/orders/order', :locals => {:order => @order}
-%hr
 = render :partial => 'effective/orders/order_payment_details', :locals => {:order => @order}
-
-%hr
-= link_to 'Back', :back, :class => 'btn btn-primary'
-- if @order.purchased?
-  = '-'
-  = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), 'data-confirm' => 'This action will email the buyer a copy of the original email receipt.  Send receipt now?', :class => 'btn btn-default'
-
-

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

@@ -1,19 +1,21 @@
 = render order
 
 .effective-order.effective-order-purchase-actions
-  - if 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}
-    %p= EffectiveOrders.allow_pretend_purchase_in_production_message
-  - elsif (Rails.env.development? || Rails.env.test?)
+  - 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}
 
+  - 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}
+
   - 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}
+    = render :partial => '/effective/orders/moneris/form', locals: {order: order, purchased_redirect_url: purchased_redirect_url, declined_redirect_url: declined_redirect_url}
 
   - if EffectiveOrders.paypal_enabled
-    = render :partial => '/effective/orders/paypal/form', :locals => {:order => order}
+    = render :partial => '/effective/orders/paypal/form', locals: {order: order}
 
   - if EffectiveOrders.stripe_enabled
-    = render :partial => '/effective/orders/stripe/form', :locals => {:order => order}
+    = render :partial => '/effective/orders/stripe/form', locals: {order: order}
 
+  - if (Rails.env.production? == true && EffectiveOrders.allow_pretend_purchase_in_production)
+    %p= EffectiveOrders.allow_pretend_purchase_in_production_message
 

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

@@ -4,12 +4,14 @@
       %th Order
       %th Date of Purchase
       %th Description
+      %th
   %tbody
     - orders.each do |order|
       %tr
-        %td= link_to "##{order.to_param}", order_path.gsub(':id', order.to_param)
+        %td= order.to_param
         %td= order.purchased_at.strftime("%Y-%m-%d %H:%M")
         %td= order_summary(order)
+        %td= link_to 'View', order_path.gsub(':id', order.to_param)
 
 - unless orders.present?
   %p You have no purchased orders

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

@@ -1,4 +1,7 @@
 .effective-order
-  = render :partial => 'effective/orders/order_header', :locals => {:order => order}
-  = render :partial => 'effective/orders/order_shipping', :locals => {:order => order}
-  = render :partial => 'effective/orders/order_items', :locals => {:order => order}
+  - unless defined?(no_order_actions)
+    = render partial: 'effective/orders/order_actions', locals: {order: order}
+
+  = render partial: 'effective/orders/order_header', locals: {order: order}
+  = render partial: 'effective/orders/order_shipping', locals: {order: order}
+  = render partial: 'effective/orders/order_items', locals: {order: order}

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

@@ -0,0 +1,4 @@
+- if order.purchased?
+  %p.pull-right
+    = link_to 'Print', '#', :class => 'btn btn-default print-button', 'data-role' => 'print-button', :onClick => "window.print(); false;"
+    = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(order), :data => {'confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', 'disable_with' => 'Resending...'}, :class => 'btn btn-default'

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

@@ -6,11 +6,7 @@
   - elsif order.declined?
     %p This order was declined with the following details:
 
-  %table.table
-    %tbody
-      - order.payment.each do |k, v|
-        %tr
-          %td= k
-          %td= v
+  = tableize_hash(order.payment)
+
 - else
-  %p None
+  %p No payment details present

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

@@ -1,10 +1,5 @@
-%h2 Unable to Purchase
-%p There was an error purchasing an order.
+%h2 Payment Declined
 
-= render @order
+%p Your #{link_to_current_cart(label: 'Shopping Cart')} items have been saved.  Please try again.
 
-%p Your cart has been restored.
 
-%hr
-= link_to 'Home', root_url, :class => 'btn btn-primary'
-= link_to_current_cart :class => 'btn btn-default'

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

@@ -34,4 +34,4 @@
     = hidden_field_tag(:bill_postal_code, address.postal_code)
     = hidden_field_tag(:bill_country, address.country)
 
-  = submit_tag 'Checkout with Moneris', :class => 'btn btn-primary', :data => {'disable_with' => 'Proceeding to Moneris...' }
+  = submit_tag 'Pay with Moneris', :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

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

@@ -1,6 +1,3 @@
 %h2 Order History
 
 = render_order_history(@orders)
-
-%hr
-= link_to 'Home', root_url, :class => 'btn btn-primary'

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

@@ -23,6 +23,3 @@
 
 - unless @order_items.present?
   %p You have no sales
-
-%hr
-= link_to 'Home', root_url, :class => 'btn btn-primary'

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 'Checkout with PayPal', :class => 'btn btn-primary', :data => {'disable_with' => 'Proceeding to PayPal...' }
+  = submit_tag 'Pay with 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' => 'Purchasing...' }
+  = submit_tag label, :class => 'btn btn-primary', :data => {'disable_with' => 'Continuing...' }

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

@@ -2,9 +2,4 @@
 
 %p You have successfully purchased the following:
 
-%a.btn.btn-default.pull-right{'data-role' => 'print-button', :class => 'print-button', :onClick => "window.print(); false;"} Print
-
 = render @order
-
-%hr
-= link_to 'Home', root_url, :class => 'btn btn-primary'

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

@@ -1,16 +1,5 @@
-- if @order.purchased?
-  %h2 Receipt
-- else
-  %h2 Order
-%hr
-
-%p.pull-right
-  %a.btn.btn-default{'data-role' => 'print-button', :class => 'print-button', :onClick => "window.print(); false;"} Print
-  - if @order.purchased?
-    = link_to 'Resend Receipt', effective_orders.resend_buyer_receipt_path(@order), :data => {'confirm' => 'This action will email you a copy of the original email receipt.  Send receipt now?', 'disable_with' => 'Resending...'}, :class => 'btn btn-default'
+%h2= (@order.purchased? ? 'Receipt' : 'Order')
 
 = render @order
 
-= link_to 'Back', :back, :class => 'btn btn-primary'
-
 

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

@@ -4,5 +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 'Continue to Payment', :class => 'btn btn-primary'
-
+    = f.submit 'Pay with Stripe', :class => 'stripe-button', :data => {'disable_with' => 'Continuing...' }

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

@@ -5,4 +5,4 @@
   %body
     %p An order has been successfully purchased:
 
-    = render @order
+    = render(@order, no_order_actions: true)

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

@@ -5,4 +5,4 @@
   %body
     %p Your order has been successfully purchased:
 
-    = render @order
+    = render(@order, no_order_actions: true)

data/lib/effective_orders.rb

@@ -28,6 +28,7 @@ module EffectiveOrders
   mattr_accessor :obfuscate_order_ids
   mattr_accessor :silence_deprecation_warnings
 
+  mattr_accessor :allow_pretend_purchase_in_development
   mattr_accessor :allow_pretend_purchase_in_production
   mattr_accessor :allow_pretend_purchase_in_production_message
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.4.2'.freeze
+  VERSION = '1.4.3'.freeze
 end

data/lib/generators/templates/effective_orders.rb

@@ -74,6 +74,10 @@ EffectiveOrders.setup do |config|
   # and just display the 'Thank You' after checkout is clicked
   config.allow_free_orders = true
 
+  # Display a 'Purchase order' button on the Checkout screen allowing the user
+  # to purchase an Order without going through the payment processor
+  config.allow_pretend_purchase_in_development = true
+
   # Allow Pretend Purchase in Production
   # WARNING: Setting this option to true will allow users to purchase! an Order without entering a credit card
   # WARNING: When true, users can purchase! anything without paying money

data/spec/controllers/moneris_orders_controller_spec.rb

@@ -131,115 +131,3 @@ describe Effective::OrdersController do
 
   end
 end
-
-
-  # describe '#stripe_charge' do
-  #   before do
-  #     sign_in order.user
-  #   end
-
-  #   describe 'invalid parameters' do
-  #     it 'raises RecordNotFound when passed an unknown order id' do
-  #       expect {
-  #         post :stripe_charge, stripe_charge_params.tap { |x| x[:effective_stripe_charge]['effective_order_id'] = 999 }
-  #       }.to raise_error(ActiveRecord::RecordNotFound)
-  #     end
-
-  #     it 'renders the :create action on validation failure' do
-  #       subject.should_not_receive(:process_stripe_charge)
-
-  #       post :stripe_charge, stripe_charge_params.tap { |x| x[:effective_stripe_charge]['token'] = nil }
-
-  #       flash[:danger].downcase.include?('token').should eq true
-  #       assigns(:stripe_charge).errors[:token].present?.should eq true
-
-  #       assigns(:order).purchased?.should eq false
-  #       response.should render_template(:checkout)
-  #     end
-  #   end
-
-  #   describe 'valid parameters' do
-  #     it 'redirects to order_purchase_path on success' do
-  #       post :stripe_charge, stripe_charge_params
-  #       assigns(:order).purchased?.should eq true
-  #       response.should redirect_to "/orders/#{assigns(:order).to_param}/purchased"
-  #     end
-
-  #     it 'assigns the @stripe_charge, @order and @buyer properly' do
-  #       post :stripe_charge, stripe_charge_params
-
-  #       assigns(:stripe_charge).valid?.should eq true
-  #       assigns(:stripe_charge).order.should eq order
-  #       assigns(:order).should eq order
-  #       assigns(:buyer).should eq buyer
-  #     end
-
-  #     it 'calls process_stripe_charge when the stripe_charge form object is valid' do
-  #       subject.should_receive(:process_stripe_charge)
-  #       post :stripe_charge, stripe_charge_params
-  #     end
-
-  #     it 'assigns the buyer a new card based on the passed token' do
-  #       Effective::Customer.any_instance.should_receive(:update_card!).with(token)
-  #       post :stripe_charge, stripe_charge_params
-  #     end
-
-  #     it 'stores the Stripe::Charge info in the order.payment' do
-  #       post :stripe_charge, stripe_charge_params
-  #       assigns(:order).payment[:charge]['object'].should eq 'charge'
-  #       assigns(:order).payment[:charge]['amount'].should eq (order.total*100).to_i
-  #       assigns(:order).payment[:charge]['customer'].should eq buyer.stripe_customer_id
-  #     end
-  #   end
-
-  #   describe 'stripe charge errors' do
-  #     it 'rollsback the entire transaction when Stripe::Charge fails' do
-  #       StripeMock.prepare_card_error(:card_declined)
-
-  #       post :stripe_charge, stripe_charge_params
-
-  #       assigns(:order).purchased?.should eq false
-  #       assigns(:stripe_charge).errors[:base].first.downcase.include?('unable to process order with stripe').should eq true
-  #       assigns(:stripe_charge).errors[:base].first.downcase.include?('the card was declined').should eq true
-  #       response.should render_template(:checkout)
-  #     end
-  #   end
-  # end
-
-  # describe '#stripe_charge with a subscription' do
-  #   let(:order) { FactoryGirl.create(:order_with_subscription) }
-  #   let(:buyer) { Effective::Customer.for_user(order.user) }
-  #   let(:subscription) { order.order_items[1].purchasable }
-  #   let(:token) { 'tok_123456789' }
-  #   let(:stripe_charge_params) do
-  #     {:effective_stripe_charge => {'effective_order_id' => order.to_param, 'token' => token}}
-  #   end
-
-  #   before do
-  #     sign_in order.user
-  #   end
-
-  #   it 'redirects to order_purchase_path on success' do
-  #     post :stripe_charge, stripe_charge_params
-  #     assigns(:order).purchased?.should eq true
-  #     response.should redirect_to "/orders/#{assigns(:order).to_param}/purchased"
-  #   end
-
-  #   it 'makes a Stripe::Charge for only the non-Subscription OrderItems' do
-  #     post :stripe_charge, stripe_charge_params
-  #     assigns(:order).payment[:charge]['object'].should eq 'charge'
-  #     assigns(:order).payment[:charge]['amount'].should eq (order.order_items.first.total * 100).to_i
-  #   end
-
-  #   it 'makes a Stripe::Subscription for the Subscriptions' do
-  #     post :stripe_charge, stripe_charge_params
-
-  #     assigns(:order).payment[:subscriptions]["#{subscription.stripe_plan_id}"]['object'].should eq 'subscription'
-  #     assigns(:order).payment[:subscriptions]["#{subscription.stripe_plan_id}"]['plan'].should eq subscription.stripe_plan_id
-  #     subscription.reload.stripe_subscription_id.present?.should eq true
-  #     subscription.reload.stripe_coupon_id.present?.should eq true
-
-  #     Effective::Subscription.find(subscription.id).purchased?.should eq true
-  #   end
-  # end
-#end

data/spec/dummy/log/test.log

@@ -174,3 +174,11 @@
    (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.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  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"

data/spec/models/order_spec.rb

@@ -164,10 +164,9 @@ describe Effective::Order do
       order.purchase!('by a test')
     end
 
-    it 'throws an error when purchased twice' do
+    it 'returns true when purchased twice' do
       order.purchase!('first time')
-
-      expect { order.purchase!('second time') }.to raise_error(EffectiveOrders::AlreadyPurchasedException)
+      order.purchase!('second time').should eq false
     end
 
     it 'sends emails to the admin, buyer and seller' do
@@ -245,10 +244,14 @@ describe Effective::Order do
       order.decline!('by a test')
     end
 
-    it 'throws an error when declined twice' do
+    it 'returns false when declined twice' do
       order.decline!('first time')
+      order.decline!('second time').should eq false
+    end
 
-      expect { order.decline!('second time') }.to raise_error(EffectiveOrders::AlreadyDeclinedException)
+    it 'returns false when declined twice' do
+      order.decline!('first time')
+      order.decline!('second time').should eq false
     end
 
     it 'is included with the declined scope' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-15 00:00:00.000000000 Z
+date: 2015-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -368,6 +368,7 @@ files:
 - app/views/effective/orders/_checkout_step_2.html.haml
 - app/views/effective/orders/_my_purchases.html.haml
 - app/views/effective/orders/_order.html.haml
+- app/views/effective/orders/_order_actions.html.haml
 - app/views/effective/orders/_order_header.html.haml
 - app/views/effective/orders/_order_items.html.haml
 - app/views/effective/orders/_order_payment_details.html.haml