vesr 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3450d3a9a5cc6153eb7f5a327971bd3895d6147b
-  data.tar.gz: cb623ffa96b02ec15ace1c46247be069ec64d2ca
+  metadata.gz: ae7e408a671168464173f8f975352930137d89ef
+  data.tar.gz: b558c3cc6bdd0373587246fb5a6dfe656c707895
 SHA512:
-  metadata.gz: 7f9fe0c6f727d99c6484475e42b382b1cbab3730767a417e1364fc85e59ddf5846f4c27467dae96fc71aa76cc76dcb98e89faea64b5f81ae18166640064585e4
-  data.tar.gz: 7ee38e929b480680b258f60ca3690fe06fdefc6013001c6ac2c6bc24b2d8e14fa0b35f79ef8f44e7279c7b32a5ae3b6f92a5778f11868c60b1760b5b29937aae
+  metadata.gz: ee0ce7d1edb35a4ec9662dcfc52bf79ba5231190dfbc96650ba1020623132cad60bdacf437e6f85f68999322937c833e0ffe77ff7a35147eafb76fe72410ae08
+  data.tar.gz: 73f57511a7651bb6d3fbb05ed9d643d22af65aff458ed570534681fe6f3b27235d54528c6361a39109eade3eea301ca0178d110eb14dfc5f948230826ed95979

data/app/helpers/esr_record_helper.rb

@@ -0,0 +1,18 @@
+module EsrRecordHelper
+  def event_image(event)
+    html_class = case event.to_s
+                 when 'book_extra_earning'
+                   'icon-circle-arrow-up'
+                 when 'reactivate'
+                   'icon-refresh'
+                 when 'resolve'
+                   'icon-ok'
+                 when 'show_all'
+                   'icon-list-alt'
+                 when 'write_off'
+                   'icon-circle-arrow-down'
+                 end
+
+    content_tag :span, '', class: html_class
+  end
+end

data/app/models/esr_file.rb

@@ -31,8 +31,19 @@ class EsrFile < ActiveRecord::Base
 
   private
   def create_records
-    File.new(file.current_path).each {|line|
-      self.esr_records << EsrRecord.new.parse(line) unless line[0..2] == '999'
-    }
+    File.new(file.current_path).each do |line|
+      if EsrRecord.supported_line?(line)
+        esr_records << create_esr_record(line)
+      else
+        Rails.logger.info "VESR: Ignoring line #{line}"
+      end
+    end
+  end
+
+  def create_esr_record(line)
+    record = EsrRecord.new.parse(line)
+    record.save
+    Rails.logger.error "VESR: Record #{record.inspect} is invalid: #{record.errors.inspect}" unless record.valid?
+    record
   end
 end

data/app/models/esr_record.rb

@@ -1,6 +1,10 @@
 # encoding: utf-8
 
 class EsrRecord < ActiveRecord::Base
+  SUPPORTED_RECORD_TYPES = [
+    :lsv_credit
+  ]
+
   # Access restrictions
   attr_accessible :file, :remarks
 
@@ -40,6 +44,11 @@ class EsrRecord < ActiveRecord::Base
   scope :unsolved, where(:state => ['overpaid', 'underpaid', 'missing'])
   scope :valid, where(:state => 'paid')
 
+  def self.supported_line?(line)
+    record_type_code = line[0..2]
+    record_type = EsrRecordTypes.lookup_code record_type_code
+    SUPPORTED_RECORD_TYPES.include?(record_type)
+  end
 
   private
   def parse_date(value)
@@ -196,16 +205,16 @@ class EsrRecord < ActiveRecord::Base
 
     if invoice
       esr_booking = invoice.bookings.build
-      debit_account = invoice.balance_account
+      credit_account = invoice.balance_account
     else
       esr_booking = Booking.new
-      debit_account = DebitInvoice.balance_account
+      credit_account = DebitInvoice.balance_account
     end
 
     esr_booking.update_attributes(
       :amount         => amount,
-      :debit_account  => debit_account,
-      :credit_account => vesr_account,
+      :debit_account  => vesr_account,
+      :credit_account => credit_account,
       :value_date     => value_date,
       :title          => "VESR Zahlung",
       :comments       => remarks
@@ -240,8 +249,8 @@ class EsrRecord < ActiveRecord::Base
       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']),
+                   :debit_account  => vesr_account,
+                   :credit_account => Account.find_by_tag('vesr:extra-earnings'),
                    :value_date => Date.today)
     end
   end

data/app/models/esr_record_types.rb

@@ -0,0 +1,29 @@
+module EsrRecordTypes
+  RECORD_TYPES = {
+    esr_e_banking_credit: '002',
+    esr_e_banking_cancellation: '005',
+    esr_e_banking_correction: '008',
+    esr_post_office_counter_credit: '012',
+    esr_post_office_counter_cancellation: '015',
+    esr_post_office_counter_correction: '018',
+
+    esr_plus_e_banking_credit: '102',
+    esr_plus_e_banking_cancellation: '105',
+    esr_plus_e_banking_correction: '108',
+    esr_plus_post_office_counter_credit: '112',
+    esr_plus_post_office_counter_cancellation: '115',
+    esr_plus_post_office_counter_correction: '118',
+
+    lsv_credit: '202',
+    lsv_cancellation: '205',
+
+    total_record_credit: '999',
+    total_record_cancellation: '995',
+  }
+
+  def self.lookup_code(lookup_code)
+    RECORD_TYPES.each do |name, code|
+      return name if code == lookup_code
+    end
+  end
+end

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

@@ -7,4 +7,4 @@
   %td.currency= currency_fmt(esr_record.invoice.balance.currency_round) if esr_record.invoice
   %td.action-links
     - esr_record.aasm.events.each do |event|
-      = link_to image_tag("16x16/#{event}.png"), polymorphic_url([event, esr_record]), :remote => true, :method => :post, :title => t_action(event)
+      = link_to event_image(event.name), polymorphic_url([event.name, esr_record]), :remote => true, :method => :post, :title => t_action(event.name)

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vesr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Roman Simecek
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aasm
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.4.0
 description: VESR provides support for ESR number calculations and gives ready to
   use Rails components.
 email:
@@ -38,16 +52,14 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.rdoc
-- 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/images/.gitkeep
 - app/assets/stylesheets/vesr.scss
 - app/controllers/esr_files_controller.rb
 - app/controllers/esr_records_controller.rb
+- app/helpers/esr_record_helper.rb
 - app/models/esr_file.rb
 - app/models/esr_record.rb
+- app/models/esr_record_types.rb
 - app/uploaders/esr_file_uploader.rb
 - app/views/esr_files/_esr_file.html.haml
 - app/views/esr_files/_form.html.haml