erp_orders 3.0.1 → 3.0.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/app/models/charge_line.rb +3 -2
  2. data/app/models/charge_line_payment_txn.rb +1 -0
  3. data/lib/erp_orders/version.rb +1 -1
  4. metadata +89 -100
data/app/models/charge_line.rb CHANGED
@@ -3,10 +3,11 @@ class ChargeLine < ActiveRecord::Base
3
3
  belongs_to :charged_item, :polymorphic => true
4
4
  belongs_to :money
5
5
  has_many :charge_line_payment_txns, :dependent => :destroy
6
+ has_many :financial_txns, :through => :charge_line_payment_txns, :source => :financial_txn,
7
+ :conditions => ["charge_line_payment_txns.payment_txn_type = ?", 'FinancialTxn']
6
8
 
7
9
  def payment_txns
8
- #this is a stub for extensions
9
- return []
10
+ self.financial_txns
10
11
  end
11
12
 
12
13
  def add_payment_txn(payment_txn)
data/app/models/charge_line_payment_txn.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  class ChargeLinePaymentTxn < ActiveRecord::Base
2
2
  belongs_to :charge_line
3
3
  belongs_to :payment_txn, :polymorphic => true
4
+ belongs_to :financial_txn, :class_name => "FinancialTxn",:foreign_key => "payment_txn_id"
4
5
  end
data/lib/erp_orders/version.rb CHANGED
@@ -2,7 +2,7 @@ module ErpOrders
2
2
  module VERSION #:nodoc:
3
3
  MAJOR = 3
4
4
  MINOR = 0
5
- TINY = 1
5
+ TINY = 2
6
6
 
7
7
  STRING = [MAJOR, MINOR, TINY].compact.join('.')
8
8
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: erp_orders
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.1
4
+ version: 3.0.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,44 +9,33 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-17 00:00:00.000000000 Z
12
+ date: 2012-05-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
- name: erp_app
16
- requirement: &82396800 !ruby/object:Gem::Requirement
15
+ name: erp_products
16
+ requirement: &2161317980 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
- - - =
19
+ - - ~>
20
20
  - !ruby/object:Gem::Version
21
- version: 3.0.1
21
+ version: '3.0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *82396800
24
+ version_requirements: *2161317980
25
25
  - !ruby/object:Gem::Dependency
26
- name: erp_agreements
27
- requirement: &82421180 !ruby/object:Gem::Requirement
26
+ name: erp_txns_and_accts
27
+ requirement: &2161317480 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
- - - =
30
+ - - ~>
31
31
  - !ruby/object:Gem::Version
32
- version: 3.0.1
32
+ version: '3.0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *82421180
36
- - !ruby/object:Gem::Dependency
37
- name: erp_products
38
- requirement: &82420340 !ruby/object:Gem::Requirement
39
- none: false
40
- requirements:
41
- - - =
42
- - !ruby/object:Gem::Version
43
- version: 3.0.1
44
- type: :runtime
45
- prerelease: false
46
- version_requirements: *82420340
35
+ version_requirements: *2161317480
47
36
  - !ruby/object:Gem::Dependency
48
37
  name: erp_dev_svcs
49
- requirement: &82419610 !ruby/object:Gem::Requirement
38
+ requirement: &2161317020 !ruby/object:Gem::Requirement
50
39
  none: false
51
40
  requirements:
52
41
  - - =
@@ -54,7 +43,7 @@ dependencies:
54
43
  version: 3.0.1
55
44
  type: :development
56
45
  prerelease: false
57
- version_requirements: *82419610
46
+ version_requirements: *2161317020
58
47
  description: The Orders Engine in CompassAE implements models for Orders, Order Items
59
48
  and Order status tracking. It also houses models for charge lines associated with
60
49
  Orders (although it could be argued that this functionality should reside in Commerce).
@@ -65,83 +54,83 @@ extensions: []
65
54
  extra_rdoc_files: []
66
55
  files:
67
56
  - public/javascripts/erp_app/desktop/applications/order_manager/line_items_grid_panel.js
68
- - public/javascripts/erp_app/desktop/applications/order_manager/payments_grid_panel.js
69
57
  - public/javascripts/erp_app/desktop/applications/order_manager/module.js
70
58
  - public/javascripts/erp_app/desktop/applications/order_manager/orders_grid_panel.js
71
- - public/javascripts/erp_app/organizer/applications/order_management/line_items_grid_panel.js
72
- - public/javascripts/erp_app/organizer/applications/order_management/payments_grid_panel.js
59
+ - public/javascripts/erp_app/desktop/applications/order_manager/payments_grid_panel.js
60
+ - public/javascripts/erp_app/organizer/applications/order_management/base.js
73
61
  - public/javascripts/erp_app/organizer/applications/order_management/extensions.js
62
+ - public/javascripts/erp_app/organizer/applications/order_management/line_items_grid_panel.js
74
63
  - public/javascripts/erp_app/organizer/applications/order_management/orders_grid_panel.1.js
75
- - public/javascripts/erp_app/organizer/applications/order_management/base.js
76
- - app/assets/stylesheets/erp_orders/application.css
64
+ - public/javascripts/erp_app/organizer/applications/order_management/payments_grid_panel.js
77
65
  - app/assets/javascripts/erp_orders/application.js
78
- - app/views/layouts/erp_orders/application.html.erb
79
- - app/models/line_item_role_type.rb
80
- - app/models/charge_line_payment_txn.rb
81
- - app/models/order_txn_type.rb
82
- - app/models/order_line_item.rb
83
- - app/models/order_line_item_pty_role.rb
84
- - app/models/order_txn.rb
66
+ - app/assets/stylesheets/erp_orders/application.css
67
+ - app/controllers/erp_orders/erp_app/desktop/order_manager/base_controller.rb
68
+ - app/controllers/erp_orders/erp_app/organizer/order_management/base_controller.rb
69
+ - app/helpers/erp_orders/application_helper.rb
85
70
  - app/models/charge_line.rb
86
- - app/models/extensions/product_type.rb
87
- - app/models/extensions/party.rb
71
+ - app/models/charge_line_payment_txn.rb
72
+ - app/models/extensions/agreement.rb
88
73
  - app/models/extensions/money.rb
74
+ - app/models/extensions/party.rb
89
75
  - app/models/extensions/product_instance.rb
90
- - app/models/extensions/agreement.rb
76
+ - app/models/extensions/product_type.rb
77
+ - app/models/line_item_role_type.rb
78
+ - app/models/order_line_item.rb
79
+ - app/models/order_line_item_pty_role.rb
91
80
  - app/models/order_line_item_type.rb
92
- - app/helpers/erp_orders/application_helper.rb
93
- - app/controllers/erp_orders/erp_app/desktop/order_manager/base_controller.rb
94
- - app/controllers/erp_orders/erp_app/organizer/order_management/base_controller.rb
81
+ - app/models/order_txn.rb
82
+ - app/models/order_txn_type.rb
83
+ - app/views/layouts/erp_orders/application.html.erb
95
84
  - config/routes.rb
96
- - db/migrate/20110602194707_update_order_txn_ship_to_bill_to.rb
97
- - db/migrate/20080805000060_base_orders.rb
85
+ - db/data_migrations/20110605231556_create_order_party_roles.rb
98
86
  - db/data_migrations/20110728201731_create_desktop_app_order_manager.rb
99
- - db/data_migrations/20120229174343_add_orders_widget.rb
100
87
  - db/data_migrations/20110728201732_create_organizer_app_order_management.rb
101
- - db/data_migrations/20110605231556_create_order_party_roles.rb
102
- - lib/erp_orders.rb
88
+ - db/data_migrations/20120229174343_add_orders_widget.rb
89
+ - db/migrate/20080805000060_base_orders.rb
90
+ - db/migrate/20110602194707_update_order_txn_ship_to_bill_to.rb
103
91
  - lib/erp_orders/engine.rb
104
- - lib/erp_orders/extensions.rb
105
92
  - lib/erp_orders/extensions/active_record/acts_as_order_txn.rb
93
+ - lib/erp_orders/extensions.rb
106
94
  - lib/erp_orders/version.rb
95
+ - lib/erp_orders.rb
107
96
  - lib/tasks/erp_orders_tasks.rake
108
97
  - GPL-3-LICENSE
109
98
  - Rakefile
110
99
  - README.rdoc
111
- - spec/spec_helper.rb
112
- - spec/models/order_line_item_type_spec.rb
113
- - spec/models/order_line_item_pty_role_spec.rb
114
- - spec/models/line_item_role_type_spec.rb
115
- - spec/models/order_txn_type_spec.rb
116
- - spec/models/charge_line_spec.rb
117
- - spec/models/charge_line_payment_txn_spec.rb
118
- - spec/models/order_txn_spec.rb
119
- - spec/models/order_line_item_spec.rb
120
- - spec/dummy/public/422.html
121
- - spec/dummy/public/404.html
122
- - spec/dummy/public/500.html
123
- - spec/dummy/public/favicon.ico
124
- - spec/dummy/config.ru
125
- - spec/dummy/app/assets/stylesheets/application.css
126
100
  - spec/dummy/app/assets/javascripts/application.js
127
- - spec/dummy/app/views/layouts/application.html.erb
128
- - spec/dummy/app/helpers/application_helper.rb
101
+ - spec/dummy/app/assets/stylesheets/application.css
129
102
  - spec/dummy/app/controllers/application_controller.rb
130
- - spec/dummy/config/routes.rb
131
- - spec/dummy/config/locales/en.yml
132
- - spec/dummy/config/boot.rb
103
+ - spec/dummy/app/helpers/application_helper.rb
104
+ - spec/dummy/app/views/layouts/application.html.erb
133
105
  - spec/dummy/config/application.rb
106
+ - spec/dummy/config/boot.rb
107
+ - spec/dummy/config/database.yml
108
+ - spec/dummy/config/environment.rb
134
109
  - spec/dummy/config/environments/spec.rb
135
- - spec/dummy/config/initializers/mime_types.rb
136
- - spec/dummy/config/initializers/session_store.rb
137
110
  - spec/dummy/config/initializers/backtrace_silencers.rb
138
- - spec/dummy/config/initializers/wrap_parameters.rb
139
111
  - spec/dummy/config/initializers/inflections.rb
112
+ - spec/dummy/config/initializers/mime_types.rb
140
113
  - spec/dummy/config/initializers/secret_token.rb
141
- - spec/dummy/config/environment.rb
142
- - spec/dummy/config/database.yml
114
+ - spec/dummy/config/initializers/session_store.rb
115
+ - spec/dummy/config/initializers/wrap_parameters.rb
116
+ - spec/dummy/config/locales/en.yml
117
+ - spec/dummy/config/routes.rb
118
+ - spec/dummy/config.ru
119
+ - spec/dummy/public/404.html
120
+ - spec/dummy/public/422.html
121
+ - spec/dummy/public/500.html
122
+ - spec/dummy/public/favicon.ico
143
123
  - spec/dummy/Rakefile
144
124
  - spec/dummy/script/rails
125
+ - spec/models/charge_line_payment_txn_spec.rb
126
+ - spec/models/charge_line_spec.rb
127
+ - spec/models/line_item_role_type_spec.rb
128
+ - spec/models/order_line_item_pty_role_spec.rb
129
+ - spec/models/order_line_item_spec.rb
130
+ - spec/models/order_line_item_type_spec.rb
131
+ - spec/models/order_txn_spec.rb
132
+ - spec/models/order_txn_type_spec.rb
133
+ - spec/spec_helper.rb
145
134
  homepage: http://development.compassagile.com
146
135
  licenses: []
147
136
  post_install_message:
@@ -162,43 +151,43 @@ required_rubygems_version: !ruby/object:Gem::Requirement
162
151
  version: '0'
163
152
  requirements: []
164
153
  rubyforge_project:
165
- rubygems_version: 1.8.10
154
+ rubygems_version: 1.8.15
166
155
  signing_key:
167
156
  specification_version: 3
168
157
  summary: The Orders Engine in CompassAE implements models for Orders, Order Items
169
158
  and Order status tracking.
170
159
  test_files:
171
- - spec/spec_helper.rb
172
- - spec/models/order_line_item_type_spec.rb
173
- - spec/models/order_line_item_pty_role_spec.rb
174
- - spec/models/line_item_role_type_spec.rb
175
- - spec/models/order_txn_type_spec.rb
176
- - spec/models/charge_line_spec.rb
177
- - spec/models/charge_line_payment_txn_spec.rb
178
- - spec/models/order_txn_spec.rb
179
- - spec/models/order_line_item_spec.rb
180
- - spec/dummy/public/422.html
181
- - spec/dummy/public/404.html
182
- - spec/dummy/public/500.html
183
- - spec/dummy/public/favicon.ico
184
- - spec/dummy/config.ru
185
- - spec/dummy/app/assets/stylesheets/application.css
186
160
  - spec/dummy/app/assets/javascripts/application.js
187
- - spec/dummy/app/views/layouts/application.html.erb
188
- - spec/dummy/app/helpers/application_helper.rb
161
+ - spec/dummy/app/assets/stylesheets/application.css
189
162
  - spec/dummy/app/controllers/application_controller.rb
190
- - spec/dummy/config/routes.rb
191
- - spec/dummy/config/locales/en.yml
192
- - spec/dummy/config/boot.rb
163
+ - spec/dummy/app/helpers/application_helper.rb
164
+ - spec/dummy/app/views/layouts/application.html.erb
193
165
  - spec/dummy/config/application.rb
166
+ - spec/dummy/config/boot.rb
167
+ - spec/dummy/config/database.yml
168
+ - spec/dummy/config/environment.rb
194
169
  - spec/dummy/config/environments/spec.rb
195
- - spec/dummy/config/initializers/mime_types.rb
196
- - spec/dummy/config/initializers/session_store.rb
197
170
  - spec/dummy/config/initializers/backtrace_silencers.rb
198
- - spec/dummy/config/initializers/wrap_parameters.rb
199
171
  - spec/dummy/config/initializers/inflections.rb
172
+ - spec/dummy/config/initializers/mime_types.rb
200
173
  - spec/dummy/config/initializers/secret_token.rb
201
- - spec/dummy/config/environment.rb
202
- - spec/dummy/config/database.yml
174
+ - spec/dummy/config/initializers/session_store.rb
175
+ - spec/dummy/config/initializers/wrap_parameters.rb
176
+ - spec/dummy/config/locales/en.yml
177
+ - spec/dummy/config/routes.rb
178
+ - spec/dummy/config.ru
179
+ - spec/dummy/public/404.html
180
+ - spec/dummy/public/422.html
181
+ - spec/dummy/public/500.html
182
+ - spec/dummy/public/favicon.ico
203
183
  - spec/dummy/Rakefile
204
184
  - spec/dummy/script/rails
185
+ - spec/models/charge_line_payment_txn_spec.rb
186
+ - spec/models/charge_line_spec.rb
187
+ - spec/models/line_item_role_type_spec.rb
188
+ - spec/models/order_line_item_pty_role_spec.rb
189
+ - spec/models/order_line_item_spec.rb
190
+ - spec/models/order_line_item_type_spec.rb
191
+ - spec/models/order_txn_spec.rb
192
+ - spec/models/order_txn_type_spec.rb
193
+ - spec/spec_helper.rb