caboose-cms 0.5.121 → 0.5.122

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2Y1OWJiMzc0ZWRjNWExMGRkMWE3ZDEyYmJiYzhkZmZjZDU4MTE1Nw==
+    N2FiYWQyMDg1ZTg0OGIyMTdhNzFiMGJiNTIwOGUwMjI4Y2MyMjM5Yg==
   data.tar.gz: !binary |-
-    OWI4YjQxNDMyNDMzNzJlMTZjMzJlYjQ4ZDVkZmUwY2MyNjRhODZhZg==
+    MDY4Y2Y5MTI3ZWZkMGRkOTEwYzlhZTMwOWJlMmYzZTJjMTY1MGUyNA==
 SHA512:
   metadata.gz: !binary |-
-    YTliMTNhNTRlYmNiNzk5NWIxZjU5ZWM5NmFmZmExODExNDgyYWI1MTFlODVm
-    NmY4ZWZiMjdkODEwODUwZGFiM2VjNWY4MmIzMTdhZTU2ZDQyMWM5YmFkOGJi
-    NjI1MTU0NDdiNDE3NDhiMDM3MWI4MTM2ZjZkMWQ0MGQwNWVhZWY=
+    MDg5NmM2ZWU4NWU4YjFkZWJmYmZmZmQwMWMzOWJiNzQ3NDBkM2EwODIwMmZj
+    YmVjY2M5NDlhYzgzMzgyYWFjN2NlOWIzODgwOWU1MDgyYTY4MzdkZDJmNGI0
+    N2Y4YWM0MDcyZTY1ZjhiYjUzNmZjZTJhMTg2ZDEwNzA3NTg1NjI=
   data.tar.gz: !binary |-
-    NGRjMGEyNWI5YzkwMGQ1MjI5YTc0ZWI0ODA5MDQ2OTAyYzNkMTMzOTY4ZTQ5
-    ODEyNzNlZDQ4MjQxYmI4ZGZkZWMxZjBiMDhmYzIyMjBlYTIwNmI2ZGI5OGVi
-    NDAwYTNlMjE5ZmNlMzlmODZiNmUwNzc0YWE2OWJhYzdiZjZjOTc=
+    ZWZmYWI3YTAzNzc1OTIyYTIxZjdkYjMxMzU2NGYzOWI0ZDAzYjU5ODI0NjI2
+    Y2E5NzkyMTUxZjQzYTAwZDk0MWIyMjI3MDA2MjlmZWU4YzE3ZTE4ODE4MWE5
+    YzNkZmViYzdjYjQxMWE3NTJlYmM3YWRmZGQ4NDY1MmI5OWFmYzI=

data/app/controllers/caboose/checkout_controller.rb

@@ -34,7 +34,7 @@ module Caboose
     # GET /checkout/shipping
     def shipping
       redirect_to '/checkout'           and return if !logged_in?
-      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+      redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?) 
                   
       if !@order.has_shippable_items?
         redirect_to '/checkout/gift-cards'
@@ -59,7 +59,7 @@ module Caboose
     # GET /checkout/gift-cards
     def gift_cards
       redirect_to '/checkout'           and return if !logged_in?
-      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+      redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
       redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?
       @logged_in_user = logged_in_user
     end
@@ -68,7 +68,7 @@ module Caboose
     # GET /checkout/payment
     def payment
       redirect_to '/checkout'           and return if !logged_in?
-      redirect_to '/checkout/addresses' and return if @order.shipping_address.nil? || @order.billing_address.nil?
+      redirect_to '/checkout/addresses' and return if @order.billing_address.nil? || (@order.has_shippable_items? && @order.shipping_address.nil?)
       redirect_to '/checkout/shipping'  and return if @order.has_shippable_items? && @order.has_empty_shipping_methods?      
       
       # Make sure all the variants still exist      
@@ -159,7 +159,7 @@ module Caboose
         billing_address.zip        = params[:billing][:zip]
       end
       
-      # Save address info; generate ids
+      # Save address info; generate ids      
       render :json => { :success => false, :errors => shipping_address.errors.full_messages, :address => 'shipping' } and return if has_shippable_items && !shipping_address.save
       render :json => { :success => false, :errors => billing_address.errors.full_messages, :address => 'billing' } and return if !billing_address.save
       

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.121'
+  VERSION = '0.5.122'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.121
+  version: 0.5.122
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg