spree_exactor 1.1.4.20130729 → 1.1.5.20130731

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f5bfa0c8da069c380831843a08103da78df42e
-  data.tar.gz: 15c9eebf445ddea087d443b8f67c960838b88567
+  metadata.gz: a0f00d92c091463778e6980f170f498afefc09e4
+  data.tar.gz: 357356a22904958b90db1590392cac48f651aecc
 SHA512:
-  metadata.gz: f2be701bf8b97295cbcebf6d02cf0ee13c2cd1d2358b323554734e22c4bf43bf2a78db29d647676d32c8805764db627fa3cf098ff5165d1aaf171e4cba5f813f
-  data.tar.gz: efe8c4b847e04bb070f9646714014e784e451cecf4e1ef53a44aae27f126cd89b8b498807985012c194433d93573a6692812f6fc9105038e1c07d7461a6dc440
+  metadata.gz: effe15c9dea6eac0de075d1584084450db437a45be19be2979dc844a58f05ba1b1193a875a3c973878eedad7f508c115767219ea67cd9fc7563637ab7b41c1ff
+  data.tar.gz: 360f65ff9dbedb539a3bae5a471010aad150d66221a1b98f3494037196ed0b3cdcc0abdcd1707e989f5a7c08c81d12aac5fa7b455a1ed59581118a13293372c4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_exactor (1.1.4.20130729)
+    spree_exactor (1.1.5.20130731)
       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 = "20130729"
+    PLUGIN_VERSION = "20130731"
     TEST_TRANSACTION_NAME = "Spree Test Transaction"
     TEST_ITEM_DESRIPTION = "Exactor Account Verification. Plug-in version:"
     PLUGIN_NAME = "SpreeCommerce"
@@ -115,6 +115,7 @@ module SpreeExactorConnector
       if (response.is_valid)
         order.update_column(:exactor_invoice_transaction, nil)
         order.update_column(:exactor_commit_transaction, response.commit_id)
+        order.update_column(:exactor_commit_option, @settings.commit_option)
       else
         order.errors[:base]<<"Tax calculation failure: #{response.error_code}:#{response.error_description}"
       end
@@ -122,7 +123,9 @@ module SpreeExactorConnector
     end
 
     def do_cancel!(order)
-      if can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::TRANSACTION_STATE, order) or can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::SHIPMENT_STATE, order)
+      if can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::TRANSACTION_STATE, order) or
+          can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::PAYMENT_STATE, order)
+          can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::SHIPMENT_STATE, order)
         if !order.exactor_commit_transaction.nil?
           response = refund_transaction(order)
           if (response.is_valid)
@@ -154,13 +157,19 @@ module SpreeExactorConnector
       if (can_be_handled?(Spree::ExactorSetting::COMMIT_OPTIONS::PAYMENT_STATE, order))
         update_tax_if_needed(order)
         resp = nil
+
+        # Check a case: transaction has been committed on transaction state, then user changed commit option to payment state and paid for the order.
+        if order.exactor_commit_transaction and order.exactor_commit_option != Spree::ExactorSetting::COMMIT_OPTIONS::TRANSACTION_STATE
+          return
+        end
+
         if order.exactor_commit_transaction
           resp = refund_transaction(order)
         end
-        if (!resp or resp.is_valid)
+        if !resp or resp.is_valid
           resp = do_commit!(order)
         end
-        if (!resp.is_valid)
+        if !resp.is_valid
           order.current_payment.errors[:base]<<"Tax synchronization failure: #{resp.error_code}:#{resp.error_description}" unless order.current_payment.nil?
         end
       end

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

@@ -13,6 +13,10 @@ class Spree::Calculator::ExactorTaxCalculator < Spree::Calculator
     # don't try to calculate hash for partially formed order
     return false unless is_full?(computable)
 
+    return false if !computable.updated_shipment_count.nil? and !computable.is_last_shipment_updated?
+
+    computable.updated_shipment_count_reset
+
     order_hash = exactor.calculate_hash(computable)
     current_order_hash = Spree::Order.find(computable.id).exactor_order_hash_sum
     result = order_hash!=current_order_hash

data/app/models/spree/order_decorator.rb

@@ -68,7 +68,7 @@ module Spree
   end
 
   Order.class_eval do
-    attr_accessible :exactor_invoice_transaction, :exactor_commit_transaction, :exactor_order_hash_sum, :exactor_is_edit
+    attr_accessible :exactor_invoice_transaction, :exactor_commit_transaction, :exactor_order_hash_sum, :exactor_is_edit, :exactor_commit_option
     after_save :on_saved
     attr_accessor :current_payment
 
@@ -93,5 +93,33 @@ module Spree
       on_update
       update_column(:exactor_is_edit, nil);
     end
+
+    # WORKAROUND BEGIN
+    # Reloading or submitting of delivery page leads to shipment recreation every time.
+    # The problem appears if user changes shipping methods for more than one packages.
+    # Spree invoke tax recalculation for each change. We count updated shipments.
+    # And if last update took a place then invoke tax recalculation.
+
+    @@updated_shipment_counter = Hash.new(nil)
+
+    def updated_shipment_count
+      return nil if @@updated_shipment_counter.nil?
+      return @@updated_shipment_counter[self.id]
+    end
+
+    def is_last_shipment_updated?
+      self.updated_shipment_count >= self.shipments.size
+    end
+
+    def updated_shipment_count_reset
+      @@updated_shipment_counter[self.id] = nil
+    end
+
+    def updated_shipment_count_inc
+      @@updated_shipment_counter[self.id] = 0 if self.updated_shipment_count.nil?
+
+      @@updated_shipment_counter[self.id] += 1
+    end
+    # WORKAROUND END
   end
 end

data/app/models/spree/shipment_decorator.rb

@@ -0,0 +1,17 @@
+module Spree
+
+  Shipment.class_eval do
+
+  end
+
+  class Shipment
+    alias :super_selected_shipping_rate_id= :selected_shipping_rate_id=
+
+    def selected_shipping_rate_id=(id)
+      self.order.updated_shipment_count_inc
+
+      self.super_selected_shipping_rate_id=id
+    end
+
+  end
+end

data/db/migrate/20130731110400_add_commit_option_to_order.rb

@@ -0,0 +1,5 @@
+class AddCommitOptionToOrder < ActiveRecord::Migration
+  def change
+    add_column  :spree_orders,  :exactor_commit_option, :string
+  end
+end

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

@@ -12,6 +12,7 @@ module SpreeExactor
         supported_versions '1.1.2.20130723'=>['2.0.*']
         supported_versions '1.1.3.20130726'=>['2.0.*']
         supported_versions '1.1.4.20130729'=>['2.0.*']
+        supported_versions '1.1.5.20130731'=>['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.4.20130729'
+  s.version     = '1.1.5.20130731'
   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'
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
   "db/migrate/20120713152512_modify_dependent_entities.rb",
   "db/migrate/20120813124740_extend_user.rb",
   "db/migrate/20120815104739_add_exactor_tor_inline_tax.rb",
+  "db/migrate/20130731110400_add_commit_option_to_order.rb",
   "config/routes.rb",
   "config/locales/en.yml",
   ".rspec",
@@ -45,6 +46,7 @@ Gem::Specification.new do |s|
   "app/models/spree/line_item_decorator.rb",
   "app/models/spree/order_decorator.rb",
   "app/models/spree/order_updater_decorator.rb",
+  "app/models/spree/shipment_decorator.rb",
   "app/models/spree/tax_rate_decorator.rb",
   "app/models/spree/adjustment_decorator.rb",
   "app/models/spree/payment_decorator.rb",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_exactor
 version: !ruby/object:Gem::Version
-  version: 1.1.4.20130729
+  version: 1.1.5.20130731
 platform: ruby
 authors:
 - Exactor, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-29 00:00:00.000000000 Z
+date: 2013-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -87,6 +87,7 @@ files:
 - db/migrate/20120713152512_modify_dependent_entities.rb
 - db/migrate/20120813124740_extend_user.rb
 - db/migrate/20120815104739_add_exactor_tor_inline_tax.rb
+- db/migrate/20130731110400_add_commit_option_to_order.rb
 - config/routes.rb
 - config/locales/en.yml
 - .rspec
@@ -107,6 +108,7 @@ files:
 - app/models/spree/line_item_decorator.rb
 - app/models/spree/order_decorator.rb
 - app/models/spree/order_updater_decorator.rb
+- app/models/spree/shipment_decorator.rb
 - app/models/spree/tax_rate_decorator.rb
 - app/models/spree/adjustment_decorator.rb
 - app/models/spree/payment_decorator.rb