redmine_crm 0.0.60 → 0.0.61

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4adb8a5f98b9989c95a54071384b427de1c34bcb21796475973f2b26e29d5d21
-  data.tar.gz: d2d29aefe59b7f0d9ce46e1d8586ac0bb2aa913d2d2a6d5435f88510f4ee1065
+  metadata.gz: 6c71d48ccbfad49844db606ac43e6927c07fbc886770df6f2e2cddcdd95a6081
+  data.tar.gz: de57d13eb0eebdd8b58b095938d5266ee5bcfd043a41fee736cfa5f4e0d4a436
 SHA512:
-  metadata.gz: e42a0654d5415acbdfafd653096eea4c0276d75fb0b489e1cf9034b773bdcac837be3ef4690ae48ecfa855fd17ba8d5bbcdd10810233e33e82775cb3b9a777da
-  data.tar.gz: 58290aa95c957eb789bb5d02d8c7f59b61da91169ebd689fe4f1fb2dfc52a1a9221728e074ec7a5868d6469c838aeeaec1f2448dae348afb9edeb0a8294c23ec
+  metadata.gz: '096a9b92b027b8d5229dd95305a1b63f4a0250266cf50454ff650ea6b16b2255ae9ca2c938bc4b00d09ad7b3c7af11c30535f05a7b7c9e23762d807b04d4611f'
+  data.tar.gz: 4140df48577e1ff647ee18bc7c24347528648bc7de68ffe17c12804256fce43134e16405d5d17eff7b4bdc6d3c53dfeb28514913d1f57d50cf4a42dbce2648ff

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

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

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

data/lib/redmine_crm/helpers/external_assets_helper.rb

@@ -16,12 +16,5 @@ module RedmineCrm
       javascript_include_tag('Chart.bundle.min', plugin: GEM_NAME)
     end
 
-    def timepicker_assets
-      return if @timepicker_tag_included
-
-      @timepicker_tag_included = true
-      javascript_include_tag('timepicker_addon', plugin: GEM_NAME) +
-        stylesheet_link_tag('timepicker_addon', plugin: GEM_NAME)
-    end
   end
 end

data/lib/redmine_crm/helpers/form_tag_helper.rb

@@ -73,33 +73,16 @@ module RedmineCrm
       javascript_tag("setSelect2Filter('#{type}', #{options.to_json});") unless type.empty?
     end
 
-    def datetime_calendar_for(field_id)
-      include_datetime_calendar_headers_tags
-      javascript_tag("$(function() { $('##{field_id}').datetimepicker(dateTimePickerOptions); });")
+    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 include_datetime_calendar_headers_tags
-      unless @datetime_calendar_headers_tags
-        tags = ''.html_safe
-        @datetime_calendar_headers_tags = true
-        content_for :header_tags do
-          start_of_week = Setting.start_of_week
-          start_of_week = l(:general_first_day_of_week, :default => '1') if start_of_week.blank?
-          start_of_week = start_of_week.to_i % 7
+    def format_datetime_date(time)
+      formated_date = ::I18n.l(time.to_date, format: '%Y-%m-%d')
+      "#{formated_date}"
+    end    
 
-          locale_keys = ::I18n.backend.send(:translations)[::I18n.config.locale]
-          time_format = Setting.time_format.blank? ? locale_keys[:time][:formats][:time] : Setting.time_format
-          time_format = time_format.to_s.gsub('%H', 'H').gsub('%I', 'hh').gsub('%M', 'mm').gsub('%p', 'tt')
-
-          date_format = 'yy-mm-dd'
-          tags << javascript_tag(
-            "var dateTimePickerOptions = {dateFormat: '#{date_format}', timeFormat: '#{time_format}', firstDay: #{start_of_week}," +
-              "showOn: 'button', buttonImageOnly: true, buttonImage: '" +
-              path_to_image('/images/calendar.png') +
-              "', showButtonPanel: true, controlType: 'select', oneLine: true, };")
-          tags
-        end
-      end
-    end
   end
 end

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

@@ -35,7 +35,6 @@ module RedmineCrm
 
       delegate :id,
                :subject,
-               :description,
                :visible?,
                :closed?,
                :start_date,
@@ -104,6 +103,10 @@ module RedmineCrm
         @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
       end
@@ -117,11 +120,11 @@ module RedmineCrm
       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
@@ -155,6 +158,19 @@ module RedmineCrm
       def custom_field_values
         @issue.custom_field_values
       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

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = '0.0.60'
+  VERSION = '0.0.61'
 end

data/test/liquid/filters/base_filter_test.rb

@@ -61,7 +61,7 @@ module RedmineCrm
     end
 
     def test_currency_filter
-      assert_equal '99,99 RUB', @liquid_render.render("{{99.99 | currency: 'RUB' }}")
+      assert_equal '99,99 ₽', @liquid_render.render("{{99.99 | currency: 'RUB' }}")
     end
   end
 end

data/test/money_helper_test.rb

@@ -5,7 +5,7 @@ class MoneyHelperTest < ActiveSupport::TestCase
 
   def test_price_to_currency
     assert_equal '$3,265.65', price_to_currency(3265.65, 'USD')
-    assert_equal '3.265,65 RUB', price_to_currency(3265.65, 'RUB')
+    assert_equal '3.265,65 ₽', price_to_currency(3265.65, 'RUB')
     assert_equal '3,200.0', price_to_currency(3200, '')
     assert_equal '3,200.0', price_to_currency(3200, 'Foo')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.60
+  version: 0.0.61
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-20 00:00:00.000000000 Z
+date: 2023-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails