vesr 0.12.7 → 0.13.0

data/app/assets/stylesheets/{vesr.css → vesr.scss}

@@ -1,3 +1,11 @@
+table {
+  &.esr_records, &.esr_files {
+    .currency {
+      text-align: right;
+    }
+  }
+}
+
 tr.esr_record.overpaid {
   background-color: #FCF8E3;
 }

data/app/models/esr_file.rb

@@ -9,9 +9,10 @@ class EsrFile < ActiveRecord::Base
 
   # File upload
   mount_uploader :file, EsrFileUploader
+  validates :file, :presence => true
 
   has_many :esr_records, :dependent => :destroy
-  
+
   # String
   def to_s(format = :default)
     case format

data/app/models/esr_record.rb

@@ -5,10 +5,10 @@ class EsrRecord < ActiveRecord::Base
   attr_accessible :file, :remarks
 
   belongs_to :esr_file
-  
+
   belongs_to :booking, :dependent => :destroy, :autosave => true
   belongs_to :invoice
-  
+
   # State Machine
   include AASM
   aasm_column :state
@@ -21,6 +21,7 @@ class EsrRecord < ActiveRecord::Base
   aasm_state :overpaid
   aasm_state :underpaid
   aasm_state :resolved
+  aasm_state :duplicate
 
   aasm_event :write_off do
     transitions :from => :underpaid, :to => :resolved
@@ -34,10 +35,11 @@ class EsrRecord < ActiveRecord::Base
     transitions :from => [:overpaid, :missing], :to => :resolved
   end
 
-  scope :invalid, where(:state => ['overpaid', 'underpaid', 'resolved'])
+  scope :invalid, where(:state => ['overpaid', 'underpaid', 'resolved', 'duplicate'])
   scope :unsolved, where(:state => ['overpaid', 'underpaid', 'missing'])
   scope :valid, where(:state => 'paid')
 
+
   private
   def parse_date(value)
     year  = value[0..1].to_i + 2000
@@ -50,15 +52,15 @@ class EsrRecord < ActiveRecord::Base
   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
@@ -130,6 +132,11 @@ class EsrRecord < ActiveRecord::Base
   end
 
   def update_state
+    if duplicate_of.present?
+      self.state = 'duplicate'
+      return
+    end
+
     if self.invoice.nil?
       self.state = 'missing'
       return
@@ -154,7 +161,7 @@ class EsrRecord < ActiveRecord::Base
 
   # Invoices
   before_create :assign_invoice, :create_esr_booking, :update_state, :update_remarks, :update_invoice_state
-  
+
   private
   def assign_invoice
     # Prepare remarks to not be null
@@ -168,12 +175,19 @@ class EsrRecord < ActiveRecord::Base
       self.invoice = imported_invoice
     end
   end
-  
+
   def vesr_account
     BankAccount.find_by_esr_id(client_id)
   end
 
+  # Tries to find a record this would duplicate
+  def duplicate_of
+    EsrRecord.where(:reference => reference, :bank_pc_id => bank_pc_id, :amount => amount, :payment_date => payment_date, :transaction_date => transaction_date).first
+  end
+
   def create_esr_booking
+    return if duplicate_of.present?
+
     if invoice
       esr_booking = invoice.bookings.build
       debit_account = invoice.balance_account
@@ -181,7 +195,7 @@ class EsrRecord < ActiveRecord::Base
       esr_booking = Booking.new
       debit_account = Invoice.direct_account
     end
-    
+
     esr_booking.update_attributes(
       :amount         => amount,
       :credit_account => vesr_account,
@@ -190,11 +204,11 @@ class EsrRecord < ActiveRecord::Base
       :title          => "VESR Zahlung",
       :comments       => remarks
     )
-    
+
     esr_booking.save
- 
+
     self.booking = esr_booking
-    
+
     return esr_booking
   end
 
@@ -208,7 +222,7 @@ class EsrRecord < ActiveRecord::Base
     end
   end
 
-public
+  public
   def create_write_off_booking
     invoice.write_off("Korrektur nach VESR Zahlung").save
   end

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

@@ -1,6 +1,6 @@
 %tr[esr_file]
   %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)
+  %td.currency= esr_file.esr_records.paid.count
+  %td.currency= esr_file.esr_records.invalid.count
+  %td.currency= esr_file.esr_records.missing.count
+  %td.currency= currency_fmt(esr_file.esr_records.sum(:amount) || 0.0)

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

@@ -1,7 +1,6 @@
 = simple_form_for resource do |f|
-  = f.input :file, :as => :file
-
   .row-fluid
-    .span12= f.input :remarks, :input_html => {:rows => 4}
+    = f.input :file, :as => :file
 
-  = f.button :submit
+  .form-actions
+    = f.button :submit

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

@@ -2,10 +2,10 @@
   %thead
     %tr   
       %th= t_attr :updated_at, 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.currency= t_attr :bookings, EsrFile
+      %th.currency= t_attr :invalid_bookings, EsrFile
+      %th.currency= t_attr :missing_bookings, EsrFile
+      %th.currency= t_attr :total_amount, EsrFile
       %th.action-links
   %tbody
     = render @esr_files

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

@@ -1,4 +1,4 @@
-%table.table.table-striped.collection
+%table.table.table-striped.esr_records.collection
   %thead
     %tr
       %th= t_attr :value_date, EsrRecord

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.12.7"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vesr
 version: !ruby/object:Gem::Version
-  version: 0.12.7
+  version: 0.13.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-07 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies: []
 description: VESR provides support for ESR number calculations and gives ready to
   use Rails components.
@@ -28,7 +28,7 @@ files:
 - 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/assets/stylesheets/vesr.scss
 - app/controllers/esr_files_controller.rb
 - app/controllers/esr_records_controller.rb
 - app/models/esr_file.rb