bookyt_salary 0.19.3 → 0.19.4

data/app/controllers/salaries_controller.rb

@@ -55,21 +55,16 @@ class SalariesController < InvoicesController
   def payslip
     @salary = Salary.find(params[:id])
 
-    @include_hours_table = !@salary.employment.hourly_paid
-    @include_leave_days_table = !@salary.employment.hourly_paid && @salary.used_leave_days && @salary.leave_days_balance
+    @include_hours_table = @salary.track_hours?
+    @include_leave_days_table = @salary.track_leave_days?
 
     if @include_hours_table
       @hours_carry = @salary.hours_carry
-      work_days = @salary.work_days
 
-      if work_days.present?
-        @hours_due = @salary.work_days.sum(:hours_due)
-        @hours_worked = @salary.work_days.sum(:hours_worked)
-        @hours_saldo = @salary.work_days.last.overall_overtime
-      else
-        # Don't show hours table if no work days are recorded
-        @include_hours_table = false
-      end
+      work_days = @salary.work_days
+      @hours_due = work_days.sum(:hours_due)
+      @hours_worked = work_days.sum(:hours_worked)
+      @hours_saldo = work_days.last.overall_overtime
     end
 
     show! do |format|

data/app/models/salary.rb

@@ -19,10 +19,40 @@ class Salary < Invoice
     company_id
   end
       
+  # Emplyoment helpers
   def employment
     employee.employments.valid_at(value_date).last
   end
 
+  def hourly_paid?
+    employment.try(:hourly_paid?)
+  end
+
+  def track_hours?
+    # No tracking if we have no information how payment is done
+    return false if hourly_paid?.nil?
+
+    # No tracking if paid by hour
+    return false if hourly_paid?
+
+    # No tracking if we have no current information
+    return false unless work_days.present?
+  end
+
+  def track_leave_days?
+    # No tracking if we have no information how payment is done
+    return false if hourly_paid?.nil?
+
+    # No tracking if paid by hour
+    return false if hourly_paid?
+
+    # No tracking if we have no current information
+    return false unless used_leave_days && leave_days_balance
+
+    # Track otherwise
+    return true
+  end
+
   # States
   # ======
   STATES = ['booked', 'canceled', 'paid']
@@ -57,6 +87,11 @@ class Salary < Invoice
     amount_of('5000')
   end
 
+  def bvg_amount
+    # TODO: hardcoded salary_booking_template
+    amount_of('5050')
+  end
+
   # Assignment proxies
   def duration_from=(value)
     write_attribute(:duration_from, value)

data/app/views/salaries/payslip.pdf.prawn

@@ -10,9 +10,12 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
 
   pdf.move_down 20
   rows = [
-    [t_attr(:social_security_nr, Employee), employee.social_security_nr],
-    [t_attr(:payment_to, Employment), resource.employment.payment_to]
+    [t_attr(:social_security_nr, Employee), employee.social_security_nr]
   ]
+  rows << [
+    [t_attr(:payment_to, Employment), resource.employment.payment_to]
+  ] if resource.employment
+
   pdf.table rows, :width => pdf.bounds.width do
     cells.valign  = :top
     cells.borders = []

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.19.3'
+  VERSION = '0.19.4'
 end

metadata

@@ -1,102 +1,102 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bookyt_salary
-version: !ruby/object:Gem::Version 
-  hash: 85
+version: !ruby/object:Gem::Version
+  version: 0.19.4
   prerelease: 
-  segments: 
-  - 0
-  - 19
-  - 3
-  version: 0.19.3
 platform: ruby
-authors: 
-- "Simon H\xC3\xBCrlimann (CyT)"
+authors:
+- Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-06-22 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rails
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 3
-        - 1
-        version: "3.1"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: recurrence
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: recurrence
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This plugin extends bookyt with Salary functionality.
 email: simon.huerlimann@cyt.ch
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - app/assets/stylesheets/bookyt_salary.sass
 - app/controllers/salaries_controller.rb
 - app/controllers/salary_booking_templates_controller.rb
@@ -159,38 +159,29 @@ files:
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
 homepage: https://github.com/huerlisi/bookyt_salary
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
-
 has_rdoc: