dorsale 2.2.16 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f5b895c255fca34f132b85c734bf75d4895da5f
-  data.tar.gz: 77be2848428d2b8e5cabc045dd6132b9314f3444
+  metadata.gz: 3f41912784a960279ff47c66a5cdc9915c985535
+  data.tar.gz: 55e82c1a5e7ec297a99e7e6093b347644f71dfd1
 SHA512:
-  metadata.gz: 756c3cbb5bb33027fbad03c587d7bcd15f71bfc8da3d3f6089f932891991f12be6e598ece46bc87d11d94298f18d97faa1dc8bb40fb5faeb686b195fa7f600cf
-  data.tar.gz: 1b3c34cc752bf8eb3a1d62cfa955953599fd34c248073ab78c0c9549bc9820de43e5614500a0b469446df335847f09520e7c8d69bde8414c3eb64ed096cbd077
+  metadata.gz: 504fe6ac2d229116ca3dcd1bfeed0cf322f756b5182b47337c79b1040aaf50446cf039f2be9314b533ede9bd32f4b855c6cc9a5767c066912e5344051e9376d4
+  data.tar.gz: bbd2819038b6ce487b477bea14694a308a8a8f8dd54c72ba9a68b10c044318f96836ae27799e0bece7439dfaa6deb4cb2adde40021d9354d1059dde1a2af2343

data/app/assets/javascripts/dorsale/tabs_loader.coffee

@@ -1,6 +1,6 @@
 $(document).on "ready page:load", ->
   if window.location.hash
-    activeTab = $('[href=' + window.location.hash + ']')
+    activeTab = $('[href="' + window.location.hash + '"]')
     activeTab && activeTab.tab('show')
 
   $('.nav-tabs a').on 'click', (e) ->

data/app/controllers/dorsale/expense_gun/application_controller.rb

@@ -0,0 +1,7 @@
+module Dorsale
+  module ExpenseGun
+    class ApplicationController < ::Dorsale::ApplicationController
+
+    end
+  end
+end

data/app/controllers/dorsale/expense_gun/expense_lines_controller.rb

@@ -0,0 +1,63 @@
+module Dorsale
+  module ExpenseGun
+    class ExpenseLinesController < ::Dorsale::ExpenseGun::ApplicationController
+      before_action :set_objects
+
+      def index
+        redirect_to dorsale.expense_gun_expense_path(@expense)
+      end
+
+      def new
+        authorize! :edit, @expense
+
+        @expense_line = @expense.expense_lines.new
+      end
+
+      def create
+        authorize! :edit, @expense
+
+        @expense_line = @expense.expense_lines.new(expense_line_params)
+
+        if @expense_line.save
+          flash[:success] = t("expense_gun.expense_line.flash.created")
+          redirect_to dorsale.expense_gun_expense_path(@expense)
+        else
+          render :new
+        end
+      end
+
+      def edit
+        authorize! :edit, @expense
+      end
+
+      def update
+        authorize! :edit, @expense
+        if @expense_line.update_attributes(expense_line_params)
+          flash[:success] = t("expense_gun.expense_line.flash.created")
+          redirect_to dorsale.expense_gun_expense_path(@expense)
+        else
+          render :edit
+        end
+      end
+
+      def destroy
+        authorize! :edit, @expense
+
+        @expense_line.destroy
+        flash[:success] = t("expense_gun.expense_line.flash.created")
+        redirect_to dorsale.expense_gun_expense_path(@expense)
+      end
+
+      private
+
+      def set_objects
+        @expense      = Expense.find params[:expense_id]
+        @expense_line = ExpenseLine.find params[:id] if params[:id].present?
+      end
+
+      def expense_line_params
+        params.require(:expense_line).permit!
+      end
+    end
+  end
+end

data/app/controllers/dorsale/expense_gun/expenses_controller.rb

@@ -0,0 +1,107 @@
+module Dorsale
+  module ExpenseGun
+    class ExpensesController < Dorsale::ExpenseGun::ApplicationController
+      before_action :set_expense, only: [:show, :edit, :update, :destroy, :submit, :accept, :refuse, :cancel]
+
+      def index
+        authorize! :list, Expense
+
+        if params[:state].blank?
+          redirect_to state: "submited"
+          return
+        end
+
+        if params[:state] == "all"
+          @expenses ||= Expense.all
+        else
+          @expenses ||= Expense.where(state: params[:state])
+        end
+
+        @expenses = @expenses.page(params[:page])
+        @all_expenses ||= Expense.all
+      end
+
+      def new
+        authorize! :create, Expense
+
+        @expense ||= Expense.new
+      end
+
+      def create
+        authorize! :create, Expense
+
+        @expense ||= Expense.new(expense_params)
+
+        if @expense.save
+          flash[:success] = t("expense_gun.expense.flash.created")
+          redirect_to dorsale.expense_gun_expense_path(@expense)
+        else
+          render :new
+        end
+      end
+
+      def show
+        authorize! :show, @expense
+      end
+
+      def edit
+        authorize! :edit, @expense
+
+        @expense_line ||= ExpenseGun::ExpenseLine.new
+      end
+
+      def update
+        authorize! :edit, @expense
+
+        if @expense.update_attributes(expense_params)
+          flash[:success] = t("expense_gun.expense.flash.updated")
+          redirect_to dorsale.expense_gun_expense_path(@expense)
+        else
+          render :edit
+        end
+      end
+
+      def submit
+        authorize! :submit, @expense
+
+        @expense.submit!
+        flash[:success] = t("expense_gun.expense.flash.submited")
+        redirect_to dorsale.expense_gun_expenses_path
+      end
+
+      def accept
+        authorize! :accept, @expense
+
+        @expense.accept!
+        flash[:success] = t("expense_gun.expense.flash.accepted")
+        redirect_to dorsale.expense_gun_expense_path(@expense)
+      end
+
+      def refuse
+        authorize! :refuse, @expense
+
+        @expense.refuse!
+        flash[:success] = t("expense_gun.expense.flash.refused")
+        redirect_to dorsale.expense_gun_expenses_path
+      end
+
+      def cancel
+        authorize! :cancel, @expense
+
+        @expense.cancel!
+        flash[:success] = t("expense_gun.expense.flash.canceled")
+        redirect_to dorsale.expense_gun_expenses_path
+      end
+
+      private
+
+      def set_expense
+        @expense = Expense.find(params[:id])
+      end
+
+      def expense_params
+        params.require(:expense_gun_expense).permit!
+      end
+    end
+  end
+end

data/app/models/dorsale/expense_gun/ability_helper.rb

@@ -0,0 +1,9 @@
+module Dorsale
+  module ExpenseGun
+    module AbilityHelper
+      def define_dorsale_expense_gun_abilities
+        can [:list, :create, :show, :edit, :submit , :accept, :refuse, :cancel], ::Dorsale::ExpenseGun::Expense
+      end
+    end
+  end
+end

data/app/models/dorsale/expense_gun/category.rb

@@ -0,0 +1,8 @@
+module Dorsale
+  module ExpenseGun
+    class Category < ActiveRecord::Base
+      self.table_name = "dorsale_expense_gun_categories"
+      validates :name, presence: true
+    end
+  end
+end

data/app/models/dorsale/expense_gun/expense.rb

@@ -0,0 +1,65 @@
+module Dorsale
+  module ExpenseGun
+    class Expense < ActiveRecord::Base
+      self.table_name = "dorsale_expense_gun_expenses"
+      include AASM
+
+      has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name: ::Dorsale::ExpenseGun::ExpenseLine
+
+      validates :name, presence: true
+      validates :date, presence: true
+
+      def initialize(*args)
+        super
+        self.date = Date.today if self.date.nil?
+      end
+
+      # Sum of line amounts
+      def total_all_taxes
+        expense_lines.map(&:total_all_taxes).sum
+      end
+
+      # Sum of line emplee payback
+      def total_employee_payback
+        expense_lines.map(&:employee_payback).sum
+      end
+
+      # Sum of deductible deductible vat
+      def total_vat_deductible
+        expense_lines.map(&:total_vat_deductible).sum
+      end
+
+      def current_state
+        aasm.current_state
+      end
+
+      aasm(column: :state, whiny_transitions: false) do
+        state :new, initial: true
+        state :submited
+        state :accepted
+        state :refused
+        state :canceled
+
+        event :submit do
+          transitions from: :new, to: :submited
+        end
+
+        event :accept do
+          transitions from: :submited, to: :accepted
+        end
+
+        event :refuse do
+          transitions from: :submited, to: :refused
+        end
+
+        event :cancel do
+          transitions from: [:new, :submited, :accepted], to: :canceled
+        end
+      end
+
+      def may_edit?
+        current_state == :new
+      end
+    end
+  end
+end

data/app/models/dorsale/expense_gun/expense_line.rb

@@ -0,0 +1,32 @@
+module Dorsale
+  module ExpenseGun
+    class ExpenseLine < ActiveRecord::Base
+      self.table_name = "dorsale_expense_gun_expense_lines"
+      belongs_to :expense, class_name: ::Dorsale::ExpenseGun::Expense
+      belongs_to :category, class_name: ::Dorsale::ExpenseGun::Category
+
+      def initialize(h = {})
+        super({company_part: 100}.merge(h))
+      end
+
+      validates :expense,         presence: true
+      validates :name,            presence: true
+      validates :date,            presence: true
+      validates :category,        presence: true
+      validates :total_all_taxes, presence: true, numericality: {greater_than_or_equal_to: 1.0}
+      validates :vat,             presence: true, numericality: {greater_than_or_equal_to: 0}
+      validates :company_part,    presence: true, numericality: {greater_than_or_equal_to: 1.0, less_than_or_equal_to: 100.0}
+
+      # simple_form
+      validates :category_id, presence: true
+
+      def employee_payback
+        (total_all_taxes * company_part / 100)
+      end
+
+      def total_vat_deductible
+        category.vat_deductible == true ? (vat * company_part / 100) : 0.0
+      end
+    end
+  end
+end

data/app/views/dorsale/billing_machine/invoices/show.html.slim

@@ -1,14 +1,14 @@
 .billing_machine
   .actions
-    - if can?(:copy, @invoice)
-      = copy_button dorsale.copy_billing_machine_invoice_path(@invoice)
-
     - if can?(:update, @invoice)
       = update_button dorsale.edit_billing_machine_invoice_path(@invoice)
 
     - if can?(:download, @invoice)
       = download_button dorsale.billing_machine_invoice_path(@invoice, format: :pdf)
 
+    - if can?(:copy, @invoice)
+      = copy_button dorsale.copy_billing_machine_invoice_path(@invoice), confirm: true
+
     - if can?(:pay, @invoice)
       = dorsale_button dorsale.pay_billing_machine_invoice_path(@invoice), icon: :check, action: :paid, method: :patch
 

data/app/views/dorsale/billing_machine/quotations/show.html.slim

@@ -12,5 +12,8 @@
     - if can?(:create, @quotation)
       = dorsale_button dorsale.create_invoice_billing_machine_quotation_path(@quotation), action: :create_invoice, icon: :magic
 
+    - if can?(:delete, @quotation)
+      = delete_button dorsale.billing_machine_quotation_path(@quotation)
+
   = render "dorsale/billing_machine/invoices/details", document: @quotation
 

data/app/views/dorsale/expense_gun/expense_lines/_form.html.slim

@@ -0,0 +1,14 @@
+= horizontal_form_for [@expense, @expense_line], url: url, as: :expense_line do |f|
+  .panel.panel-default
+    .panel-body
+      .row
+        .col-md-6
+          = f.input :name
+          = f.input :date, as: :string, input_html: {type: :date}
+          = f.input :category_id, collection: ::Dorsale::ExpenseGun::Category.all
+        .col-md-6
+          = f.input :total_all_taxes
+          = f.input :vat
+          = f.input :company_part
+
+  = form_buttons back_url: false

data/app/views/dorsale/expense_gun/expense_lines/edit.html.slim

@@ -0,0 +1,8 @@
+.expenses.expense_lines
+  .actions-block
+    = link_to t("expense_gun.expense_line.back_to_expense"), dorsale.expense_gun_expense_path(@expense), class: "btn btn-default"
+    = link_to t("expense_gun.expense.list"), dorsale.expense_gun_expenses_path, class: "btn btn-default"
+
+  h1 = t("expense_gun.expense_line.edit")
+
+  = render "form", url: dorsale.expense_gun_expense_expense_line_path(@expense, @expense_line)

data/app/views/dorsale/expense_gun/expense_lines/new.html.slim

@@ -0,0 +1,11 @@
+.expenses.expense_lines
+  .actions-block
+    = link_to t("expense_gun.expense_line.back_to_expense"), dorsale.expense_gun_expense_path(@expense), class: "btn btn-default"
+    = link_to t("expense_gun.expense.list"), dorsale.expense_gun_expenses_path, class: "btn btn-default"
+
+  h1
+    = @expense.name
+    = " : "
+    = t("expense_gun.expense_line.new")
+
+  = render "form", url: dorsale.expense_gun_expense_expense_lines_path(@expense)

data/app/views/dorsale/expense_gun/expenses/_form.html.slim

@@ -0,0 +1,5 @@
+.row: .col-md-6
+  = horizontal_form_for  @expense do |f|
+    = f.input :name
+    = f.input :date, as: :string, input_html: {type: :date}
+    = form_buttons back_url: false

data/app/views/dorsale/expense_gun/expenses/edit.html.slim

@@ -0,0 +1,7 @@
+.expenses
+  .actions-block
+    = link_to t("expense_gun.expense.list"), dorsale.expense_gun_expenses_path, class: "btn btn-default"
+
+  h1 = @expense.name
+
+  = render "form"

data/app/views/dorsale/expense_gun/expenses/index.html.slim

@@ -0,0 +1,62 @@
+h1 = t("expense_gun.expense.list")
+
+.row.expenses
+  .col-md-4
+    ul.nav.nav-pills.nav-stacked
+      - for state in %w(submited new accepted refused canceled)
+        li class=("active" if params[:state] == state)
+          a href=dorsale.url_for(state: state)
+            = t("labels.states.#{state}").pluralize
+            span.badge.pull-right = @all_expenses.where(state: state).count
+
+      li class=("active" if params[:state] == "all")
+        a href=dorsale.url_for(state: "all")
+          = t("labels.states.all")
+          span.badge.pull-right = @all_expenses.count
+
+    hr
+
+    p = link_to t("expense_gun.expense.new"), dorsale.new_expense_gun_expense_path, class: "btn btn-success"
+
+  .col-md-8
+    - for expense in @expenses
+      .panel.panel-default
+        .panel-heading
+          .row
+            .col-md-8
+              h2.panel-title = expense.name
+            .col-md-4
+              .date = date expense.date
+        .panel-body
+          p
+            strong = t("labels.employee") + " : "
+            = expense.user.full_name if expense.respond_to?(:user)
+
+          p
+            strong = t("labels.state") + " : "
+            = t("labels.states.#{expense.current_state}")
+
+          p
+            strong = t("labels.total_all_taxes") + " : "
+            = euros expense.total_all_taxes
+
+        .panel-footer
+          = link_to t("expense_gun.expense.show"), dorsale.expense_gun_expense_path(expense), class: "btn btn-default"
+
+          - if can? :edit, expense
+            = link_to t("expense_gun.expense.edit"), dorsale.edit_expense_gun_expense_path(expense), class: "btn btn-default"
+
+          - if can? :submit, expense
+            = link_to t("expense_gun.expense.submit"), dorsale.submit_expense_gun_expense_path(expense), data: {method: "patch"}, class: "btn btn-primary"
+
+          - if can? :accept, expense
+            = link_to t("expense_gun.expense.accept"), dorsale.accept_expense_gun_expense_path(expense), data: {method: "patch"}, class: "btn btn-success"
+
+          - if can? :refuse, expense
+            = link_to t("expense_gun.expense.refuse"), dorsale.refuse_expense_gun_expense_path(expense), data: {method: "patch"}, class: "btn btn-danger"
+
+          - if can? :cancel, expense
+            = link_to t("expense_gun.expense.cancel"), dorsale.cancel_expense_gun_expense_path(expense), data: {method: "patch"}, class: "btn btn-warning"
+
+
+== paginate @expenses