dorsale 3.18.0 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f967e032d9c4918a372978e3c92216d542751e9e29881843aa029c7d63be401f
-  data.tar.gz: 35fbc1b26a2dea2067f936674324804b8d02fd6a673adfd92354886060b56ced
+  metadata.gz: 86af52038f7c9cfc24b17dbcf5229608296a7152f2e4565d3fd415d2dd88ce87
+  data.tar.gz: cd7c59ee287a99e1cac77068550f7a0d64451e164cb2e10855fd1dd2d9b5fb12
 SHA512:
-  metadata.gz: b0bb3cf0a9cd7322cc3e6928101ba486c8dddd577fa9962f1c462612d3c876e2df525224acdc6a2a4902510943ca61c500986431a6b1e895313f246c60467826
-  data.tar.gz: 135ff2e5848baede200b8ab36ba6bed2078f1c56024a8a1e901bcad21b9ae3f0bb700a314d74582006ae9275d6779f082bbcd6d17577af38f9296291fa379c76
+  metadata.gz: 20bc75f4aa3210835d0b8ce2c6e7bb0b43ab7b2a496555df02fc1b6ef9983af553ad586170a5d67c729630905706d6ecea52340811781707520f71a47211e73a
+  data.tar.gz: 33809971e1f21d88f6a6d6d110a062cb94b18391dee6c667afa28adc9c7d9690d99806b783f02c8a0f427771e7d9f473b7a693cbba069f339005f5631426fa6d

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+# 3.19.0
+- Change expenses state machine
+- Change expenses list view
+
 # 3.18.0
 - Change uploaders `extension_whitelist` to `extension_allowlist`
 - Rails 6.1 compatibility

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

@@ -1,15 +1,5 @@
 class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::ApplicationController
-  before_action :set_expense, only: [
-    :show,
-    :edit,
-    :update,
-    :copy,
-    :submit,
-    :accept,
-    :refuse,
-    :cancel,
-  ]
-
+  before_action :set_expense
   before_action :set_filters_variables, only: [:index]
 
   def index
@@ -18,7 +8,10 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     @expenses ||= scope.all.preload(:user, :expense_lines)
     @filters ||= Dorsale::ExpenseGun::SmallData::FilterForExpenses.new(filters_jar)
     @expenses = @filters.apply(@expenses)
+    @expenses = Dorsale::ExpenseGun::ExpensesSorter.call(@expenses, params[:sort] ||= "-created_at")
     @expenses = @expenses.page(params[:page]).per(25)
+
+    @total_payback = @expenses.limit(nil).to_a.sum(&:total_employee_payback)
   end
 
   def new
@@ -34,7 +27,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     @expense ||= scope.new(expense_params_for_create)
 
     if @expense.save
-      flash[:success] = t("expense_gun.expense.messages.created")
+      set_succress_flash
       redirect_to dorsale.expense_gun_expense_path(@expense)
     else
       render :new
@@ -55,7 +48,7 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     authorize @expense, :update?
 
     if @expense.update(expense_params_for_update)
-      flash[:success] = t("expense_gun.expense.messages.updated")
+      set_succress_flash
       redirect_to dorsale.expense_gun_expense_path(@expense)
     else
       render :edit
@@ -71,50 +64,47 @@ class Dorsale::ExpenseGun::ExpensesController < Dorsale::ExpenseGun::Application
     render :new
   end
 
-  def submit
-    authorize @expense, :submit?
+  def go_to_pending
+    authorize @expense, :go_to_pending?
 
-    @expense.go_to_submitted!
-    flash[:success] = t("expense_gun.expense.messages.submitted")
+    @expense.update!(state: "pending")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
-  def accept
-    authorize @expense, :accept?
-
-    @expense.go_to_accepted!
-    flash[:success] = t("expense_gun.expense.messages.accepted")
-    redirect_to dorsale.expense_gun_expense_path(@expense)
-  end
+  def go_to_paid
+    authorize @expense, :go_to_paid?
 
-  def refuse
-    authorize @expense, :refuse?
-
-    @expense.go_to_refused!
-    flash[:success] = t("expense_gun.expense.messages.refused")
+    @expense.update!(state: "paid")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
-  def cancel
-    authorize @expense, :cancel?
+  def go_to_canceled
+    authorize @expense, :go_to_canceled?
 
-    @expense.go_to_canceled!
-    flash[:success] = t("expense_gun.expense.messages.canceled")
+    @expense.update!(state: "canceled")
+    set_succress_flash
     redirect_to dorsale.expense_gun_expenses_path
   end
 
   private
 
+  def set_succress_flash
+    flash.notice = t("expense_gun.expense.messages.#{action_name}_ok")
+  end
+
   def model
     ::Dorsale::ExpenseGun::Expense
   end
 
   def set_expense
-    @expense = scope.find(params[:id])
+    @expense = scope.find(params[:id]) if params.key?(:id)
   end
 
   def permitted_params
     [
+      :state,
       :name,
       :date,
       :expense_lines_attributes => [

data/app/filters/dorsale/expense_gun/small_data/filter_for_expenses.rb

@@ -1,6 +1,9 @@
 class Dorsale::ExpenseGun::SmallData::FilterForExpenses < ::Agilibox::SmallData::Filter
   STRATEGIES = {
-    "expense_state"   => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("state"),
-    "expense_user_id" => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("user_id"),
+    "expense_state"       => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("state"),
+    "expense_user_id"     => ::Agilibox::SmallData::FilterStrategyByKeyValue.new("user_id"),
+    "expense_time_period" => ::Agilibox::SmallData::FilterStrategyByDatePeriod.new(:date),
+    "expense_date_begin"  => ::Agilibox::SmallData::FilterStrategyByDateBegin.new(:date),
+    "expense_date_end"    => ::Agilibox::SmallData::FilterStrategyByDateEnd.new(:date),
   }
 end

data/app/helpers/dorsale/expense_gun/application_helper.rb

@@ -1,6 +1,6 @@
 module Dorsale::ExpenseGun::ApplicationHelper
   def expense_states_for_filters_select
-    Dorsale::ExpenseGun::Expense.aasm.states.map do |state|
+    Dorsale::ExpenseGun::Expense::STATES.map do |state|
       [
         Dorsale::ExpenseGun::Expense.t("state.#{state}"),
         state,

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

@@ -1,6 +1,7 @@
 class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   self.table_name = "dorsale_expense_gun_expenses"
-  include AASM
+
+  STATES = %w(draft pending paid canceled)
 
   has_many :expense_lines, inverse_of: :expense, dependent: :destroy, class_name: "Dorsale::ExpenseGun::ExpenseLine"
 
@@ -12,6 +13,7 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   belongs_to :user
   validates :user, presence: true
 
+  validates :state, presence: true, inclusion: {in: STATES}
   validates :name, presence: true
   validates :date, presence: true
 
@@ -24,6 +26,7 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   }
 
   def assign_default_values
+    assign_default :state, STATES.first
     assign_default :date, Date.current
   end
 
@@ -41,34 +44,4 @@ class Dorsale::ExpenseGun::Expense < ::Dorsale::ApplicationRecord
   def total_vat_deductible
     expense_lines.sum(&:total_vat_deductible)
   end
-
-  delegate :current_state, to: :aasm
-
-  aasm(column: :state, whiny_transitions: false) do
-    state :draft, initial: true
-    state :submitted
-    state :accepted
-    state :refused
-    state :canceled
-
-    event :go_to_submitted do
-      transitions from: :draft, to: :submitted
-    end
-
-    event :go_to_accepted do
-      transitions from: :submitted, to: :accepted
-    end
-
-    event :go_to_refused do
-      transitions from: :submitted, to: :refused
-    end
-
-    event :go_to_canceled do
-      transitions from: [:draft, :submitted, :accepted], to: :canceled
-    end
-  end
-
-  def may_edit?
-    current_state == :draft
-  end
 end

data/app/policies/dorsale/expense_gun/expense_policy_helper.rb

@@ -5,34 +5,23 @@ module Dorsale::ExpenseGun::ExpensePolicyHelper
     :read?,
     :update?,
     :copy?,
-    :submit?,
-    :accept?,
-    :refuse?,
-    :cancel?,
+    :go_to_pending?,
+    :go_to_paid?,
+    :go_to_canceled?,
   ]
 
-  def update?
-    return false unless expense.may_edit?
+  def go_to_pending?
+    return false unless expense.state == "draft"
     super
   end
 
-  def submit?
-    return false unless expense.may_go_to_submitted?
+  def go_to_paid?
+    return false unless expense.state == "pending"
     super
   end
 
-  def accept?
-    return false unless expense.may_go_to_accepted?
-    super
-  end
-
-  def refuse?
-    return false unless expense.may_go_to_refused?
-    super
-  end
-
-  def cancel?
-    return false unless expense.may_go_to_canceled?
+  def go_to_canceled?
+    return false unless expense.state == "draft"
     super
   end
 end

data/app/sorters/dorsale/expense_gun/expenses_sorter.rb

@@ -0,0 +1,8 @@
+class Dorsale::ExpenseGun::ExpensesSorter < Agilibox::Sorter
+  def sort
+    case column
+    when :created_at, :date
+      {column => direction}
+    end
+  end
+end

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

@@ -1,3 +1,11 @@
 = filters_form do |f|
   = f.input :expense_state, collection: expense_states_for_filters_select, include_blank: t("expense_gun.filters.all_states")
   = f.input :expense_user_id, collection: @users, include_blank: t("expense_gun.filters.all_users")
+
+  = f.input(:expense_time_period,
+    :collection    => agilibox_time_periods_for_select,
+    :include_blank => false,
+  )
+
+  = f.input :expense_date_begin, input_html: {placeholder: t("filters.date_begin")}
+  = f.input :expense_date_end,   input_html: {placeholder: t("filters.date_end")}

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

@@ -8,10 +8,9 @@
 
       .panel-body
         .row
-          .col-md-6
-            = f.input :name
-          .col-md-6
-            = f.input :date, as: :string, input_html: {type: :date}
+          .col-md-4 = f.input :name
+          .col-md-4 = f.input :date, as: :string, input_html: {type: :date}
+          .col-md-4 = f.input :state, collection: expense_states_for_filters_select, include_blank: false
 
     #expense-lines
       = f.simple_fields_for :expense_lines do |line_form|

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

@@ -1,20 +1,62 @@
-- expenses.each do |expense|
-  .panel.panel-default.expense
-    .panel-heading
-      .pull-right
-        = read_button dorsale.expense_gun_expense_path(expense)
-
-        - if policy(expense).update?
-          = update_button dorsale.edit_expense_gun_expense_path(expense)
-
-      .panel-title = expense
-
-    .panel-body
-      .row
-        .col-md-6
-          = info expense, :user
-          = info expense, :total_all_taxes,        helper: :euros
-          = info expense, :total_employee_payback, helper: :euros
-        .col-md-6
-          = info expense, :state
-          = info expense, :date
+table.default
+  thead
+    tr
+      th.expense-created_at
+        = sortable_column Dorsale::ExpenseGun::Expense.t(:created_at), :created_at
+
+      th.expense-date
+        = sortable_column Dorsale::ExpenseGun::Expense.t(:date), :date
+
+      th.expense-name
+        = Dorsale::ExpenseGun::Expense.t(:name)
+
+      th.expense-user
+        = Dorsale::ExpenseGun::Expense.t(:user)
+
+      th.expense-total_employee_payback
+        = Dorsale::ExpenseGun::Expense.t(:total_employee_payback)
+
+      th.expense-total_all_taxes
+        = Dorsale::ExpenseGun::Expense.t(:total_all_taxes)
+
+      th.expense-state
+        = Dorsale::ExpenseGun::Expense.t(:state)
+
+      th.expense-actions.actions
+        = ta(:actions)
+
+
+  tbody
+    - @expenses.each do |expense|
+      tr.expense
+        td.expense-created_at
+          = date expense.created_at.to_date
+
+        td.expense-date
+          = date expense.date
+
+        td.expense-name
+          = expense.name
+
+        td.expense-user
+          = expense.user
+
+        td.expense-total_employee_payback
+          = euros expense.total_employee_payback
+
+        td.expense-total_all_taxes
+          = euros expense.total_all_taxes
+
+        td.expense-state
+          = expense.tv(:state)
+
+        td.expense-actions.actions
+          = read_button dorsale.expense_gun_expense_path(expense)
+          = render "state_actions", expense: expense
+
+  tfoot
+    tr
+      td.text-right colspan=99
+        strong
+          = "Total remboursements : "
+          = euros @total_payback

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

@@ -1,21 +1,11 @@
+= render "state_actions", expense: @expense
+
 - if policy(@expense).update?
   = update_button dorsale.edit_expense_gun_expense_path(@expense)
 
 - if policy(@expense).copy?
   = copy_button dorsale.copy_expense_gun_expense_path(@expense)
 
-- if policy(@expense).submit?
-  = bs_button dorsale.submit_expense_gun_expense_path(@expense), action: :submit, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-primary"
-
-- if policy(@expense).accept?
-  = bs_button dorsale.accept_expense_gun_expense_path(@expense), action: :accept, method: "patch", confirm: true, icon: :check, class: "btn btn-xs btn-success"
-
-- if policy(@expense).refuse?
-  = bs_button dorsale.refuse_expense_gun_expense_path(@expense), action: :refuse, method: "patch", confirm: true, icon: :ban, class: "btn btn-xs btn-danger"
-
-- if policy(@expense).cancel?
-  = bs_button dorsale.cancel_expense_gun_expense_path(@expense), action: :cancel, method: "patch", confirm: true, icon: :times, class: "btn btn-xs btn-warning"
-
 = download_button url_for(format: :pdf)
 
 = print_button

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

@@ -0,0 +1,8 @@
+- if policy(expense).go_to_pending?
+  = bs_button dorsale.go_to_pending_expense_gun_expense_path(expense), text: t("expense_gun.actions.go_to_pending"), method: "post", confirm: true, icon: :check, class: "btn btn-xs btn-success"
+
+- if policy(expense).go_to_paid?
+  = bs_button dorsale.go_to_paid_expense_gun_expense_path(expense), text: t("expense_gun.actions.go_to_paid"), method: "post", confirm: true, icon: :check, class: "btn btn-xs btn-success"
+
+- if policy(expense).go_to_canceled?
+  = bs_button dorsale.go_to_canceled_expense_gun_expense_path(expense), text: t("expense_gun.actions.go_to_canceled"), method: "post", confirm: true, icon: :times, class: "btn btn-xs btn-warning"

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

@@ -13,7 +13,7 @@
   - content_for :filters
     = render "dorsale/expense_gun/expenses/filters"
 
-  - content_for :page_body
+  - content_for :table
     = render "dorsale/expense_gun/expenses/list", expenses: @expenses
 
   = render_dorsale_page

data/config/locales/expense_gun.fr.yml

@@ -2,12 +2,11 @@ fr:
   expense_gun:
     expense:
       messages:
-        created   : "La note de frais a été créée."
-        updated   : "La note de frais a été mise à jour."
-        submitted : "La note de frais a été soumise."
-        accepted  : "La note de frais a été acceptée."
-        refused   : "La note de frais a été refusée."
-        canceled  : "La note de frais a été annulée."
+        create_ok: "La note de frais a été créée."
+        update_ok: "La note de frais a été mise à jour."
+        go_to_pending_ok: "La note de frais a été marquée comme à payer."
+        go_to_paid_ok: "La note de frais a été marquée comme payée."
+        go_to_canceled_ok: "La note de frais a été marquée comme annulée."
 
       actions:
         create : "Nouvelle note de frais"
@@ -25,6 +24,10 @@ fr:
       all_states: "Tous les états"
       all_users: "Tous les utilisateurs"
 
+    actions:
+      go_to_pending: "Marquer à payer"
+      go_to_paid: "Marquer payée"
+      go_to_canceled: "Marquer annulée"
 
   activerecord:
     models:
@@ -43,7 +46,7 @@ fr:
     attributes:
       dorsale/expense_gun/expense:
         user                   : "Employé"
-        total_employee_payback : "Total remboursement employé"
+        total_employee_payback : "Total remboursement"
         vat_deductible         : "TVA déductible"
         total_vat_deductible   : "Total TVA déductible"
         total_all_taxes        : "Total TTC"
@@ -63,7 +66,6 @@ fr:
       dorsale/expense_gun/expense/state:
         all       : "Toutes"
         draft     : "Brouillon"
-        submitted : "Soumise"
-        accepted  : "Accepée"
-        refused   : "Refusée"
+        pending   : "À payer"
+        paid      : "Payé"
         canceled  : "Annulée"

data/config/routes.rb

@@ -96,10 +96,9 @@ Dorsale::Engine.routes.draw do
     resources :expenses, except: [:destroy] do
       member do
         get :copy
-        patch :submit
-        patch :accept
-        patch :refuse
-        patch :cancel
+        post :go_to_pending
+        post :go_to_paid
+        post :go_to_canceled
       end
     end
 

data/db/migrate/20210506070548_expenses_change_states.rb

@@ -0,0 +1,7 @@
+class ExpensesChangeStates < ActiveRecord::Migration[6.1]
+  def change
+    Dorsale::ExpenseGun::Expense.where(state: "submitted").update_all(state: "pending")
+    Dorsale::ExpenseGun::Expense.where(state: "accepted").update_all(state: "paid")
+    Dorsale::ExpenseGun::Expense.where(state: "refused").update_all(state: "canceled")
+  end
+end

data/features/expense_gun_expenses.feature

@@ -28,33 +28,3 @@ Feature: Expenses
     When I copy the expense
     Then an expense copy is created
     And I am redirected on the expense page
-
-  Scenario: Submit expense
-    Given an existing expense
-    When I go on the expense page
-    And I submit the expense
-    Then I am redirect to the expenses page
-    And the expense state is "submitted"
-
-  Scenario: Cancel expense
-    Given an existing expense
-    When I go on the expense page
-    And I cancel the expense
-    Then I am redirect to the expenses page
-    And the expense state is "canceled"
-
-  Scenario: Accept expense
-    Given an existing expense
-    And the expense is submitted
-    When I go on the expense page
-    And I accept the expense
-    Then I am redirect to the expense page
-    And the expense state is "accepted"
-
-  Scenario: Refuse expense
-    Given an existing expense
-    And the expense is submitted
-    When I go on the expense page
-    And I refuse the expense
-    Then I am redirect to the expenses page
-    And the expense state is "refused"

data/features/step_definitions/expense_gun_expenses_steps.rb

@@ -61,6 +61,7 @@ When(/^I update the expense$/) do
   @expenses_count      = Dorsale::ExpenseGun::Expense.count
   @expense_lines_count = Dorsale::ExpenseGun::ExpenseLine.count
 
+  find(".link_read").click
   find("#main [href$=edit]").click
 
   fill_in :expense_name, with: "NewExpenseName"
@@ -78,10 +79,6 @@ Then(/^the expense is update$/) do
   expect(@expense.name).to eq "NewExpenseName"
 end
 
-When(/^I submit the expense$/) do
-  find("[href$='/submit']").click
-end
-
 Then(/^I am redirect to the expenses page$/) do
   wait_for { current_path }.to eq dorsale.expense_gun_expenses_path
 end
@@ -94,18 +91,6 @@ Given(/^the expense is submitted$/) do
   @expense.update_columns(state: "submitted")
 end
 
-When(/^I cancel the expense$/) do
-  find("[href$='/cancel']").click
-end
-
-When(/^I accept the expense$/) do
-  find("[href$='/accept']").click
-end
-
-When(/^I refuse the expense$/) do
-  find("[href$='/refuse']").click
-end
-
 Then(/^I am redirect to the expense page$/) do
   wait_for { current_path }.to include dorsale.expense_gun_expense_path(@expense)
 end

data/lib/dorsale/engine.rb

@@ -13,7 +13,6 @@ require "pundit"
 require "awesome_print"
 require "kaminari-i18n"
 require "carrierwave"
-require "aasm"
 require "pdf/reader"
 require "prawn"
 require "prawn/table"

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.18.0"
+  VERSION = "3.19.0"
 end

data/spec/controllers/dorsale/expense_gun/expenses_controller_spec.rb

@@ -9,38 +9,57 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
     describe "filters" do
       render_views
 
-      it "should filter by state" do
-        expense1 = create(:expense_gun_expense, state: "accepted")
-        expense2 = create(:expense_gun_expense, state: "refused")
+      let!(:user1) { create(:user) }
+      let!(:user2) { create(:user) }
+      let!(:expense1) {
+        create(:expense_gun_expense, state: "pending", user: user1, date: "2021-05-10")
+      }
+      let!(:expense2) {
+        create(:expense_gun_expense, state: "canceled", user: user2, date: "2021-05-20")
+      }
 
-        cookies[:filters] = {expense_state: "accepted"}.to_json
+      def filter_by(**filters)
+        cookies[:filters] = filters.to_json
         get :index
+        assigns :expenses
+      end
 
-        expect(assigns :expenses).to eq [expense1]
+      it "should filter by state" do
+        expect(filter_by expense_state: "pending").to eq [expense1]
       end
 
       it "should filter by user" do
-        user1    = create(:user)
-        user2    = create(:user)
-        expense1 = create(:expense_gun_expense, user: user1)
-        expense2 = create(:expense_gun_expense, user: user2)
+        expect(filter_by expense_user_id: user1.id).to eq [expense1]
+      end
 
-        cookies[:filters] = {expense_user_id: user1.id}.to_json
-        get :index
+      it "should filter by date period" do
+        Timecop.freeze "2021-05-20"
+        expect(filter_by expense_time_period: "this_week").to eq [expense2]
+      end
 
-        expect(assigns :expenses).to eq [expense1]
+      it "should filter by date begin" do
+        expect(filter_by expense_date_begin: "2021-05-15").to eq [expense2]
       end
 
-      it "should assigns only users having expenses" do
-        user1    = create(:user)
-        user2    = create(:user)
-        expense2 = create(:expense_gun_expense, user: user2)
+      it "should filter by date begin" do
+        expect(filter_by expense_date_end: "2021-05-15").to eq [expense1]
+      end
 
+      it "should assigns only users having expenses" do
+        expense1.destroy!
         get :index
-
         expect(assigns :users).to eq [user2]
       end
     end # describe "filters"
+
+    it "should set total_payback" do
+      create(:expense_gun_expense_line, total_all_taxes: 200, company_part: 50)
+        .expense.update!(state: "pending")
+      create(:expense_gun_expense_line, total_all_taxes: 50, company_part: 100)
+        .expense.update!(state: "paid")
+      get :index
+      expect(assigns :total_payback).to eq 150
+    end
   end # describe "#index"
 
   describe "#show" do
@@ -52,4 +71,34 @@ RSpec.describe ::Dorsale::ExpenseGun::ExpensesController, type: :controller do
       expect(response).to be_ok
     end
   end # describe "#show"
+
+  describe "#go_to_pending" do
+    it "should go to pending and redirect" do
+      expense = create(:expense_gun_expense, user: user, state: "draft")
+      post :go_to_pending, params: {id: expense}
+      expect(response).to be_redirect
+      expect(flash.notice).to be_present
+      expect(expense.reload.state).to eq "pending"
+    end
+  end # describe "#go_to_pending"
+
+  describe "#go_to_paid" do
+    it "should go to paid and redirect" do
+      expense = create(:expense_gun_expense, user: user, state: "pending")
+      post :go_to_paid, params: {id: expense}
+      expect(response).to be_redirect
+      expect(flash.notice).to be_present
+      expect(expense.reload.state).to eq "paid"
+    end
+  end # describe "#go_to_pending"
+
+  describe "#go_to_canceled" do
+    it "should go to canceled and redirect" do
+      expense = create(:expense_gun_expense, user: user, state: "draft")
+      post :go_to_canceled, params: {id: expense}
+      expect(response).to be_redirect
+      expect(flash.notice).to be_present
+      expect(expense.reload.state).to eq "canceled"
+    end
+  end # describe "#go_to_pending"
 end

data/spec/models/dorsale/expense_gun/expense_spec.rb

@@ -14,123 +14,7 @@ RSpec.describe Dorsale::ExpenseGun::Expense, type: :model do
   end
 
   it "new expense should have new state" do
-    expect(described_class.new.current_state).to be :draft
-  end
-
-  describe "new state" do
-    before :each do
-      @expense = build(:expense_gun_expense)
-    end
-
-    it "new expense can be submitted" do
-      expect(@expense.go_to_submitted).to be true
-      expect(@expense.current_state).to be :submitted
-    end
-
-    it "new expense can't be accepted" do
-      expect(@expense.go_to_accepted).to be false
-      expect(@expense.current_state).to be :draft
-    end
-
-    it "new expense can't be refused" do
-      expect(@expense.go_to_refused).to be false
-      expect(@expense.current_state).to be :draft
-    end
-
-    it "new expense can be canceled" do
-      expect(@expense.go_to_canceled).to be true
-      expect(@expense.current_state).to be :canceled
-    end
-  end
-
-  describe "submitted state" do
-    before :each do
-      @expense = build(:expense_gun_expense)
-      @expense.go_to_submitted
-    end
-
-    it "submitted expense can be accepted" do
-      expect(@expense.go_to_accepted).to be true
-      expect(@expense.current_state).to be :accepted
-    end
-
-    it "submitted expense can be refused" do
-      expect(@expense.go_to_refused).to be true
-      expect(@expense.current_state).to be :refused
-    end
-
-    it "submitted expense can be canceled" do
-      expect(@expense.go_to_canceled).to be true
-      expect(@expense.current_state).to be :canceled
-    end
-  end
-
-  describe "acceped state" do
-    before :each do
-      @expense = build(:expense_gun_expense)
-      @expense.go_to_submitted
-      @expense.go_to_accepted
-    end
-
-    it "acceped expense can't be submitted" do
-      expect(@expense.go_to_submitted).to be false
-      expect(@expense.current_state).to be :accepted
-    end
-
-    it "acceped expense can't be refused" do
-      expect(@expense.go_to_refused).to be false
-      expect(@expense.current_state).to be :accepted
-    end
-
-    it "acceped expense can be canceled" do
-      expect(@expense.go_to_canceled).to be true
-      expect(@expense.current_state).to be :canceled
-    end
-  end
-
-  describe "refused state" do
-    before :each do
-      @expense = build(:expense_gun_expense)
-      @expense.go_to_submitted
-      @expense.go_to_refused
-    end
-
-    it "refused expense can't be submitted" do
-      expect(@expense.go_to_submitted).to be false
-      expect(@expense.current_state).to be :refused
-    end
-
-    it "refused expense can't be acceped" do
-      expect(@expense.go_to_accepted).to be false
-      expect(@expense.current_state).to be :refused
-    end
-
-    it "refused expense can't be canceled" do
-      expect(@expense.go_to_canceled).to be false
-      expect(@expense.current_state).to be :refused
-    end
-  end
-
-  describe "canceled state" do
-    before :each do
-      @expense = build(:expense_gun_expense)
-      @expense.go_to_canceled
-    end
-
-    it "canceled expense can't be submitted" do
-      expect(@expense.go_to_submitted).to be false
-      expect(@expense.current_state).to be :canceled
-    end
-
-    it "canceled expense can't be acceped" do
-      expect(@expense.go_to_accepted).to be false
-      expect(@expense.current_state).to be :canceled
-    end
-
-    it "canceled expense can't be refused" do
-      expect(@expense.go_to_refused).to be false
-      expect(@expense.current_state).to be :canceled
-    end
+    expect(described_class.new.state).to eq "draft"
   end
 
   it "#total_all_taxes should return sum of lines" do
@@ -165,12 +49,4 @@ RSpec.describe Dorsale::ExpenseGun::Expense, type: :model do
 
     expect(expense.total_vat_deductible).to eq 5.0
   end
-
-  it "#may_edit? should return false unless expense is not submitted" do
-    expect(described_class.new(state: :draft).may_edit?).to be true
-    expect(described_class.new(state: :submitted).may_edit?).to be false
-    expect(described_class.new(state: :acceped).may_edit?).to be false
-    expect(described_class.new(state: :refused).may_edit?).to be false
-    expect(described_class.new(state: :canceled).may_edit?).to be false
-  end
 end

data/spec/routing/dorsale/expense_gun/expenses_routing_spec.rb

@@ -34,24 +34,19 @@ describe ::Dorsale::ExpenseGun::ExpensesController, type: :routing do
         route_to("dorsale/expense_gun/expenses#update", id: "1")
     end
 
-    it "#submit" do
-      expect(patch "/expense_gun/expenses/1/submit").to \
-        route_to("dorsale/expense_gun/expenses#submit", id: "1")
+    it "#go_to_pending" do
+      expect(post "/expense_gun/expenses/1/go_to_pending").to \
+        route_to("dorsale/expense_gun/expenses#go_to_pending", id: "1")
     end
 
-    it "#accept" do
-      expect(patch "/expense_gun/expenses/1/accept").to \
-        route_to("dorsale/expense_gun/expenses#accept", id: "1")
+    it "#go_to_paid" do
+      expect(post "/expense_gun/expenses/1/go_to_paid").to \
+        route_to("dorsale/expense_gun/expenses#go_to_paid", id: "1")
     end
 
-    it "#refuse" do
-      expect(patch "/expense_gun/expenses/1/refuse").to \
-        route_to("dorsale/expense_gun/expenses#refuse", id: "1")
-    end
-
-    it "#cancel" do
-      expect(patch "/expense_gun/expenses/1/cancel").to \
-        route_to("dorsale/expense_gun/expenses#cancel", id: "1")
+    it "#go_to_canceled" do
+      expect(post "/expense_gun/expenses/1/go_to_canceled").to \
+        route_to("dorsale/expense_gun/expenses#go_to_canceled", id: "1")
     end
 
     it "#copy" do

data/spec/services/dorsale/expense_gun/expense/copy_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense::Copy do
       :user  => create(:user),
       :name  => "ExpenseName",
       :date  => Date.current,
-      :state => "accepted",
+      :state => "paid",
     )
 
     line = create(:expense_gun_expense_line,
@@ -56,7 +56,7 @@ RSpec.describe ::Dorsale::ExpenseGun::Expense::Copy do
   end
 
   it "should reset expense state" do
-    expect(expense.state).to eq "accepted"
+    expect(expense.state).to eq "paid"
     expect(copy.state).to eq "draft"
   end
 

data/spec/sorters/dorsale/expense_gun/expenses_sorter_spec.rb

@@ -0,0 +1,20 @@
+require "rails_helper"
+
+describe Dorsale::ExpenseGun::ExpensesSorter do
+  let!(:expense1) { create(:expense_gun_expense, date: "2021-05-10") }
+  let!(:expense2) { create(:expense_gun_expense, date: "2021-05-20") }
+
+  def sort_by(column)
+    described_class.call(Dorsale::ExpenseGun::Expense.all, column)
+  end
+
+  def self.it_should_sort_by(column)
+    it "should sort by #{column}" do
+      expect(sort_by column.to_s).to eq [expense1, expense2]
+      expect(sort_by "-#{column}").to eq [expense2, expense1]
+    end
+  end
+
+  it_should_sort_by :created_at
+  it_should_sort_by :date
+end # describe "sorting"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - agilidée
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -218,20 +218,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '99'
-- !ruby/object:Gem::Dependency
-  name: aasm
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '99'
 - !ruby/object:Gem::Dependency
   name: pdf-reader
   requirement: !ruby/object:Gem::Requirement
@@ -589,6 +575,7 @@ files:
 - app/services/dorsale/service.rb
 - app/services/dorsale/tag_list_for_model.rb
 - app/sorters/dorsale/alexandrie/attachments_sorter.rb
+- app/sorters/dorsale/expense_gun/expenses_sorter.rb
 - app/sorters/dorsale/flyboy/task_comments_sorter.rb
 - app/sorters/dorsale/flyboy/tasks_sorter.rb
 - app/uploaders/dorsale/alexandrie/file_uploader.rb
@@ -716,6 +703,7 @@ files:
 - app/views/dorsale/expense_gun/expenses/_index_actions.html.slim
 - app/views/dorsale/expense_gun/expenses/_list.html.slim
 - app/views/dorsale/expense_gun/expenses/_show_actions.html.slim
+- app/views/dorsale/expense_gun/expenses/_state_actions.html.slim
 - app/views/dorsale/expense_gun/expenses/edit.html.slim
 - app/views/dorsale/expense_gun/expenses/index.html.slim
 - app/views/dorsale/expense_gun/expenses/new.html.slim
@@ -819,6 +807,7 @@ files:
 - db/migrate/20171115171425_dorsale_customer_vault_people_add_secondary_emails.rb
 - db/migrate/20210202100529_billing_machine_add_positions.rb
 - db/migrate/20210311131928_billing_machine_add_missing_unique_indexes.rb
+- db/migrate/20210506070548_expenses_change_states.rb
 - features/access.feature
 - features/billing_machine_invoices.feature
 - features/billing_machine_multiple_vat.feature
@@ -951,6 +940,7 @@ files:
 - spec/services/dorsale/expense_gun/expense/copy_spec.rb
 - spec/services/dorsale/flyboy/task/copy_spec.rb
 - spec/services/dorsale/flyboy/task/snoozer_spec.rb
+- spec/sorters/dorsale/expense_gun/expenses_sorter_spec.rb
 - spec/spec_helper.rb
 - spec/support/devise.rb
 - spec/support/message_delivery.rb
@@ -1004,6 +994,7 @@ test_files:
 - spec/models/dorsale/flyboy/task_spec.rb
 - spec/models/dorsale/flyboy/task_comment_spec.rb
 - spec/models/dorsale/address_spec.rb
+- spec/sorters/dorsale/expense_gun/expenses_sorter_spec.rb
 - spec/support/devise.rb
 - spec/support/message_delivery.rb
 - spec/factories/expense_gun_categories.rb