dorsale 3.9.2 → 3.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5358e48332086ea75f9a49b3578793b5d16967a4
-  data.tar.gz: 12a4d387aa03f2b70f1461b9961b1e8cc034800a
+  metadata.gz: 2920c20a5fcc0b5057396ace7326452b10413142
+  data.tar.gz: 3b6318a593083ae63a1c4ad7e6b4ff19ca66beef
 SHA512:
-  metadata.gz: eb146a34700533fc56964b13a83249d901233c4c3d746ca51454796e3c70bcd1c0013b513805ef47e622dc8732b001f5e2935fbfdadef1ed24d16dbb695bd34a
-  data.tar.gz: e8a441114f93b6074e80d298b29c1a362686e5c5fc07a78af43e05bc77f09abf83f7893e0c561c475fec365367b604909787d96273ce32faf51e4e9e5fb084eb
+  metadata.gz: 7930f9d2cd19663154dd4b326d2216870d890a3fdf69251a337d1776b1963b925c8081078d062105b67e3be9b35a43d5ad1a63a44c44e6dd7164d1ac27df9149
+  data.tar.gz: 1c23b59eec27a27fa88934e35586c0617236077ad83ce16097ce0036d495be15ea97c99149d1fc343d4671201e118c47195e7c44db497723e1e0ddfb0864dc79

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## Next version
 
+## 3.9.3
+
+- BillingMachine : Fix payment status filter
+
 ## 3.9.2
 
 - CustomerVault : Add secondary emails + uniqueness validation

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

@@ -1,18 +1,2 @@
 class Dorsale::CustomerVault::ApplicationController < ::Dorsale::ApplicationController
-  before_action :set_form_variables, only: [
-    :new,
-    :create,
-    :edit,
-    :update,
-  ]
-
-  private
-
-  def customer_vault_tag_list
-    Dorsale::TagListForModel.(Dorsale::CustomerVault::Person)
-  end
-
-  def set_form_variables
-    @tags ||= customer_vault_tag_list
-  end
 end

data/app/controllers/dorsale/customer_vault/people_controller.rb

@@ -4,13 +4,8 @@ class Dorsale::CustomerVault::PeopleController < ::Dorsale::CustomerVault::Appli
   def index
     authorize model, :list?
 
-    @filters        ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(filters_jar)
-    @tags           ||= customer_vault_tag_list
-    @origins        ||= policy_scope(Dorsale::CustomerVault::Origin)
-    @activity_types ||= policy_scope(Dorsale::CustomerVault::ActivityType)
-    @people         ||= policy_scope(model)
-      .search(params[:q])
-      .preload(:taggings)
+    @filters ||= ::Dorsale::CustomerVault::SmallData::FilterForPeople.new(filters_jar)
+    @people  ||= policy_scope(model).search(params[:q]).preload(:taggings)
 
     if params[:q].blank?
       @people = @filters.apply(@people)

data/app/filters/dorsale/billing_machine/small_data/filter_strategy_by_payment_status.rb

@@ -13,7 +13,7 @@ class Dorsale::BillingMachine::SmallData::FilterStrategyByPaymentStatus < ::Agil
     elsif value == "late"
       query
         .where(paid: false)
-        .where("#{table_name}.due_date < ? OR #{table_name}.due_date IS NULL)", Date.current)
+        .where("#{table_name}.due_date < ? OR #{table_name}.due_date IS NULL", Date.current)
     else
       query
     end

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

@@ -57,4 +57,16 @@ module Dorsale::CustomerVault::ApplicationHelper
   def new_event_for(person)
     policy_scope(Dorsale::CustomerVault::Event).new(person: person, author: current_user)
   end
+
+  def customer_vault_tag_list
+    Dorsale::TagListForModel.(Dorsale::CustomerVault::Person)
+  end
+
+  def customer_vault_origins_for_select
+    policy_scope(Dorsale::CustomerVault::Origin)
+  end
+
+  def customer_vault_activity_types_for_select
+    policy_scope(Dorsale::CustomerVault::ActivityType)
+  end
 end

data/app/models/dorsale/flyboy/task.rb

@@ -1,10 +1,11 @@
 class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
-  REMINDER_TYPES = %w(duration custom)
-  REMINDER_UNITS = %w(days weeks months)
+  include ::Agilibox::Search
 
   self.table_name = "dorsale_flyboy_tasks"
 
-  include ::Agilibox::Search
+  REMINDER_TYPES = %w(duration custom)
+  REMINDER_UNITS = %w(days weeks months)
+  STATES         = %w(done undone ontime onwarning onalert)
 
   paginates_per 50
 
@@ -20,8 +21,6 @@ class Dorsale::Flyboy::Task < ::Dorsale::ApplicationRecord
     super.sort
   end
 
-  STATES = %w(done undone ontime onwarning onalert)
-
   def state
     return "done"      if done
     return "onalert"   if term          && term          <= Date.current

data/app/pdfs/dorsale/billing_machine/invoice_single_vat_pdf.rb

@@ -1,10 +1,6 @@
 class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   include Dorsale::Alexandrie::Prawn::RenderWithAttachments
 
-  def attachments
-    @main_document.try(:attachments) || []
-  end
-
   DEBUG = false
 
   BLACK      = "000000"
@@ -12,10 +8,6 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
   GREY       = "808080"
   LIGHT_GREY = "C0C0C0"
 
-  def bm_currency(n)
-    currency(n, Dorsale::BillingMachine.default_currency)
-  end
-
   attr_reader :main_document
 
   def initialize(main_document)
@@ -24,6 +16,14 @@ class Dorsale::BillingMachine::InvoiceSingleVatPdf < Dorsale::ApplicationPdf
     setup
   end
 
+  def attachments
+    @main_document.try(:attachments) || []
+  end
+
+  def bm_currency(n)
+    currency(n, Dorsale::BillingMachine.default_currency)
+  end
+
   # rubocop:disable Style/SingleLineMethods, Layout/EmptyLineBetweenDefs
   def header_height;         90.mm; end
   def logo_height;           32.mm; end

data/app/views/dorsale/customer_vault/people/_filters.html.slim

@@ -4,14 +4,14 @@
     :include_blank => ::Dorsale::CustomerVault::Person.t(:all_types)
 
   = f.input :person_tags,
-    :collection    => @tags,
+    :collection    => customer_vault_tag_list,
     :input_html    => {multiple: true},
     :placeholder => ::Dorsale::CustomerVault::Person.t(:all_tags)
 
   = f.input :person_origin,
-    :collection    => @origins,
+    :collection    => customer_vault_origins_for_select,
     :include_blank => ::Dorsale::CustomerVault::Person.t(:all_origins)
 
   = f.input :person_activity,
-    :collection    => @activity_types,
+    :collection    => customer_vault_activity_types_for_select,
     :include_blank => ::Dorsale::CustomerVault::Person.t(:all_activity_types)

data/app/views/dorsale/customer_vault/people/_form.html.slim

@@ -14,7 +14,7 @@
       = f.association :origin, collection: policy_scope(Dorsale::CustomerVault::Origin), input_html: {class: 'select2'}
       - if @person.corporation?
         = f.association :activity_type, collection: policy_scope(Dorsale::CustomerVault::ActivityType), input_html: {class: 'select2'}
-      = f.input :tag_list, collection: @tags, input_html: {multiple: true}
+      = f.input :tag_list, collection: customer_vault_tag_list, input_html: {multiple: true}
 
   .panel.panel-default
     .panel-heading: .panel-title = t("customer_vault.additional_informations")

data/lib/dorsale/version.rb

@@ -1,3 +1,3 @@
 module Dorsale
-  VERSION = "3.9.2"
+  VERSION = "3.9.3"
 end

data/spec/controllers/dorsale/billing_machine/invoices_controller_spec.rb

@@ -30,96 +30,108 @@ describe Dorsale::BillingMachine::InvoicesController, type: :controller do
   end # describe "PDF export"
 
   describe "filters" do
-    before do
-      Timecop.freeze "2016-11-08 12:00:00"
-      @today      = create(:billing_machine_invoice, date: "2016-11-08")
-      @yesterday  = create(:billing_machine_invoice, date: "2016-11-07")
-      @tomorrow   = create(:billing_machine_invoice, date: "2016-11-09")
-      @last_week  = create(:billing_machine_invoice, date: "2016-11-04")
-      @last_month = create(:billing_machine_invoice, date: "2016-10-18")
-      @last_year  = create(:billing_machine_invoice, date: "2015-10-18")
-    end
-
-    def filter(period)
-      cookies[:filters] = {"bm_time_period" => period.to_s}.to_json
-      get :index
-    end
-
-    it "should filter by all_time" do
-      filter :all_time
-      expect(assigns :invoices).to contain_exactly(
-        @today,
-        @yesterday,
-        @tomorrow,
-        @last_week,
-        @last_month,
-        @last_year,
-      )
-    end
-
-    it "should filter by today" do
-      filter :today
-      expect(assigns :invoices).to contain_exactly(
-        @today,
-      )
-    end
-
-    it "should filter by yesterday" do
-      filter :yesterday
-      expect(assigns :invoices).to contain_exactly(
-        @yesterday,
-      )
-    end
-
-    it "should filter by this_week" do
-      filter :this_week
-      expect(assigns :invoices).to contain_exactly(
-        @today,
-        @yesterday,
-        @tomorrow,
-      )
-    end
-
-    it "should filter by this_month" do
-      filter :this_month
-      expect(assigns :invoices).to contain_exactly(
-        @today,
-        @yesterday,
-        @tomorrow,
-        @last_week,
-      )
-    end
-
-    it "should filter by this_year" do
-      filter :this_year
-      expect(assigns :invoices).to contain_exactly(
-        @today,
-        @yesterday,
-        @tomorrow,
-        @last_week,
-        @last_month,
-      )
-    end
-
-    it "should filter by last_week" do
-      filter :last_week
-      expect(assigns :invoices).to contain_exactly(
-        @last_week,
-      )
-    end
-
-    it "should filter by last_month" do
-      filter :last_month
-      expect(assigns :invoices).to contain_exactly(
-        @last_month,
-      )
-    end
-
-    it "should filter by last_year" do
-      filter :last_year
-      expect(assigns :invoices).to contain_exactly(
-        @last_year,
-      )
-    end
+    describe "filter by date" do
+      before do
+        Timecop.freeze "2016-11-08 12:00:00"
+        @today      = create(:billing_machine_invoice, date: "2016-11-08")
+        @yesterday  = create(:billing_machine_invoice, date: "2016-11-07")
+        @tomorrow   = create(:billing_machine_invoice, date: "2016-11-09")
+        @last_week  = create(:billing_machine_invoice, date: "2016-11-04")
+        @last_month = create(:billing_machine_invoice, date: "2016-10-18")
+        @last_year  = create(:billing_machine_invoice, date: "2015-10-18")
+      end
+
+      def filter(period)
+        cookies[:filters] = {"bm_time_period" => period.to_s}.to_json
+        get :index
+      end
+
+      it "should filter by all_time" do
+        filter :all_time
+        expect(assigns :invoices).to contain_exactly(
+          @today,
+          @yesterday,
+          @tomorrow,
+          @last_week,
+          @last_month,
+          @last_year,
+        )
+      end
+
+      it "should filter by today" do
+        filter :today
+        expect(assigns :invoices).to contain_exactly(@today)
+      end
+
+      it "should filter by yesterday" do
+        filter :yesterday
+        expect(assigns :invoices).to contain_exactly(@yesterday)
+      end
+
+      it "should filter by this_week" do
+        filter :this_week
+        expect(assigns :invoices).to contain_exactly(@today, @yesterday, @tomorrow)
+      end
+
+      it "should filter by this_month" do
+        filter :this_month
+        expect(assigns :invoices).to contain_exactly(@today, @yesterday, @tomorrow, @last_week)
+      end
+
+      it "should filter by this_year" do
+        filter :this_year
+        expect(assigns :invoices).to \
+          contain_exactly(@today, @yesterday, @tomorrow, @last_week, @last_month)
+      end
+
+      it "should filter by last_week" do
+        filter :last_week
+        expect(assigns :invoices).to contain_exactly(@last_week)
+      end
+
+      it "should filter by last_month" do
+        filter :last_month
+        expect(assigns :invoices).to contain_exactly(@last_month)
+      end
+
+      it "should filter by last_year" do
+        filter :last_year
+        expect(assigns :invoices).to contain_exactly(@last_year)
+      end
+    end # describe "filter by date"
+
+    describe "filter by payment status" do
+      before do
+        Timecop.freeze "2016-11-08 12:00:00"
+        @paid       = create(:billing_machine_invoice, paid: true,  due_date: "2016-01-08")
+        @pending    = create(:billing_machine_invoice, paid: false, due_date: "2016-11-10")
+        @late       = create(:billing_machine_invoice, paid: false, due_date: "2016-06-05")
+      end
+
+      def filter(value)
+        cookies[:filters] = {"bm_payment_status" => value.to_s}.to_json
+        get :index
+      end
+
+      it "should filter by paid" do
+        filter :paid
+        expect(assigns :invoices).to contain_exactly(@paid)
+      end
+
+      it "should filter by unpaid" do
+        filter :unpaid
+        expect(assigns :invoices).to contain_exactly(@pending, @late)
+      end
+
+      it "should filter by pending" do
+        filter :pending
+        expect(assigns :invoices).to contain_exactly(@pending)
+      end
+
+      it "should filter by late" do
+        filter :late
+        expect(assigns :invoices).to contain_exactly(@late)
+      end
+    end # describe "filter by payment status"
   end # describe "filters"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dorsale
 version: !ruby/object:Gem::Version
-  version: 3.9.2
+  version: 3.9.3
 platform: ruby
 authors:
 - agilidée
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-29 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails