caboose-cms 0.7.52 → 0.7.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0e0f4aa92fbb65aaabac75ba5f3884b9e192c24
-  data.tar.gz: d839b63800e699bd9a22c5fa69daf9c897f9df7f
+  metadata.gz: e1c25efdd92fb196e5661e1c86472abaf5e79e16
+  data.tar.gz: 13b850bc5278f2830e4f161dcb0daeaf6e7fa04e
 SHA512:
-  metadata.gz: 17155c48bf2b85ccc7a2dc5f75cd3edd8a9c56d6f5970834c1bca06eaebdeb2d1083d6c3566f974b5b68a8a1eedc743e17ef5b5186007075b29b8969870d4d1a
-  data.tar.gz: 33de8ef3a691c39ac3ee880e65d55ac9cbd0658c4fa5736e0eb76e2eddda9acdda0e114b5c53bcee58bbdee8f87e5c23926984f0732e4cd67de05d70e01fc49a
+  metadata.gz: 06cfd11597bc1334919febeb206504ffef3ea4642b4f3a8821ae7b41898a41548aece70d8c3f9e6f5ce014b1f911cb3c7c4d5558e0e36bec812b0e26f4ba1e7d
+  data.tar.gz: 88880a095e686f5e7a6e5fe26d72522dbe0adf73426d9922709f3f89fe07554514e02a785ca2ac590497f4a54daab25cb17ec0bf9a75c0363afd113a5c681833

data/app/models/caboose/tax_calculator.rb

@@ -10,6 +10,7 @@ module Caboose
     def self.tax(order)
       return 0.00 if !order.shipping_address
       return 0.00 if !order.has_taxable_items?
+      return 0.00 if !order.has_shippable_items?
 
       sc = order.site.store_config                                                      
       return self.custom_tax(sc, order) if !sc.auto_calculate_tax      

data/app/models/caboose/user.rb

@@ -95,4 +95,61 @@ class Caboose::User < ActiveRecord::Base
     end
     return nil
   end
+
+  def marshal_dump      
+    [
+      self.id                   ,
+      self.site_id              ,
+      self.first_name           ,
+      self.last_name            ,
+      self.username             ,
+      self.email                ,
+      self.address              ,
+      self.address2             ,
+      self.city                 ,
+      self.state                ,
+      self.zip                  ,
+      self.phone                ,
+      self.fax                  ,
+      self.timezone             ,        
+      self.password             ,
+      self.password_reset_id    ,
+      self.password_reset_sent  ,
+      self.token                ,
+      self.date_created         ,
+      self.image                ,
+      self.is_guest             ,
+      self.customer_profile_id  ,
+      self.payment_profile_id   ,
+      self.locked               
+    ]
+  end
+
+  def marshal_load array    
+    self.id                   ,
+    self.site_id              ,
+    self.first_name           ,
+    self.last_name            ,
+    self.username             ,
+    self.email                ,
+    self.address              ,
+    self.address2             ,
+    self.city                 ,
+    self.state                ,
+    self.zip                  ,
+    self.phone                ,
+    self.fax                  ,
+    self.timezone             ,        
+    self.password             ,
+    self.password_reset_id    ,
+    self.password_reset_sent  ,
+    self.token                ,
+    self.date_created         ,
+    self.image                ,
+    self.is_guest             ,
+    self.customer_profile_id  ,
+    self.payment_profile_id   ,
+    self.locked = array
+  end  
+
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.52'
+  VERSION = '0.7.53'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.52
+  version: 0.7.53
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-01 00:00:00.000000000 Z
+date: 2016-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg