caboose-cms 0.9.11 → 0.9.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4298da2a7310afb66b5acfe0f5b1aed40328acfc
-  data.tar.gz: 1482610b197353074a198f8e28e99eeb668d83d0
+  metadata.gz: e6b21e4e3fe1e4fffbbf0e0c07e5a8f66014fba1
+  data.tar.gz: c8794f4febe45b56f519a93d8db75a75e34cb19e
 SHA512:
-  metadata.gz: abdc67be4a910c33816a9298d08f68843d3a27723547c5b3a800fbffac9729101b96e35e494b47f520a888e01b2ee5df6e23601d5a3d7f611bbf846767e12a16
-  data.tar.gz: b77679d97a89ca4404788fb1fc456af8a8a20633dd6d4014374dcc879f9046f4cd7e65e63a97efd82089d62a92b6ecb166ed0514cf35fa43c08c12eeb695cd28
+  metadata.gz: 4aee44531816be1b60eba614a3f76a7b212df96a4c6e9dec4aead01d9f6d22ae9ee373f34783041921bfe78d746cca320bdd5e8f8af48022c8004612cd69afa7
+  data.tar.gz: 41e9fe6899cf068580bfe5640133333300db0ea342d61cbc69e8cbf6289f85b48d88638d7256b52d7ccb0f8a9ac0e8dc593d6e093e02a36abf832fe2083ed024

data/app/assets/javascripts/caboose/checkout/checkout_controller.js

@@ -150,13 +150,14 @@ CheckoutController.prototype = {
             //before_update: function() { this.value_old = this.value_clean; }, 
             after_update: function()  {
               that.invoice.instore_pickup = this.value;
-              var arr = ['shipping_address_container'];
-              $.each(that.invoice.invoice_packages, function(i, ip) {
-                arr.push('invoice_package_' + ip.id + '_shipping_method');
-              });            
-              if (parseInt(this.value) == 0) $.each(arr, function(i, el) { $('#'+el).slideDown(); });
-              else                           $.each(arr, function(i, el) { $('#'+el).slideUp();   });
-              that.print_ready_message();                                            
+              //var arr = ['shipping_address_container'];
+              //$.each(that.invoice.invoice_packages, function(i, ip) {
+              //  arr.push('invoice_package_' + ip.id + '_shipping_method');
+              //});            
+              //if (parseInt(this.value) == 0) $.each(arr, function(i, el) { $('#'+el).slideDown(); });
+              //else                           $.each(arr, function(i, el) { $('#'+el).slideUp();   });
+              that.refresh_and_print();
+              //that.print_ready_message();                                            
             }                  
           }
         ]            

data/app/controllers/caboose/checkout_controller.rb

@@ -464,6 +464,8 @@ module Caboose
               ip.instore_pickup = v
               ip.save
             end
+            
+            @invoice.calculate
         end
       end
       

data/app/models/caboose/#Untitled-1#

@@ -0,0 +1,12 @@
+
+x = 0.0
+invoice.line_items.each do |li|
+  li.verify_unit_price  
+  x = x + (li.unit_price * li.quantity) if li.variant.taxable
+end
+
+return x * 0.09 if invoice.instore_pickup
+sa = invoice.shipping_address
+return 0.00 if sa.nil? || sa.city.nil? || sa.state.nil?       
+return 0.00 if sa.state.downcase != 'al'
+return (0.09 * x).round(2)

data/app/models/caboose/schema.rb

@@ -842,6 +842,7 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :default_product_status            , :string  ],
         [ :default_taxable                   , :boolean ],
         [ :allow_instore_pickup              , :boolean  , { :default => false }],
+        [ :instore_tax_rate                  , :decimal  , { :precision => 8, :scale => 2 }],
         [ :custom_invoice_pdf                , :string  ]
       ],  
       Caboose::Subscription => [      

data/app/models/caboose/tax_calculator.rb

@@ -9,16 +9,23 @@ module Caboose
     
     def self.tax(invoice)
       sc = invoice.site.store_config                                                      
-      return self.custom_tax(sc, invoice) if !sc.auto_calculate_tax   
+      return self.custom_tax(sc, invoice) if !sc.auto_calculate_tax
+      
+      if invoice.instore_pickup
+        if sc.instore_tax_rate.nil?
+          Caboose.log("Error: Null in-store tax rate")
+          return 0.00
+        end         
+        return invoice.subtotal * sc.instore_tax_rate
+      end
 
-      return 0.00 if !invoice.shipping_address
+      return 0.00 if !invoice.shipping_address 
       return 0.00 if !invoice.has_taxable_items?
       return 0.00 if !invoice.has_shippable_items?
 
       return invoice.subtotal * invoice.tax_rate if invoice.tax_rate # See if the tax rate has already been calculated
 
-      t = self.transaction(invoice)
-      Caboose.log(t.inspect)
+      t = self.transaction(invoice)      
       lookup = t.lookup
       tax = lookup.tax_amount
       

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.11'
+  VERSION = '0.9.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.9.12
 platform: ruby
 authors:
 - William Barry
@@ -839,6 +839,7 @@ files:
 - app/mailers/caboose/caboose_mailer.rb
 - app/mailers/caboose/invoices_mailer.rb
 - app/mailers/caboose/login_mailer.rb
+- app/models/caboose/#Untitled-1#
 - app/models/caboose/ab_option.rb
 - app/models/caboose/ab_testing.rb
 - app/models/caboose/ab_value.rb