has_accounts_engine 1.0.4 → 1.1.0

data/app/controllers/booking_templates_controller.rb

@@ -0,0 +1,23 @@
+class BookingTemplatesController < AuthorizedController
+  # Actions
+  def create
+    create! do |success, failure|
+      success.html { redirect_to collection_path }
+    end
+  end
+
+  def update
+    update! do |success, failure|
+      success.html { redirect_to collection_path }
+    end
+  end
+
+  def new_booking
+    booking_params = params[:booking] || {}
+    booking_params[:value_date] ||= Date.today
+    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)
+  end
+end

data/app/controllers/simple_bookings_controller.rb

@@ -0,0 +1,39 @@
+# encoding: UTF-8
+
+class SimpleBookingsController < ApplicationController
+  # GET /bookings/new
+  def new
+    params[:booking] ||= {}
+
+    if invoice_id = params[:invoice_id]
+      params[:booking][:reference_id] = invoice_id
+      params[:booking][:reference_type] = 'Invoice'
+    end
+
+    if template_id = params[:booking_template_id]
+      template = BookingTemplate.find(template_id)
+      @booking = template.build_booking(params[:booking])
+    else
+      @booking = Booking.new
+    end
+    @booking.value_date = Date.today
+
+    render 'show_modal'
+  end
+
+  # PUT /booking
+  def create
+    if params[:invoice_id]
+      @invoice = Invoice.find(params[:invoice_id])
+      @booking = @invoice.bookings.build(params[:booking])
+    else
+      @booking = Booking.new(params[:booking])
+    end
+
+    if @booking.save
+      flash[:notice] = 'Buchung erfasst.'
+    end
+
+    redirect_to @invoice
+  end
+end

data/app/helpers/booking_template_helper.rb

@@ -0,0 +1,17 @@
+module BookingTemplateHelper
+  def amount_relations_as_collection
+    relations = ['reference_amount', 'reference_balance', 'reference_amount_minus_balance']
+    relations.inject({}) do |result, relation|
+      result[t(relation, :scope => 'booking_template.relation')] = relation
+      result
+    end
+  end
+
+  def amount_to_s(booking_template)
+    if booking_template.amount_relates_to.present?
+      return "%.2f%%" % (booking_template.amount.to_f * 100)
+    else
+      return currency_fmt(booking_template.amount)
+    end
+  end
+end

data/app/views/booking_templates/_booking_template.html.haml

@@ -0,0 +1,12 @@
+- item_action ||= lambda{|object| url_for(object)}
+
+%tr[booking_template]
+  %td
+    = link_to "%s" % [booking_template.title, booking_template.code], item_action.call(booking_template), 'data-href-container' => 'tr'
+    - if booking_template.comments.present?
+      %hr{:style => "height: 1px; margin: 0"}/
+      %i= booking_template.comments
+  %td= link_to booking_template.credit_account.code, account_path(booking_template.credit_account), :title => booking_template.credit_account.title unless booking_template.credit_account.nil?
+  %td= link_to booking_template.debit_account.code, account_path(booking_template.debit_account), :title => booking_template.debit_account.title unless booking_template.debit_account.nil?
+  %td.currency= amount_to_s(booking_template)
+  %td= t(booking_template.amount_relates_to, :scope => 'booking_template.relation') if booking_template.amount_relates_to.present?

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

@@ -0,0 +1,26 @@
+= simple_form_for @booking_template do |f|
+  .row-fluid
+    .span6
+      = f.input :title, :input_html => {"data-autofocus" => true}
+    .span6
+      = f.input :code
+  .row-fluid
+    .span6
+      = f.association :credit_account, :as => :combobox, :collection => accounts_as_collection, :input_html => {:class => 'span6'}
+    .span6
+      = f.association :debit_account, :as => :combobox, :collection => accounts_as_collection, :input_html => {:class => 'span6'}
+  .row-fluid
+    .span6
+      = f.input :amount
+    .span6
+      = f.input :amount_relates_to, :collection => amount_relations_as_collection
+  .row-fluid
+    .span12
+      = f.input :tag_list, :input_html => {:class => 'select2-tags'}
+
+  .row-fluid
+    .span12
+      = f.input :comments, :input_html => {:rows => 5, :class => 'span12'}
+
+  .form-actions
+    = f.button :submit

data/app/views/booking_templates/_list.html.haml

@@ -0,0 +1,11 @@
+%table.table.table-striped.booking_templates.collection
+  %thead
+    %tr
+      %th= t_attr :title, BookingTemplate
+      %th= t_attr :credit_account, BookingTemplate
+      %th= t_attr :debit_account, BookingTemplate
+      %th.currency= t_attr 'amount', BookingTemplate
+      %th= t_attr :amount_relates_to, BookingTemplate
+      %th.action-links
+    %tbody
+      = render @booking_templates, :item_action => (item_action ||= nil)

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

@@ -6,7 +6,7 @@
       = f.input :value_date, :as => :date_field
   .row-fluid
     .span6
-      = f.input :amount, :as => :string, :input_html => {:size => 12}
+      = f.input :amount, :as => :string
     .span6
       = f.input :code
 
@@ -25,4 +25,5 @@
       = f.input :reference_type, :as => :hidden, :input_html => {:value => 'Invoice'}
       //= f.association :reference, :collection => suggested_invoices_for_booking(@booking, :include_all => true), :as => :combobox, :include_blank => true
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

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

@@ -0,0 +1,18 @@
+= simple_form_for @booking, :url => invoice_simple_bookings_path do |f|
+  = f.input :debit_account_id, :as => :hidden
+  = f.input :credit_account_id, :as => :hidden
+  = f.input :reference_id, :as => :hidden
+  = f.input :reference_type, :as => :hidden
+
+  .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
+
+  .row-fluid
+    .span12
+      = f.input :comments, :input_html => {:rows => 4, :class => 'span12'}

data/app/views/simple_bookings/_show_modal.html.haml

@@ -0,0 +1,9 @@
+.modal{:style => 'width: 80%; left: 10%; margin-left: 0'}
+  = modal_header t_title(:new, Booking)
+
+  .modal-body{:style => 'min-height: 30em'}
+    = render 'form'
+
+  .modal-footer
+    = link_to t_action(:new), '#', :class => 'btn submit-button'
+    = link_to t_action(:cancel), '#', :class => 'btn', 'data-dismiss' => 'modal'

data/config/locales/de.yml

@@ -7,6 +7,7 @@ de:
       bank:             Bank
       account_type:     Kontentyp
       booking:          Buchung
+      booking_template: Buchungsvorlage
 
     attributes:
       account:
@@ -43,6 +44,13 @@ de:
         destroy:        Löschen
         valuta:         Valuta
         value:          Betrag
+      booking_template:
+        amount_relates_to: "Relativ zu"
+        charge_rate_code: Abgabesatz
+        credit_account: Soll
+        debit_account: Haben
+        reference: Referenz
+        value_date: Valutadatum
 
   form:
     bank:

data/lib/has_accounts_engine/version.rb

@@ -1,3 +1,3 @@
 module HasAccountsEngine
-  VERSION = "1.0.4"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: has_accounts_engine
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,8 +136,11 @@ files:
 - app/controllers/accounts_controller.rb
 - app/controllers/bank_accounts_controller.rb
 - app/controllers/banks_controller.rb
+- app/controllers/booking_templates_controller.rb
 - app/controllers/bookings_controller.rb
+- app/controllers/simple_bookings_controller.rb
 - app/helpers/account_helper.rb
+- app/helpers/booking_template_helper.rb
 - app/views/accounts/_account.html.haml
 - app/views/accounts/_booking_item.html.haml
 - app/views/accounts/_booking_list_footer.html.haml
@@ -161,6 +164,9 @@ files:
 - app/views/bank_accounts/_form.html.haml
 - app/views/banks/_bank.html.haml
 - app/views/banks/_form.html.haml
+- app/views/booking_templates/_booking_template.html.haml
+- app/views/booking_templates/_form.html.haml
+- app/views/booking_templates/_list.html.haml
 - app/views/bookings/_booking.html.haml
 - app/views/bookings/_form.html.haml
 - app/views/bookings/_list.html.haml
@@ -171,6 +177,8 @@ files:
 - app/views/bookings/select.html.haml
 - app/views/bookings/show.html.haml
 - app/views/bookings/simple_edit.html.haml
+- app/views/simple_bookings/_form.html.haml
+- app/views/simple_bookings/_show_modal.html.haml
 - config/locales/de.yml
 - config/locales/en.yml
 - config/routes.rb