bookyt_salary 0.10.0 → 0.10.1

data/app/models/salary.rb

@@ -96,8 +96,9 @@ class Salary < Invoice
       line_item.set_booking_template(salary_item.salary_booking_template)
 
       # Overrides from salary_item
-      line_item.times = salary_item.times if salary_item.times.present?
-      line_item.price = salary_item.price if salary_item.price.present?
+      line_item.times    = salary_item.times if salary_item.times.present?
+      line_item.price    = salary_item.price if salary_item.price.present?
+      line_item.position = salary_item.position if salary_item.position.present?
     end
   end
 

data/app/models/salary_item.rb

@@ -1,6 +1,8 @@
 class SalaryItem < ActiveRecord::Base
+  # Ordering
+  default_scope order(:position)
+
+  # Associations
   belongs_to :salary_template
   belongs_to :salary_booking_template
-
-  default_scope order(:position)
 end

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

@@ -1,4 +1,4 @@
-prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => Prawn::LetterDocument) do |pdf|
+prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => Prawn::Payslip) do |pdf|
   employer = resource.employer
   employee = resource.employee
   direct_account = Account.find_by_code("5000")

data/lib/bookyt_salary/railtie.rb

@@ -3,6 +3,8 @@ require 'rails'
 
 module BookytSalary
   class Railtie < Rails::Engine
+    config.autoload_paths << File.expand_path("../lib", __FILE__)
+
     engine_name "bookyt_salary"
   end
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

data/lib/prawn/payslip.rb

@@ -0,0 +1,16 @@
+module Prawn
+  class Payslip < LetterDocument
+    def salary_table(direct_balance, direct_account, direct_bookings)
+      content = direct_bookings.inject([]) do |out, item|
+        title = item.title if item
+        out << [title, nil, nil, nil, currency_fmt(item.accounted_amount(direct_account))] if item.contra_account(direct_account)
+
+        out
+      end
+
+      rows = content + [total_row(currency_fmt(direct_balance))]
+
+      items_table(rows)
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 10
-  - 0
-  version: 0.10.0
+  - 1
+  version: 0.10.1
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -147,6 +147,7 @@ files:
 - lib/bookyt_salary/navigation.rb
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
+- lib/prawn/payslip.rb
 homepage: https://github.com/huerlisi/bookyt_salary
 licenses: 
 - MIT
@@ -176,10 +177,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
-has_rdoc: