has_accounts_engine 3.0.0.beta6 → 3.0.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55dd3abef7759acba2842d6e3ea4f84d9a75626e
-  data.tar.gz: 93781ee13a4dbd617660129e1c6f9abc10a96008
+  metadata.gz: 92d02380a3cb2d5eda13943a8ecbb569a3d81ba9
+  data.tar.gz: dee2443a0c07e4bd3ccb1d60c4c85ba17abff87e
 SHA512:
-  metadata.gz: 8d49141e17eadd475cffbc7a6fa720ac4360f15e33ecc704911b63bf7a57913209ecf6ea385f9cf86c19e71d674cd3d4cb059d19d3156d936524db2a1245dbbd
-  data.tar.gz: 1d4fea76a1ffbb6594306fb8dc2d711aeb845907ec2b51244dffa6ba70ac5788fb161d098be784ad218f4f01fa96b712303712c8f8fa7f5efae7f47f99230c25
+  metadata.gz: 2d8d4d1bf8a5cd7ccaf712294a8c9f553b954f965d6a30b3e55b4434ffcd494bbe265357248849f54554bbc9e1d8697458c43b3271ac765c832f6d05f88f72f6
+  data.tar.gz: 6fd8b0e24235e7d1b37ce4939e5403606ac8071daa5adf29a2dbcc82a4882ae3b20ba165f35bb11253a1890a981a7c5997ffdbcba6d277caef77476ca3a41a80

data/app/controllers/accounts_controller.rb

@@ -1,6 +1,6 @@
 class AccountsController < HasAccountsController
   # Scopes
-  has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
+  has_scope :by_date, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_text
 
   has_scope :page, :only => :index
@@ -24,8 +24,8 @@ class AccountsController < HasAccountsController
     @carry_booking = @bookings.all.first
     @saldo = @account.saldo(@carry_booking, false)
 
-    if @account.profit_account? && params[:by_value_period] && params[:by_value_period][:to]
-      @saldo -= @account.saldo(Date.parse(params[:by_value_period][:from]), false)
+    if @account.profit_account? && params[:by_date] && params[:by_date][:to]
+      @saldo -= @account.saldo(Date.parse(params[:by_date][:from]), false)
     end
 
     show!

data/app/controllers/bookings_controller.rb

@@ -1,6 +1,5 @@
 class BookingsController < HasAccountsController
   # Scopes
-  has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_text
   has_scope :by_amount, :using => [:from, :to]
   has_scope :by_date, :using => [:from, :to]

data/app/views/accounts/_account.html.haml

@@ -1,12 +1,12 @@
 %tr[account]
   %td= account.code
   %td
-    = link_to account.title, url_for(account), {'data-href-container' => 'tr'}, :by_value_period => params[:by_value_period]
+    = link_to account.title, url_for(account), {'data-href-container' => 'tr'}, :by_date => params[:by_date]
     .pull-right= account.tags.map{|tag| boot_label(tag.name)}.join(' ').html_safe
   - if @date
     %td{:style => "text-align: right"}= currency_fmt(account.saldo(@date))
-  - elsif params[:by_value_period]
-    %td{:style => "text-align: right"}= currency_fmt(account.saldo(params[:by_value_period][:from]..params[:by_value_period][:to]))
+  - elsif params[:by_date]
+    %td{:style => "text-align: right"}= currency_fmt(account.saldo(params[:by_date][:from]..params[:by_date][:to]))
   - else
     %td{:style => "text-align: right"}= currency_fmt(account.saldo)
   %td.action-links

data/app/views/bookings/_sidebar.html.haml

@@ -1 +1 @@
-- filter_name = :by_value_period
+- filter_name = :by_date

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta6"
+  VERSION = "3.0.0.beta7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta6
+  version: 3.0.0.beta7
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-29 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -351,9 +351,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: HasAccountsEngine provides controllers, views for has_accounts.
 test_files: []
-has_rdoc: