redmine_crm 0.0.49 → 0.0.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d521ac72c4e9d6ba00dd20c9b6bd6d682a294df
-  data.tar.gz: c307e86b5223bcf0580812bf7c57366c0175ba60
+  metadata.gz: c0e9fa1d47785da85bc39db433d55e0ba8df629e
+  data.tar.gz: 2efa0ef9d8a1a0e267ba622b098fcac20c68a378
 SHA512:
-  metadata.gz: 659cc759af4c3dc2c5219c74c33db83f0e7d9051884a684cb0e86ca2ba91338c5bd7ef989d4ec1b34f91af4eea8d50292c77e87650607a7bf1223a98dd655db6
-  data.tar.gz: 38a779b4da037c6bfc16dfc63f27698572fece725422659a92db835ead93e0796a0b525ea364a57558abbef0181e0edd089adbea6d4b5b354390df7dba4d27cf
+  metadata.gz: f74717a3d2fa3e033a32f3c02b1855d3fa4bad61edfe57c23bf2a2dcc36f26954a1e87b65aa31662455b953ac4cb42e2e3252cd6f49be52edd1b0f6815925388
+  data.tar.gz: 2d242b17ba64c4799e52f07c110b683f3cb61116833384c1bc66571e3a68df9a68f159526de9735234c6b5bba61ebd953351c1a1eed097a1f31d56af5909d6d9

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

@@ -3,7 +3,7 @@
 <div id="settings">
   <%= form_tag({ action: 'settings', id: @section[:id] }) do %>
     <div class="box tabular settings">
-      <%= render_tabs @section_tabs %>
+      <%= render partial: 'money' %>
     </div>
     <%= submit_tag l(:button_apply) %>
   <% end %>

data/bitbucket-pipelines.yml

@@ -32,6 +32,8 @@ pipelines:
           - 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
+          - sed -i "s/^end/  spec.add_development_dependency 'thor', '~> 0.20.3'\nend/g" redmine_crm.gemspec
+          - sed -i "s/'rubyzip'/'rubyzip', '~> 1.3.0'/g" redmine_crm.gemspec
           - bundle install
           - bundle exec rake test DB=sqlite
           - bundle exec rake test DB=mysql

data/config/locales/en.yml

@@ -1,5 +1,5 @@
 en:
-  label_redmine_crm_settings: Redmine Crm Settings
+  label_redmine_crm_settings: Money Settings
   label_redmine_crm_money: Money
 
   label_redmine_crm_disable_taxes: Disable taxes

data/config/locales/ru.yml

@@ -1,5 +1,5 @@
 ru:
-  label_redmine_crm_settings: Настройки Redmine Crm
+  label_redmine_crm_settings: Настройки валют
   label_redmine_crm_money: Деньги
 
   label_redmine_crm_disable_taxes: Отключить налоги

data/doc/CHANGELOG

@@ -1,9 +1,32 @@
 == Redmine CRM gem changelog
 
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
-Copyright (C) 2011-2019 RedmineUP
+Copyright (C) 2011-2020 RedmineUP
 https://www.redmineup.com/
  
+== 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

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/liquid/filters/arrays.rb

@@ -100,7 +100,7 @@ module RedmineCrm
         def tagged_with(input, tags, match='all')
           return input unless input.respond_to?(:select)
           input = input.values if input.is_a?(Hash)
-          tag_list = input.is_a?(Array) ? tags.sort : tags.split(',').map(&:strip).sort
+          tag_list = tags.is_a?(Array) ? tags.sort : tags.split(',').map(&:strip).sort
           case match
           when "all"
             input.select do |object|

data/lib/redmine_crm/liquid/filters/base.rb

@@ -36,7 +36,7 @@ module RedmineCrm
 
         def md5(input)
           Digest::MD5.hexdigest(input) unless input.blank?
-        end        
+        end
 
         # example:
         #   {{ "http:://www.example.com?key=hello world" | encode }}
@@ -87,8 +87,8 @@ module RedmineCrm
           to_number(input).floor.to_i
         end
 
-        def currency(input, currency_code = 'USD')
-          price_to_currency(input, currency_code, :converted => false)
+        def currency(input, currency_code = nil)
+          price_to_currency(input, currency_code || container_currency, :converted => false)
         end
 
         def call_method(input, method_name)
@@ -121,6 +121,30 @@ module RedmineCrm
           end
         end
 
+        def multi_line(input)
+          input.to_s.gsub("\n", '<br/>').html_safe
+        end
+
+        def concat(input, *args)
+          result = input.to_s
+          args.flatten.each { |a| result << a.to_s }
+          result
+        end
+
+        # right justify and padd a string
+        def rjust(input, integer, padstr = '')
+          input.to_s.rjust(integer, padstr)
+        end
+
+        # left justify and padd a string
+        def ljust(input, integer, padstr = '')
+          input.to_s.ljust(integer, padstr)
+        end
+
+        def textile(input)
+          ::RedCloth3.new(input).to_html
+        end
+
         protected
 
         # Convert an array of properties ('key:value') into a hash
@@ -210,6 +234,14 @@ module RedmineCrm
             end
           end
         end
+
+        def container
+          @container ||= @context.registers[:container]
+        end
+
+        def container_currency
+          container.currency if container.respond_to?(:currency)
+        end
       end
       ::Liquid::Template.register_filter(RedmineCrm::Liquid::Filters::Base)
     end

data/lib/redmine_crm/settings.rb

@@ -5,11 +5,8 @@ module RedmineCrm
     }.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)
+        return if !Object.const_defined?('Setting') || Setting.respond_to?(:plugin_redmine_crm)
 
         if Setting.respond_to?(:define_setting)
           Setting.send(:define_setting, 'plugin_redmine_crm', 'default' => default_settings, 'serialized' => true)
@@ -24,18 +21,23 @@ module RedmineCrm
             setting.value
           end)
         end
+        @settings_initialized
       end
 
       # Use apply instead attrs assign because it can rewrite other attributes
       def apply=(values)
+        initialize_gem_settings unless @settings_initialized
+
         Setting.plugin_redmine_crm = Setting.plugin_redmine_crm.merge(values)
       end
 
       def values
+        initialize_gem_settings unless @settings_initialized
         Object.const_defined?('Setting') ? Setting.plugin_redmine_crm : {}
       end
 
       def [](value)
+        initialize_gem_settings unless @settings_initialized
         return Setting.plugin_redmine_crm[value] if Object.const_defined?('Setting')
 
         nil

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.49'
+  VERSION = '0.0.54'
 end

data/redmine_crm.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'rails'
   spec.add_runtime_dependency 'liquid', '< 2.6.4'
+  spec.add_runtime_dependency 'rubyzip'
 
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'mysql2'

data/vendor/assets/javascripts/select2_helpers.js

@@ -80,11 +80,11 @@ function findSelectTagInRowBy(field) {
 };
 
 function rowHasSelectTag(field) {
-  return findInRowBy(field, '.values select.value').size() > 0;
+  return findInRowBy(field, '.values select.value').length > 0;
 };
 
 function rowHasSelect2(field) {
-  return findInRowBy(field, '.values .select2').size() > 0;
+  return findInRowBy(field, '.values .select2').length > 0;
 };
 
 function findInRowBy(field, selector) {
@@ -137,6 +137,7 @@ function buildSelect2Options(options) {
   result = {
     placeholder: options['placeholder'] || '',
     allowClear: !!options['allow_clear'],
+    containerCssClass: options['containerCssClass'],
     minimumInputLength: options['min_input_length'] || 0,
     templateResult: window[options['format_state']],
     templateSelection: window[options['format_selection']],

data/vendor/assets/stylesheets/select2.css

@@ -150,18 +150,26 @@
 }
 
 .select2-container--default .select2-selection--single {
-  background: #fff url(../images/vcard.png) no-repeat 2px 50%;
-  border: 1px solid #9EB1C2;
-  border-radius: 2px;
-  height: 21px;
+  /*background: #fff url(../images/vcard.png) no-repeat 2px 50%;*/
+  background-color: #fff;
+  height: 24px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
+}
+
+.select2-container--default .select2-selection--single.icon {
+  background-position-x: 3px;
 }
 
 .select2-container--default .select2-selection--single .select2-selection__rendered {
-  padding-left: 21px;
-  line-height: 18px;
+  line-height: 21px;
   font-size: 11px;
 }
 
+.select2-container--default .select2-selection--single.icon .select2-selection__rendered {
+  padding-left: 2px
+}
+
 .select2-container--default .select2-selection--single .select2-selection__clear {
   cursor: pointer;
   float: right;
@@ -172,7 +180,7 @@
   color: #999;
 }
 .select2-container--default .select2-selection--single .select2-selection__arrow {
-  height: 20px;
+  height: 24px;
   position: absolute;
   top: 0px;
   right: 1px;
@@ -210,8 +218,8 @@
 }
 .select2-container--default .select2-selection--multiple {
   background-color: white;
-  border: 1px solid #9EB1C2;
-  border-radius: 2px;
+  border: 1px solid #ccc;
+  border-radius: 3px;
   cursor: text;
 }
 
@@ -220,7 +228,7 @@
   box-sizing: border-box;
   list-style: none;
   margin: 0;
-  padding: 0 2px 2px 2px;
+  padding: 0 2px 1px 2px;
   width: 100%;
 }
 .select2-container--default .select2-selection--multiple .select2-selection__rendered li {
@@ -235,8 +243,8 @@
   cursor: pointer;
   float: right;
   font-weight: bold;
-  margin-top: 5px;
-  margin-right: 10px;
+  margin-top: 2px;
+  margin-right: 2px;
 }
 
 #sidebar .select2-container--default .select2-selection--multiple .select2-selection__choice,
@@ -245,8 +253,8 @@
   border-radius: 2px;
   cursor: default;
   float: left;
-  margin-right: 3px;
-  margin-top: 3px;
+  margin-right: 2px;
+  margin-top: 2px;
   padding: 0 3px;
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice__remove {
@@ -271,8 +279,8 @@
   margin-right: auto;
 }
 .select2-container--default.select2-container--focus .select2-selection--multiple {
-  border: solid #aaa 1px;
-  outline: 0;
+  border: 1px solid #5ad;
+  outline: none;
 }
 .select2-container--default.select2-container--disabled .select2-selection--multiple {
   background-color: #eee;
@@ -298,6 +306,7 @@
   outline: 0;
   box-shadow: none;
   -webkit-appearance: textfield;
+  height: 18px;
 }
 .select2-container--default .select2-results > .select2-results__options {
   max-height: 200px;
@@ -355,12 +364,12 @@
   border: 0px !important;
   height: inherit !important;
   padding: 0px !important;
-  width: 2em !important;
 }
 
 .filter .select2-container--default .select2-selection--multiple .select2-selection__choice {
+  outline: none;
   border: 0px;
-  padding: 2px 5px;
+  padding: 3px 5px;
 }
 
 /* == Theming ===

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.49
+  version: 0.0.54
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-12 00:00:00.000000000 Z
+date: 2020-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,6 +38,20 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.6.4
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement