bookyt_salary 0.2.3 → 0.2.4

data/app/assets/stylesheets/bookyt_salary.sass

@@ -1,60 +0,0 @@
-@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,4 @@
-class SalariesController < AuthorizedController
+class SalariesController < InvoicesController
   
   respond_to :html, :pdf
   
@@ -28,6 +28,13 @@ class SalariesController < AuthorizedController
 
     @salary = Salary.new(salary_params)
 
+    # Line Items
+    line_item = @salary.line_items.build(
+      :times         => 1,
+      :quantity      => 'x'
+    )
+    line_item.assign_booking_template = BookingTemplate.find_by_code('salary:employee:ahv_iv_eo')
+
     # Prebuild an empty attachment instance
     @salary.attachments.build
 

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

@@ -1,14 +1,24 @@
-= semantic_form_for @salary, :remote => true do |f|
+= semantic_form_for @salary do |f|
   = f.semantic_errors
   = f.inputs do
     = f.input :state, :collection => invoice_states_as_collection
-    = f.input :customer_id, :as => :hidden
-    = f.input :company_id, :as => :hidden
+    = f.input :employer, :as => :combobox
+    = f.input :employee, :as => :combobox
     = f.input :title
     = f.input :duration_from, :as => :date_field
     = f.input :duration_to, :as => :date_field
     = f.input :amount, :input_html => {:size => 12}
     = f.input :remarks, :input_html => {:rows => 4}
 
+  = f.inputs t('title.line_items') do
+    %table#line_items
+      %thead
+        = render 'line_items/list_header', :invoice => resource
+      %tbody
+        = f.fields_for :line_items do |line_item|
+          = render 'line_items/form', :line_item => line_item
+      %tfoot
+        = render 'line_items/list_footer', :total_amount => resource.amount
+
   = f.buttons do
     = f.commit_button

data/config/locales/de.yml

@@ -9,8 +9,8 @@ de:
         net_amount:    Nettolohn
         bvg_amount:    BVG
         social_amount: AHV/IV/EO/ALV/NBU
-        customer:      Arbeitgeber
-        company:       Arbeitnehmer
+        employer:      Arbeitgeber
+        employee:      Arbeitnehmer
 
   crud:
     title:

data/config/routes.rb

@@ -1,8 +1,20 @@
 Rails.application.routes.draw do
-  # Days
-  resources :days do
+  # Salaries
+  resources :salaries do
     collection do
-      post :calculate_cash
+      get :statistics
+    end
+
+    member do
+      get :payslip
+    end
+
+    # Line Items
+    member do
+      get :new_line_item
+    end
+    collection do
+      get :new_line_item
     end
   end
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +01:00
+date: 2011-11-11 00:00:00 +01:00
 default_executable: 
 dependencies: []