has_accounts_engine 3.0.0.beta7 → 3.0.0.beta8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d02380a3cb2d5eda13943a8ecbb569a3d81ba9
-  data.tar.gz: dee2443a0c07e4bd3ccb1d60c4c85ba17abff87e
+  metadata.gz: 07ebaba05025b7323e2305a1bab6984a8d9770d4
+  data.tar.gz: 1faf2a6f349e8ccd7a17af7e8c35ef37004fdec5
 SHA512:
-  metadata.gz: 2d8d4d1bf8a5cd7ccaf712294a8c9f553b954f965d6a30b3e55b4434ffcd494bbe265357248849f54554bbc9e1d8697458c43b3271ac765c832f6d05f88f72f6
-  data.tar.gz: 6fd8b0e24235e7d1b37ce4939e5403606ac8071daa5adf29a2dbcc82a4882ae3b20ba165f35bb11253a1890a981a7c5997ffdbcba6d277caef77476ca3a41a80
+  metadata.gz: 39c77f7dc025d83e5ece2de093d6f85adadd9f77d4a627268557d5e3e0e4af861d3d33db75198d822e3c18f8bca9ab80780de03aee1d4be3986f51ab5fa29c9c
+  data.tar.gz: 93f27bb7728660a19b82fe486763f8470b1de74b671570c615657e0d09058ed35d155dd96c1abf0a503e1541ad3d7584d2c0860e81cbc8ffe03513ad460d1c3d

data/app/controllers/accounts_controller.rb

@@ -6,7 +6,7 @@ class AccountsController < HasAccountsController
   has_scope :page, :only => :index
 
   def index
-    @accounts = apply_scopes(Account).includes(:account_type).includes(:credit_bookings, :credit_bookings).page(params[:page]).per_page(100)
+    @accounts = collection.includes(:account_type).includes(:credit_bookings, :credit_bookings).page(params[:page]).per_page(100)
   end
 
   def show

data/app/controllers/booking_templates_controller.rb

@@ -1,15 +1,11 @@
 class BookingTemplatesController < HasAccountsController
   # Actions
   def create
-    create! do |success, failure|
-      success.html { redirect_to collection_path }
-    end
+    create! { collection_path }
   end
 
   def update
-    update! do |success, failure|
-      success.html { redirect_to collection_path }
-    end
+    update! { collection_path }
   end
 
   def new_booking
@@ -18,6 +14,6 @@ class BookingTemplatesController < HasAccountsController
     booking_params[:code]       ||= (Booking.maximum(:code) || 0) + 1
     booking_parameters = @booking_template.booking_parameters(booking_params)
 
-    redirect_to simple_edit_bookings_path(:booking => booking_parameters)
+    redirect_to new_booking_path(:booking => booking_parameters)
   end
 end

data/app/controllers/bookings_controller.rb

@@ -5,18 +5,6 @@ class BookingsController < HasAccountsController
   has_scope :by_date, :using => [:from, :to]
 
   # Actions
-  def index
-    # @bookings = apply_scopes(Booking).accessible_by(current_ability, :list).includes(:credit_account, :debit_account).paginate(:page => params[:page], :per_page => params[:per_page])
-    index!
-  end
-
-  def new
-    @booking = Booking.new(:value_date => Date.today)
-    # Only include base class records
-    @booking_templates = BookingTemplate.where(:type => [nil, 'BookingTemplate']).where("NOT(code LIKE '%:%')").paginate(:page => params[:page])
-    new!
-  end
-
   def select_booking
     @booking = Booking.find(params[:id]).dup
 
@@ -27,11 +15,7 @@ class BookingsController < HasAccountsController
     # Take value date from form
     @booking.value_date = params[:booking][:value_date]
 
-    render :action => 'simple_edit'
-  end
-
-  def simple_edit
-    new!
+    render :action => 'edit'
   end
 
   def select
@@ -42,14 +26,7 @@ class BookingsController < HasAccountsController
   end
 
   def create
-    @booking = Booking.new(params[:booking])
-
-    create! do |success, failure|
-      success.html do
-        redirect_to new_booking_path
-      end
-      failure.html {render 'edit'}
-    end
+    create! { new_booking_path }
   end
 
   def copy

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

@@ -1,7 +1,7 @@
 .contextual
-  = icon_link_to 'only_debit_bookings', url_for(:only_debit_bookings => true) unless params[:only_debit_bookings]
-  = icon_link_to 'only_credit_bookings', url_for(:only_credit_bookings => true) unless params[:only_credit_bookings]
-  = icon_link_to 'all_bookings', @account if params[:only_credit_bookings] || params[:only_debit_bookings]
+  = icon_link_to :only_debit_bookings, url_for(:only_debit_bookings => true) unless params[:only_debit_bookings]
+  = icon_link_to :only_credit_bookings, url_for(:only_credit_bookings => true) unless params[:only_credit_bookings]
+  = icon_link_to :all_bookings, @account if params[:only_credit_bookings] || params[:only_debit_bookings]
   = contextual_links_for
 
 = boot_page_title

data/config/locales/de.yml

@@ -71,5 +71,6 @@ de:
   crud:
     action:
       copy:                 Kopieren
+      all_bookings:         Alle
       only_credit_bookings: Nur Soll
       only_debit_bookings:  Nur Haben

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
         title:          Title
         saldo:          Saldo
         account_type:   Account Type
+        tag_list:       Tags
       account_type:
         name:           Name
         title:          Title
@@ -60,9 +61,16 @@ en:
       title:            Booking Journal
     copy:
       title:            Copy Booking
+    search:
+      by_text:          Content
+      by_amount_from:   Amount from
+      by_amount_to:     Amount to
+      by_date_from:     Date from
+      by_date_to:       Date to
 
   crud:
     action:
-      copy:                 Kopieren
+      copy:                 Copy
+      all_bookings:         All
       only_credit_bookings: Only Credit
       only_debit_bookings:  Only Debit

data/config/routes.rb

@@ -6,7 +6,6 @@ Rails.application.routes.draw do
   resources :bookings do
     collection do
       post :select
-      get :simple_edit
     end
     member do
       get :select_booking

data/lib/has_accounts_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta7
+  version: 3.0.0.beta8
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-28 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -295,16 +295,12 @@ files:
 - app/views/bookings/_form.html.haml
 - app/views/bookings/_form_fields.html.haml
 - app/views/bookings/_list.html.haml
-- app/views/bookings/_new_form.html.haml
 - app/views/bookings/_sidebar.html.haml
-- app/views/bookings/_simple_form.html.haml
 - app/views/bookings/index.html.haml
 - app/views/bookings/index.js.erb
-- app/views/bookings/new.html.haml
 - app/views/bookings/select.html.haml
 - app/views/bookings/show.html.haml
 - app/views/bookings/show.js.erb
-- app/views/bookings/simple_edit.html.haml
 - app/views/bookings/update.js.erb
 - app/views/has_accounts/_form.html.haml
 - app/views/has_accounts/_list.html.haml
@@ -356,3 +352,4 @@ signing_key:
 specification_version: 4
 summary: HasAccountsEngine provides controllers, views for has_accounts.
 test_files: []
+has_rdoc: 

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

@@ -1,8 +0,0 @@
-= simple_form_for @booking, :url => select_bookings_path do |f|
-  = hidden_field_tag :stage, 'select'
-  .row-fluid
-    .span8= f.input :title, :input_html => {'data-autofocus' => true}
-    .span4= f.input :value_date, :as => :date_field, :input_html => {:size => 10, :style => 'text-align: right'}
-
-  .form-actions
-    = f.button :submit

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

@@ -1,25 +0,0 @@
-= simple_form_for @booking do |f|
-
-  .row-fluid
-    .span6
-      = f.input :title, :input_html => {"data-autofocus" => true}
-    .span6
-      = f.input :value_date, :as => :date_field
-  .row-fluid
-    .span6
-      = f.input :amount, :as => :string, :input_html => {:size => 12}
-    .span6
-      = f.input :code
-
-  .row-fluid
-    .span6
-      = f.association :debit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
-    .span6
-      = f.association :credit_account, :collection => accounts_as_collection(Account.all), :as => :combobox
-
-  .row-fluid
-    .span12
-      = f.input :comments, :input_html => {:rows => 4}
-
-  .form-actions
-    = f.button :submit

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

@@ -1,8 +0,0 @@
-= contextual_links
-
-= boot_page_title(BookingTemplate)
-= render 'booking_templates/list', :item_action => lambda{|object| new_booking_booking_template_path(object)}
-
-= boot_page_title
-= render 'new_form'
-

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

@@ -1,4 +0,0 @@
-= contextual_links
-
-= boot_page_title :new
-= render 'simple_form'