redmine_crm 0.0.43 → 0.0.63

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c7ec4763f7c0ff9e5ce0744bcd8579020ed89b32
-  data.tar.gz: 45d4f87a91b17c299097c1f6aa5a9732507f30cc
+SHA256:
+  metadata.gz: d6f025a0e487391530abd90ac50a2e4eae82f8f7dfe2a111b94fdf5bee72e49c
+  data.tar.gz: f4b6416ab62493a9909739545c70ec32ec22334409e07bf1270d6127a1149fcf
 SHA512:
-  metadata.gz: a604d13c92a5a5e47ff93d7aeb3867c503c1743beb55059502cbc4fd28a2ddadac9e6cc7745e950249aace899dab2ed8e86d7ced27d5682bd2aade9f7c6e6ca3
-  data.tar.gz: d26992ff800bf72702248dd3d3afb416ee15a5432091ed38befa56196a436b75901fc04a328dc742450261d1e59dba55552e33c8a32e985e6834fada408c79dc
+  metadata.gz: dd9eb904c28266a1d335f7b797c107686d74661bde31dee567de54c1aed2f556721b18621c1b2a03607f129d698e6b46525a325b5ca33c27663b7bce281c1b6a
+  data.tar.gz: c8e0342ed8a4f60fc7bb56d4e7b91d4e19f5b677fcb88f8f5dbe196515f86139a98c4f48ad003e3061b0b066fdac46c25128d4fc8889711cb70e2a6f68858a25

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in redmine_crm.gemspec
-gemspec
+gemspec

data/app/controllers/redmine_crm_controller.rb

@@ -0,0 +1,26 @@
+class RedmineCrmController < ApplicationController
+  layout 'admin'
+
+  before_action :require_admin
+  require_sudo_mode :settings if respond_to?(:require_sudo_mode)
+
+  def settings
+    @section = RedmineCrm::Settings::SECTIONS[params[:id]]
+    return render_404 unless @section
+
+    if request.post?
+      setting =
+        if params[:settings].present?
+          params[:settings].respond_to?(:to_unsafe_hash) ? params[:settings].to_unsafe_hash : params[:settings]
+        else
+          {}
+        end
+      RedmineCrm::Settings.apply = setting
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to redmine_crm_settings_path(@section[:id])
+    else
+      @settings = RedmineCrm::Settings.values
+    end
+    @section_tabs = RedmineCrm::Settings::SECTIONS.map { |_n, s| { name: s[:id], partial: s[:partial], label: s[:label] } }
+  end
+end

data/app/views/redmine_crm/_money.html.erb

@@ -0,0 +1,44 @@
+<p>
+  <label for="cb_settings_disable_taxes"><%= l(:label_redmine_crm_disable_taxes) %></label>
+  <%= hidden_field_tag 'settings[disable_taxes]', '0' %>
+  <%= check_box_tag 'settings[disable_taxes]', 1, RedmineCrm::Settings::Money.disable_taxes?, id: 'cb_settings_disable_taxes' %>
+</p>
+
+<span id="tax_data">
+  <p>
+    <label><%= l(:label_redmine_crm_default_tax) %></label>
+    <%= text_field_tag 'settings[default_tax]', RedmineCrm::Settings::Money.default_tax, size: 6, maxlength: 5 %> %
+  </p>
+
+  <p>
+    <label><%= l(:label_redmine_crm_tax_type) %></label>
+    <%= select_tag 'settings[tax_type]', options_for_select([[l(:label_redmine_crm_tax_type_exclusive), RedmineCrm::Settings::Money::TAX_TYPE_EXCLUSIVE],
+                                                             [l(:label_redmine_crm_tax_type_inclusive), RedmineCrm::Settings::Money::TAX_TYPE_INCLUSIVE]],
+                                                             @settings['tax_type']) %>
+  </p>
+</span>
+
+<p>
+  <label><%= l(:label_redmine_crm_default_currency) %></label>
+  <%= select_tag 'settings[default_currency]', options_for_select(all_currencies.insert(0, ['', '']), RedmineCrm::Settings::Money.default_currency) %>
+</p>
+
+<p>
+  <label><%= l(:label_redmine_crm_major_currencies) %></label>
+  <%= text_field_tag 'settings[major_currencies]', RedmineCrm::Settings::Money.major_currencies.join(', '), size: 40 %>
+  <br>
+  <em class="info"><%= l(:text_comma_separated) %></em>
+</p>
+
+<p>
+  <label><%= l(:label_redmine_crm_thousands_delimiter) %></label>
+  <%= select_tag 'settings[thousands_delimiter]',  options_for_select([["9 999", " "],
+                                                                       ["9,999", ","],
+                                                                       ["9.999", "."]], RedmineCrm::Settings::Money.thousands_delimiter) %>
+</p>
+
+<p>
+  <label><%= l(:label_redmine_crm_decimal_separator) %></label>
+  <%= select_tag 'settings[decimal_separator]',  options_for_select([["0.00", "."],
+                                                                     ["0,00", ","]], RedmineCrm::Settings::Money.decimal_separator) %>
+</p>

data/app/views/redmine_crm/settings.html.erb

@@ -0,0 +1,10 @@
+<%= title l(:label_redmine_crm_settings) %>
+
+<div id="settings">
+  <%= form_tag({ action: 'settings', id: @section[:id] }) do %>
+    <div class="box tabular settings">
+      <%= render partial: 'money' %>
+    </div>
+    <%= submit_tag l(:button_apply) %>
+  <% end %>
+</div>

data/bitbucket-pipelines.yml

@@ -12,6 +12,7 @@ pipelines:
         script:
           - sed -i "s/'sqlite3'/'sqlite3', '~> 1.3.6'/g" redmine_crm.gemspec
           - sed -i "s/'mysql2'/'mysql2', '~> 0.4.0'/g" redmine_crm.gemspec
+          - sed -i "s/'rubyzip'/'rubyzip'\n  spec.add_runtime_dependency 'loofah', '~>2.19.1'/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=postgresql
@@ -19,14 +20,6 @@ pipelines:
         services:
           - mysql
           - postgres
-    - step:
-        name: Old ruby
-        image: ruby:1.9.3
-        script:
-          - bundle install
-          - bundle exec rake test DB=mysql
-        services:
-          - mysql
 
 definitions:
   services:

data/config/currency_iso.json

@@ -1813,7 +1813,7 @@
     "priority": 100,
     "iso_code": "RUB",
     "name": "Russian Ruble",
-    "symbol": "RUB",
+    "symbol": "₽",
     "alternate_symbols": ["руб.", "р."],
     "subunit": "Kopeck",
     "subunit_to_unit": 100,

data/config/locales/cs.yml

@@ -0,0 +1,13 @@
+cs:
+  label_redmine_crm_settings: Peníze
+  label_redmine_crm_money: Peníze
+
+  label_redmine_crm_disable_taxes: Znemožnit daně
+  label_redmine_crm_default_tax: Výchozí hodnota daně
+  label_redmine_crm_tax_type: Typ daně
+  label_redmine_crm_tax_type_exclusive: Bez daně
+  label_redmine_crm_tax_type_inclusive: Včetně daně
+  label_redmine_crm_default_currency: Výchozí měna
+  label_redmine_crm_major_currencies: Hlavní měny
+  label_redmine_crm_thousands_delimiter: Oddělovač tisíců
+  label_redmine_crm_decimal_separator: Desetinný oddělovač

data/config/locales/de.yml

@@ -0,0 +1,13 @@
+de:
+  label_redmine_crm_settings: Währungseinstellungen
+  label_redmine_crm_money: Währung
+
+  label_redmine_crm_disable_taxes: Steuern deaktiviert
+  label_redmine_crm_default_tax: Standard Steuersatz
+  label_redmine_crm_tax_type: Steuerart
+  label_redmine_crm_tax_type_exclusive: Steuer ausgeschlossen
+  label_redmine_crm_tax_type_inclusive: Steuer eingeschlossen
+  label_redmine_crm_default_currency: Standard Währung
+  label_redmine_crm_major_currencies: Aktive Währungen
+  label_redmine_crm_thousands_delimiter: Tausendertrennzeichen
+  label_redmine_crm_decimal_separator: Dezimaltrennzeichen

data/config/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  label_redmine_crm_settings: Money Settings
+  label_redmine_crm_money: Money
+
+  label_redmine_crm_disable_taxes: Disable taxes
+  label_redmine_crm_default_tax: Default tax value
+  label_redmine_crm_tax_type: Tax type
+  label_redmine_crm_tax_type_exclusive: Tax exclusive
+  label_redmine_crm_tax_type_inclusive: Tax inclusive
+  label_redmine_crm_default_currency: Default currency
+  label_redmine_crm_major_currencies: Major currencies
+  label_redmine_crm_thousands_delimiter: Thousands delimiter
+  label_redmine_crm_decimal_separator: Decimal separator

data/config/locales/es.yml

@@ -0,0 +1,13 @@
+es:
+  label_redmine_crm_settings: Configuración
+  label_redmine_crm_money: Dinero
+
+  label_redmine_crm_disable_taxes: Deshabilitar impuestos
+  label_redmine_crm_default_tax: Impuesto por defecto
+  label_redmine_crm_tax_type: Tipo de impuesto
+  label_redmine_crm_tax_type_exclusive: Excluir
+  label_redmine_crm_tax_type_inclusive: Incluir
+  label_redmine_crm_default_currency: Moneda por defecto
+  label_redmine_crm_major_currencies: Monedas usadas
+  label_redmine_crm_thousands_delimiter: Separador de miles
+  label_redmine_crm_decimal_separator: Separador de decimales

data/config/locales/ru.yml

@@ -0,0 +1,13 @@
+ru:
+  label_redmine_crm_settings: Настройки валют
+  label_redmine_crm_money: Деньги
+
+  label_redmine_crm_disable_taxes: Отключить налоги
+  label_redmine_crm_default_tax: Ставка налога
+  label_redmine_crm_tax_type: Тип налога
+  label_redmine_crm_tax_type_exclusive: Налог добавлен к общей сумме
+  label_redmine_crm_tax_type_inclusive: Налог включен с общую сумму
+  label_redmine_crm_default_currency: Валюта по умолчанию
+  label_redmine_crm_major_currencies: Основные валюты
+  label_redmine_crm_thousands_delimiter: Разделитель разрядов
+  label_redmine_crm_decimal_separator: Десятичный разделитель

data/config/routes.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+Rails.application.routes.draw do
+  match 'redmine_crm/settings/:id', to: 'redmine_crm#settings', as: 'redmine_crm_settings', via: [:get, :post]
+end

data/doc/CHANGELOG

@@ -1,9 +1,100 @@
 == Redmine CRM gem changelog
 
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2019 RedmineUP
+Copyright (C) 2011-2023 RedmineUP
 https://www.redmineup.com/
+
+== 2023-12-26 v0.0.63
+
+* Compatibility fixes with attachment routes 
+
+== 2023-11-15 v0.0.62
+
+* Redmine 5.1 compatibility fixes
+
+== 2023-09-27 v0.0.61
+
+* Reverted time picker calendar
+* Added helper methods for time format
+
+== 2023-09-20 v0.0.60
+
+* Fixed SQL injection 
+* Added calendar with date time picker
+
+== 2023-01-16 v0.0.59
+
+* Fixed attachments constraint 
+* Added Spanish locale (Juan José Taguas Navarro)
  
+== 2022-09-26 v0.0.58
+
+* Added closed? method to Issue Drop
+* Added blank issue for Time Entry
+* Added helpdesk_ticket method for Issue Drop
+
+== 2022-02-14 v0.0.57
+
+* Fixed BigDecimal liquid bug for ruby > 2.6 
+
+== 2022-02-14 v0.0.56
+
+* Added rcrm_acts_as_priceable 
+* Added IssueRealtions drops
+
+== 2021-06-08 v0.0.55
+
+* Added Attachment Liquid drop
+* Added section to Checklist Liquid drop
+* Added Czech locale
+* Added German locale
+
+== 2020-08-10 v0.0.54
+
+* Fixed new JQuery select2 bug
+
+== 2020-04-07 v0.0.53
+
+* Multiselect styles cleanup
+* Added rubyzip dependence 
+
+== 2019-12-26 v0.0.52
+
+* select2 styles cleanup
+
+== 2019-12-20 v0.0.51
+
+* Changed drafts params 
+* Changed Money settings UI
+* Fixed bug with settings access
+
+== 2019-11-18 v0.0.50
+
+* Fixed bug with settings initialization
+
+== 2019-11-12 v0.0.49
+
+* Fixed settings compatibility bug
+
+== 2019-11-07 v0.0.48
+
+* Added global money setting
+* Fixed select2 format 
+
+== 2019-08-26 v0.0.47
+
+* Fixed bug with tag cloud 
+
+== 2019-08-14 v0.0.46
+
+* select2 update
+
+== 2019-08-13 v0.0.44
+
+* Fixed Safari scroll down bug
+* Multiaddress select helpers fixes
+* Fixed tags privacy bugs
+
 == 2019-05-07 v0.0.43
 
 * custom_field and custom_fields methods added from Reporter plugin

data/lib/redmine_crm/acts_as_draftable/draft.rb

@@ -24,7 +24,7 @@ module RedmineCrm
   module ActsAsDraftable
     class Draft < ActiveRecord::Base
       belongs_to :user
-      belongs_to :parent, polymorphic: true
+      belongs_to :parent, polymorphic: true, autosave: false
 
       validates_presence_of :data, :target_type
 

data/lib/redmine_crm/acts_as_draftable/rcrm_acts_as_draftable.rb

@@ -78,8 +78,10 @@ module RedmineCrm
         target
       end
 
-      def drafts(user)
-        Draft.where(user_id: user.id, target_type: name)
+      def drafts(user = nil)
+        drafts = Draft.where(target_type: name)
+        drafts = drafts.where(user_id: user.id) if user
+        drafts
       end
     end # ClassMethods
 

data/lib/redmine_crm/acts_as_priceable/rcrm_acts_as_priceable.rb

@@ -0,0 +1,33 @@
+module RedmineCrm
+  module ActsAsPriceable
+    module Base
+      def rcrm_acts_as_priceable(*args)
+        priceable_options = args
+        priceable_options << :price if priceable_options.empty?
+        priceable_methods = ""
+        priceable_options.each do |priceable_attr|
+          priceable_methods << %(
+            def #{priceable_attr.to_s}_to_s
+              object_price(
+                self,
+                :#{priceable_attr},
+                {
+                  :decimal_mark => RedmineCrm::Settings::Money.decimal_separator,
+                  :thousands_separator => RedmineCrm::Settings::Money.thousands_delimiter
+                }
+              ) if self.respond_to?(:#{priceable_attr})
+            end
+          )
+        end
+
+        class_eval <<-EOV
+          include RedmineCrm::MoneyHelper
+
+          #{priceable_methods}
+        EOV
+      end
+    end
+  end
+end
+
+ActiveRecord::Base.extend RedmineCrm::ActsAsPriceable::Base

data/lib/redmine_crm/acts_as_taggable/rcrm_acts_as_taggable.rb

@@ -90,7 +90,7 @@ module RedmineCrm
         #Return all avalible tags for a project or global
         #Example: Question.available_tags(:project => @project_id )
         def available_tags(options = {})
-          project = options[:project]
+          projects = [[options[:project]], options[:projects]].flatten.compact
           limit = options[:limit].to_i.zero? ? 30 : options[:limit].to_i
           scope = Tag.where({})
           class_name = quote_string_value(base_class.name)
@@ -98,9 +98,9 @@ module RedmineCrm
           join << "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id "
           join << "JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id
             AND #{Tagging.table_name}.taggable_type = #{class_name} "
-          if attribute_names.include?('project_id') && project
+          if attribute_names.include?('project_id') && projects.any?
             join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
-            scope = scope.where("#{table_name}.project_id = ?", project.id)
+            scope = scope.where("#{table_name}.project_id IN (%s)", projects.map(&:id).join(','))
           end
 
           if options[:name_like]
@@ -111,6 +111,13 @@ module RedmineCrm
           group_fields << ", #{Tag.table_name}.created_at" if Tag.respond_to?(:created_at)
           group_fields << ", #{Tag.table_name}.updated_at" if Tag.respond_to?(:updated_at)
 
+          if base_class.respond_to?(:visible_condition)
+            visible_condition = base_class.visible_condition(User.current)
+            if visible_condition.include?('project_id') && join.all? { |jn| jn.exclude?('JOIN projects') }
+              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            end
+            scope = scope.where(visible_condition)
+          end
           scope = scope.joins(join.join(' '))
           scope = scope.select("#{Tag.table_name}.*, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
           scope = scope.group("#{Tag.table_name}.id, #{Tag.table_name}.name #{group_fields}")

data/lib/redmine_crm/acts_as_taggable/tag_list.rb

@@ -58,7 +58,7 @@ module RedmineCrm
 
         map do |name|
           name.include?(delimiter) ? "\"#{name}\"" : name
-        end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
+        end.join(delimiter[-1] == (' ') ? delimiter : "#{delimiter} ")
       end
 
      private

data/lib/redmine_crm/acts_as_viewed/rcrm_acts_as_viewed.rb

@@ -183,7 +183,7 @@ module RedmineCrm
           if viewer && !viewer.id.nil? && !viewer.anonymous?
             return viewings.where("viewer_id = '#{viewer.id}'").any?
           else
-            return viewings.where("ip = '#{ip}'").any?
+            return viewings.where("ip = :ip", ip: ip).any?
           end
         end
 

data/lib/redmine_crm/acts_as_votable/rcrm_acts_as_votable.rb

@@ -58,7 +58,7 @@ module RedmineCrm
 
         end
 
-        if self.parent::VERSION::MAJOR < 4
+        if ::ActiveRecord::VERSION::MAJOR < 4
           create_index votes_name_table, [:votable_id, :votable_type, :vote_ip]
           create_index votes_name_table, [:voter_id, :voter_type, :vote_ip]
         end

data/lib/redmine_crm/acts_as_votable/votable.rb

@@ -233,9 +233,9 @@ module RedmineCrm
         end
         self.record_timestamps = false
         if (::ActiveRecord::VERSION::MAJOR == 3) && (::ActiveRecord::VERSION::MINOR != 0)
-          self.update_attributes(updates, :without_protection => true) if !updates.empty?
+          self.assign_attributes(updates, :without_protection => true) && self.save if !updates.empty?
         else
-          self.update_attributes(updates) if !updates.empty?
+          self.assign_attributes(updates) && self.save if !updates.empty?
         end
       end
 

data/lib/redmine_crm/compatibility/routing_mapper_patch.rb

@@ -0,0 +1,27 @@
+module RedmineCrm
+  module Patches
+    module RoutingMapperPatch
+      def self.included(base)
+        base.send(:include, InstanceMethods)
+
+        base.class_eval do
+          alias_method :constraints_without_redmine_crm, :constraints
+          alias_method :constraints, :constraints_with_redmine_crm
+        end
+      end
+
+      module InstanceMethods
+        def constraints_with_redmine_crm(options = {}, &block)
+          return constraints_without_redmine_crm(options, &block) unless options.is_a?(Hash)
+
+          options[:object_type] = /.+/ if options[:object_type] && options[:object_type].is_a?(Regexp)
+          constraints_without_redmine_crm(options, &block)
+        end
+      end
+    end
+  end
+end
+
+unless ActionDispatch::Routing::Mapper.included_modules.include?(RedmineCrm::Patches::RoutingMapperPatch)
+  ActionDispatch::Routing::Mapper.send(:include, RedmineCrm::Patches::RoutingMapperPatch)
+end

data/lib/redmine_crm/currency/formatting.rb

@@ -4,8 +4,8 @@ module RedmineCrm
     module Formatting
       def self.included(base)
         [
-          [:thousands_separator, :delimiter, ","],
-          [:decimal_mark, :separator, "."]
+          [:thousands_separator, :delimiter, RedmineCrm::Settings::Money.thousands_delimiter],
+          [:decimal_mark, :separator, RedmineCrm::Settings::Money.decimal_separator]
         ].each do |method, name, character|
           define_i18n_method(method, name, character)
         end
@@ -115,9 +115,9 @@ module RedmineCrm
 
       def default_formatting_rules
         {
-          :decimal_mark =>".",
-          :thousands_separator => ",",
-          :subunit_to_unit => 100
+          decimal_mark: RedmineCrm::Settings::Money.decimal_separator || '.',
+          thousands_separator: RedmineCrm::Settings::Money.thousands_delimiter || ',',
+          subunit_to_unit: 100
         }
       end
 

data/lib/redmine_crm/currency.rb

@@ -33,6 +33,17 @@ module RedmineCrm
 
     class << self
 
+      def add_admin_money_menu
+        return if Redmine::MenuManager.map(:admin_menu).exists?(:redmine_crm_money)
+
+        require 'redmine_crm/hooks/views_layouts_hook'
+        Redmine::MenuManager.map(:admin_menu).push(:redmine_crm_money,
+                                                   { controller: 'redmine_crm', action: 'settings', id: 'money' },
+                                                   caption: :label_redmine_crm_money,
+                                                   html: { class: 'icon icon-redminecrm-money' })
+
+      end
+
       # Lookup a currency with given +id+ an returns a +Currency+ instance on
       # success, +nil+ otherwise.
       #
@@ -190,40 +201,40 @@ module RedmineCrm
       end
     end
 
-    # @!attribute [r] id 
+    # @!attribute [r] id
     #   @return [Symbol] The symbol used to identify the currency, usually THE
     #     lowercase +iso_code+ attribute.
-    # @!attribute [r] priority 
+    # @!attribute [r] priority
     #   @return [Integer] A numerical value you can use to sort/group the
     #     currency list.
-    # @!attribute [r] iso_code 
+    # @!attribute [r] iso_code
     #   @return [String] The international 3-letter code as defined by the ISO
     #     4217 standard.
-    # @!attribute [r] iso_numeric 
+    # @!attribute [r] iso_numeric
     #   @return [String] The international 3-numeric code as defined by the ISO
     #     4217 standard.
-    # @!attribute [r] name 
+    # @!attribute [r] name
     #   @return [String] The currency name.
-    # @!attribute [r] symbol 
+    # @!attribute [r] symbol
     #   @return [String] The currency symbol (UTF-8 encoded).
-    # @!attribute [r] disambiguate_symbol 
+    # @!attribute [r] disambiguate_symbol
     #   @return [String] Alternative currency used if symbol is ambiguous
-    # @!attribute [r] html_entity 
+    # @!attribute [r] html_entity
     #   @return [String] The html entity for the currency symbol
-    # @!attribute [r] subunit 
+    # @!attribute [r] subunit
     #   @return [String] The name of the fractional monetary unit.
-    # @!attribute [r] subunit_to_unit 
+    # @!attribute [r] subunit_to_unit
     #   @return [Integer] The proportion between the unit and the subunit
-    # @!attribute [r] decimal_mark 
+    # @!attribute [r] decimal_mark
     #   @return [String] The decimal mark, or character used to separate the
     #     whole unit from the subunit.
-    # @!attribute [r] The 
+    # @!attribute [r] The
     #   @return [String] character used to separate thousands grouping of the
     #     whole unit.
-    # @!attribute [r] symbol_first 
+    # @!attribute [r] symbol_first
     #   @return [Boolean] Should the currency symbol precede the amount, or
     #     should it come after?
-    # @!attribute [r] smallest_denomination 
+    # @!attribute [r] smallest_denomination
     #   @return [Integer] Smallest amount of cash possible (in the subunit of
     #     this currency)
 
@@ -301,7 +312,7 @@ module RedmineCrm
                           end
       self.id.to_s.downcase == other_currency_id
     end
-    
+
     private :compare_ids
 
     # Returns a Fixnum hash value based on the +id+ attribute in order to use
@@ -402,7 +413,7 @@ module RedmineCrm
     end
 
     private
-      
+
     def cache
       self.class.decimal_places_cache
     end
@@ -436,4 +447,4 @@ module RedmineCrm
       @thousands_separator   = data[:thousands_separator]
     end
   end
-end
+end

data/lib/redmine_crm/engine.rb

@@ -0,0 +1,4 @@
+module RedmineCrm
+   class Engine < Rails::Engine
+   end
+end

data/lib/redmine_crm/helpers/calendars_helper.rb

@@ -0,0 +1,22 @@
+module RedmineCrm
+  module CalendarsHelper
+
+    def calendar_day_css_classes(calendar, day)
+      css = day.month==calendar.month ? +'even' : +'odd'
+      css << " today" if User.current.today == day
+      css << " nwday" if non_working_week_days.include?(day.cwday)
+      css
+    end
+
+    def non_working_week_days
+      @non_working_week_days ||= begin
+        days = Setting.non_working_week_days
+        if days.is_a?(Array) && days.size < 7
+          days.map(&:to_i)
+        else
+          []
+        end
+      end
+    end
+  end
+end

data/lib/redmine_crm/helpers/external_assets_helper.rb

@@ -15,5 +15,6 @@ module RedmineCrm
       @chartjs_tag_included = true
       javascript_include_tag('Chart.bundle.min', plugin: GEM_NAME)
     end
+
   end
 end

data/lib/redmine_crm/helpers/form_tag_helper.rb

@@ -72,5 +72,17 @@ module RedmineCrm
     def transform_to_select2(type, options = {})
       javascript_tag("setSelect2Filter('#{type}', #{options.to_json});") unless type.empty?
     end
+
+    def format_datetime(time)
+      formated_time = format_time(time, false)
+      formated_date = ::I18n.l(time.to_date, format: '%Y-%m-%d')
+      "#{formated_date} #{formated_time}"
+    end
+
+    def format_datetime_date(time)
+      formated_date = ::I18n.l(time.to_date, format: '%Y-%m-%d')
+      "#{formated_date}"
+    end    
+
   end
 end