vesr 0.10.1 → 0.11.0

data/app/assets/stylesheets/vesr.css

@@ -0,0 +1,15 @@
+tr.esr_record.overpaid {
+  background-color: #FCF8E3;
+}
+
+tr.esr_record.underpaid {
+  background-color: #F2DEDE;
+}
+
+tr.esr_record.resolved {
+  background-color: #DFF0D8;
+}
+
+tr.esr_record.missing {
+  background-color: #D9EDF7;
+}

data/app/controllers/esr_files_controller.rb

@@ -1,2 +1,5 @@
 class EsrFilesController < AuthorizedController
+  before_filter :only => [:index, :show] do
+    EsrRecord.update_unsolved_states
+  end
 end

data/app/controllers/esr_records_controller.rb

@@ -0,0 +1,50 @@
+class EsrRecordsController < AuthorizedController
+  respond_to :html, :js
+
+  before_filter :only => [:index] do
+    EsrRecord.update_unsolved_states
+  end
+
+  # Scopes
+  def index
+    @esr_records = EsrRecord.unsolved.paginate :page => params[:page], :order => 'state, value_date'
+  end
+
+  # State events
+  def write_off
+    @esr_record = EsrRecord.find(params[:id])
+    @esr_record.invoice.write_off("Korrektur nach VESR Zahlung").save
+    @esr_record.write_off!
+
+    respond_to do |format|
+      format.js {}
+      format.html {redirect_to @esr_record.esr_file}
+    end
+  end
+
+  def book_extra_earning
+    @esr_record = EsrRecord.find(params[:id])
+    if invoice = @esr_record.invoice
+      @esr_record.invoice.book_extra_earning("Korrektur nach VESR Zahlung").save
+    else
+      @esr_record.create_extra_earning_booking
+    end
+
+    @esr_record.book_extra_earning!
+    respond_to do |format|
+      format.js {}
+      format.html {redirect_to @esr_record.esr_file}
+    end
+  end
+
+  def resolve
+    @esr_record = EsrRecord.find(params[:id])
+    @esr_record.resolve!
+
+    respond_to do |format|
+
+      format.js {}
+      format.html {redirect_to @esr_record.esr_file}
+    end
+  end
+end

data/app/models/esr_file.rb

@@ -6,10 +6,14 @@ class EsrFile < ActiveRecord::Base
   
   def to_s(format = :default)
     case format
-    when :long
-      esr_records.map{|record| record.to_s}.join("\n")
-    else
+    when :short
       "#{updated_at.strftime('%d.%m.%Y')}: #{esr_records.count} Buchungen"
+    else
+      s = ''
+      esr_records.each {|record|
+        s += record.to_s + "\n"
+      }
+      s
     end
   end
 

data/app/models/esr_record.rb

@@ -4,11 +4,35 @@ class EsrRecord < ActiveRecord::Base
   belongs_to :booking, :dependent => :destroy, :autosave => true
   belongs_to :invoice
   
-  scope :valid, where(:state => 'valid')
-  scope :missing, where(:state => 'missing')
-  scope :bad, where(:state => 'bad')
-  scope :invalid, where(:state => 'invalid')
-  
+  # State Machine
+  include AASM
+  aasm_column :state
+  validates_presence_of :state
+
+  aasm_initial_state :ready
+  aasm_state :ready
+  aasm_state :paid
+  aasm_state :missing
+  aasm_state :overpaid
+  aasm_state :underpaid
+  aasm_state :resolved
+
+  aasm_event :write_off do
+    transitions :from => :underpaid, :to => :resolved
+  end
+
+  aasm_event :resolve do
+    transitions :from => :underpaid, :to => :resolved
+  end
+
+  aasm_event :book_extra_earning do
+    transitions :from => [:overpaid, :missing], :to => :resolved
+  end
+
+  scope :invalid, where(:state => ['overpaid', 'underpaid', 'resolved'])
+  scope :unsolved, where(:state => ['overpaid', 'underpaid', 'missing'])
+  scope :valid, where(:state => 'paid')
+
   private
   def parse_date(value)
     year  = value[0..1].to_i + 2000
@@ -68,14 +92,12 @@ class EsrRecord < ActiveRecord::Base
     self
   end
 
-  # Invoices
-  before_create :assign_invoice, :build_esr_booking
-  
-  private
-  def evaluate_bad
-    if invoice.state == 'paid'
+  def update_remarks
+    if invoice.nil?
+      self.remarks += ", Rechnung ##{invoice_id} nicht gefunden"
+    elsif invoice.state == 'paid'
       # already paid
-      if invoice.amount.currency_round == self.amount.currency_round
+      if invoice.amount == self.amount
         # paid twice
         self.remarks += ", doppelt bezahlt"
       else
@@ -83,8 +105,8 @@ class EsrRecord < ActiveRecord::Base
       end
     elsif !(invoice.active)
       # canceled invoice
-      self.remarks += ", wurde #{invoice.state_adverb}"
-    elsif invoice.amount.currency_round == self.amount.currency_round
+      self.remarks += ", wurde bereits #{invoice.state_adverb}"
+    elsif invoice.amount == self.amount
       # TODO much too open condition (issue #804)
       # reminder fee not paid
       self.remarks += ", Mahnspesen nicht bezahlt"
@@ -93,31 +115,44 @@ class EsrRecord < ActiveRecord::Base
       self.remarks += ", falscher Betrag"
     end
   end
+
+  def update_state
+    if self.invoice.nil?
+      self.state = 'missing'
+      return
+    end
+
+    balance = self.invoice.balance
+    if balance == 0
+      self.state = 'paid'
+    elsif balance > 0
+      self.state = 'underpaid'
+    elsif balance < 0
+      self.state = 'overpaid'
+    end
+  end
+
+  def self.update_unsolved_states
+    self.unsolved.find_each do |e|
+      e.update_state
+      e.save
+    end
+  end
+
+  # Invoices
+  before_create :assign_invoice, :create_esr_booking, :update_remarks, :update_state
   
+  private
   def assign_invoice
     # Prepare remarks to not be null
     self.remarks ||= ''
+
+    self.remarks += "Referenz #{reference}"
+
     if Invoice.exists?(invoice_id)
       self.invoice_id = invoice_id
-      self.remarks += "Referenz #{reference}"
-      if invoice.balance.currency_round != self.amount.currency_round
-        evaluate_bad
-        self.state = "bad"
-      else
-        self.state = "valid"
-      end
     elsif Invoice.column_names.include?(:imported_esr_reference) && imported_invoice = Invoice.find(:first, :conditions => ["imported_esr_reference LIKE concat(?, '%')", reference])
       self.invoice = imported_invoice
-      self.remarks += "Referenz #{reference}"
-      if invoice.balance.currency_round != self.amount.currency_round
-        self.remarks += ", falscher Betrag"
-        self.state = "bad"
-      else
-        self.state = "valid"
-      end
-    else
-      self.remarks += "Rechnung ##{invoice_id} nicht gefunden"
-      self.state = "missing"
     end
   end
   
@@ -125,7 +160,7 @@ class EsrRecord < ActiveRecord::Base
     BankAccount.find_by_esr_id(client_id)
   end
 
-  def build_esr_booking
+  def create_esr_booking
     if invoice
       esr_booking = invoice.bookings.build
     else
@@ -140,8 +175,20 @@ class EsrRecord < ActiveRecord::Base
       :title          => "VESR Zahlung",
       :comments       => remarks)
     
+    esr_booking.save
+ 
     self.booking = esr_booking
     
     return esr_booking
   end
+
+public
+  def create_extra_earning_booking(comments = nil)
+    Booking.create(:title => "Ausserordentlicher Ertrag",
+                   :comments => comments || "Zahlung kann keiner Rechnung zugewiesen werden",
+                   :amount => self.amount,
+                   :debit_account  => Account.find_by_code(Invoice.settings['invoices.extra_earnings_account_code']),
+                   :credit_account => Account.find_by_code(Invoice.settings['invoices.balance_account_code']),
+                   :value_date => Date.today)
+  end
 end

data/app/views/esr_files/_esr_file.html.haml

@@ -1,5 +1,6 @@
 %tr[esr_file]
-  %td= link_to esr_file.updated_at, esr_file
-  %td.currency= esr_file.esr_records.valid.count
-  %td.currency= esr_file.esr_records.invalid.count
-  %td.currency= sprintf("%0.2f", esr_file.esr_records.sum(:amount) || 0.0)
+  %td= link_to l(esr_file.updated_at), esr_file, 'data-href-container' => 'tr'
+  %td.right= esr_file.esr_records.paid.count
+  %td.right= esr_file.esr_records.invalid.count
+  %td.right= esr_file.esr_records.missing.count
+  %td.right= currency_fmt(esr_file.esr_records.sum(:amount) || 0.0)

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

@@ -1,9 +1,10 @@
 %table.list#esr_file_list
   %tr   
     %th= t_attr :updated_at, EsrFile
-    %th.currency= t_attr :bookings, EsrFile
-    %th.currency= t_attr :bad_bookings, EsrFile
-    %th.currency= t_attr :total_amount, EsrFile
+    %th.right= t_attr :bookings, EsrFile
+    %th.right= t_attr :invalid_bookings, EsrFile
+    %th.right= t_attr :missing_bookings, EsrFile
+    %th.right= t_attr :total_amount, EsrFile
     %th.action-links
 
   = render @esr_files

data/app/views/esr_files/_navigation_section.html.erb

@@ -1,5 +1,5 @@
 <%= navigation_section(:esr, {
-      :esr_bookings          => :esr_bookings,
-      :new_esr  => new_esr_booking_path
-#      "Fehlerhafte Buchungen" => bad_esr_bookings_path
+      :esr_files              => :esr_files,
+      :new_esr                => new_esr_file_path,
+      :unresolved_records     => esr_records_path
     }, '48x48/esr.png') %>

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

@@ -0,0 +1,5 @@
+.contextual
+  = link_to t_title(:index), esr_files_path, :class => "icon icon-book"
+
+%h2= t_title
+= render 'form'

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

@@ -1,13 +1,20 @@
 .contextual
   = link_to_function "Protokoll drucken", 'window.print()', :class => "icon icon-print"
   = link_to "VESR Liste", esr_files_path, :class => "icon icon-book"
-%h2
-  VESR Protokoll vom #{l(@esr_file.updated_at.to_date)}
-= render :partial => 'list_records', :object => @esr_file.esr_records.valid
-- unless @esr_file.esr_records.bad.empty?
+  = link_to t_action(:show_all), {:show_valid => true}, :class => 'icon icon-show_all' unless params['show_valid']
+
+%h2 VESR Protokoll vom #{l(@esr_file.updated_at.to_date)}
+
+- unless @esr_file.esr_records.invalid.empty?
   %h3 Falscher Betrag
-  = render :partial => 'list_records', :object => @esr_file.esr_records.bad
+  = render 'esr_records/list', :esr_records => @esr_file.esr_records.invalid
+
 - unless @esr_file.esr_records.missing.empty?
   %h3 Rechnung nicht gefunden
-  = render :partial => 'list_records', :object => @esr_file.esr_records.missing
+  = render 'esr_records/list', :esr_records => @esr_file.esr_records.missing
+
+- if params['show_valid'].present?
+  %h3 Korrekte Zahlungen
+  = render 'esr_records/list', :esr_records => @esr_file.esr_records.valid
+
 = render :partial => 'sidebar'

data/app/views/esr_records/_esr_record.html.haml

@@ -0,0 +1,10 @@
+%tr[esr_record]{:class => esr_record.state}
+  %td= esr_record.value_date
+  %td= link_to esr_record.invoice.customer.to_s, esr_record.invoice.customer if esr_record.invoice
+  %td= esr_record.invoice ? link_to(esr_record.remarks, esr_record.invoice) : esr_record.remarks
+  %td.currency= currency_fmt(esr_record.invoice.amount.currency_round) if esr_record.invoice
+  %td.currency= currency_fmt(esr_record.amount.currency_round)
+  %td.currency= currency_fmt(esr_record.invoice.balance.currency_round) if esr_record.invoice
+  %td.action-links
+    - esr_record.aasm_events_for_current_state.each do |event|
+      = link_to image_tag("16x16/#{event}.png"), polymorphic_url([event, esr_record]), :remote => true, :method => :post, :title => t_action(event)

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

@@ -0,0 +1,11 @@
+%table.list{:style => "width: 100%"}
+  %tr
+    %th= t_attr :value_date, EsrRecord
+    %th= t_attr :customer, EsrRecord
+    %th= t_attr :state, EsrRecord
+    %th.currency= t_attr :amount, EsrRecord
+    %th.currency= t_attr :payment_amount, EsrRecord
+    %th.currency= t_attr :saldo, EsrRecord
+    %th.action-links
+
+  = render @esr_records || esr_records

data/app/views/esr_records/book_extra_earning.js.erb

@@ -0,0 +1 @@
+jQuery('#esr_record_<%= @esr_record.id %>').replaceWith('<%= escape_javascript(render @esr_record) %>');

data/app/views/esr_records/resolve.js.erb

@@ -0,0 +1 @@
+jQuery('#esr_record_<%= @esr_record.id %>').replaceWith('<%= escape_javascript(render @esr_record) %>');

data/app/views/esr_records/write_off.js.erb

@@ -0,0 +1 @@
+jQuery('#esr_record_<%= @esr_record.id %>').replaceWith('<%= escape_javascript(render @esr_record) %>');

data/config/locales/de.yml

@@ -10,12 +10,14 @@ de:
         file:       Dateiname
         updated_at: Verbucht am
         bookings:   Buchungen
-        bad_bookings: Fehlerhafte Buchungen
+        invalid_bookings: Fehlerhafte Buchungen
+        missing_bookings: Rechnung nicht gefunden
         total_amount: Total (inkl. fehlerhaft)
+        uploaded_data: Datei
       esr_record:
         bank_pc_id:       Teilnehmer-Nr.
         reference:        Referenz
-        amount:           Betrag
+        amount:           Rechnungsbetrag
         transaction_date: Transaktionsdatum
         payment_amount:   Zahlbetrag
         payment_date:     Zahldatum
@@ -26,3 +28,19 @@ de:
         booking:          Buchung
         state:            Status
         remarks:          Bemerkungen
+
+  # Titles
+  esr_files:
+    new:
+      title:              VESR Datei einlesen
+    index:
+      index:              VESR Liste
+
+  # CRUD
+  crud:
+    action:
+      show_all:           Alle anzeigen
+      reactivate:         Reaktivieren
+      write_off:          Abschreiben
+      book_extra_earning: Ausserordentlicher Gewinn verbuchen
+      resolve:            Als erledigt markieren

data/config/routes.rb

@@ -1,3 +1,8 @@
 Rails.application.routes.draw do
   resources :esr_files
+  resources :esr_records do
+    member do
+      post :write_off, :book_extra_earning, :resolve
+    end
+  end
 end

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.10.1"
+  VERSION = "0.11.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 51
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 1
-  version: 0.10.1
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-03-02 00:00:00 Z
 dependencies: []
 
 description: VESR provides support for ESR number calculations and gives ready to use Rails components.
@@ -31,7 +31,14 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 files: 
+- app/assets/images/16x16/book_extra_earning.png
+- app/assets/images/16x16/reactivate.png
+- app/assets/images/16x16/resolve.png
+- app/assets/images/16x16/show_all.png
+- app/assets/images/16x16/write_off.png
+- app/assets/stylesheets/vesr.css
 - app/controllers/esr_files_controller.rb
+- app/controllers/esr_records_controller.rb
 - app/models/esr_file.rb
 - app/models/esr_record.rb
 - app/uploaders/esr_file_uploader.rb
@@ -40,7 +47,13 @@ files:
 - app/views/esr_files/_list_records.html.haml
 - app/views/esr_files/_navigation_section.html.erb
 - app/views/esr_files/_sidebar.html.haml
+- app/views/esr_files/new.html.haml
 - app/views/esr_files/show.html.haml
+- app/views/esr_records/_esr_record.html.haml
+- app/views/esr_records/_list.html.haml
+- app/views/esr_records/book_extra_earning.js.erb
+- app/views/esr_records/resolve.js.erb
+- app/views/esr_records/write_off.js.erb
 - config/locales/de.yml
 - config/routes.rb
 - db/migrate/1_create_vesr_tables.rb
@@ -81,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: VESR invoice support library.