caboose-cms 0.5.73 → 0.5.74

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzEzZTMxZmQ0NzgyOGVhNjgyZGRiOGE5ZjQ1YzFhZjM3MzA3YmI0OA==
+    NjNhNjFkMzlmZjgwYzQ1NWVmNzNkNmUwZGI5OGU0ODNkMjViOGFjZg==
   data.tar.gz: !binary |-
-    ZGY2MDNjMmE3YzZkYzExMzI1NTE5NDcxOTU0NTQzMDBlM2JlYjU4OA==
+    Zjg4MmMxOWEwMGRkNjRjYzM1NGY3YTQ1N2RjODRkNzU4NzEwODJmYw==
 SHA512:
   metadata.gz: !binary |-
-    YTg2ZjA4NTFjNzI3MmQ5YjQ0ZTU2ZGViZWQwNTJlMjM5MDgzZGJlNDg2NGY4
-    ZTM1OTkwN2ZkYWY4MzU4MTcyMWFkNDhjMThlNjQ1MWQyMDhhZTRhZTkyY2I5
-    ZDEyN2Y3NThmZDQwZjcwMGY4N2NlOGQyNTc5OThjMDQ5YmQ5NzM=
+    ZjZhYmQzYjgyNGJlMGQ3ZmE2YzY2ZTMyNjY4YTUyY2YyN2RkNjFlYWUzZGI4
+    OWJmZWUwZTBjZjk3ZjVmNmNjODhmMjQyM2VmOTAzZmE4MjEzNTRkYzViNzI5
+    ZGZjNTg2ZWVmMGQ0MGY3ZjEzMzhmN2Q5ZWZiNTQyNGViNDgxOTk=
   data.tar.gz: !binary |-
-    MmMxN2ZhNjg1MDIwOWZiNTM1NDQxYzBiNTk1MzFlNDJhMzNiOGRiZTRhY2Ix
-    MjMyZWQ5N2U5ZjA1ZTAyY2QxY2Y0MzczYWQ3NThiY2NmZTkzZjg3OTE4ZGJm
-    ZmQ2N2Y4OWNlMTczZjUwMjczMzQ5OGQxZDRlODkyZGU5MTUxN2I=
+    Y2JkZWJkZTc4NDEwMTVkNjEyODJkM2Q0NzRlN2RlNTZlZDFkMTEzN2RlOTUw
+    Mjc0YzFhZDAzODdlMjg1OTk4MmVhZjA5NTkxNTI1NmEzYjRlOGExYzcwNzdi
+    NWQ0NmQ3NmRmODlkOWYxOTc2ODVmMzMxZDZhNjY3ZjAyYzZkNDk=

data/app/controllers/caboose/checkout_controller.rb

@@ -52,7 +52,7 @@ module Caboose
     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/shipping'  and return if @order.shipping_service_code.nil?
+      redirect_to '/checkout/shipping'  and return if @order.has_empty_shipping_methods?
     end
     
     # Step 5 - Payment
@@ -60,7 +60,7 @@ module Caboose
     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/shipping'  and return if @order.shipping_service_code.nil?      
+      redirect_to '/checkout/shipping'  and return if @order.has_empty_shipping_methods?      
       
       # Make sure all the variants still exist      
       @order.line_items.each do |li|
@@ -188,11 +188,6 @@ module Caboose
       render :json => resp            
     end
     
-    ## GET /checkout/shipping
-    #def shipping
-    #  render :json => { :rates => ShippingCalculator.rates(@order), :selected_rate => ShippingCalculator.rate(@order) }
-    #end
-    
     # PUT /checkout/shipping
     def update_shipping
       op = OrderPackage.find(params[:order_package_id])

data/app/models/caboose/order.rb

@@ -227,6 +227,15 @@ module Caboose
         gc.save
       end
     end
+    
+    def has_empty_shipping_methods?
+      return true if self.order_packages.nil?
+      return true if self.order_packages.count == 0
+      self.order_packages.each do |op|
+        return true if op.shipping_method_id.nil?
+      end
+      return false
+    end
   end
 end
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.73'
+  VERSION = '0.5.74'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.73
+  version: 0.5.74
 platform: ruby
 authors:
 - William Barry