bookyt_salary 0.14.5 → 0.14.6

data/app/controllers/salaries_controller.rb

@@ -54,6 +54,12 @@ class SalariesController < InvoicesController
   end
 
   def payslip
+    @salary = Salary.find(params[:id])
+
+    @hours_due = @salary.work_days.sum(:hours_due)
+    @hours_worked = @salary.work_days.sum(:hours_worked)
+    @hours_saldo = @salary.work_days.last.overall_overtime
+
     show! do |format|
       format.html { redirect_to :action => :show }
     end

data/app/models/salary.rb

@@ -121,4 +121,10 @@ class Salary < Invoice
   def self.default_debit_account
     self.direct_account
   end
+
+  # bookyt_projects
+  def work_days
+    WorkDay.create_or_update_upto(employee, duration_to)
+    employee.work_days.where(:date => duration_from..duration_to)
+  end
 end

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

@@ -14,6 +14,15 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
   pdf.text "#{t_attr(:social_security_nr, Employee)}: #{employee.social_security_nr}"
   pdf.text "#{t_attr(:payment_to, Employment)}: #{resource.employment.payment_to}"
 
+  unless resource.employment.hourly_paid
+    pdf.move_down 20
+    pdf.text "Stundenabrechnung", :style => :bold
+    pdf.text "#{t_attr(:hours_due, Activity)}: #{@hours_due}"
+    pdf.text "#{t_attr(:hours_worked, Activity)}: #{@hours_worked}"
+    pdf.text " "
+    pdf.text "Aktueller Stundensaldo: #{@hours_saldo}"
+  end
+
   # Closing
   pdf.common_closing(employer) 
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.14.5'
+  VERSION = '0.14.6'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 43
   prerelease: 
   segments: 
   - 0
   - 14
-  - 5
-  version: 0.14.5
+  - 6
+  version: 0.14.6
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"