spree_exactor 1.1.3.20130726 → 1.1.4.20130729

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a296fbaa1625887546dc2741b4702c5f5b818624
-  data.tar.gz: d433d5b3ab4908e5790e0cdd7e14225b9cae911c
+  metadata.gz: 51f5bfa0c8da069c380831843a08103da78df42e
+  data.tar.gz: 15c9eebf445ddea087d443b8f67c960838b88567
 SHA512:
-  metadata.gz: 970892fac28c3aa4bdd4813b64a93c9a1280624035a6b0fe0c9150e633b9ac34b93fb13c056f481c51c6b2f4ed085234639b99ed7e23e8e971c46ac90c784ce4
-  data.tar.gz: f966b3813218ce7a388eda4e8b983533977bd8bdeecc075850530ef0366a6ebadf787558c27957509c4ca2ba153880492ae3f4848f252c1a45c0c5a8108930fa
+  metadata.gz: f2be701bf8b97295cbcebf6d02cf0ee13c2cd1d2358b323554734e22c4bf43bf2a78db29d647676d32c8805764db627fa3cf098ff5165d1aaf171e4cba5f813f
+  data.tar.gz: efe8c4b847e04bb070f9646714014e784e451cecf4e1ef53a44aae27f126cd89b8b498807985012c194433d93573a6692812f6fc9105038e1c07d7461a6dc440

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_exactor (1.1.3.20130726)
+    spree_exactor (1.1.4.20130729)
       rspec
       spree_core (>= 2.0.0)
       sqlite3

data/app/helpers/spree_exactor_connector.rb

@@ -4,7 +4,7 @@ require 'bigdecimal/util'
 
 module SpreeExactorConnector
   class SpreeExactorConnector
-    PLUGIN_VERSION = "20130726"
+    PLUGIN_VERSION = "20130729"
     TEST_TRANSACTION_NAME = "Spree Test Transaction"
     TEST_ITEM_DESRIPTION = "Exactor Account Verification. Plug-in version:"
     PLUGIN_NAME = "SpreeCommerce"
@@ -204,7 +204,6 @@ module SpreeExactorConnector
 
     def update_tax_if_needed(order)
       if order.exactor_invoice_transaction.nil?
-        order.update_column(:exactor_order_hash_sum, nil)
         order.update_adjustments
       end
     end
@@ -340,11 +339,11 @@ module SpreeExactorConnector
             invoice.LineItem << exactor_line
           end
         end
-        # using stock_location_id instead of shipment_id is a workaround. Spree recreates shipments on delivery page.
         # collect shipment amounts to create shipping items in the future
-        shipment_amounts[shipment.stock_location_id] = shipment.cost
-        shipment_addresses[shipment.stock_location_id] = stockAddress
-        shipment_quantities[shipment.stock_location_id] += 1
+        shipment_key = generate_shipment_key(shipment)
+        shipment_amounts[shipment_key] = shipment.cost
+        shipment_addresses[shipment_key] = stockAddress
+        shipment_quantities[shipment_key] += 1
       end
       shipment_amounts.each do |id, amount|
         shipment_quantities[id].times do
@@ -380,6 +379,12 @@ module SpreeExactorConnector
       return invoice
     end
 
+    # @param [Spree::Shipment] shipment
+    def generate_shipment_key(shipment)
+      # using stock_location_id instead of shipment_id is a workaround. Spree recreates shipments on delivery page.
+      "#{shipment.stock_location_id}_#{shipment.shipping_method.id}"
+    end
+
     def add_free_shipping_lineitem(shipping_amount, stock = nil)
       exactor_line = InvoiceRequest::LineItem.new
       exactor_line.SKU=@settings.shipping_include_handling ? SHIPPING_EUC_WITH_HANDLING : SHIPPING_EUC_NO_HANDLING

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

@@ -72,9 +72,6 @@ class Spree::Calculator::ExactorTaxCalculator < Spree::Calculator
   # @param [Spree::Order] order
   # @return [Boolean]
   def is_full?(order)
-    packages = Spree::Stock::Coordinator.new(order).packages
-
-    return false if packages.size > order.shipments.size
 
     variant2quantity = Hash.new(0)
 

data/app/models/spree/order_decorator.rb

@@ -7,7 +7,9 @@ module Spree
     #check out handler
     def finalize!
       exactor_connector = SpreeExactorConnector::SpreeExactorConnector.new
-      exactor_connector.do_checkout!(self)
+      #we can accidentally commit order with an old invoice id
+      this_order = Spree::Order.find(self.id)
+      exactor_connector.do_checkout!(this_order)
       super_finalize!
     end
 

data/lib/generators/spree_exactor/install/install_generator.rb

@@ -11,6 +11,7 @@ module SpreeExactor
         supported_versions '1.1.1.112920126'=>['1.1.1','1.1.2','1.1.3']
         supported_versions '1.1.2.20130723'=>['2.0.*']
         supported_versions '1.1.3.20130726'=>['2.0.*']
+        supported_versions '1.1.4.20130729'=>['2.0.*']
         unless @supported_versions.include? _plugin_version
           puts "Unknown plug-in version. Try any of those: "+ @supported_versions.keys.to_s
           exit(0)

data/spree_exactor.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_exactor'
-  s.version     = '1.1.3.20130726'
+  s.version     = '1.1.4.20130729'
   s.summary     = 'Exactor sales tax compliance module for SpreeCommerce'
   s.description = 'Sales tax compliance module for (i) calculating sales tax with SpreeCommerce; and (ii) generating and filing sales tax returns in all US jurisdictions (state and local).'
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_exactor
 version: !ruby/object:Gem::Version
-  version: 1.1.3.20130726
+  version: 1.1.4.20130729
 platform: ruby
 authors:
 - Exactor, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2013-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core