vesr 0.3.1 → 0.4.0

data/app/models/esr_file.rb

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

data/app/models/esr_record.rb

@@ -47,7 +47,7 @@ class EsrRecord < ActiveRecord::Base
     reference[19..-1].to_i
   end
 
-  def patient_id
+  def customer_id
     reference[6..18].to_i
   end
 
@@ -98,7 +98,7 @@ class EsrRecord < ActiveRecord::Base
     if Invoice.exists?(invoice_id)
       self.invoice_id = invoice_id
       self.remarks += "Referenz #{reference}"
-      if invoice.due_amount.currency_round != self.amount.currency_round
+      if invoice.balance.currency_round != self.amount.currency_round
         evaluate_bad
         self.state = "bad"
       else
@@ -107,7 +107,7 @@ class EsrRecord < ActiveRecord::Base
     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.due_amount.currency_round != self.amount.currency_round
+      if invoice.balance.currency_round != self.amount.currency_round
         self.remarks += ", falscher Betrag"
         self.state = "bad"
       else

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

@@ -9,9 +9,9 @@
 
   - for esr_record in list_records
     %tr
-      %td= h esr_record.value_date
-      %td= link_to esr_record.invoice.patient.to_s, esr_record.invoice if esr_record.invoice
+      %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.due_amount.currency_round) if esr_record.invoice
+      %td.currency= currency_fmt(esr_record.invoice.balance.currency_round) if esr_record.invoice

data/lib/vesr/prawn/esr_recipe.rb

@@ -24,8 +24,8 @@ module Prawn
         vcard = sender.vcard
         text vcard.full_name
         text vcard.extended_address if vcard.extended_address.present?
-        text vcard.street_address
-        text vcard.postal_code + " " + vcard.locality
+        text vcard.street_address if vcard.street_address
+        text vcard.postal_code + " " + vcard.locality if vcard.postal_code and vcard.locality
 
         move_down cm2pt(0.8)
         indent cm2pt(2.3) do
@@ -54,9 +54,9 @@ module Prawn
 
         vcard = invoice.customer.vcard
         text vcard.full_name
-        text vcard.extended_address if vcard.extended_address.present?
-        text vcard.street_address
-        text vcard.postal_code + " " + vcard.locality
+        text vcard.extended_address if vcard.extended_address
+        text vcard.street_address if vcard.street_address
+        text vcard.postal_code + " " + vcard.locality if vcard.postal_code and vcard.locality
       end
 
       bounding_box [cm2pt(6), cm2pt(8.8)], :width => cm2pt(5) do
@@ -70,8 +70,8 @@ module Prawn
         vcard = sender.vcard
         text vcard.full_name
         text vcard.extended_address if vcard.extended_address.present?
-        text vcard.street_address
-        text vcard.postal_code + " " + vcard.locality
+        text vcard.street_address if vcard.street_address
+        text vcard.postal_code + " " + vcard.locality if vcard.postal_code and vcard.locality
 
         move_down cm2pt(0.8)
         indent cm2pt(2.6) do
@@ -102,8 +102,8 @@ module Prawn
         text vcard.honorific_prefix if vcard.honorific_prefix
         text vcard.full_name
         text vcard.extended_address if vcard.extended_address.present?
-        text vcard.street_address
-        text vcard.postal_code + " " + vcard.locality
+        text vcard.street_address if vcard.street_address
+        text vcard.postal_code + " " + vcard.locality if vcard.postal_code and vcard.locality
       end
 
       # ESR-Reference

data/lib/vesr/version.rb

@@ -1,3 +1,3 @@
 module Vesr
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: vesr
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Roman Simecek