has_accounts_engine 3.0.0.beta0 → 3.0.0.beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. checksums.yaml +7 -0
  2. data/app/controllers/accounts_controller.rb +1 -1
  3. data/app/views/accounts/_show_bookings.html.haml +6 -3
  4. data/app/views/bookings/new.html.haml +1 -1
  5. data/lib/has_accounts_engine/version.rb +1 -1
  6. metadata +29 -53
  7. data/app/views/accounts/_booking_list_paginate.html.haml +0 -5
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: 90bc21ac216a284aa8aa7a65c56dc8698bf8dbd2
4
+ data.tar.gz: 2e083cd2c9d4e6138924e347f9d9da9dda7c32c1
5
+ SHA512:
6
+ metadata.gz: 9c81fab1b1e8f3b941380a7e82e7cc912b976509302db0bb31bcd968e1aa4612cd976b838f64c75b1fe9b06908a295c952764e8ec4e1481c5bd778d56399dea3
7
+ data.tar.gz: f26596fbd3173bb4ae3142db67e2fe251d2872549852f122a30d941768dfe68f030893158aaa6fdd5b497ff58e1b86bdc89761f035bf99de1bd290f5d3f7b82b
data/app/controllers/accounts_controller.rb CHANGED
@@ -24,7 +24,7 @@ class AccountsController < HasAccountsController
24
24
  @carry_booking = @bookings.all.first
25
25
  @saldo = @account.saldo(@carry_booking, false)
26
26
 
27
- if @account.is_profit_account? && params[:by_value_period] && params[:by_value_period][:to]
27
+ if @account.profit_account? && params[:by_value_period] && params[:by_value_period][:to]
28
28
  @saldo -= @account.saldo(Date.parse(params[:by_value_period][:from]), false)
29
29
  end
30
30
 
data/app/views/accounts/_show_bookings.html.haml CHANGED
@@ -1,5 +1,7 @@
1
1
  - url_params = {:controller => 'accounts', :action => 'show', :id => params[:account_id] || params[:id]}
2
2
 
3
+ = paginate @bookings
4
+
3
5
  %table.table.table-striped.bookings.collection
4
6
  %thead
5
7
  = render 'accounts/booking_list_header'
@@ -8,9 +10,10 @@
8
10
 
9
11
  - for @booking in @bookings
10
12
  - amount = @booking.amount
11
- - amount = -(amount) if @account.is_liability_account?
12
- - @saldo += amount if @booking.debit_account == @account
13
- - @saldo -= amount if @booking.credit_account == @account
13
+ - amount = -(amount) if @account.liability_account?
14
+ - @saldo += @booking.accounted_amount(@account)
14
15
  = render 'accounts/booking_item'
15
16
  %tfoot
16
17
  = render 'accounts/booking_list_footer' unless @bookings.empty?
18
+
19
+ = paginate @bookings
data/app/views/bookings/new.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- = contextual_links 'data-remote' => true
1
+ = contextual_links
2
2
 
3
3
  = boot_page_title(BookingTemplate)
4
4
  = render 'booking_templates/list', :item_action => lambda{|object| new_booking_booking_template_path(object)}
data/lib/has_accounts_engine/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module HasAccountsEngine
2
- VERSION = "3.0.0.beta0"
2
+ VERSION = "3.0.0.beta1"
3
3
  end
metadata CHANGED
@@ -1,174 +1,153 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: has_accounts_engine
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0.beta0
5
- prerelease: 6
4
+ version: 3.0.0.beta1
6
5
  platform: ruby
7
6
  authors:
8
7
  - Simon Hürlimann (CyT)
9
8
  autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2014-04-22 00:00:00.000000000 Z
11
+ date: 2014-11-26 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: rails
16
15
  requirement: !ruby/object:Gem::Requirement
17
- none: false
18
16
  requirements:
19
- - - ~>
17
+ - - "~>"
20
18
  - !ruby/object:Gem::Version
21
19
  version: '3.1'
22
20
  type: :runtime
23
21
  prerelease: false
24
22
  version_requirements: !ruby/object:Gem::Requirement
25
- none: false
26
23
  requirements:
27
- - - ~>
24
+ - - "~>"
28
25
  - !ruby/object:Gem::Version
29
26
  version: '3.1'
30
27
  - !ruby/object:Gem::Dependency
31
28
  name: has_accounts
32
29
  requirement: !ruby/object:Gem::Requirement
33
- none: false
34
30
  requirements:
35
- - - ! '>='
31
+ - - ">="
36
32
  - !ruby/object:Gem::Version
37
33
  version: 1.0.2
38
34
  type: :runtime
39
35
  prerelease: false
40
36
  version_requirements: !ruby/object:Gem::Requirement
41
- none: false
42
37
  requirements:
43
- - - ! '>='
38
+ - - ">="
44
39
  - !ruby/object:Gem::Version
45
40
  version: 1.0.2
46
41
  - !ruby/object:Gem::Dependency
47
42
  name: has_vcards
48
43
  requirement: !ruby/object:Gem::Requirement
49
- none: false
50
44
  requirements:
51
- - - ! '>='
45
+ - - ">="
52
46
  - !ruby/object:Gem::Version
53
47
  version: '0'
54
48
  type: :runtime
55
49
  prerelease: false
56
50
  version_requirements: !ruby/object:Gem::Requirement
57
- none: false
58
51
  requirements:
59
- - - ! '>='
52
+ - - ">="
60
53
  - !ruby/object:Gem::Version
61
54
  version: '0'
62
55
  - !ruby/object:Gem::Dependency
63
56
  name: i18n_rails_helpers
64
57
  requirement: !ruby/object:Gem::Requirement
65
- none: false
66
58
  requirements:
67
- - - ! '>='
59
+ - - ">="
68
60
  - !ruby/object:Gem::Version
69
61
  version: '0'
70
62
  type: :runtime
71
63
  prerelease: false
72
64
  version_requirements: !ruby/object:Gem::Requirement
73
- none: false
74
65
  requirements:
75
- - - ! '>='
66
+ - - ">="
76
67
  - !ruby/object:Gem::Version
77
68
  version: '0'
78
69
  - !ruby/object:Gem::Dependency
79
70
  name: acts-as-taggable-on
80
71
  requirement: !ruby/object:Gem::Requirement
81
- none: false
82
72
  requirements:
83
- - - ! '>='
73
+ - - ">="
84
74
  - !ruby/object:Gem::Version
85
75
  version: '0'
86
76
  type: :runtime
87
77
  prerelease: false
88
78
  version_requirements: !ruby/object:Gem::Requirement
89
- none: false
90
79
  requirements:
91
- - - ! '>='
80
+ - - ">="
92
81
  - !ruby/object:Gem::Version
93
82
  version: '0'
94
83
  - !ruby/object:Gem::Dependency
95
84
  name: validates_timeliness
96
85
  requirement: !ruby/object:Gem::Requirement
97
- none: false
98
86
  requirements:
99
- - - ! '>='
87
+ - - ">="
100
88
  - !ruby/object:Gem::Version
101
89
  version: '0'
102
90
  type: :runtime
103
91
  prerelease: false
104
92
  version_requirements: !ruby/object:Gem::Requirement
105
- none: false
106
93
  requirements:
107
- - - ! '>='
94
+ - - ">="
108
95
  - !ruby/object:Gem::Version
109
96
  version: '0'
110
97
  - !ruby/object:Gem::Dependency
111
98
  name: inherited_resources
112
99
  requirement: !ruby/object:Gem::Requirement
113
- none: false
114
100
  requirements:
115
- - - ! '>='
101
+ - - ">="
116
102
  - !ruby/object:Gem::Version
117
103
  version: '0'
118
104
  type: :runtime
119
105
  prerelease: false
120
106
  version_requirements: !ruby/object:Gem::Requirement
121
- none: false
122
107
  requirements:
123
- - - ! '>='
108
+ - - ">="
124
109
  - !ruby/object:Gem::Version
125
110
  version: '0'
126
111
  - !ruby/object:Gem::Dependency
127
112
  name: has_scope
128
113
  requirement: !ruby/object:Gem::Requirement
129
- none: false
130
114
  requirements:
131
- - - ! '>='
115
+ - - ">="
132
116
  - !ruby/object:Gem::Version
133
117
  version: '0'
134
118
  type: :runtime
135
119
  prerelease: false
136
120
  version_requirements: !ruby/object:Gem::Requirement
137
- none: false
138
121
  requirements:
139
- - - ! '>='
122
+ - - ">="
140
123
  - !ruby/object:Gem::Version
141
124
  version: '0'
142
125
  - !ruby/object:Gem::Dependency
143
126
  name: simple_form
144
127
  requirement: !ruby/object:Gem::Requirement
145
- none: false
146
128
  requirements:
147
- - - ! '>='
129
+ - - ">="
148
130
  - !ruby/object:Gem::Version
149
131
  version: '0'
150
132
  type: :runtime
151
133
  prerelease: false
152
134
  version_requirements: !ruby/object:Gem::Requirement
153
- none: false
154
135
  requirements:
155
- - - ! '>='
136
+ - - ">="
156
137
  - !ruby/object:Gem::Version
157
138
  version: '0'
158
139
  - !ruby/object:Gem::Dependency
159
140
  name: anjlab-bootstrap-rails
160
141
  requirement: !ruby/object:Gem::Requirement
161
- none: false
162
142
  requirements:
163
- - - ~>
143
+ - - "~>"
164
144
  - !ruby/object:Gem::Version
165
145
  version: 2.1.0
166
146
  type: :runtime
167
147
  prerelease: false
168
148
  version_requirements: !ruby/object:Gem::Requirement
169
- none: false
170
149
  requirements:
171
- - - ~>
150
+ - - "~>"
172
151
  - !ruby/object:Gem::Version
173
152
  version: 2.1.0
174
153
  description: HasAccountsEngine is a full featured Rails 3 gem accompanying has_accounts
@@ -181,6 +160,8 @@ extra_rdoc_files:
181
160
  - MIT-LICENSE
182
161
  - README.md
183
162
  files:
163
+ - MIT-LICENSE
164
+ - README.md
184
165
  - app/assets/images/16x16/add.png
185
166
  - app/assets/images/16x16/alert.png
186
167
  - app/assets/images/16x16/combolink.png
@@ -293,7 +274,6 @@ files:
293
274
  - app/views/accounts/_booking_item.html.haml
294
275
  - app/views/accounts/_booking_list_footer.html.haml
295
276
  - app/views/accounts/_booking_list_header.html.haml
296
- - app/views/accounts/_booking_list_paginate.html.haml
297
277
  - app/views/accounts/_booking_list_saldo.html.haml
298
278
  - app/views/accounts/_booking_list_turnover.html.haml
299
279
  - app/views/accounts/_carry_booking.html.haml
@@ -348,32 +328,28 @@ files:
348
328
  - lib/has_accounts_engine.rb
349
329
  - lib/has_accounts_engine/railtie.rb
350
330
  - lib/has_accounts_engine/version.rb
351
- - MIT-LICENSE
352
- - README.md
353
331
  homepage: https://github.com/huerlisi/has_accounts_engine
354
332
  licenses:
355
333
  - MIT
334
+ metadata: {}
356
335
  post_install_message:
357
336
  rdoc_options: []
358
337
  require_paths:
359
338
  - lib
360
339
  required_ruby_version: !ruby/object:Gem::Requirement
361
- none: false
362
340
  requirements:
363
- - - ! '>='
341
+ - - ">="
364
342
  - !ruby/object:Gem::Version
365
343
  version: 1.9.3
366
344
  required_rubygems_version: !ruby/object:Gem::Requirement
367
- none: false
368
345
  requirements:
369
- - - ! '>'
346
+ - - ">"
370
347
  - !ruby/object:Gem::Version
371
348
  version: 1.3.1
372
349
  requirements: []
373
350
  rubyforge_project:
374
- rubygems_version: 1.8.23
351
+ rubygems_version: 2.2.2
375
352
  signing_key:
376
- specification_version: 3
353
+ specification_version: 4
377
354
  summary: HasAccountsEngine provides controllers, views for has_accounts.
378
355
  test_files: []
379
- has_rdoc:
data/app/views/accounts/_booking_list_paginate.html.haml DELETED
@@ -1,5 +0,0 @@
1
- %tr
2
- - ## TODO: See http://groups.google.com/group/will_paginate/browse_thread/thread/5d702999d78e47e5
3
- - url_params = {:controller => 'accounts', :action => 'show', :id => params[:account_id] || params[:id]}
4
- %th{:colspan => "6", :style => "text-align: right"}= will_paginate @bookings, :params => url_params.merge(:query => params[:query])
5
- %th