has_accounts_engine 3.0.0.beta0 → 3.0.0.beta1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 90bc21ac216a284aa8aa7a65c56dc8698bf8dbd2
+  data.tar.gz: 2e083cd2c9d4e6138924e347f9d9da9dda7c32c1
+SHA512:
+  metadata.gz: 9c81fab1b1e8f3b941380a7e82e7cc912b976509302db0bb31bcd968e1aa4612cd976b838f64c75b1fe9b06908a295c952764e8ec4e1481c5bd778d56399dea3
+  data.tar.gz: f26596fbd3173bb4ae3142db67e2fe251d2872549852f122a30d941768dfe68f030893158aaa6fdd5b497ff58e1b86bdc89761f035bf99de1bd290f5d3f7b82b

data/app/controllers/accounts_controller.rb

@@ -24,7 +24,7 @@ class AccountsController < HasAccountsController
     @carry_booking = @bookings.all.first
     @saldo = @account.saldo(@carry_booking, false)
 
-    if @account.is_profit_account? && params[:by_value_period] && params[:by_value_period][:to]
+    if @account.profit_account? && params[:by_value_period] && params[:by_value_period][:to]
       @saldo -= @account.saldo(Date.parse(params[:by_value_period][:from]), false)
     end
 

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

@@ -1,5 +1,7 @@
 - url_params = {:controller => 'accounts', :action => 'show', :id => params[:account_id] || params[:id]}
 
+= paginate @bookings
+
 %table.table.table-striped.bookings.collection
   %thead
     = render 'accounts/booking_list_header'
@@ -8,9 +10,10 @@
 
     - for @booking in @bookings
       - amount = @booking.amount
-      - amount = -(amount) if @account.is_liability_account?
-      - @saldo += amount if @booking.debit_account == @account
-      - @saldo -= amount if @booking.credit_account == @account
+      - amount = -(amount) if @account.liability_account?
+      - @saldo += @booking.accounted_amount(@account)
       = render 'accounts/booking_item'
   %tfoot
     = render 'accounts/booking_list_footer' unless @bookings.empty?
+
+= paginate @bookings

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

@@ -1,4 +1,4 @@
-= contextual_links 'data-remote' => true
+= contextual_links
 
 = boot_page_title(BookingTemplate)
 = render 'booking_templates/list', :item_action => lambda{|object| new_booking_booking_template_path(object)}

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta0"
+  VERSION = "3.0.0.beta1"
 end

metadata

@@ -1,174 +1,153 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta0
-  prerelease: 6
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: has_accounts
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: has_vcards
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n_rails_helpers
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: validates_timeliness
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: has_scope
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: anjlab-bootstrap-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.1.0
 description: HasAccountsEngine is a full featured Rails 3 gem accompanying has_accounts
@@ -181,6 +160,8 @@ extra_rdoc_files:
 - MIT-LICENSE
 - README.md
 files:
+- MIT-LICENSE
+- README.md
 - app/assets/images/16x16/add.png
 - app/assets/images/16x16/alert.png
 - app/assets/images/16x16/combolink.png
@@ -293,7 +274,6 @@ files:
 - app/views/accounts/_booking_item.html.haml
 - app/views/accounts/_booking_list_footer.html.haml
 - app/views/accounts/_booking_list_header.html.haml
-- app/views/accounts/_booking_list_paginate.html.haml
 - app/views/accounts/_booking_list_saldo.html.haml
 - app/views/accounts/_booking_list_turnover.html.haml
 - app/views/accounts/_carry_booking.html.haml
@@ -348,32 +328,28 @@ files:
 - lib/has_accounts_engine.rb
 - lib/has_accounts_engine/railtie.rb
 - lib/has_accounts_engine/version.rb
-- MIT-LICENSE
-- README.md
 homepage: https://github.com/huerlisi/has_accounts_engine
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: HasAccountsEngine provides controllers, views for has_accounts.
 test_files: []
-has_rdoc: 

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

@@ -1,5 +0,0 @@
-%tr
-  - ## TODO: See http://groups.google.com/group/will_paginate/browse_thread/thread/5d702999d78e47e5
-  - url_params = {:controller => 'accounts', :action => 'show', :id => params[:account_id] || params[:id]}
-  %th{:colspan => "6", :style => "text-align: right"}= will_paginate @bookings, :params => url_params.merge(:query => params[:query])
-  %th