redmine_crm 0.0.43 → 0.0.63

data/lib/redmine_crm/hooks/views_layouts_hook.rb

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

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

@@ -0,0 +1,47 @@
+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
+
+      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 ||= UserDrop.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/issue_relations_drop.rb

@@ -0,0 +1,41 @@
+module RedmineCrm
+  module Liquid
+    class IssueRelationsDrop < ::Liquid::Drop
+      def initialize(relations)
+        @relations = relations
+      end
+
+      def all
+        @all ||= @relations.map { |relation| IssueRelationDrop.new(relation) }
+      end
+
+      def visible
+        @visible ||= @all.select(&:visible?)
+      end
+
+      def each(&block)
+        all.each(&block)
+      end
+
+      def size
+        @relations.size
+      end
+    end
+
+    class IssueRelationDrop < ::Liquid::Drop
+      delegate :relation_type, :delay, to: :@relation
+
+      def initialize(relation)
+        @relation = relation
+      end
+
+      def issue_from
+        @issue_from ||= IssueDrop.new(@relation.issue_from)
+      end
+
+      def issue_to
+        @issue_to ||= IssueDrop.new(@relation.issue_to)
+      end
+    end
+  end
+end

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

@@ -6,14 +6,15 @@ module RedmineCrm
       end
 
       def before_method(id)
-        issue = @issues.where(:id => id).first || Issue.new
+        issue = @issues.where(id: id).first || Issue.new
         IssueDrop.new issue
       end
 
       def all
-        @all ||= @issues.map do |issue|
-          IssueDrop.new issue
-        end
+        @all ||=
+          @issues.map do |issue|
+            IssueDrop.new issue
+          end
       end
 
       def visible
@@ -34,9 +35,8 @@ module RedmineCrm
 
       delegate :id,
                :subject,
-               :description,
                :visible?,
-               :open?,
+               :closed?,
                :start_date,
                :due_date,
                :overdue?,
@@ -49,14 +49,14 @@ module RedmineCrm
                :closed_on,
                :updated_on,
                :created_on,
-               :to => :@issue
+               to: :@issue
 
       def initialize(issue)
         @issue = issue
       end
 
       def link
-        link_to @issue.subject, self.url
+        link_to @issue.subject, url
       end
 
       def url
@@ -96,23 +96,35 @@ 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 description
+        @description ||= replace_images_urls(@issue.description)
       end
 
       def subtasks
-        @subtasks ||= IssuesDrop.new @issue.children 
+        @subtasks ||= IssuesDrop.new @issue.children
+      end
+
+      def relations_from
+        @relations_from ||= IssueRelationsDrop.new(@issue.relations_from.select { |r| r.other_issue(@issue) && r.other_issue(@issue).visible? })
+      end
+
+      def relations_to
+        @relations_to ||= IssueRelationsDrop.new(@issue.relations_to.select { |r| r.other_issue(@issue) && r.other_issue(@issue).visible? })
       end
 
       def notes
-        @notes ||= @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil).order(:created_on).map(&:notes)
+        @notes ||= @issue.journals.where.not(notes: [nil, '']).order(:created_on).map(&:notes).map { |note| replace_images_urls(note) }
       end
 
       def journals
-        @journals ||= JournalsDrop.new @issue.journals.where("#{Journal.table_name}.notes IS NOT ?", nil)
+        @journals ||= JournalsDrop.new(@issue.journals.where.not(notes: nil).find_each { |journal| journal.notes = replace_images_urls(journal.notes) })
       end
 
       def tags
@@ -126,19 +138,39 @@ 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 helpdesk_ticket
+        return nil unless defined?(::HelpdeskTicketDrop)
+
+        @helpdesk_ticket ||= HelpdeskTicketDrop.new(@issue)
       end
 
       def custom_field_values
         @issue.custom_field_values
-      end      
+      end
+
+      private
 
+      def replace_images_urls(text)
+        text.gsub(/\!.*\!/) do |i_name|
+          i_name = i_name.delete('!')
+          i_name_css = i_name.scan(/^\{.*\}/).first.to_s
+          attachment = @issue.attachments.find_by(filename: i_name.gsub(i_name_css, ''))
+          image = AttachmentDrop.new attachment if attachment
+          attach_url = image.try(:url)
+          attach_url ? "!#{i_name_css}#{attach_url}!" : i_name
+        end
+      end
     end
 
     class JournalsDrop < ::Liquid::Drop
@@ -147,9 +179,10 @@ module RedmineCrm
       end
 
       def all
-        @all ||= @journals.map do |journal|
-          JournalDrop.new journal
-        end
+        @all ||=
+          @journals.map do |journal|
+            JournalDrop.new journal
+          end
       end
 
       def visible
@@ -166,12 +199,7 @@ module RedmineCrm
     end
 
     class JournalDrop < ::Liquid::Drop
-      delegate :id,
-               :notes,
-               :created_on,
-               :private_notes,
-               :to => :@journal, 
-               allow_nil: true
+      delegate :id, :notes, :created_on, :private_notes, to: :@journal, allow_nil: true
 
       def initialize(journal)
         @journal = journal
@@ -182,10 +210,8 @@ module RedmineCrm
       end
 
       def issue
-        @issue ||= IssueDrop.new @journal.issue if @journal.issue 
+        @issue ||= IssueDrop.new @journal.issue if @journal.issue
       end
-
     end
-
   end
 end

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

@@ -49,7 +49,7 @@ module RedmineCrm
       end
 
       def issue
-        @issue ||= IssueDrop.new(@time_entry.issue)
+        @issue ||= IssueDrop.new(@time_entry.issue) unless @time_entry.issue.blank?
       end
 
       def activity

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)
@@ -100,7 +100,7 @@ module RedmineCrm
         def custom_field(input, field_name)
           if input.respond_to?(:custom_field_values)
             custom_value = input.custom_field_values.detect { |cfv| cfv.custom_field.name == field_name }
-            custom_value.custom_field.format.formatted_custom_value(nil, custom_value)
+            custom_value.custom_field.format.formatted_custom_value(nil, custom_value) if custom_value
           end
         end
 
@@ -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/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/patches/liquid_patch.rb

@@ -0,0 +1,33 @@
+module RedmineCrm
+  module Patches
+    module LiquidPatch
+      module StandardFilters
+
+        def self.included(base)
+          base.class_eval do
+            
+            private
+    
+            def to_number(obj)
+              case obj
+              when Float
+                BigDecimal(obj.to_s)
+              when Numeric
+                obj
+              when String
+                (obj.strip =~ /^\d+\.\d+$/) ? BigDecimal(obj) : obj.to_i
+              else
+                0
+              end
+            end
+          end
+        end
+
+      end
+    end
+  end
+end
+  
+unless Liquid::StandardFilters.included_modules.include?(RedmineCrm::Patches::LiquidPatch::StandardFilters)
+  Liquid::StandardFilters.send(:include, RedmineCrm::Patches::LiquidPatch::StandardFilters)
+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/settings.rb

@@ -0,0 +1,53 @@
+module RedmineCrm
+  class Settings
+    SECTIONS = {
+      'money' => { id: :money, label: :label_redmine_crm_money, partial: 'money' }
+    }.freeze
+
+    class << self
+      def initialize_gem_settings
+        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)
+        elsif Setting.respond_to?(:available_settings)
+          Setting.available_settings['plugin_redmine_crm'] = { 'default' => default_settings, 'serialized' => true }
+          Setting.class.send(:define_method, 'plugin_redmine_crm', -> { Setting['plugin_redmine_crm'] })
+          Setting.class.send(:define_method, 'plugin_redmine_crm=', lambda do |val|
+            setting = find_or_default('plugin_redmine_crm')
+            setting.value = val || ''
+            @cached_settings['plugin_redmine_crm'] = nil
+            setting.save(validate: false)
+            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
+      end
+
+      private
+
+      def default_settings
+        {}
+      end
+    end
+  end
+end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.43'
+  VERSION = '0.0.63'
 end

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'
@@ -15,6 +19,7 @@ require 'redmine_crm/acts_as_votable/vote'
 require 'redmine_crm/acts_as_votable/voter'
 require 'redmine_crm/acts_as_draftable/rcrm_acts_as_draftable'
 require 'redmine_crm/acts_as_draftable/draft'
+require 'redmine_crm/acts_as_priceable/rcrm_acts_as_priceable'
 
 require 'redmine_crm/currency'
 require 'redmine_crm/helpers/tags_helper'
@@ -30,12 +35,17 @@ 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/liquid/drops/issue_relations_drop'
 
+require 'redmine_crm/helpers/calendars_helper'
 require 'redmine_crm/helpers/external_assets_helper'
 require 'redmine_crm/helpers/form_tag_helper'
 require 'redmine_crm/assets_manager'
 
 require 'redmine_crm/compatibility/application_controller_patch'
+require 'redmine_crm/compatibility/routing_mapper_patch'
+require 'redmine_crm/patches/liquid_patch' unless BigDecimal.respond_to?(:new)
 
 module RedmineCrm
   GEM_NAME = 'redmine_crm'.freeze
@@ -50,6 +60,7 @@ end
 RedmineCrm::AssetsManager.install_assets
 
 if defined?(ActionView::Base)
+  ActionView::Base.send :include, RedmineCrm::CalendarsHelper
   ActionView::Base.send :include, RedmineCrm::ExternalAssetsHelper
   ActionView::Base.send :include, RedmineCrm::FormTagHelper
 end
@@ -57,6 +68,7 @@ end
 def requires_redmine_crm(arg)
   def compare_versions(requirement, current)
     raise ArgumentError.new('wrong version format') unless check_version_format(requirement)
+
     requirement = requirement.split('.').collect(&:to_i)
     requirement <=> current.slice(0, requirement.size)
   end
@@ -65,7 +77,7 @@ def requires_redmine_crm(arg)
     version =~ /^\d+.?\d*.?\d*$/m
   end
 
-  arg = { :version_or_higher => arg } unless arg.is_a?(Hash)
+  arg = { version_or_higher: arg } unless arg.is_a?(Hash)
   arg.assert_valid_keys(:version, :version_or_higher)
 
   current = RedmineCrm::VERSION.split('.').map { |x| x.to_i }
@@ -73,6 +85,7 @@ def requires_redmine_crm(arg)
     case k
     when :version_or_higher
       raise ArgumentError.new(':version_or_higher accepts a version string only') unless req.is_a?(String)
+
       unless compare_versions(req, current) <= 0
         Rails.logger.error "\033[31m[ERROR]\033[0m Redmine requires redmine_crm gem version #{req} or higher (you're using #{RedmineCrm::VERSION}).\n\033[31m[ERROR]\033[0m Please update with 'bundle update redmine_crm'." if Rails.logger
         abort "\033[31mRedmine requires redmine_crm gem version #{req} or higher (you're using #{RedmineCrm::VERSION}).\nPlease update with 'bundle update redmine_crm'.\033[0m"
@@ -80,7 +93,7 @@ def requires_redmine_crm(arg)
     when :version
       req = [req] if req.is_a?(String)
       if req.is_a?(Array)
-        unless req.detect {|ver| compare_versions(ver, current) == 0}
+        unless req.detect { |ver| compare_versions(ver, current) == 0 }
           abort "\033[31mRedmine requires redmine_crm gem version #{req} (you're using #{RedmineCrm::VERSION}).\nPlease update with 'bundle update redmine_crm'.\033[0m"
         end
       elsif req.is_a?(Range)

data/redmine_crm.gemspec

@@ -10,16 +10,18 @@ Gem::Specification.new do |spec|
   spec.email         = ["support@redminecrm.com"]
   spec.summary       = %q{Common libraries for RedmineUP plugins for Redmine}
   spec.description   = %q{Common libraries for RedmineUP plugins (www.redmineup.com) for Redmine. Requered Redmine from http://redmine.org}
-  spec.homepage      = ""
-  spec.license       = "GPL2"
+  spec.homepage      = "https://www.redmineup.com"
+  spec.license       = "GPL-2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.0.0"
 
   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/test/acts_as_draftable/rcrm_acts_as_draftable_test.rb

@@ -7,7 +7,6 @@ class RcrmActsAsDraftableTest < ActiveSupport::TestCase
     end
   end
 
-  class SomeClass < ActiveRecord::Base; end
   def test_rcrm_acts_as_draftable_with_parent
     assert_nothing_raised do
       News.rcrm_acts_as_draftable(parent: :author)