effective_orders 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e8d141053c95493bf5fdd56d7fed89546813995
-  data.tar.gz: d5b381799fe9984c0b81da4116af1faa468d2af2
+  metadata.gz: 7c9a7700d9145bc57026646a8ef90acc261cbdac
+  data.tar.gz: a35fd250cc3e386888be37deab0e5b5e793a3791
 SHA512:
-  metadata.gz: f39d818fc70058225e0912a11a9caa299fb52fdbff23c397d1fa9cb936015d351c3ab509334afe2ab6f24cb7744c73fa9ba64b69e7a851a891744e92acd19059
-  data.tar.gz: 5a6a69fd2abfa9326f0fcf1cddeb85975c95fe427dbb59591e68a34f31d50188aed6a14629c3cbc090f5c5a07d9918ec69958e878dcb56ea59fa6506014b189b
+  metadata.gz: b59994fba1055c8bb4591e5677032c8b13d04b9df52bd44a5e8dcebc5929a6c6bf37638ee36dd73280cddac77658052f8fbf9ab2241b0e1be19d5d07eacf4694
+  data.tar.gz: aba3e9ecceb9916ad7b91ff23fff5b021cfa033a819a544d8f7fd7bbafb8fbf9c8f9951437b09afadcbd488a5e3ae72c10f95ca122a0b383f1295d9360f6fa17

data/app/controllers/effective/orders_controller.rb

@@ -50,7 +50,7 @@ module Effective
 
           @order.save!
 
-          if @order.total < 0.01 && @order.total >= 0.00 && EffectiveOrders.allow_free_orders
+          if @order.total == 0 && EffectiveOrders.allow_free_orders
             order_purchased('zero-dollar order')
           else
             redirect_to(effective_orders.order_path(@order))

data/app/helpers/effective_orders_helper.rb

@@ -67,10 +67,9 @@ module EffectiveOrdersHelper
       :declined_redirect_url => nil
     }.merge(opts)
 
-    if order.new_record?
+    if order.new_record? || !order.valid?
       render(:partial => 'effective/orders/checkout_step_1', :locals => locals.merge({:order => order}))
     else
-      raise ArgumentError.new('unable to checkout a persisted but invalid order') unless order.valid?
       render(:partial => 'effective/orders/checkout_step_2', :locals => locals.merge({:order => order}))
     end
   end

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

@@ -1,6 +1,6 @@
 .effective-order
   = simple_form_for(order, (EffectiveOrders.simple_form_options || {}).merge(:url => effective_orders.orders_path)) do |f|
-    = render :partial => 'order_items', :locals => {:order => order, :form => f}
+    = render :partial => 'effective/orders/order_items', :locals => {:order => order, :form => f}
 
     - if order.errors[:order_items].present?
       %p.inline-errors= order.errors[:order_items].first
@@ -36,4 +36,8 @@
 
     %hr
     = link_to_current_cart :label => 'Change Items', :class => 'btn btn-default'
-    = f.submit 'Continue to Checkout Confirmation', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+
+    - if order.total == 0 && EffectiveOrders.allow_free_orders
+      = f.submit 'Checkout', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'
+    - else
+      = f.submit 'Continue to Checkout Confirmation', :class => 'btn btn-primary pull-right', :rel => :nofollow, 'data-disable-with' => 'Continuing...'

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

@@ -9,10 +9,9 @@
 - if EffectiveOrders.stripe_enabled
   = render :partial => '/effective/orders/stripe/form', :locals => {:order => order}
 
-- if true || EffectiveOrders.allow_pretend_purchase_in_production
+- if EffectiveOrders.allow_pretend_purchase_in_production
   = link_to 'Process Order', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
-  %p payment information is not required to process this order at this time.
-  %p * credit card details are not currently required to process this order
+  %p= EffectiveOrders.allow_pretend_purchase_in_production_message
 - elsif Rails.env.development?
   = link_to 'Process Order (development only)', effective_orders.pretend_purchase_path(order, :purchased_redirect_url => purchased_redirect_url, :declined_redirect_url => declined_redirect_url), :class => 'btn btn-primary'
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/effective_orders.rb

@@ -22,7 +22,9 @@ module EffectiveOrders
   mattr_accessor :use_active_admin
   mattr_accessor :obfuscate_order_ids
   mattr_accessor :silence_deprecation_warnings
+
   mattr_accessor :allow_pretend_purchase_in_production
+  mattr_accessor :allow_pretend_purchase_in_production_message
 
   mattr_accessor :require_billing_address
   mattr_accessor :require_shipping_address

data/lib/generators/templates/effective_orders.rb

@@ -78,6 +78,7 @@ EffectiveOrders.setup do |config|
   # Clicking this button will mark an Order purchased and redirect the user to the
   # Thank You page just as if they had successfully Checked Out through a payment processor
   config.allow_pretend_purchase_in_production = false
+  config.allow_pretend_purchase_in_production_message = '* payment information is not required to process this order at this time.'
 
 
   # Layout Settings

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails