redmine_crm 0.0.50 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0db9ce68acb0514cc0652eb603284800851c5a2a
-  data.tar.gz: ba29da7491709f471cd6be83674fb70d73b7d710
+  metadata.gz: afd4e0e67e1d1a6bb522e7736c051c0ccf0495f1
+  data.tar.gz: 85b94490ebf04a788428ed6ebf5581d93f8d6723
 SHA512:
-  metadata.gz: f6b1ff459d4b63a648703af6306ccc87c81278d83fc057ea911a849690565adf41b5e31096f966ab7b67195c55967721337fb6b72508ecb739c7c71bcaab7b06
-  data.tar.gz: 81b37a16be40aa4af841f63fe659a3b74c70977a36547fd73d375d523b1c8c9b6110500be48c5fb9a85055ba75c3ce46bf2aab5795a00edcea8b37270552ddcb
+  metadata.gz: 0db2f41a96bdc765da21a0553f9989ea484da52daff6b52922da75feb26d83d9b9c938cb1aca72c42463708190df9e0159caa5671b6753ce665f0c8540b0b40b
+  data.tar.gz: 27bb8d96230d724b121cd12125036a40d98bcaf6fbe437eea42eb5ce12faa1df1c3378c7287089310566cef3a728be95df2f33701bc92672ad59c36189e589d7

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/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

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

data/lib/redmine_crm.rb

@@ -34,6 +34,7 @@ require 'redmine_crm/liquid/drops/news_drop'
 require 'redmine_crm/liquid/drops/projects_drop'
 require 'redmine_crm/liquid/drops/users_drop'
 require 'redmine_crm/liquid/drops/time_entries_drop'
+require 'redmine_crm/liquid/drops/attachment_drop'
 
 require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/helpers/form_tag_helper'

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_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]

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/liquid/drops/attachment_drop.rb

@@ -0,0 +1,49 @@
+module RedmineCrm
+  module Liquid
+    class AttachmentDrop < ::Liquid::Drop
+      delegate :id,
+               :filename,
+               :title,
+               :description,
+               :filesize,
+               :content_type,
+               :digest,
+               :downloads,
+               :created_on,
+               :token,
+               :visible?,
+               :image?,
+               :thumbnailable?,
+               :is_text?,
+               :readable?,
+               to: :@attachment
+
+      delegate :id, :filename, :filesize, :description, to: :@attachment
+
+      def initialize(attachment)
+        @attachment = attachment
+      end
+
+      def url(options = {})
+        Rails.application.routes.url_helpers.download_named_attachment_url(@attachment, { filename: filename,
+                                                                                          host: Setting.host_name,
+                                                                                          protocol: Setting.protocol }.merge(options))
+      end
+
+      def link
+        link_to((@attachment.description.blank? ? @attachment.filename : @attachment.description), url)
+      end
+
+      def author
+        @author ||= UsersDrop.new @attachment.author
+      end
+
+      def read
+        @content ||= if @attachment.is_text? && @attachment.filesize <= Setting.file_max_size_displayed.to_i.kilobyte
+                       File.new(@attachment.diskfile, "rb").read
+                     end
+        @content
+      end
+    end
+  end
+end

data/lib/redmine_crm/liquid/drops/issues_drop.rb

@@ -96,15 +96,15 @@ module RedmineCrm
       end
 
       def parent
-        @parent ||= IssueDrop.new @issue.parent if @issue.parent 
+        @parent ||= IssueDrop.new @issue.parent if @issue.parent
       end
 
       def project
-        @project ||= ProjectDrop.new @issue.project if @issue.project 
+        @project ||= ProjectDrop.new @issue.project if @issue.project
       end
 
       def subtasks
-        @subtasks ||= IssuesDrop.new @issue.children 
+        @subtasks ||= IssuesDrop.new @issue.children
       end
 
       def notes
@@ -126,19 +126,20 @@ module RedmineCrm
       def color
         @issue.respond_to?(:color) && @issue.color
       end
-      
+
       def day_in_state
         @issue.respond_to?(:day_in_state) && @issue.day_in_state
       end
 
       def checklists
-        @issue.respond_to?(:checklists) && @issue.checklists.map{|item| {"id_done" => item.is_done, "subject" => item.subject}}
+        @issue.respond_to?(:checklists) && @issue.checklists.map do |item|
+          { 'id_done' => item.is_done, 'subject' => item.subject, 'is_section' => item.is_section }
+        end
       end
 
       def custom_field_values
         @issue.custom_field_values
-      end      
-
+      end
     end
 
     class JournalsDrop < ::Liquid::Drop
@@ -170,7 +171,7 @@ module RedmineCrm
                :notes,
                :created_on,
                :private_notes,
-               :to => :@journal, 
+               :to => :@journal,
                allow_nil: true
 
       def initialize(journal)
@@ -182,7 +183,7 @@ module RedmineCrm
       end
 
       def issue
-        @issue ||= IssueDrop.new @journal.issue if @journal.issue 
+        @issue ||= IssueDrop.new @journal.issue if @journal.issue
       end
 
     end

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

@@ -26,6 +26,8 @@ module RedmineCrm
 
       # 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
 

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.50'
+  VERSION = '0.0.55'
 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.50
+  version: 0.0.55
 platform: ruby
 authors:
 - RedmineUP
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2021-06-08 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
@@ -97,6 +111,8 @@ files:
 - app/views/redmine_crm/settings.html.erb
 - bitbucket-pipelines.yml
 - config/currency_iso.json
+- config/locales/cs.yml
+- config/locales/de.yml
 - config/locales/en.yml
 - config/locales/ru.yml
 - config/routes.rb
@@ -129,6 +145,7 @@ files:
 - 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/attachment_drop.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