bookyt_salary 0.7.1 → 0.8.0

data/app/assets/stylesheets/bookyt_salary.sass

@@ -0,0 +1,6 @@
+@import partials/base
+@import partials/content/icons
+
+// Icons
+// =====
++icon-class("payslip", "pdf")

data/app/controllers/salaries_controller.rb

@@ -29,9 +29,10 @@ class SalariesController < InvoicesController
 
   def new
     @salary = Salary.new(params[:salary])
-    @employee = @salary.employee
+    @salary.state = 'booked'
 
-    unless @employee
+    unless @salary.employee
+      # Trigger validation to flag bad values in select form
       @salary.valid?
 
       render :action => 'select_employee' and return
@@ -52,18 +53,6 @@ class SalariesController < InvoicesController
     new!
   end
 
-  def create
-    @salary = Salary.new(params[:salary])
-    @salary.state = 'booked'
-
-    # Set @employee in case we redisplay the form partial
-    @employee = @salary.employee
-
-    @salary.build_booking
-
-    create!
-  end
-
   def payslip
     show! do |format|
       format.html { redirect_to :action => :show }

data/app/models/salary.rb

@@ -75,12 +75,23 @@ class Salary < Invoice
     self.due_date   ||= date
   end
 
+  # Get salary template
+  #
+  # Tries to get a personal salary template, falls back to templates with
+  # no assigned persons.
+  #
+  # If more than one template matches the criteria, it is unspecified which
+  # one will be returned.
+  def salary_template
+    template = SalaryTemplate.where(:person_id => employee.id).last
+    template ||= SalaryTemplate.where(:person_id => nil).last
+  end
+
   # Line Items
   def build_line_items
-    template = SalaryTemplate.where(:person_id => employee.id).first
-    template.salary_booking_templates.each do |booking_template|
+    salary_template.salary_booking_templates.each do |booking_template|
       line_item = line_items.build(:date => self.value_date)
-      line_item.booking_template = booking_template
+      line_item.set_booking_template(booking_template)
     end
   end
 
@@ -97,7 +108,7 @@ class Salary < Invoice
   end
 
   def self.available_credit_accounts
-    Account.by_type(['costs', 'current_assets'])
+    Account.all
   end
 
   def self.default_credit_account
@@ -105,7 +116,7 @@ class Salary < Invoice
   end
 
   def self.available_debit_accounts
-    Account.by_type(['outside_capital'])
+    Account.all
   end
 
   def self.default_debit_account

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

@@ -3,6 +3,7 @@
   = f.inputs do
     = f.input :employee_id, :as => :hidden
     = f.input :employer_id, :as => :hidden
+    = f.input :state, :as => :hidden
     .row
       .span16= f.input :title, :input_html => {:class => 'span12'}
     .row

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

@@ -1,35 +1,21 @@
 .contextual
-  = icon_link_to :pdf, :format => :pdf
   = icon_link_to(:payslip, {:action => :payslip, :format => :pdf}, :target => '_blank')
   = contextual_links_for
 
-%h1= resource.title
-.box
-  %table{:style => "width: 100%"}
-    %tr
-      %th= t_attr(:customer)
-      %td= link_to(full_address(resource.customer.vcard, ', '), resource.customer)
-      %th= t_attr(:company)
-      %td= link_to(full_address(resource.company.vcard, ', '), resource.company)
-    %tr
-      %th= t_attr(:amount)
-      %td= currency_fmt(resource.amount)
-    %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
+.page-header
+  %h1= resource.title
 
-%h3= t('title.line_items')
-%table.list
-  = render resource.line_items
-  = render 'line_items/list_footer', :total_amount => resource.amount
+- bookings = Booking.by_reference(resource)
+- credit_accounts = bookings.select('credit_account_id').group('credit_account_id').map{|account| account.credit_account}
+- debit_accounts = bookings.select('debit_account_id').group('debit_account_id').map{|account| account.debit_account}
+- accounts = (credit_accounts + debit_accounts).uniq
 
-.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')
+%ul.tabs
+  %li.active= link_to t_model, '#tab-main'
+  - accounts.each do |account|
+    %li= link_to account.to_s, "#tab-account-#{account.id}"
 
-= 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")
+.tab-content
+  #tab-main.active= render "form"
+  - accounts.each do |account|
+    %div{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account

data/config/locales/bookyt_salary.de.yml

@@ -23,10 +23,10 @@ de:
         salary_declaration_code: Lohnausweis
         for_deduction_at_source: Quellensteuer
       salary_template:
-        person:                  Person
-        salary_booking_template: Lohnarten
-        title:                   Titel
-        remarks:                 Bemerkungen
+        person:                   Person
+        salary_booking_templates: Lohnarten
+        title:                    Titel
+        remarks:                  Bemerkungen
 
   salaries:
     select_employee:
@@ -37,12 +37,3 @@ de:
   salary_templates:
     index:
       title: Lohnvorlagen
-
-  bookyt:
-    main_navigation:
-      days:       Tagesabschlüsse
-      new_day:    Tagesabschluss
-
-      tooltip:
-        new_day:  Hier können Sie einen neuen Tagesabschluss gemäss Registrierkasse buchen
-        days:     Hier finden Sie eine Liste aller Tagesabschlüsse

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails