caboose-cms 0.7.16 → 0.7.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5296ff62df1d3dca4dc184aa275bb11324a4a5d5
-  data.tar.gz: 7170556acc8d764c0859353cf077576ec72d08fb
+  metadata.gz: 820bfc8858e33c2b4af5c694a2692f03dde511bc
+  data.tar.gz: 95f81b1e0e4cf78778adbbef05b6757e195e0b3e
 SHA512:
-  metadata.gz: 7597b374c85781663a6af491668112579c21cce9dbe32d550ffbd8ddcc27b8a57e9044a9f9a49c5323d05f9357591db65e5745a398f3abbf808abb98a8214ed1
-  data.tar.gz: 4ca180a513d793b898def98f75d5a7db0f6f486de6e7cf7d76738d75c801f75575c77d33df732d5614f095fa8b49dcee31b5286f240633c79b5f44e2d6ebff0f
+  metadata.gz: 4e0b9ac6bb9dd120791dc4b99f658995811538683283b4914f70c1a602194aaa9fe86665f8c44be7a5ca88d6e824e29f207042b5a07abf91d3b6b12ef1fdd86d
+  data.tar.gz: 7bb4c217b83766dcffbc2a3df9c1d177aba0ea691fb0a763fb270e43cc7e47a51ba5c9561738f4486deb6ad98ef7023fd04bfd74b50a38fa4a5f755057d5cb09

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -263,6 +263,7 @@ PageContentController.prototype = {
             
     $('#block_' + b.id).attr('onclick','').unbind('click');    
     $('#block_' + b.id).click(function(e) {
+      e.preventDefault();
       e.stopPropagation();
       that.edit_block(b.id); 
     });

data/app/assets/javascripts/caboose/model/bound_date_time.js

@@ -17,6 +17,7 @@ BoundDateTime = BoundControl.extend({
     $('#'+this.el).wrap($('<div/>')
       .attr('id', this.el + '_container')
       .addClass('mb_container')
+      .addClass('mb_date_time_container')
       .css('position', 'relative')
     );
     $('#'+this.el+'_container').empty();

data/app/controllers/caboose/checkout_controller.rb

@@ -339,6 +339,9 @@ module Caboose
         order.status = Order::STATUS_PENDING
         order.order_number = @site.store_config.next_order_number
         order.date_authorized = DateTime.now.utc
+        
+        # Tell taxcloud the order was authorized
+        Caboose::TaxCalculator.authorized(order)
          
         # Take funds from any gift cards that were used on the order
         order.take_gift_card_funds

data/app/controllers/caboose/orders_controller.rb

@@ -89,7 +89,10 @@ module Caboose
       return if !user_is_allowed('orders', 'edit')
            
       order = Order.find(params[:id])
-      resp = order.capture_funds      
+      resp = order.capture_funds   
+      
+      # Tell taxcloud the order was captured
+      Caboose::TaxCalculator.captured(order)
       
       render :json => resp
     end

data/app/models/caboose/order.rb

@@ -228,6 +228,13 @@ module Caboose
       return false
     end
     
+    def has_taxable_items?
+      self.line_items.each do |li|
+        return true if li.variant.taxable && li.variant.taxable == true
+      end
+      return false
+    end        
+
     # Capture funds from a previously authorized transaction
     def capture_funds
       

data/app/models/caboose/tax_calculator.rb

@@ -9,24 +9,48 @@ module Caboose
     
     def self.tax(order)
       return 0.00 if !order.shipping_address
+      return 0.00 if !order.has_taxable_items?
 
-      sc = order.site.store_config                        
-      if !sc.auto_calculate_tax                        
-        tax = self.custom_tax(sc, order)
-        return tax
-      end
+      sc = order.site.store_config                                                      
+      return self.custom_tax(sc, order) if !sc.auto_calculate_tax      
+      return order.subtotal * order.tax_rate if order.tax_rate # See if the tax rate has already been calculated
+
+      t = self.transaction(order)
+      Caboose.log(t.inspect)
+      lookup = t.lookup
+      tax = lookup.tax_amount
       
-      # See if the tax rate has already been calculated
-      # If so, use that instead of doing another web service call
-      if order.tax_rate
-        return order.subtotal * order.tax_rate
-      end
+      # Save the tax rate      
+      order.tax_rate = tax/order.subtotal
+      order.save
+      
+      # Return the tax amount
+      return tax                                             
+    end
+    
+    def self.authorized(order)
+      t = self.transaction(order)
+      return if t.nil?
+      t.order_id = order.id
+      t.authorized            
+    end
+    
+    def self.captured(order)
+      t = self.transaction(order)
+      return if t.nil?
+      t.order_id = order.id
+      t.captured            
+    end
+    
+    def self.transaction(order)            
+      sc = order.site.store_config 
+      return nil if sc.nil? || !sc.auto_calculate_tax
       
       sa = order.shipping_address
       if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?        
         sa = order.billing_address
       end
-      return 0.00 if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?
+      return nil if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?
       
       TaxCloud.configure do |config|
         config.api_login_id  = sc.taxcloud_api_id
@@ -34,26 +58,9 @@ module Caboose
         config.usps_username = sc.usps_username
       end
       
-      origin = TaxCloud::Address.new(
-        :address1 => sc.origin_address1,
-        :address2 => sc.origin_address2,
-        :city     => sc.origin_city,
-        :state    => sc.origin_state,
-        :zip5     => sc.origin_zip
-      )      
-      destination = TaxCloud::Address.new(
-        :address1 => sa.address1,
-        :address2 => sa.address2,
-        :city     => sa.city,
-        :state    => sa.state,
-        :zip5     => sa.zip
-      )      
-      transaction = TaxCloud::Transaction.new(
-        :customer_id => order.customer_id,
-        :cart_id     => order.id,
-        :origin      => origin,
-        :destination => destination
-      )
+      origin      = TaxCloud::Address.new(:address1 => sc.origin_address1 , :address2 => sc.origin_address2 , :city => sc.origin_city , :state => sc.origin_state , :zip5 => sc.origin_zip )      
+      destination = TaxCloud::Address.new(:address1 => sa.address1        , :address2 => sa.address2        , :city => sa.city        , :state => sa.state        , :zip5 => sa.zip        )      
+      transaction = TaxCloud::Transaction.new(:customer_id => order.customer_id, :cart_id => order.id, :origin => origin, :destination => destination)
       order.line_items.each_with_index do |li, i|
         next if !li.variant.taxable # Skip any non-taxable items        
         transaction.cart_items << TaxCloud::CartItem.new(
@@ -64,35 +71,76 @@ module Caboose
           :quantity => li.quantity
         )
       end
-      lookup = transaction.lookup
-      tax = lookup.tax_amount
-      
-      # Save the tax rate      
-      order.tax_rate = tax/order.subtotal
-      order.save
-      
-      # Return the tax amount
-      return tax
-                          
-      #return 0.00 if address.nil? || address.city.nil? || address.state.nil?       
-      #return 0 if address.state.downcase != 'al'
-      #return 0.09
-      
-      #rate = 0.00      
-      #city = address.city.downcase            
-      #rate = rate + 0.05 if city == 'brookwood'  
-      #rate = rate + 0.05 if city == 'coaling'    
-      #rate = rate + 0.05 if city == 'coker'      
-      #rate = rate + 0.05 if city == 'holt'       
-      #rate = rate + 0.05 if city == 'holt CDP'   
-      #rate = rate + 0.05 if city == 'lake View'  
-      #rate = rate + 0.05 if city == 'moundville' 
-      #rate = rate + 0.05 if city == 'northport'  
-      #rate = rate + 0.05 if city == 'tuscaloosa' 
-      #rate = rate + 0.05 if city == 'vance'      
-      #rate = rate + 0.05 if city == 'woodstock'      
-      #rate = rate + 0.04 if address.state.downcase == 'al' || address.state.downcase == 'alabama'              
-      #return rate.round(2)             
+      return transaction
     end
+
+    #def self.tax(order)
+    #  return 0.00 if !order.shipping_address
+    #
+    #  sc = order.site.store_config                        
+    #  if !sc.auto_calculate_tax                        
+    #    tax = self.custom_tax(sc, order)
+    #    return tax
+    #  end
+    #  
+    #  # See if the tax rate has already been calculated
+    #  # If so, use that instead of doing another web service call
+    #  if order.tax_rate
+    #    return order.subtotal * order.tax_rate
+    #  end
+    #  
+    #  sa = order.shipping_address
+    #  if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?        
+    #    sa = order.billing_address
+    #  end
+    #  return 0.00 if sa.nil? || sa.address1.nil? || sa.city.nil? || sa.state.nil? || sa.zip.nil?
+    #  
+    #  TaxCloud.configure do |config|
+    #    config.api_login_id  = sc.taxcloud_api_id
+    #    config.api_key       = sc.taxcloud_api_key
+    #    config.usps_username = sc.usps_username
+    #  end
+    #  
+    #  origin = TaxCloud::Address.new(
+    #    :address1 => sc.origin_address1,
+    #    :address2 => sc.origin_address2,
+    #    :city     => sc.origin_city,
+    #    :state    => sc.origin_state,
+    #    :zip5     => sc.origin_zip
+    #  )      
+    #  destination = TaxCloud::Address.new(
+    #    :address1 => sa.address1,
+    #    :address2 => sa.address2,
+    #    :city     => sa.city,
+    #    :state    => sa.state,
+    #    :zip5     => sa.zip
+    #  )      
+    #  transaction = TaxCloud::Transaction.new(
+    #    :customer_id => order.customer_id,
+    #    :cart_id     => order.id,
+    #    :origin      => origin,
+    #    :destination => destination
+    #  )
+    #  order.line_items.each_with_index do |li, i|
+    #    next if !li.variant.taxable # Skip any non-taxable items        
+    #    transaction.cart_items << TaxCloud::CartItem.new(
+    #      :index    => i,
+    #      :item_id  => li.variant.id,
+    #      :tic      => TaxCloud::TaxCodes::GENERAL,
+    #      :price    => li.unit_price,
+    #      :quantity => li.quantity
+    #    )
+    #  end
+    #  lookup = transaction.lookup
+    #  tax = lookup.tax_amount
+    #  
+    #  # Save the tax rate      
+    #  order.tax_rate = tax/order.subtotal
+    #  order.save
+    #  
+    #  # Return the tax amount
+    #  return tax                                             
+    #end
+    
   end
 end

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.7.16'
+  VERSION = '0.7.17'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.7.16
+  version: 0.7.17
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg