vesr 0.13.1 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3450d3a9a5cc6153eb7f5a327971bd3895d6147b
+  data.tar.gz: cb623ffa96b02ec15ace1c46247be069ec64d2ca
+SHA512:
+  metadata.gz: 7f9fe0c6f727d99c6484475e42b382b1cbab3730767a417e1364fc85e59ddf5846f4c27467dae96fc71aa76cc76dcb98e89faea64b5f81ae18166640064585e4
+  data.tar.gz: 7ee38e929b480680b258f60ca3690fe06fdefc6013001c6ac2c6bc24b2d8e14fa0b35f79ef8f44e7279c7b32a5ae3b6f92a5778f11868c60b1760b5b29937aae

data/app/models/esr_record.rb

@@ -11,28 +11,29 @@ class EsrRecord < ActiveRecord::Base
 
   # 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_state :duplicate
+  validates_presence_of :state
 
-  aasm_event :write_off do
-    transitions :from => :underpaid, :to => :resolved
-  end
+  aasm :column => :state do
+    state :ready, :initial => true
+    state :paid
+    state :missing
+    state :overpaid
+    state :underpaid
+    state :resolved
+    state :duplicate
+
+    event :write_off do
+      transitions :from => :underpaid, :to => :resolved
+    end
 
-  aasm_event :resolve do
-    transitions :from => :underpaid, :to => :resolved
-  end
+    event :resolve do
+      transitions :from => :underpaid, :to => :resolved
+    end
 
-  aasm_event :book_extra_earning do
-    transitions :from => [:overpaid, :missing], :to => :resolved
+    event :book_extra_earning do
+      transitions :from => [:overpaid, :missing], :to => :resolved
+    end
   end
 
   scope :invalid, where(:state => ['overpaid', 'underpaid', 'resolved'])
@@ -100,6 +101,11 @@ class EsrRecord < ActiveRecord::Base
   end
 
   def update_remarks
+    # Duplicate
+    if self.state == 'duplicate'
+      return
+    end
+
     # Invoice not found
     if self.state == 'missing'
       self.remarks += ", Rechnung ##{invoice_id} nicht gefunden"
@@ -116,7 +122,7 @@ class EsrRecord < ActiveRecord::Base
     return if invoice.balance == 0
 
     # Paid more than once
-    if (self.state == 'overpaid') and (invoice.amount == self.amount)
+    if (self.state == 'overpaid') && (invoice.amount == self.amount)
       self.remarks += ", mehrfach bezahlt"
       return
     end
@@ -182,7 +188,7 @@ class EsrRecord < ActiveRecord::Base
 
   # 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
+    EsrRecord.where(:reference => reference, :bank_pc_id => bank_pc_id, :amount => amount, :payment_date => payment_date, :transaction_date => transaction_date).where("id != ?", id).first
   end
 
   def create_esr_booking
@@ -193,13 +199,13 @@ class EsrRecord < ActiveRecord::Base
       debit_account = invoice.balance_account
     else
       esr_booking = Booking.new
-      debit_account = Invoice.direct_account
+      debit_account = DebitInvoice.balance_account
     end
 
     esr_booking.update_attributes(
       :amount         => amount,
-      :credit_account => vesr_account,
       :debit_account  => debit_account,
+      :credit_account => vesr_account,
       :value_date     => value_date,
       :title          => "VESR Zahlung",
       :comments       => remarks

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

@@ -6,5 +6,5 @@
   %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|
+    - 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)

data/lib/vesr/prawn/esr_recipe.rb

@@ -7,8 +7,10 @@ module Prawn
     include ActionView::Helpers::TranslationHelper
 
     def draw_account_detail(bank, sender, print_payment_for)
-      text bank.vcard.full_name
-      text bank.vcard.postal_code + " " + bank.vcard.locality
+      if bank
+        text bank.vcard.full_name
+        text bank.vcard.postal_code + " " + bank.vcard.locality
+      end
 
       text " "
       if print_payment_for

data/lib/vesr/version.rb

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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vesr
 version: !ruby/object:Gem::Version
-  version: 0.13.1
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Roman Simecek
@@ -10,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
-dependencies: []
+date: 2015-09-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: aasm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
 description: VESR provides support for ESR number calculations and gives ready to
   use Rails components.
 email:
@@ -23,6 +36,8 @@ extra_rdoc_files:
 - README.rdoc
 - LICENSE.txt
 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
@@ -55,32 +70,29 @@ files:
 - lib/vesr/prawn/esr_recipe.rb
 - lib/vesr/railtie.rb
 - lib/vesr/version.rb
-- README.rdoc
-- LICENSE.txt
 homepage: https://github.com/raskhadafi/vesr
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: VESR invoice support library.
 test_files: []
 has_rdoc: