has_accounts_engine 3.0.0.beta10 → 3.0.0.beta11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76006e88be871b79e33bca9f8ceb7780218bd15f
-  data.tar.gz: 0483ee9a50458ca0897698df090732c5af74c3ab
+  metadata.gz: 1a9a0fc966a5f625dece331009a3d9f15d95d34e
+  data.tar.gz: f96c0f4ee3acf648b9bd1a25db88e184d0061431
 SHA512:
-  metadata.gz: 20442b5840215e0e66941993bc216fd527a83314f23666f230edcc3a8a3bc0acdc8b39f1a80f1d157a53dda619ebd2e35ec490dc2f36442940d6b19d6293c8ad
-  data.tar.gz: 3e6e6282189af1eff23eb6124c1399293054067c8811ba38edea850205c91ef0c40a9a261426752878c474f6e11d06790eb7653d6cc415133af20a7c98d8bc8b
+  metadata.gz: 5b8fec12a5c69246ec8e23179105a98c65db7d62ea1be2c573d0f397b5f15b88e0fdb431864519c503833cabe580625232663007977aedc7f605c69a218ca6d9
+  data.tar.gz: f1e334312c52edcdd66c233c442e423932a7d3cc4d4aba8d959eea1a8c7dc3dc4948ce1a93f1c9255d032b241b1dbe5fb4266cdefe2c500027b4fa9326455df8

data/app/controllers/accounts_controller.rb

@@ -12,7 +12,8 @@ class AccountsController < HasAccountsController
   def show
     @account = Account.find(params[:id])
     @bookings = apply_scopes(Booking).includes(:debit_account => :account_type, :credit_account => :account_type).by_account(@account)
-    @bookings = @bookings.page(params[:page]) || 1
+    @bookings = @bookings.page(params[:page] || 1)
+    @bookings = @bookings.per_page(params[:per_page].to_i) if params[:per_page].present?
 
     if params[:only_credit_bookings]
       @bookings = @bookings.where(:credit_account_id => @account.id)

data/app/controllers/bookings_controller.rb

@@ -1,5 +1,6 @@
 class BookingsController < HasAccountsController
   # Scopes
+  has_scope :by_code
   has_scope :by_text
   has_scope :by_amount, :using => [:from, :to]
   has_scope :by_date, :using => [:from, :to]

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

@@ -0,0 +1,13 @@
+= simple_form_for '', :method => :get, remote: true do |f|
+  .container-fluid
+    .row-fluid
+      .span3= f.input :by_code, label: t_attr(:code), required: false
+      .span6= f.input :by_text, label: t(:by_text, scope: 'bookings.search'), required: false
+    .row-fluid
+      .span3= f.input 'by_amount[from]', label: t(:by_amount_from, scope: 'bookings.search'), required: false
+      .span3= f.input 'by_amount[to]', label: t(:by_amount_to, scope: 'bookings.search'), required: false
+      .span3= f.input 'by_date[from]', label: t(:by_date_from, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:from]) }
+      .span3= f.input 'by_date[to]', label: t(:by_date_to, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:to]) }
+
+  .form-actions
+    = f.button :submit, t_action(:search)

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

@@ -1,5 +1,5 @@
-= simple_form_for @booking do |f|
-  = render 'form_fields', resource: @booking, f: f
+= simple_form_for resource, remote: true do |f|
+  = render 'form_fields', resource: resource, f: f
 
   .form-actions
     = f.button :submit

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

@@ -2,18 +2,7 @@
 
 = boot_page_title
 
-= simple_form_for '', :method => :get, remote: true do |f|
-  .container-fluid
-    .row-fluid
-      .span6= f.input :by_text, label: t(:by_text, scope: 'bookings.search'), required: false
-    .row-fluid
-      .span3= f.input 'by_amount[from]', label: t(:by_amount_from, scope: 'bookings.search'), required: false
-      .span3= f.input 'by_amount[to]', label: t(:by_amount_to, scope: 'bookings.search'), required: false
-      .span3= f.input 'by_date[from]', label: t(:by_date_from, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:from]) }
-      .span3= f.input 'by_date[to]', label: t(:by_date_to, scope: 'bookings.search'), required: false, input_html: { value: try_parse_date(params[:by_date][:to]) }
-
-  .form-actions
-    = f.button :submit, t_action(:search)
+= render 'filter_form'
 
 .index
   = render 'list'

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "3.0.0.beta10"
+  VERSION = "3.0.0.beta11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta10
+  version: 3.0.0.beta11
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-03 00:00:00.000000000 Z
+date: 2015-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -292,6 +292,7 @@ files:
 - app/views/booking_templates/_list.html.haml
 - app/views/bookings/_booking.html.haml
 - app/views/bookings/_booking_form.html.haml
+- app/views/bookings/_filter_form.html.haml
 - app/views/bookings/_form.html.haml
 - app/views/bookings/_form_fields.html.haml
 - app/views/bookings/_list.html.haml