spree_exactor 1.1.2.20130723 → 1.1.3.20130726
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile.lock +1 -1
- data/app/helpers/spree_exactor_connector.rb +3 -5
- data/app/models/spree/order_updater_decorator.rb +1 -1
- data/app/views/spree/admin/exactor_settings/show.html.erb +1 -1
- data/config/locales/en.yml +1 -1
- data/lib/generators/spree_exactor/install/install_generator.rb +2 -1
- data/spree_exactor.gemspec +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: a296fbaa1625887546dc2741b4702c5f5b818624
|
4
|
+
data.tar.gz: d433d5b3ab4908e5790e0cdd7e14225b9cae911c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 970892fac28c3aa4bdd4813b64a93c9a1280624035a6b0fe0c9150e633b9ac34b93fb13c056f481c51c6b2f4ed085234639b99ed7e23e8e971c46ac90c784ce4
|
7
|
+
data.tar.gz: f966b3813218ce7a388eda4e8b983533977bd8bdeecc075850530ef0366a6ebadf787558c27957509c4ca2ba153880492ae3f4848f252c1a45c0c5a8108930fa
|
data/Gemfile.lock
CHANGED
@@ -4,7 +4,7 @@ require 'bigdecimal/util'
|
|
4
4
|
|
5
5
|
module SpreeExactorConnector
|
6
6
|
class SpreeExactorConnector
|
7
|
-
PLUGIN_VERSION = "
|
7
|
+
PLUGIN_VERSION = "20130726"
|
8
8
|
TEST_TRANSACTION_NAME = "Spree Test Transaction"
|
9
9
|
TEST_ITEM_DESRIPTION = "Exactor Account Verification. Plug-in version:"
|
10
10
|
PLUGIN_NAME = "SpreeCommerce"
|
@@ -57,7 +57,7 @@ module SpreeExactorConnector
|
|
57
57
|
taxRequest = create_invoice_request_for_order(order)
|
58
58
|
|
59
59
|
invoice = taxRequest.InvoiceRequest
|
60
|
-
hash = '|' + invoice.ExemptionId
|
60
|
+
hash = '|' + invoice.ExemptionId.to_s
|
61
61
|
hash += '|' + calculate_hash_for_address(invoice.ShipFrom)
|
62
62
|
hash += '|' + calculate_hash_for_address(invoice.ShipTo)
|
63
63
|
hash += '|' + calculate_hash_for_address(invoice.BillTo)
|
@@ -376,9 +376,7 @@ module SpreeExactorConnector
|
|
376
376
|
end
|
377
377
|
invoice.SaleDate=Date.current.to_s
|
378
378
|
invoice.PurchaseOrderNumber=order.number.to_s
|
379
|
-
unless order.user.
|
380
|
-
invoice.ExemptionId=order.user.exactor_exemption_id
|
381
|
-
end
|
379
|
+
invoice.ExemptionId=order.user.exactor_exemption_id unless order.user.nil?
|
382
380
|
return invoice
|
383
381
|
end
|
384
382
|
|
@@ -42,7 +42,7 @@ module Spree
|
|
42
42
|
exactor_connector = SpreeExactorConnector::SpreeExactorConnector.new
|
43
43
|
# due to unknown reasons payment_state is paid when user add first line item into order
|
44
44
|
# so, we need to check order state too
|
45
|
-
if order.payment_state=='paid' and order.state ==
|
45
|
+
if order.payment_state=='paid' and order.state == 'complete'
|
46
46
|
exactor_connector.do_payment_completed!(order)
|
47
47
|
elsif order.current_payment and order.current_payment.state == 'void' and order.current_payment.previous_state == 'completed'
|
48
48
|
exactor_connector.do_refund_payment!(order)
|
data/config/locales/en.yml
CHANGED
@@ -3,7 +3,7 @@
|
|
3
3
|
|
4
4
|
en:
|
5
5
|
hello: "Hello world"
|
6
|
-
exactor_settings: "Exactor Settings"
|
6
|
+
exactor_settings: "Exactor Sales Tax Settings"
|
7
7
|
exactor_settings_updated: "Exactor settings have been successfully updated"
|
8
8
|
exactor_settings_created: "Exactor settings have been successfully created"
|
9
9
|
|
@@ -10,6 +10,7 @@ module SpreeExactor
|
|
10
10
|
def install
|
11
11
|
supported_versions '1.1.1.112920126'=>['1.1.1','1.1.2','1.1.3']
|
12
12
|
supported_versions '1.1.2.20130723'=>['2.0.*']
|
13
|
+
supported_versions '1.1.3.20130726'=>['2.0.*']
|
13
14
|
unless @supported_versions.include? _plugin_version
|
14
15
|
puts "Unknown plug-in version. Try any of those: "+ @supported_versions.keys.to_s
|
15
16
|
exit(0)
|
@@ -17,7 +18,7 @@ module SpreeExactor
|
|
17
18
|
spree_versions = @supported_versions.values_at(_plugin_version)[0]
|
18
19
|
answer=ask("ATTENTION! This plug-in supports only these versions of Spree: "+spree_versions.to_s+" Is your version of Spree listed there? [Y/n] \n")
|
19
20
|
if (answer.downcase=='n')
|
20
|
-
puts "
|
21
|
+
puts "Please contact Exactor customer technical support at tech.support@exactor.com for compatibility with other versions."
|
21
22
|
exit(0)
|
22
23
|
end
|
23
24
|
puts "Removing all previous Exactor dependencies (if exist)... "
|
data/spree_exactor.gemspec
CHANGED
@@ -2,7 +2,7 @@
|
|
2
2
|
Gem::Specification.new do |s|
|
3
3
|
s.platform = Gem::Platform::RUBY
|
4
4
|
s.name = 'spree_exactor'
|
5
|
-
s.version = '1.1.
|
5
|
+
s.version = '1.1.3.20130726'
|
6
6
|
s.summary = 'Exactor sales tax compliance module for SpreeCommerce'
|
7
7
|
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).'
|
8
8
|
s.required_ruby_version = '>= 2.0.0'
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: spree_exactor
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.1.
|
4
|
+
version: 1.1.3.20130726
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Exactor, Inc
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2013-07-
|
11
|
+
date: 2013-07-26 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: spree_core
|