caboose-cms 0.9.26 → 0.9.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d61cd61f33861af8f6d6629ed21732da3b9f845
-  data.tar.gz: ac17118766ee2a78a539c7d44639766d4cbcc71a
+  metadata.gz: e1dc62676f228e072765b01730da01c40c6de169
+  data.tar.gz: 6e6e41ffc74f7f5f43459a043207e7861dcb26d8
 SHA512:
-  metadata.gz: 8c1dc5d7b14673ce914d9053ad1a43de195c619c709e156ac867d4744eb6ca81fc1b91eb19550831cc8583730e7317fa0266c10c21f32785e642d5443edb0d4a
-  data.tar.gz: 24d22a58ec6af37d01ec3c3c1f8ade46113cecc94f0adc9a6f0b30031f44c5b193c4af17169cfa5317d928fc4a715f771d304dfa4c89603276d8addefb82e9f8
+  metadata.gz: eac09898d009bf5bbb158eec4d344f95ea06f08d86c8250f2393e5827142fce4e3ed973c8b95fe2fe400efab388c095fc747c0ad44fe0f3ee271d1c00d3fe9c3
+  data.tar.gz: d06ee88853669829c7864fa4a86d774694afa75d497129d4f96e790a7a3ec229980623ae61bbf5866e5f234ff62994d1a5cfc547a2b714aa8aeb94de36812220

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

@@ -124,7 +124,7 @@ Caboose.Store.Modules.Cart = (function() {
             if (!self.$add_to_cart.find('.message').length) {                            
               self.$add_to_cart
                 .append($('<div/>').hide().addClass('note error')
-                  .append($('<p/>').text(resp.error ? resp.error : (resp.errors ? resp.errors[0] : "Error adding to cart")))
+                  .append($('<p/>').text(response.error ? response.error : (response.errors ? response.errors[0] : "Error adding to cart")))
                   .append($('<p/>').append($('<a/>').attr('href', '/cart').html('View cart')))                                      
                 );                
               self.$add_to_cart.find('.message').fadeIn();              

data/app/controllers/caboose/store_controller.rb

@@ -120,6 +120,7 @@ module Caboose
           when 'custom_packages_function'         then sc.custom_packages_function         = value
           when 'custom_shipping_function'         then sc.custom_shipping_function         = value   
           when 'custom_tax_function'              then sc.custom_tax_function              = value        
+          when 'instore_tax_rate'                 then sc.instore_tax_rate                 = value
           when 'length_unit'                      then sc.length_unit                      = value
           when 'weight_unit'                      then sc.weight_unit                      = value
           when 'download_instructions'            then sc.download_instructions            = value

data/app/models/caboose/tax_calculator.rb

@@ -9,8 +9,7 @@ module Caboose
     
     def self.tax(invoice)
       sc = invoice.site.store_config                                                      
-      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")
@@ -19,6 +18,7 @@ module Caboose
         return invoice.subtotal * sc.instore_tax_rate
       end
 
+      return self.custom_tax(sc, invoice) if !sc.auto_calculate_tax
       return 0.00 if !invoice.shipping_address 
       return 0.00 if !invoice.has_taxable_items?
       return 0.00 if !invoice.has_shippable_items?

data/app/views/caboose/store/admin_edit_tax.html.erb

@@ -7,6 +7,7 @@ sc = @store_config
 <p><div id='storeconfig_<%= sc.id %>_auto_calculate_tax'       ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_taxcloud_api_id'          ></div></p>
 <p><div id='storeconfig_<%= sc.id %>_taxcloud_api_key'         ></div></p>
+<p><div id='storeconfig_<%= sc.id %>_instore_tax_rate'></div></p>
 <div id='custom_tax_container' <% if sc.auto_calculate_tax %>style='display: none;'<% end %>>
   <h3>Custom Tax Function</h3>
   <p><code>def custom_tax_function(invoice) {</code></p>
@@ -30,7 +31,8 @@ $(document).ready(function() {
       { name: 'auto_calculate_tax'       , nice_name: 'Automatically Calculate Tax'       , type: 'checkbox' , value: <%= raw Caboose.json(sc.auto_calculate_tax ? 1 : 0 ) %>, width: 400 , after_update: function() { toggleCustomTax(this.value); }},
       { name: 'taxcloud_api_id'          , nice_name: 'TaxCloud API ID'                   , type: 'text'     , value: <%= raw Caboose.json(sc.taxcloud_api_id            ) %>, width: 400 },
       { name: 'taxcloud_api_key'         , nice_name: 'TaxCloud API Key'                  , type: 'text'     , value: <%= raw Caboose.json(sc.taxcloud_api_key           ) %>, width: 600 },            
-      { name: 'custom_tax_function'      , nice_name: 'Custom Tax Function'               , type: 'textarea' , value: <%= raw Caboose.json(sc.custom_tax_function        ) %>, width: 800, height: 200, fixed_placeholder: false }                                      
+      { name: 'custom_tax_function'      , nice_name: 'Custom Tax Function'               , type: 'textarea' , value: <%= raw Caboose.json(sc.custom_tax_function        ) %>, width: 800, height: 200, fixed_placeholder: false },
+      { name: 'instore_tax_rate'         , nice_name: 'In-store Tax Rate'                 , type: 'text'     , value: <%= raw Caboose.json(sc.instore_tax_rate           ) %>, width: 400 }
     ]    
   });
                                                                                                                                                                                     

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.26'
+  VERSION = '0.9.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.26
+  version: 0.9.27
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-09 00:00:00.000000000 Z
+date: 2016-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg