bookyt_salary 0.2.1 → 0.2.2

data/app/assets/stylesheets/bookyt_salary.sass

@@ -0,0 +1,60 @@
+@import blueprint/grid
+
+// Grid
+$blueprint-grid-columns: 24
+$blueprint-grid-width: 30px
+$blueprint-grid-margin: 10px
+
+
+// Column widths
+$column_small_form: 10
+
+// Cash up styling
+#cash_register_new,
+#new_day
+  +column(12)
+
+#cash_register_new
+  ul
+    width: 50%
+    float: left
+    &.second
+      li
+        width: 141px
+        float: right
+    label
+      width: 45px
+      float: left
+    input
+      width: 90px
+  #cash
+    float: left
+    color: red
+    text-decoration: underline
+    font-weight: bold
+  #result
+    width: 100%
+    margin-top: 10px
+    padding-top: 10px
+    border-top: 1px solid black
+    label
+      font-weight: bold
+      margin-right: 15px
+    input
+      width: 100%
+    li:first-child
+      margin-bottom: 10px
+
+#new_day
+  label
+    width: 160px
+  input
+    width: 100px
+    float: right
+    &#day_submit
+      width: 100%
+
+#day_edit
+  table
+    th
+      padding-right: 20px

data/app/controllers/salaries_controller.rb

@@ -1,4 +1,7 @@
 class SalariesController < AuthorizedController
+  
+  respond_to :html, :pdf
+  
   # Filter/Search
   # =============
   has_scope :by_state
@@ -39,6 +42,8 @@ class SalariesController < AuthorizedController
   end
 
   def payslip
-    show!
+    show! do |format|
+      format.html { redirect_to :action => :show }
+    end
   end
 end

data/app/models/salary.rb

@@ -1,4 +1,18 @@
 class Salary < Invoice
+  # Association customizing
+  belongs_to :employee, :foreign_key => :company_id, :class_name => 'Person'
+  belongs_to :employer, :foreign_key => :customer_id, :class_name => 'Person'
+
+  validates :employee, :employer, :presence => true
+
+  def employer_id=(value)
+    customer_id = value
+  end
+
+  def employee_id=(value)
+    company_id = value
+  end
+      
   # String
   def to_s(format = :default)
     "%s (%s / %s - %s)" % [title, company, duration_from ? I18n::localize(duration_from) : '', duration_to ? I18n::localize(duration_to) : '']
@@ -69,11 +83,11 @@ class Salary < Invoice
     super(params, 'salary:employer:vkb').save
 
     super(params, 'salary:employee:ktg').save
-    super(params.merge(:person_id => company.id), "salary:bvg").save
+    super(params.merge(:person_id => employee.id), "salary:bvg").save
 
     super(params, 'salary:invoice').save
 
-    super(params.merge(:person_id => company.id), "salary:kz").save
-    super(params.merge(:person_id => company.id), "salary:social:kz").save
+    super(params.merge(:person_id => employee.id), "salary:kz").save
+    super(params.merge(:person_id => employee.id), "salary:social:kz").save
   end
 end

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

@@ -0,0 +1,19 @@
+prawn_document(:renderer => Prawn::LetterDocument) do |pdf|
+  employer = resource.employer
+  employee = resource.employee
+  direct_account = Account.find_by_code("5000")
+  direct_bookings = Booking.by_reference(resource)
+  direct_balance = direct_bookings.empty? ? 0.0 : direct_bookings.direct_balance(direct_account)
+  
+  # Letter header
+  pdf.letter_header(employer, employee, resource.to_s)
+  
+  # Free text with the socical security number
+  pdf.free_text "#{t_attr(:social_security_nr, Employee)}: #{employee.social_security_nr}"
+  
+  # Line Items
+  pdf.salary_table(direct_balance, direct_account, direct_bookings)
+  
+  # Closing
+  pdf.common_closing(employer) 
+end

data/app/views/salaries/show.html.haml

@@ -1,6 +1,6 @@
 .contextual
   = icon_link_to :pdf, :format => :pdf
-  = icon_link_to :payslip
+  = icon_link_to(:payslip, {:action => :payslip, :format => :pdf, :target => '_blank'})
   = contextual_links_for
 
 %h1= resource.title
@@ -25,17 +25,6 @@
     = collection_select :direct_booking, :booking_template_id, BookingTemplate.by_type(resource_class.name.underscore), :id, :title
     = submit_tag t_action('new')
 
-- @direct_account = Account.find_by_code("2050")
-%h3= link_to @direct_account.title, @direct_account
-#salary_payment_booking_list
-  = render 'direct_bookings/list', :reference => resource
-
-- @direct_account = Account.find_by_code("5000")
-%h3= link_to @direct_account.title, @direct_account
-#salary_payment_booking_list
-  = render 'direct_bookings/list', :reference => resource
-
-- @direct_account = Account.find_by_code("5700")
-%h3= link_to @direct_account.title, @direct_account
-#salary_booking_list
-  = render 'direct_bookings/list', :reference => resource
+= render 'direct_bookings/show', :reference => resource, :direct_account => Account.find_by_code("2050")
+= render 'direct_bookings/show', :reference => resource, :direct_account => Account.find_by_code("5000")
+= render 'direct_bookings/show', :reference => resource, :direct_account => Account.find_by_code("5700")

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,33 +1,22 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: bookyt_salary
-version: !ruby/object:Gem::Version 
-  hash: 21
+version: !ruby/object:Gem::Version
+  version: 0.2.2
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 1
-  version: 0.2.1
 platform: ruby
-authors: 
-- "Simon H\xC3\xBCrlimann (CyT)"
+authors:
+- Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-19 00:00:00 +02:00
-default_executable: 
+date: 2011-11-04 00:00:00.000000000Z
 dependencies: []
-
 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/models/salary.rb
@@ -35,7 +24,7 @@ files:
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
 - app/views/salaries/_salary_certificate.html.haml
-- app/views/salaries/payslip.html.haml
+- app/views/salaries/payslip.pdf.prawn
 - app/views/salaries/show.html.haml
 - app/views/salaries/statistics.html.haml
 - config/locales/de.yml
@@ -45,39 +34,28 @@ files:
 - lib/bookyt_salary/navigation.rb
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
-has_rdoc: true
 homepage: https://github.com/huerlisi/bookyt_salary
 licenses: []
-
 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.5.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
-

data/app/views/salaries/payslip.html.haml

@@ -1,40 +0,0 @@
-.contextual
-  = icon_link_to :pdf, :format => :pdf
-  = icon_link_to :show
-
-%h1= resource.title
-.box
-  %table{:style => "width: 100%"}
-    %tr
-      %th= t_attr(:customer, Invoice)
-      %td= link_to(full_address(resource.customer.vcard, ', '), resource.customer)
-      %th= t_attr(:company, Invoice)
-      %td= link_to(full_address(resource.company.vcard, ', '), resource.company)
-    %tr
-      %th= t_attr(:state, Invoice)
-      %td#invoice_state=t resource.state, :scope => 'invoice.state'
-    %tr
-      %th= t_attr(:duration_from, Invoice)
-      %td= l(resource.duration_from) if resource.duration_from
-      %th= t_attr(:duration_to, Invoice)
-      %td= l(resource.duration_to) if resource.duration_to
-
-.contextual
-  = form_tag new_direct_booking_path(:direct_booking => {:reference_id => resource.id, :reference_type => resource_class.base_class}), :method => :get, :remote => true do
-    = collection_select :direct_booking, :booking_template_id, BookingTemplate.by_type(resource_class.name.underscore), :id, :title
-    = submit_tag t_action('new')
-
-%h3= Account.find_by_code("2050").title
-- @direct_account = Account.find_by_code("2050")
-#salary_payment_booking_list
-  = render 'direct_bookings/list', :reference => resource
-
-%h3= Account.find_by_code("5000").title
-- @direct_account = Account.find_by_code("5000")
-#salary_payment_booking_list
-  = render 'direct_bookings/list', :reference => resource
-
-%h3= Account.find_by_code("5700").title
-- @direct_account = Account.find_by_code("5700")
-#salary_booking_list
-  = render 'direct_bookings/list', :reference => resource