redmine_crm 0.0.47 → 0.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69a1fa898e3b5a087d2dd75ad7ef6fe39e28cdde
-  data.tar.gz: 26dbba848e8586993dfc82a0f6f84f446c81699a
+  metadata.gz: a1c034965196dbd50cc840b5655eadcbf75dab04
+  data.tar.gz: fa59b69096a8810670a3aa90b5c6e76d3aa24b2d
 SHA512:
-  metadata.gz: 29c1d4c2f6b61cd04a6842bae649b85ef9785ab52cd197bfdca70033c21e0b77a413392fefe05436edffea8386be6ba19c50c16bb43d451cc4e7407e6abff70c
-  data.tar.gz: 9bcfba949514d1a2bcc9abc5f6aa6f6be012c74d3abab92a287297869cc14655f65effe73d252f2b38954616f22dc844622b50670f3c9a829ab129dd0559b6cc
+  metadata.gz: 00fafa577fe756a6d0a4dfc6795816fe745bcf56a2ec0bb20fe15a6e76688d54439772b73ed425ebf4e8fadee90f5b9f92a76a6a3e5f42ef3be20a8ebd90ab73
+  data.tar.gz: 1b087c66d055885d2d1720608526768c37a6cf9bfa62ac5b98c127c139f7ca6290859bc2a8abba0e06fc88a21d3e47da2b7cef8232724d3ccc214b383bfe695b

data/app/controllers/redmine_crm_controller.rb

@@ -0,0 +1,21 @@
+class RedmineCrmController < ApplicationController
+  layout 'admin'
+
+  before_action :require_admin
+  require_sudo_mode :settings
+
+  def settings
+    @section = RedmineCrm::Settings::SECTIONS[params[:id]]
+    return render_404 unless @section
+
+    if request.post?
+      setting = params[:settings] ? params[:settings].permit!.to_h : {}
+      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_tabs @section_tabs %>
+    </div>
+    <%= submit_tag l(:button_apply) %>
+  <% end %>
+</div>

data/bitbucket-pipelines.yml

@@ -30,6 +30,8 @@ pipelines:
           - 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/'pg'/'pg', '~> 0.18.0'/g" redmine_crm.gemspec
+          - sed -i "s/^end/  spec.add_development_dependency 'minitest', '~> 5.11.3'\nend/g" redmine_crm.gemspec
+          - sed -i "s/^end/  spec.add_development_dependency 'sprockets', '~> 3.5.2'\nend/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=mysql

data/config/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  label_redmine_crm_settings: Redmine Crm 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/ru.yml

@@ -0,0 +1,13 @@
+ru:
+  label_redmine_crm_settings: Настройки Redmine Crm
+  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

@@ -4,6 +4,11 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2019 RedmineUP
 https://www.redmineup.com/
  
+== 2019-11-07 v0.0.48
+
+* Added global money setting
+* Fixed select2 format 
+
 == 2019-08-26 v0.0.47
 
 * Fixed bug with tag cloud 

data/lib/redmine_crm.rb

@@ -2,6 +2,10 @@ require 'active_record'
 require 'action_view'
 
 require 'redmine_crm/version'
+require 'redmine_crm/engine'
+
+require 'redmine_crm/settings'
+require 'redmine_crm/settings/money'
 
 require 'redmine_crm/acts_as_list/list'
 require 'redmine_crm/acts_as_taggable/tag'

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/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/engine.rb

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

data/lib/redmine_crm/hooks/views_layouts_hook.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module RedmineCrm
+  module Hooks
+    class ViewsLayoutsHook < Redmine::Hook::ViewListener
+      def view_layouts_base_html_head(_context = {})
+        stylesheet_link_tag(:money, plugin: 'redmine_crm')
+      end
+    end
+  end
+end

data/lib/redmine_crm/money_helper.rb

@@ -1,14 +1,14 @@
 require 'action_view'
+require 'redmine_crm/settings/money'
 
 module RedmineCrm
   module MoneyHelper
-
     def object_price(obj, price_field = :price, options = {})
       options.merge!({:symbol => true})
       price_to_currency(obj.try(price_field), obj.currency, options).to_s if obj.respond_to?(:currency)
     end
 
-    def prices_collection_by_currency(prices_collection, options={})
+    def prices_collection_by_currency(prices_collection, options = {})
       return [] if prices_collection.blank? || prices_collection == 0
       prices = prices_collection
       prices.reject!{|k, v| v.to_i == 0} if options[:hide_zeros]
@@ -18,17 +18,17 @@ module RedmineCrm
     def deal_currency_icon(currency)
       case currency.to_s.upcase
       when 'EUR'
-        "icon-money-euro"
+        'icon-money-euro'
       when 'GBP'
-        "icon-money-pound"
+        'icon-money-pound'
       when 'JPY'
-        "icon-money-yen"
+        'icon-money-yen'
       else
-        "icon-money-dollar"
+        'icon-money-dollar'
       end
     end
 
-    def collection_for_currencies_select(default_currency = 'USD', major_currencies = %w(USD EUR GBP RUB CHF))
+    def collection_for_currencies_select(default_currency = RedmineCrm::Settings::Money.default_currency, major_currencies = RedmineCrm::Settings::Money.major_currencies)
       currencies = []
       currencies << default_currency.to_s unless default_currency.blank?
       currencies |= major_currencies
@@ -46,17 +46,18 @@ module RedmineCrm
       end.sort{|x, y| x[0] <=> y[0]}
     end
 
-    def price_to_currency(price, currency="USD", options={})
+    def price_to_currency(price, currency = RedmineCrm::Settings::Money.default_currency, options = {})
       return '' if price.blank?
 
-      currency = "USD" unless currency.is_a?(String)
-      currency = RedmineCrm::Currency.find(currency)
+      currency = 'USD' unless currency.is_a?(String)
+      default_options = {
+        decimal_mark: RedmineCrm::Settings::Money.decimal_separator,
+        thousands_separator: RedmineCrm::Settings::Money.thousands_delimiter
+      }.reject { |_k, v| v.nil? }
 
-      return RedmineCrm::Currency.format(price.to_f, currency, options)# if currency
-      price.to_s
+      currency = RedmineCrm::Currency.find(currency)
+      RedmineCrm::Currency.format(price.to_f, currency, default_options.merge(options))
     end
-
-
   end
 end
 

data/lib/redmine_crm/settings.rb

@@ -0,0 +1,39 @@
+module RedmineCrm
+  class Settings
+    SECTIONS = {
+      'money' => { id: :money, label: :label_redmine_crm_money, partial: 'money' }
+    }.freeze
+
+    class << self
+      # Initialize settings before using with this method
+      # @example
+      #   RedmineCrm::Settings.initialize_gem_settings
+      def initialize_gem_settings
+        return if Setting.respond_to?(:plugin_redmine_crm)
+
+        Setting.send(:define_setting, 'plugin_redmine_crm', { 'default' => default_settings, 'serialized' => true })
+      end
+
+      # Use apply instead attrs assign because it can rewrite other attributes
+      def apply=(values)
+        Setting.plugin_redmine_crm = Setting.plugin_redmine_crm.merge(values)
+      end
+
+      def values
+        Object.const_defined?('Setting') ? Setting.plugin_redmine_crm : {}
+      end
+
+      def [](value)
+        return Setting.plugin_redmine_crm[value] if Object.const_defined?('Setting')
+
+        nil
+      end
+
+      private
+
+      def default_settings
+        {}
+      end
+    end
+  end
+end

data/lib/redmine_crm/settings/money.rb

@@ -0,0 +1,46 @@
+require 'redmine_crm/settings'
+
+module RedmineCrm
+  class Settings
+    class Money
+      TAX_TYPE_EXCLUSIVE = 1
+      TAX_TYPE_INCLUSIVE = 2
+
+      class << self
+        def default_currency
+          RedmineCrm::Settings['default_currency'] || 'USD'
+        end
+
+        def major_currencies
+          currencies = RedmineCrm::Settings['major_currencies'].to_s.split(',').select { |c| !c.blank? }.map(&:strip)
+          currencies = %w[USD EUR GBP RUB CHF] if currencies.blank?
+          currencies.compact.uniq
+        end
+
+        def default_tax
+          RedmineCrm::Settings['default_tax'].to_f
+        end
+
+        def tax_type
+          ((['1', '2'] & [RedmineCrm::Settings['tax_type'].to_s]).first || TAX_TYPE_EXCLUSIVE).to_i
+        end
+
+        def tax_exclusive?
+          tax_type == TAX_TYPE_EXCLUSIVE
+        end
+
+        def thousands_delimiter
+          ([' ', ',', '.'] & [RedmineCrm::Settings['thousands_delimiter']]).first
+        end
+
+        def decimal_separator
+          ([',', '.'] & [RedmineCrm::Settings['decimal_separator']]).first
+        end
+
+        def disable_taxes?
+          RedmineCrm::Settings['disable_taxes'].to_i > 0
+        end
+      end
+    end
+  end
+end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.47'
+  VERSION = '0.0.48'
 end

data/vendor/assets/javascripts/select2_helpers.js

@@ -100,7 +100,8 @@ function formatStateWithMultiaddress(opt) {
 }
 
 function formatSelectionWithEmails(opt) {
-  return opt.name ? opt.name + ' <' + opt.email + '>' : opt.text
+  email = $.trim(opt.email).length ? ' <' + opt.email + '>' : ''
+  return (opt.text || opt.name || '') + email
 }
 
 function transformToSelect2(field, options) {

data/vendor/assets/stylesheets/money.css

@@ -0,0 +1,3 @@
+.icon-redminecrm-money {
+  background-image: url(../images/money.png);
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.47
+  version: 0.0.48
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2019-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -92,8 +92,14 @@ files:
 - Gemfile
 - README.md
 - Rakefile
+- app/controllers/redmine_crm_controller.rb
+- app/views/redmine_crm/_money.html.erb
+- app/views/redmine_crm/settings.html.erb
 - bitbucket-pipelines.yml
 - config/currency_iso.json
+- config/locales/en.yml
+- config/locales/ru.yml
+- config/routes.rb
 - doc/CHANGELOG
 - doc/LICENSE.txt
 - lib/redmine_crm.rb
@@ -117,10 +123,12 @@ files:
 - lib/redmine_crm/currency/formatting.rb
 - lib/redmine_crm/currency/heuristics.rb
 - lib/redmine_crm/currency/loader.rb
+- lib/redmine_crm/engine.rb
 - lib/redmine_crm/helpers/external_assets_helper.rb
 - lib/redmine_crm/helpers/form_tag_helper.rb
 - lib/redmine_crm/helpers/tags_helper.rb
 - lib/redmine_crm/helpers/vote_helper.rb
+- lib/redmine_crm/hooks/views_layouts_hook.rb
 - lib/redmine_crm/liquid/drops/issues_drop.rb
 - lib/redmine_crm/liquid/drops/news_drop.rb
 - lib/redmine_crm/liquid/drops/projects_drop.rb
@@ -130,6 +138,8 @@ files:
 - lib/redmine_crm/liquid/filters/base.rb
 - lib/redmine_crm/liquid/filters/colors.rb
 - lib/redmine_crm/money_helper.rb
+- lib/redmine_crm/settings.rb
+- lib/redmine_crm/settings/money.rb
 - lib/redmine_crm/version.rb
 - redmine_crm.gemspec
 - test/acts_as_draftable/draft_test.rb
@@ -172,10 +182,12 @@ files:
 - test/tags_helper_test.rb
 - test/test_helper.rb
 - test/vote_helper_test.rb
+- vendor/assets/images/money.png
 - vendor/assets/images/vcard.png
 - vendor/assets/javascripts/Chart.bundle.min.js
 - vendor/assets/javascripts/select2.js
 - vendor/assets/javascripts/select2_helpers.js
+- vendor/assets/stylesheets/money.css
 - vendor/assets/stylesheets/select2.css
 homepage: ''
 licenses: