spree_correios 1.0.0 → 1.0.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/app/models/spree/calculator/correios_base_calculator.rb +10 -5
  2. data/spree_correios.gemspec +1 -1
  3. metadata +16 -16
data/app/models/spree/calculator/correios_base_calculator.rb CHANGED
@@ -2,7 +2,7 @@ module Spree
2
2
  class Calculator::CorreiosBaseCalculator < Calculator
3
3
  preference :zipcode, :string
4
4
  preference :token, :string
5
- preference :password, :password
5
+ preference :password, :string
6
6
  preference :declared_value, :boolean, default: false
7
7
  preference :receipt_notification, :boolean, default: false
8
8
  preference :receive_in_hands, :boolean, default: false
@@ -15,18 +15,23 @@ module Spree
15
15
 
16
16
  def compute(object)
17
17
  return unless object.present? and object.line_items.present?
18
+ order = object.is_a?(Spree::Order) ? object : object.order
18
19
 
19
20
  package = ::Correios::Frete::Pacote.new
20
- object.line_items.map do |item|
21
- package_item = ::Correios::Frete::PacoteItem.new(peso: item.weight, comprimento: item.length, largura: item.width, altura: item.height)
21
+ order.line_items.map do |item|
22
+ weight = item.product.weight.to_f
23
+ depth = item.product.depth.to_f
24
+ width = item.product.width.to_f
25
+ height = item.product.height.to_f
26
+ package_item = ::Correios::Frete::PacoteItem.new(peso: weight, comprimento: depth, largura: width, altura: height)
22
27
  package.add_item(package_item)
23
28
  end
24
29
 
25
30
  calculator = ::Correios::Frete::Calculador.new do |c|
26
31
  c.cep_origem = preferred_zipcode
27
- c.cep_destino = object.ship_address.zipcode
32
+ c.cep_destino = order.ship_address.zipcode
28
33
  c.encomenda = package
29
- c.valor_declarado = object.amount.to_f if prefers?(:declared_value)
34
+ c.valor_declarado = order.amount.to_f if prefers?(:declared_value)
30
35
  c.mao_propria = prefers?(:receive_in_hands)
31
36
  c.aviso_recebimento = prefers?(:receipt_notification)
32
37
  c.codigo_empresa = preferred_token if preferred_token.present?
data/spree_correios.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_correios'
5
- s.version = '1.0.0'
5
+ s.version = '1.0.1'
6
6
  s.summary = %q{A spree extensions to add Brazil's Correio calculators}
7
7
  s.required_ruby_version = '>= 1.9.2'
8
8
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spree_correios
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0
4
+ version: 1.0.1
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-15 00:00:00.000000000 Z
12
+ date: 2012-03-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: spree_core
16
- requirement: &2164530300 !ruby/object:Gem::Requirement
16
+ requirement: &2164460480 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 1.0.0
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2164530300
24
+ version_requirements: *2164460480
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: correios-frete
27
- requirement: &2164537720 !ruby/object:Gem::Requirement
27
+ requirement: &2164459940 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.5.2
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2164537720
35
+ version_requirements: *2164459940
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: capybara
38
- requirement: &2164543100 !ruby/object:Gem::Requirement
38
+ requirement: &2164459340 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - =
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: 1.0.1
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2164543100
46
+ version_requirements: *2164459340
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: factory_girl
49
- requirement: &2164552160 !ruby/object:Gem::Requirement
49
+ requirement: &2164456580 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2164552160
57
+ version_requirements: *2164456580
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: ffaker
60
- requirement: &2164562500 !ruby/object:Gem::Requirement
60
+ requirement: &2164505860 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2164562500
68
+ version_requirements: *2164505860
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec-rails
71
- requirement: &2164570920 !ruby/object:Gem::Requirement
71
+ requirement: &2164503380 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '2.7'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2164570920
79
+ version_requirements: *2164503380
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sqlite3
82
- requirement: &2164575500 !ruby/object:Gem::Requirement
82
+ requirement: &2164502040 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2164575500
90
+ version_requirements: *2164502040
91
91
  description:
92
92
  email:
93
93
  - stefano.diem@gmail.com