solidus_avatax_certified 2.0.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ba6379569acf61b06167ab217fbb1eca5e472c0
-  data.tar.gz: b32a50a24a6fad7b76e36f9de281f602a27e7463
+  metadata.gz: 5b407d1d1459d4a007f6a0a7b84df7c6c420dfad
+  data.tar.gz: df24b1e69eeb5772f1cb25249c6222db2ac368f2
 SHA512:
-  metadata.gz: bc1fd526badf9ece163b015df8368f862094da9f505e107e1ea37e731e914f2780d0b65fad326e59b48631da32c44a35d11935b8ffef3b287c025fbebf30cd8d
-  data.tar.gz: d638aa46c762ad2b656f785d3df01f1068ef090bf3bbe7d6b213820ce27c162ef538fe8566c1fe2b305e6e0dc0f29fb0b657174cdf52b770e8a0cf35ee9dc228
+  metadata.gz: 9cf57a151ae1e1d9f0f309bbb327387933ad3f3caf4cc9ab1c46df49dde076957a7bc5e45d21a01fdb27770e9e1de578e061935c64e9a81c37a52b87eafebc34
+  data.tar.gz: 95b5fd1b3d0f3acd47284a32f7d6f2ee27edfacefce615db20066dde455cf2500d982656aaff16391468d4eacf92154037d50feb9716fbf80ec0336d231f7bb3

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-branch = 'v2.1'
+branch = 'master'
 gem "solidus", github: "solidusio/solidus", branch: branch
 gem "solidus_auth_devise", github: "solidusio/solidus_auth_devise"
 
@@ -13,7 +13,4 @@ gem "rails-controller-testing", group: :test
 gem 'pg'
 gem 'mysql2'
 
-gem 'pg'
-gem 'mysql2'
-
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/boomerdigital/solidus_avatax_certified.svg?branch=master)](https://travis-ci.org/boomerdigital/solidus_avatax_certified)
+[![Build Status](https://travis-ci.org/boomerdigital/solidus_avatax_certified.svg?branch=v2.1)](https://travis-ci.org/boomerdigital/solidus_avatax_certified)
 
 SolidusAvataxCertified
 ===========
@@ -13,10 +13,17 @@ From Avalara's own explanation of the certification program:
 
 > Avalara’s partners who have created certified integrations for AvaTax have demonstrated that those integrations contain elements which are essential to providing customers with easy-to-use software that gives accurate sales tax calculations. The certification criteria used to demonstrate these elements are based on Avalara’s years of experience integrating into ERP, ecommerce and point-of-sale applications.
 
+**[For Installation and Setup instructions, please visit our wiki.](https://github.com/boomerdigital/solidus_avatax_certified/wiki)**
 
-**For Solidus versions v2.1 and up, please use branch v2.1**
+Version Compatibility Chart
+---------------------------
+
+| Solidus Version | Avatax Branch | Latest Avatax Version |
+|:---------------:|:-------------:|:---------------------:|
+|   v1.0 - v2.0   |   v1.0-v2.0   |         1.1.0         |
+|   v2.1 - v2.2   |     master    |         2.0.0         |
+|       v2.3      |      v2.3     |         3.0.0         |
 
-**[For Installation and Setup instructions, please visit our wiki.](https://github.com/boomerdigital/solidus_avatax_certified/wiki)**
 
 Testing
 -------

data/app/assets/javascripts/spree/backend/address_validator.js

@@ -37,7 +37,7 @@ AddressValidator.prototype = {
 
       $.each(["Line1", "Line2", "City", "PostalCode"], function(index, value){
         var keyVal = controller.getKeyByValue(value);
-        $(wrapper + " input[id*='" + keyVal + "']").val(data.result.Address[value]);
+        $(wrapper + " input[id*='" + keyVal + "']").val(data.Address[value]);
       }.bind(address));
 
       this.showFlash(data);

data/app/assets/javascripts/spree/frontend/address_validator.js

@@ -39,7 +39,7 @@ AddressValidator.prototype = {
 
       $.each(["Line1", "Line2", "City", "PostalCode"], function(index, value){
         var keyVal = controller.getKeyByValue(value);
-        $(wrapper + " input[id*='" + keyVal + "']").val(data.result.Address[value]);
+        $(wrapper + " input[id*='" + keyVal + "']").val(data.Address[value]);
       }.bind(address));
 
       this.showFlash(data);

data/app/models/spree/adjustment_decorator.rb

@@ -1,4 +1,5 @@
 Spree::Adjustment.class_eval do
+
   def avatax_cache_key
     key = ['Spree::Adjustment']
     key << self.id

data/app/models/spree/calculator/avalara_transaction.rb

@@ -59,7 +59,7 @@ module Spree
 
     def long_cache_key(order)
       key = order.avatax_cache_key
-      key << (order.ship_address.try(:cache_key) || order.bill_address.try(:cache_key)).to_s
+      key << order.tax_address.try(:cache_key)
       order.line_items.each do |line_item|
         key << line_item.avatax_cache_key
       end

data/app/models/tax_svc.rb

@@ -142,7 +142,6 @@ class TaxSvc
       JSON.parse(res)
     rescue => e
       logger.error(e, 'RestClient')
-      e
     end
   end
 

data/lib/solidus_avatax_certified/version.rb

@@ -1,3 +1,3 @@
 module SolidusAvataxCertified
-  VERSION = '2.0.0'
+  VERSION = '3.0.0'
 end

data/solidus_avatax_certified.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus_core", [">= 2.1.0", "< 2.3.0"]
+  s.add_dependency "solidus_core", [">= 2.3.0.alpha", "< 3.0.0"]
   s.add_dependency "json", "~> 1.8"
   s.add_dependency "addressable", "~> 2.4"
   s.add_dependency "rest-client", "~> 1.7"

data/spec/factories/avalara_order_factory.rb

@@ -25,9 +25,9 @@ FactoryGirl.define do
         create(:global_zone, default_tax: true)
       end
       if Spree::TaxCategory.first.nil?
-        create(:clothing_tax_rate, tax_category: create(:tax_category), included_in_price: evaluator.tax_included)
+        create(:clothing_tax_rate, tax_categories: [create(:tax_category)], included_in_price: evaluator.tax_included)
       else
-        create(:clothing_tax_rate, tax_category: Spree::TaxCategory.first, included_in_price: evaluator.tax_included)
+        create(:clothing_tax_rate, tax_categories: [Spree::TaxCategory.first], included_in_price: evaluator.tax_included)
       end
     end
 

data/spec/factories/avalara_shipping_method_factory.rb

@@ -14,7 +14,7 @@ FactoryGirl.define do
         create(:country)
       end
       shipping_tax_rate = create(:shipping_tax_rate, included_in_price: evaluator.tax_included)
-      shipping_method.tax_category = shipping_tax_rate.tax_category
+      shipping_method.tax_category = shipping_tax_rate.tax_categories.first
       if shipping_method.shipping_categories.empty?
         shipping_method.shipping_categories << (Spree::ShippingCategory.first || create(:shipping_category))
       end

data/spec/factories/tax_rate_factory.rb

@@ -2,7 +2,7 @@ FactoryGirl.define do
   factory :clothing_tax_rate, class: Spree::TaxRate do
     name 'Tax'
     amount 0.0
-    tax_category { Spree::TaxCategory.find_by(tax_code: 'PC030000') || create(:tax_category) }
+    tax_categories {[ Spree::TaxCategory.find_by(tax_code: 'PC030000') || create(:tax_category) ]}
     association(:calculator, factory: :avalara_transaction_calculator)
     zone { Spree::Zone.find_or_create_by(name: 'GlobalZone') }
     show_rate_in_label false
@@ -11,7 +11,7 @@ FactoryGirl.define do
   factory :shipping_tax_rate, class: Spree::TaxRate do
     name 'Shipping Tax'
     amount 0.0
-    tax_category { Spree::TaxCategory.find_by(tax_code: 'FR000000') || create(:tax_category, tax_code: 'FR000000') }
+    tax_categories {[ Spree::TaxCategory.find_by(tax_code: 'FR000000') || create(:tax_category, tax_code: 'FR000000') ]}
     association(:calculator, factory: :avalara_transaction_calculator)
     zone { Spree::Zone.find_or_create_by(name: 'GlobalZone') }
     show_rate_in_label false

data/spec/models/spree/avalara_transaction_spec.rb

@@ -114,7 +114,7 @@ describe Spree::AvalaraTransaction, :vcr do
         end
 
         subject do
-          VCR.use_cassette('capture_with_customer_usage_type', allow_playback_repeats: true) do
+          VCR.use_cassette('capture_with_customer_usage_type') do
             order.avalara_transaction.commit_avatax('SalesInvoice')
           end
         end

data/spec/models/spree/order_decorator_spec.rb

@@ -15,7 +15,7 @@ describe Spree::Order, :vcr do
 
   describe '#cancel_avalara' do
     subject do
-      VCR.use_cassette('order_cancel', allow_playback_repeats: true) do
+      VCR.use_cassette("order_cancel") do
         avalara_order.avalara_capture_finalize
         avalara_order.cancel_avalara
       end

data/spec/models/spree/refund_decorator_spec.rb

@@ -54,7 +54,7 @@ describe Spree::Refund, :vcr do
 
   describe '#avalara_capture_finalize' do
     subject do
-      VCR.use_cassette('order_return_capture', allow_playback_repeats: true) do
+      VCR.use_cassette('order_return_capture') do
         refund.save
       end
     end

data/spec/models/spree/shipping_rate_decorator_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe Spree::ShippingRate, type: :model do
   let!(:shipping_tax_category) { create(:tax_category, name: 'Shipping', tax_code: 'FR000000') }
   let!(:zone) { create(:zone, name: 'North America', default_tax: true, zone_members: []) }
-  let!(:tax_rate) { create(:tax_rate, tax_category: shipping_tax_category, amount: 0.00, included_in_price: false, zone: zone) }
+  let!(:tax_rate) { create(:tax_rate, tax_categories: [shipping_tax_category], amount: 0.00, included_in_price: false, zone: zone) }
 
   let(:shipment) { build(:shipment) }
   let(:shipping_method) { build(:shipping_method) }

data/spec/spec_helper.rb

@@ -70,7 +70,7 @@ RSpec.configure do |config|
     DatabaseCleaner.clean_with :truncation
   end
 
-  config.before :each do
+  config.before :each do |example|
     DatabaseCleaner.strategy = :truncation
     DatabaseCleaner.start
     MyConfigPreferences.set_preferences

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_avatax_certified
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Allison Reilly
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.3.0.alpha
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement