caboose-cms 0.5.209 → 0.5.210

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmYwOGNkY2QyNDllNDhhZGNiNjdlOWIyOGRhODU2MWI2NTQ2ZDA4YQ==
+    NGFkYzFmNDk4NWRjNjlmYTM5OGQ0ZjA3NjJjODdiNGMzYjAwODA3NQ==
   data.tar.gz: !binary |-
-    MmY5OTU3YmQxYTRiZGZjNzk4Mjc4ZmE1ZGRhOTg0ZWQ5ZjU1MzE4ZQ==
+    NGQ4OGU0ZGVlMDYxODM2NTFjMTRkYTBiZWU4Y2E4NTIxZjRhYzc4Mw==
 SHA512:
   metadata.gz: !binary |-
-    NTE4NjMzOTM3ZjdhNWRkN2NhZWVhYzFjM2RjMmUwNWEzYzU3OWMwMDI4NmUw
-    ZGJkYzRjNWZmOGI0NGRmNjQ5NmRjNzBmNGE5ZDlkYjk5MzYyN2EwZDg1ZGNl
-    NTI0OWFkNWEyOTYxZjhmYzQ1YTE4YjNiMzY4MTA1NzYwYmIxMzg=
+    MWE1YmRhOWUzODMyNDA3ODNmM2M4OTAzYmE5MzJkM2NmNjllNWQ3OTAwOGY1
+    YTBjYWI2NDk3YzE3ZDhjMjcxZGM4NmNlYTk1ZmE1OGM0NjA1NjEyMmMzYzhh
+    YmE0ZTE2NjU5ZDdkMzdlZWRmNDI5NDZmNDVmZmM0Mzc3NzIxODQ=
   data.tar.gz: !binary |-
-    OWRjNjk1M2U3NmRkZjg1MmEwZTFmYjY4OGRhYTEwZGM5ZThjYzM3M2U5ZmYy
-    OWQwNWE3N2ZjYWIzYjBiYjNhZWZiOWFjM2JhZTgwODJlOGE3MWEyYWI3NmUx
-    ZTY2OGZlNzNlMTI5YTg0ZWZkMTk4YWE4NmUwMjRiYzMyYWM4MWU=
+    MWRjODBlN2Y3ZjYzYTkxOGQ2ZmMwMTdiYjY4ODg5YzU2MjA4YzIzZjUzYzA1
+    NzM1YTMwNDc4OGU5OGM5YWUwMzc3ZDc2YWVhZThkNjRhNjc5YTAzZjM4YzYx
+    ODZmNTc0OTNjNGVjMmEwMzFhODMzMTQ1MDdlMTUzYmNhNWYwMWE=

data/app/models/caboose/order_package.rb

@@ -126,7 +126,7 @@ module Caboose
         dimensions[2] = dimensions[0] / 2.54
       end
       
-      return Package.new(weight, dimensions, :units => :imperial)
+      return ActiveShipping::Package.new(weight, dimensions, :units => :imperial)
     end
 
   end

data/app/models/caboose/shipping_calculator.rb

@@ -3,7 +3,7 @@ require 'active_shipping'
 
 module Caboose
   class ShippingCalculator
-    
+        
     def self.custom_rates(store_config, order)          
       return eval(store_config.custom_shipping_function)    
     end
@@ -81,12 +81,12 @@ module Caboose
       order = op.order
       sc = order.site.store_config
       sa = order.shipping_address
-      origin      = Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
-      destination = Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
+      origin      = ActiveShipping::Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
+      destination = ActiveShipping::Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
       carriers = {}      
-      carriers['UPS']   = UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username   && sc.ups_username.strip.length   > 0 
-      carriers['USPS']  = USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username  && sc.usps_username.strip.length  > 0
-      carriers['FedEx'] = FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username && sc.fedex_username.strip.length > 0
+      carriers['UPS']   = ActiveShipping::UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account)  if sc.ups_username   && sc.ups_username.strip.length   > 0 
+      carriers['USPS']  = ActiveShipping::USPS.new( :login => sc.usps_username)                                                                                             if sc.usps_username  && sc.usps_username.strip.length  > 0
+      carriers['FedEx'] = ActiveShipping::FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)        if sc.fedex_username && sc.fedex_username.strip.length > 0
       
       sp = op.shipping_package                            
       package = op.activemerchant_package
@@ -115,22 +115,22 @@ module Caboose
       order = op.order
       sc = order.site.store_config
       sa = order.shipping_address
-      origin      = Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
-      destination = Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
+      origin      = ActiveShipping::Location.new(:country => sc.origin_country, :state => sc.origin_state, :city => sc.origin_city, :zip => sc.origin_zip)
+      destination = ActiveShipping::Location.new(:country => sc.origin_country, :state => sa.state, :city => sa.city, :postal_code => sa.zip)
 
       carrier = case op.shipping_method.carrier                    
-        when 'UPS'   then UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account) 
-        when 'USPS'  then USPS.new( :login => sc.usps_username)
-        when 'FedEx' then FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)
+        when 'UPS'   then ActiveShipping::UPS.new(  :login => sc.ups_username, :password => sc.ups_password, :key => sc.ups_key, :origin_account => sc.ups_origin_account) 
+        when 'USPS'  then ActiveShipping::USPS.new( :login => sc.usps_username)
+        when 'FedEx' then ActiveShipping::FedEx.new(:login => sc.fedex_username, :password => sc.fedex_password, :key => sc.fedex_key, :account => sc.fedex_account)
         end
         
-      Caboose.log(op.shipping_method.inspect)
+      #Caboose.log(op.shipping_method.inspect)
 
       sm = op.shipping_method
       package = op.activemerchant_package                                        
       resp = carrier.find_rates(origin, destination, package)                        
       resp.rates.sort_by(&:price).each do |rate|
-        Caboose.log("rate.service_code = #{rate.service_code}, rate.service_name = #{rate.service_name}")
+        #Caboose.log("rate.service_code = #{rate.service_code}, rate.service_name = #{rate.service_name}")
         sm2 = ShippingMethod.where( :carrier => sm.carrier, :service_code => rate.service_code, :service_name => rate.service_name).first
         sm2 = ShippingMethod.create(:carrier => sm.carrier, :service_code => rate.service_code, :service_name => rate.service_name) if sm2.nil?
         if sm2.id == sm.id                    

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.209'
+  VERSION = '0.5.210'
 end

metadata

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