[pull] master from spree-contrib:master

.github/dependabot.yml

@@ -0,0 +1,7 @@
+version: 2
+updates:
+- package-ecosystem: bundler
+  directory: "/"
+  schedule:
+    interval: daily
+  open-pull-requests-limit: 10

.travis.yml

@@ -0,0 +1,58 @@
+os: linux
+dist: bionic
+
+addons:
+  apt:
+    sources:
+      - google-chrome
+    packages:
+      - google-chrome-stable
+
+services:
+  - mysql
+  - postgresql
+
+language: ruby
+
+rvm:
+  - 2.7
+  - 3.0
+
+env:
+  - DB=mysql
+  - DB=postgres
+
+gemfile:
+  - gemfiles/spree_3_2.gemfile
+  - gemfiles/spree_3_3.gemfile
+  - gemfiles/spree_3_4.gemfile
+  - gemfiles/spree_3_7.gemfile
+  - gemfiles/spree_4.gemfile
+  - gemfiles/spree_master.gemfile
+
+jobs:
+  allow_failures:
+    - gemfile: gemfiles/spree_master.gemfile
+  exclude:
+    - rvm: 3.0
+      gemfile: gemfiles/spree_3_2.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/spree_3_3.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/spree_3_4.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/spree_3_7.gemfile
+
+before_install:
+  - mysql -u root -e "GRANT ALL ON *.* TO 'travis'@'%';"
+
+before_script:
+  - CHROME_MAIN_VERSION=`google-chrome-stable --version | sed -E 's/(^Google Chrome |\.[0-9]+ )//g'`
+  - CHROMEDRIVER_VERSION=`curl -s "https://chromedriver.storage.googleapis.com/LATEST_RELEASE_$CHROME_MAIN_VERSION"`
+  - curl "https://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip" -O
+  - unzip chromedriver_linux64.zip -d ~/bin
+  - nvm install 14
+
+script:
+  - bundle exec rake test_app
+  - bundle exec rake spec

Appraisals

@@ -0,0 +1,24 @@
+appraise "spree-3-2" do
+  gem 'spree', '~> 3.2.0'
+end
+
+appraise "spree-3-3" do
+  gem 'spree', '~> 3.3.0'
+end
+
+appraise "spree-3-4" do
+  gem 'spree', '~> 3.4.0'
+end
+
+appraise "spree-3-7" do
+  gem 'spree', '~> 3.7.0'
+end
+
+appraise 'spree-4' do
+  gem 'spree', '~> 4.2'
+  gem 'rails-controller-testing'
+end
+
+appraise "spree-master" do
+  gem 'spree', github: 'spree/spree', branch: 'master'
+end

Gemfile

@@ -1,9 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'spree', github: 'spree/spree', branch: '3-2-stable'
-# Provides basic authentication functionality for testing parts of your engine
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: 'master'
-
 group :test do
   gem 'rails-controller-testing'
   gem 'byebug'

README.md

@@ -15,23 +15,21 @@ Spree::Taxjar is a sales tax extension for Spree using [SmartCalcs by TaxJar](ht
 
 1. Add this extension to your Gemfile with this line:
 
-  ```ruby
-  gem 'spree_taxjar', github: 'vinsol-spree-contrib/spree_taxjar', branch: <spree-version-compatible>
-  ```
-
-  *The `branch` option is important:* it must match the version of Spree you're using. For example, use `3-1-stable` if you're using Spree `3-1-stable` or any `3.1.x` version.
+      ```ruby
+      gem 'spree_taxjar', github: 'spree-contrib/spree_taxjar'
+      ```
 
 2. Install the gem using Bundler:
 
-  ```ruby
-  bundle install
-  ```
+      ```ruby
+      bundle install
+      ```
 
 3. Copy & run migrations
 
-  ```ruby
-  bundle exec rails g spree_taxjar:install
-  ```
+      ```ruby
+      bundle exec rails g spree_taxjar:install
+      ```
 
 4. Restart your server
 
@@ -42,6 +40,7 @@ Spree::Taxjar is a sales tax extension for Spree using [SmartCalcs by TaxJar](ht
   - Check the `TAXJAR ENABLED` checkbox
   - Optionally, check `TAXJAR DEBUG ENABLED` for debugging issues
     - Not recommended for production use unless debugging production issues
+  - Update tax rates to Spree/Taxjar calculator.
 
 ## Developing / Debugging Extension
 
@@ -75,6 +74,11 @@ bundle
 bundle exec rake
 ```
 
+## See It In Action
+<a href="http://www.youtube.com/watch?feature=player_embedded&v=xh__bVxTw3Q
+" target="_blank"><img src="http://img.youtube.com/vi/xh__bVxTw3Q/0.jpg" 
+alt="Youtube Video Tutorial" /></a>
+
 ## Credits
 
 [![vinsol.com: Ruby on Rails, iOS and Android developers](http://vinsol.com/vin_logo.png "Ruby on Rails, iOS and Android developers")](http://vinsol.com)

app/controllers/spree/admin/taxjar_settings_controller.rb

@@ -2,13 +2,14 @@ module Spree
   module Admin
     class TaxjarSettingsController < Spree::Admin::BaseController
       def edit
-        @preferences_api = [:taxjar_api_key, :taxjar_enabled, :taxjar_debug_enabled]
+        @preferences_api = %i[taxjar_api_key taxjar_enabled taxjar_debug_enabled taxjar_sandbox_environment_enabled]
       end
 
       def update
         Spree::Config[:taxjar_api_key] = params[:taxjar_api_key]
         Spree::Config[:taxjar_enabled] = params[:taxjar_enabled]
         Spree::Config[:taxjar_debug_enabled] = params[:taxjar_debug_enabled]
+        Spree::Config[:taxjar_sandbox_environment_enabled] = params[:taxjar_sandbox_environment_enabled]
 
         flash[:success] = Spree.t(:taxjar_settings_updated)
         redirect_to edit_admin_taxjar_settings_path

app/helpers/taxjar_helper.rb

@@ -13,21 +13,16 @@ def context
   class TaxjarLog
     attr_reader :logger
 
-    def initialize(path_name, file_name, log_info = nil, schedule = "weekly")
-      @logger ||= Logger.new("#{Rails.root}/log/#{path_name}.log", schedule)
+    def initialize(logdev)
+      @logger ||= Logger.new(logdev)
       @logger.formatter = Pretty.new
-      progname(file_name.split("/").last.chomp(".rb"))
-      info(log_info) unless log_info.nil?
+      @logger.progname = 'spree_taxjar extension'
     end
 
     def logger_enabled?
       Spree::Config[:taxjar_debug_enabled]
     end
 
-    def progname(progname = nil)
-      progname.nil? ? logger.progname : logger.progname = progname
-    end
-
     def info(log_info = nil)
       if logger_enabled?
         logger.info log_info unless log_info.nil?

app/models/concerns/spree_taxjar/taxable.rb

@@ -0,0 +1,12 @@
+module SpreeTaxjar
+  module Taxable
+    extend ActiveSupport::Concern
+
+    private
+
+    def taxjar_applicable?(order)
+      ::Spree::TaxRate.match(order.tax_zone).any? { |rate| rate.calculator_type == "Spree::Calculator::TaxjarCalculator" }
+    end
+  end
+end
+

app/models/spree/calculator/taxjar_calculator.rb

@@ -83,7 +83,7 @@ def cache_response(taxjar_response, order, address, item = nil)
         ## better to use Rails.cache.fetch for order and wrapping lookup based on line_item id
         res = nil
         taxjar_response.breakdown.line_items.each do |line_item|
-          item_from_db = Spree::LineItem.find_by(id: line_item.id)
+          item_from_db = Spree::LineItem.includes(:adjustments).find_by(id: line_item.id)
           if item && item_from_db.id == item.id
             res = line_item.tax_collectable
           end
@@ -94,9 +94,9 @@ def cache_response(taxjar_response, order, address, item = nil)
 
       def cache_key(order, item, address)
         if item.is_a?(Spree::LineItem)
-          ['Spree::LineItem', order.id, item.id, address.state.id, address.zipcode, item.amount, :amount_to_collect]
+          [Spree::LineItem.to_s, order.id, item.id, address.state_id, address.zipcode, item.taxable_amount, :amount_to_collect]
         else
-          ['Spree::Shipment', order.id, item.id, address.state.id, address.zipcode, item.cost, :amount_to_collect]
+          [Spree::Shipment.to_s, order.id, item.id, address.state_id, address.zipcode, item.cost, item.adjustments.select { |adjustment| adjustment.source_type != Spree::TaxRate.to_s }.map(&:amount).sum.to_f, :amount_to_collect]
         end
       end
   end