vesr 0.1.0 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

data/app/controllers/esr_bookings_controller.rb

@@ -0,0 +1,62 @@
+require 'action_controller/test_process.rb'
+
+class EsrBookingsController < ApplicationController
+  # GET /esr_bookings
+  def index
+    @esr_files = EsrFile.paginate(:page => params['page'], :per_page => 20, :order => 'updated_at DESC')
+    
+    respond_to do |format|
+      format.html {
+        render :action => 'list'
+      }
+    end
+  end
+
+  # GET /esr_bookings/new
+  def new
+    @esr_file = EsrFile.new
+
+    respond_to do |format|
+      format.html {
+        render :partial => 'form', :layout => 'application'
+      }
+      format.js { }
+    end
+  end
+
+  # POST /esr_bookings
+  def create
+    # if :filename param is set, file exists
+    if params[:filename]
+      vesr_path = params[:filename]
+      
+      @esr_file = EsrFile.new(:uploaded_data => ActionController::TestUploadedFile.new(vesr_path))
+    else
+      @esr_file = EsrFile.new(params[:esr_file])
+    end
+
+    if @esr_file.save
+      # Delete file if saved as attachment
+      File.delete(vesr_path) if vesr_path
+    end
+    
+    respond_to do |format|
+      format.html {
+        redirect_to :action => 'show', :id => @esr_file
+      }
+      format.js { }
+    end
+  end
+
+  # GET /esr_bookings/1
+  def show
+    @esr_file = EsrFile.find(params[:id])
+    
+    respond_to do |format|
+      format.html {
+        render :action => 'show'
+      }
+      format.js { }
+    end
+  end
+end

data/app/models/esr_file.rb

@@ -0,0 +1,26 @@
+class EsrFile < ActiveRecord::Base
+  has_attachment :storage => :file_system
+  has_many :esr_records, :dependent => :destroy
+  
+  def to_s(format = :default)
+    case format
+    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
+
+  after_save :create_records
+
+  private
+  def create_records
+    File.new(full_filename).each {|line|
+      self.esr_records << EsrRecord.new.parse(line) unless line[0..2] == '999'
+    }
+  end
+end

data/app/models/esr_record.rb

@@ -0,0 +1,147 @@
+class EsrRecord < ActiveRecord::Base
+  belongs_to :esr_file
+  
+  belongs_to :booking, :dependent => :destroy
+  belongs_to :invoice
+  
+  named_scope :valid, :conditions => "state = 'valid'"
+  named_scope :missing, :conditions => "state = 'missing'"
+  named_scope :bad, :conditions => "state = 'bad'"
+  named_scope :invalid, :conditions => "state != 'valid'"
+  
+  private
+  def parse_date(value)
+    year  = value[0..1].to_i + 2000
+    month = value[2..3].to_i
+    day   = value[4..5].to_i
+
+    return Date.new(year, month, day)
+  end
+
+  def payment_date=(value)
+    write_attribute(:payment_date, parse_date(value))
+  end
+  
+  def transaction_date=(value)
+    write_attribute(:transaction_date, parse_date(value))
+  end
+  
+  def value_date=(value)
+    write_attribute(:value_date, parse_date(value))
+  end
+  
+  def reference=(value)
+    write_attribute(:reference, value[0..-2])
+  end
+
+  public
+  def to_s
+    "CHF #{amount} for client #{client_id} on #{value_date}, reference #{reference}"
+  end
+
+  def client_id
+    reference[0..5]
+  end
+
+  def invoice_id
+    reference[19..-1].to_i
+  end
+
+  def patient_id
+    reference[6..18].to_i
+  end
+
+  def parse(line)
+#    self.recipe_type       = line[0, 1]
+    self.bank_pc_id        = line[3..11]
+    self.reference         = line[12..38]
+    self.amount            = BigDecimal.new(line[39..48]) / 100
+    self.payment_reference = line[49..58]
+    self.payment_date      = line[59..64]
+    self.transaction_date  = line[65..70]
+    self.value_date        = line[71..76]
+    self.microfilm_nr      = line[77..85]
+    self.reject_code       = line[86, 1]
+    self.reserved          = line[87,95]
+    self.payment_tax       = line[96..99]
+
+    self
+  end
+
+  # Invoices
+  before_create :assign_invoice, :create_esr_booking
+  
+  private
+  def evaluate_bad
+    if invoice.state == 'paid'
+      # already paid
+      if invoice.amount.currency_round == self.amount.currency_round
+        # paid twice
+        self.remarks += ", doppelt bezahlt"
+      else
+        self.remarks += ", bereits bezahlt"
+      end
+    elsif !(invoice.active)
+      # canceled invoice
+      self.remarks += ", wurde #{invoice.state_adverb}"
+    elsif invoice.amount.currency_round == self.amount.currency_round
+      # TODO much too open condition (issue #804)
+      # reminder fee not paid
+      self.remarks += ", Mahnspesen nicht bezahlt"
+    else
+      # bad amount
+      self.remarks += ", falscher Betrag"
+    end
+  end
+  
+  def assign_invoice
+    if Invoice.exists?(invoice_id)
+      self.invoice_id = invoice_id
+      self.remarks += "Referenz #{reference}"
+      if invoice.due_amount.currency_round != self.amount.currency_round
+        evaluate_bad
+        self.state = "bad"
+      else
+        self.state = "valid"
+      end
+    elsif imported_invoice = Invoice.find(:first, :conditions => ["imported_esr_reference LIKE concat(?, '%')", reference])
+      self.invoice = imported_invoice
+      self.remarks += "Referenz #{reference}"
+      if invoice.due_amount.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
+  
+  def vesr_account
+    BankAccount.find_by_esr_id(client_id)
+  end
+
+  def create_esr_booking
+    if invoice
+      esr_booking = invoice.bookings.build
+    else
+      esr_booking = Booking.new
+    end
+    
+    esr_booking.update_attributes(
+      :amount         => amount,
+      :credit_account => vesr_account,
+      :debit_account  => Invoice::DEBIT_ACCOUNT,
+      :value_date     => value_date,
+      :title          => "VESR Zahlung",
+      :comments       => remarks)
+    
+    esr_booking.save
+ 
+    self.booking = esr_booking
+    
+    return esr_booking
+  end
+end

data/app/views/esr_bookings/_form.html.erb

@@ -0,0 +1,8 @@
+<div class="contextual">
+  <%= link_to "VESR Liste", esr_bookings_path, :class => "icon icon-book" %>
+</div>
+<h2>VESR Datei einlesen</h2>
+<% form_for :esr_file, :url => esr_bookings_path, :html => { :multipart => true } do |esr_file| %>
+  Datei: <%= esr_file.file_field :uploaded_data %>
+  <%= esr_file.submit 'Einlesen' %>
+<% end %>

data/app/views/esr_bookings/_item.html.erb

@@ -0,0 +1,6 @@
+<tr id="esr_file_<%= item.id %>">
+  <td><%= link_to l(item.updated_at), esr_booking_path(item) %></td>
+  <td style="text-align: right"><%=h item.esr_records.valid.count %></td>
+  <td style="text-align: right"><%=h item.esr_records.invalid.count %></td>
+  <td style="text-align: right"><%=h sprintf("%0.2f", item.esr_records.sum(:amount) || 0.0) %></td>
+</tr>

data/app/views/esr_bookings/_list_footer.html.erb

@@ -0,0 +1,3 @@
+<tr>
+  <th colspan="5" style="text-align: right"><%= will_paginate @esr_files, :params => {:query => params[:query]} %></th>
+</tr>

data/app/views/esr_bookings/_list_header.html.erb

@@ -0,0 +1,7 @@
+<tr>
+  <th>Verbucht am</th>
+  <th>Buchungen</th>
+  <th>Fehlerhafte Buchungen</th>
+  <th style="text-align: right">Total (inkl. fehlerh.)</th>
+  <th/>
+</tr>

data/app/views/esr_bookings/_list_records.html.erb

@@ -0,0 +1,21 @@
+<table class="list" style="width: 100%">
+<tr>
+  <th>Valuta Datum</th>
+  <th>Patient</th>
+  <th>Status</th>
+  <th style="text-align: right">Rechnungsbetrag</th>
+  <th style="text-align: right">Bezahlbetrag</th>
+  <th style="text-align: right">Saldo</th>
+</tr>
+
+<% for esr_record in list_records %>
+  <tr>
+    <td><%=h esr_record.value_date %></td>
+    <td><%= link_to esr_record.invoice.patient.to_s, esr_record.invoice if esr_record.invoice %></td>
+    <td><%= esr_record.invoice ? link_to(esr_record.remarks, esr_record.invoice) : esr_record.remarks %></td>
+    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.invoice.amount.currency_round) if esr_record.invoice %></td>
+    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.amount.currency_round) %></td>
+    <td style="text-align: right"><%=h sprintf("%0.2f", esr_record.invoice.due_amount.currency_round) if esr_record.invoice %></td>
+  </tr>
+<% end %>
+</table>

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

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

data/app/views/esr_bookings/_sidebar.html.erb

@@ -0,0 +1,10 @@
+<% content_for :sidebar do %>
+<div class="sub-tabs">
+  <h3>Ältere Buchungsläufe</h3>
+  <ul>
+    <% for esr_file in EsrFile.find :all, :limit => 10, :order => 'updated_at DESC' %>
+      <li><%= link_to esr_file.to_s(:short), esr_booking_path(esr_file) %></li>
+    <% end %>
+  </ul>
+</div>
+<% end %>

data/app/views/esr_bookings/list.html.erb

@@ -0,0 +1,14 @@
+<div class="contextual">
+  <%= link_to "VESR Datei einlesen", new_esr_booking_path, :class => "icon icon-book" %>
+</div>
+
+<h2>VESR Buchungsläufe</h2>
+<div id="vesr_list">
+  <table class="list">
+    <%= render :partial => 'esr_bookings/list_header' %>
+    <%= render :partial => 'esr_bookings/item', :collection => @esr_files %>
+    <%= render :partial => 'esr_bookings/list_footer' %>
+  </table>
+</div>
+
+<%= render :partial => 'sidebar' %>

data/app/views/esr_bookings/show.html.erb

@@ -0,0 +1,18 @@
+<div class="contextual">
+  <%= link_to_function "Protokoll drucken", 'window.print()', :class => "icon icon-print" %>
+  <%= link_to "VESR Liste", esr_bookings_path, :class => "icon icon-book" %>
+</div>
+<h2>VESR Protokoll vom <%= l(@esr_file.updated_at.to_date) %></h2>
+<%= render :partial => 'list_records', :object => @esr_file.esr_records.valid %>
+
+<% unless @esr_file.esr_records.bad.empty? %>
+  <h3>Falscher Betrag</h3>
+  <%= render :partial => 'list_records', :object => @esr_file.esr_records.bad %>
+<% end %>
+
+<% unless @esr_file.esr_records.missing.empty? %>
+  <h3>Rechnung nicht gefunden</h3>
+  <%= render :partial => 'list_records', :object => @esr_file.esr_records.missing %>
+<% end %>
+
+<%= render :partial => 'sidebar' %>

data/lib/vesr/prawn/esr_recipe.rb

@@ -27,7 +27,7 @@ module Prawn
         text vcard.street_address
         text vcard.postal_code + " " + vcard.locality
 
-        move_down cm2pt(0.7)
+        move_down cm2pt(0.8)
         indent cm2pt(2.3) do
           font_size 9 do
             text esr_account.pc_id
@@ -37,13 +37,13 @@ module Prawn
 
       bounding_box [0, cm2pt(4.5)], :width => cm2pt(3.5) do
         font_size 9 do
-          text sprintf('%.0f', amount.floor), :align => :right
+          text sprintf('%.0f', amount.floor), :align => :right, :character_spacing => 1
         end
       end
 
       bounding_box [cm2pt(4.7), cm2pt(4.5)], :width => cm2pt(1) do
         font_size 9 do
-          text sprintf('%.0f', amount * 100 % 100)
+          text sprintf('%02.0f', amount * 100 % 100), :character_spacing => 1
         end
       end
 
@@ -73,7 +73,7 @@ module Prawn
         text vcard.street_address
         text vcard.postal_code + " " + vcard.locality
 
-        move_down cm2pt(0.7)
+        move_down cm2pt(0.8)
         indent cm2pt(2.6) do
           font_size 9 do
             text esr_account.pc_id
@@ -83,18 +83,18 @@ module Prawn
 
       bounding_box [cm2pt(6), cm2pt(4.5)], :width => cm2pt(3.5) do
         font_size 9 do
-          text sprintf('%.0f', amount.floor), :align => :right
+          text sprintf('%.0f', amount.floor), :align => :right, :character_spacing => 1
         end
       end
 
       bounding_box [cm2pt(10.8), cm2pt(4.5)], :width => cm2pt(1) do
         font_size 9 do
-          text sprintf('%.0f', amount * 100 % 100)
+          text sprintf('%02.0f', amount * 100 % 100), :character_spacing => 1
         end
       end
 
       font_size 10 do
-        draw_text esr9_reference(invoice, esr_account), :at => [cm2pt(12.3), cm2pt(5.9)]
+        draw_text esr9_reference(invoice, esr_account), :at => [cm2pt(12.3), cm2pt(5.9)], :character_spacing => 0.6
       end
 
       bounding_box [cm2pt(12.1), cm2pt(4.5)], :width => cm2pt(7.5) do
@@ -107,10 +107,10 @@ module Prawn
       end
 
       # ESR-Reference
-      font_size 10
+      font_size 11
       font ::Rails.root.join('data/ocrb10.ttf') if FileTest.exists?(::Rails.root.join('data/ocrb10.ttf'))
 
-      draw_text esr9(invoice, esr_account), :at => [cm2pt(5.2), 0]
+      draw_text esr9(invoice, esr_account), :at => [cm2pt(6.3), cm2pt(0.9)]
     end
 
     private
@@ -120,20 +120,21 @@ module Prawn
     end
 
     def esr9_reference(invoice, esr_account)
-      esr9_format(esr9_add_validation_digit(esr_number(esr_account.esr_id, invoice.customer.id)))
+      esr9_format(esr9_add_validation_digit(esr_number(esr_account.esr_id, invoice.customer.id, invoice.id)))
     end
 
     def esr9_build(esr_amount, invoice, biller_id, esr_id)
       # 01 is type 'Einzahlung in CHF'
       amount_string = "01#{sprintf('%011.2f', esr_amount).delete('.')}"
-      id_string = esr_number(esr_id, invoice.customer.id)
+      id_string = esr_number(esr_id, invoice.customer.id, invoice.id)
       biller_string = esr9_format_account_id(biller_id)
 
       "#{esr9_add_validation_digit(amount_string)}>#{esr9_add_validation_digit(id_string)}+ #{biller_string}>"
     end
 
-    def esr_number(esr_id, patient_id)
-      esr_id.to_s + sprintf('%013i', patient_id).delete(' ') + sprintf('%07i', id).delete(' ')
+    def esr_number(esr_id, customer_id, invoice_id)
+      customer_id_length = 19 - esr_id.to_s.length
+      esr_id.to_s + sprintf("%0#{customer_id_length}i", customer_id).delete(' ') + sprintf('%07i', invoice_id).delete(' ')
     end
 
     def esr9_add_validation_digit(value)
@@ -160,4 +161,4 @@ module Prawn
       sprintf('%02i%06i%1i', pre, main, post)
     end
   end
-end
+end

data/vesr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{vesr}
-  s.version = "0.1.0"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Simecek}]
-  s.date = %q{2011-10-07}
+  s.date = %q{2011-10-10}
   s.description = %q{VESR}
   s.email = %q{roman.simecek@cyt.ch}
   s.extra_rdoc_files = [
@@ -24,6 +24,18 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
+    "app/controllers/esr_bookings_controller.rb",
+    "app/models/esr_file.rb",
+    "app/models/esr_record.rb",
+    "app/views/esr_bookings/_form.html.erb",
+    "app/views/esr_bookings/_item.html.erb",
+    "app/views/esr_bookings/_list_footer.html.erb",
+    "app/views/esr_bookings/_list_header.html.erb",
+    "app/views/esr_bookings/_list_records.html.erb",
+    "app/views/esr_bookings/_navigation_section.html.erb",
+    "app/views/esr_bookings/_sidebar.html.erb",
+    "app/views/esr_bookings/list.html.erb",
+    "app/views/esr_bookings/show.html.erb",
     "lib/vesr.rb",
     "lib/vesr/prawn.rb",
     "lib/vesr/prawn/esr_recipe.rb",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Roman Simecek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -122,6 +122,18 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
+- app/controllers/esr_bookings_controller.rb
+- app/models/esr_file.rb
+- app/models/esr_record.rb
+- app/views/esr_bookings/_form.html.erb
+- app/views/esr_bookings/_item.html.erb
+- app/views/esr_bookings/_list_footer.html.erb
+- app/views/esr_bookings/_list_header.html.erb
+- app/views/esr_bookings/_list_records.html.erb
+- app/views/esr_bookings/_navigation_section.html.erb
+- app/views/esr_bookings/_sidebar.html.erb
+- app/views/esr_bookings/list.html.erb
+- app/views/esr_bookings/show.html.erb
 - lib/vesr.rb
 - lib/vesr/prawn.rb
 - lib/vesr/prawn/esr_recipe.rb