redmine_crm 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98f6edf8cd9c627f119640dc72c109b501716c0e
-  data.tar.gz: a361e4228e0087d21df1a61a1eade63e4d470c91
+  metadata.gz: 8476cc7f68dab5781c42ea785cdf2ceee5cd110f
+  data.tar.gz: 803b10a20986f745450fb3137b69c69d6fa53158
 SHA512:
-  metadata.gz: 16c88a5ab553ce3a01d141be49929b402f7e4f4d252c7dc9b0c476d5b1d6e9f51ab5773728a4d47c4f0fcd229829ae22e96e280f45f19b9cb6b124f013925fc4
-  data.tar.gz: 49ce508bdf8fa137cd395c6f46c726cd9760561b311e33c948ad65ac0775150262488584a7b2abbdbb49002786369cc4230aaa40abf35e47045537e82be21996
+  metadata.gz: 8a3fbac887b278b4f45ca4dc48adc508ed5876e9a5ff8bb531a6b837a8a8d9b4b0ff8d6a05df5165701030c2ec3e9c50a5f622660f25a474be2eba13b6e0e1b8
+  data.tar.gz: c14842d725949500bd2d91121f6817864908b138c899883f0b28bd83318f7c700ac18cf47bc9c8af3e4705c43084eaa845bbac697016a1e2c48906f3a3fb07db

data/doc/CHANGELOG

@@ -4,6 +4,15 @@ Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2015 RedmineCRM
 http://www.redminecrm.com/
 
+== 2015-09-26 v0.0.16
+
+* Totally remove dependency from Contact plugin
+
+== 2015-09-24 v0.0.15
+
+* Fixed bug for available tag when model not have a relation with a project
+* Added transfer of parameters for formatting a price
+
 == 2015-09-23 v0.0.14
 
 * Fixed bug in viewed? function

data/lib/redmine_crm/currency/formatting.rb

@@ -30,16 +30,15 @@ module RedmineCrm
       def format(value, currency, *rules)
         # support for old format parameters
         rules = normalize_formatting_rules(rules)
-        # byebug
-        rules = Currency.default_formatting_rules.merge(rules)
         if currency
           rules = self.localize_formatting_rules(rules, currency)
           rules = self.translate_formatting_rules(rules, currency.code) if rules[:translate]
-          rules[:decimal_mark] = currency.decimal_mark unless rules[:decimal_mark]
+          rules[:decimal_mark] = currency.decimal_mark if rules[:decimal_mark].nil?
           rules[:decimal_places] = currency.decimal_places
           rules[:subunit_to_unit] = currency.subunit_to_unit
-          rules[:thousands_separator] = currency.thousands_separator unless rules[:thousands_separator]
+          rules[:thousands_separator] = currency.thousands_separator if rules[:thousands_separator].nil?
         end
+        rules = Currency.default_formatting_rules.merge(rules){|key, v1, v2| v2.nil? ? v1 : v2}
 
         # if fractional == 0
         if rules[:display_free].respond_to?(:to_str)
@@ -50,9 +49,6 @@ module RedmineCrm
         # end
 
         symbol_value = currency.try(:symbol) || ""
-        # decimal_mark = rules["decimal_mark"]
-        # decimal_places
-
 
         formatted = value.abs.to_s
 
@@ -79,7 +75,6 @@ module RedmineCrm
           thousands_separator_value = rules[:thousands_separator] || ''
         end
         decimal_mark = rules[:decimal_mark]
-
         # Apply thousands_separator
         formatted.gsub!(regexp_format(formatted, rules, decimal_mark, symbol_value),
                         "\\1#{thousands_separator_value}")
@@ -206,8 +201,8 @@ module RedmineCrm
           rules = rules.pop
           rules = { rules => true } if rules.is_a?(Symbol)
         end
-        rules[:decimal_mark] = rules[:separator] || ContactsSetting.decimal_separator || rules[:decimal_mark]
-        rules[:thousands_separator] = rules[:delimiter] || ContactsSetting.thousands_delimiter || rules[:thousands_separator]
+        rules[:decimal_mark] = rules[:separator] || rules[:decimal_mark]
+        rules[:thousands_separator] = rules[:delimiter] || rules[:thousands_separator]
         rules
       end
 

data/lib/redmine_crm/money_helper.rb

@@ -5,8 +5,9 @@ require 'action_view'
 module RedmineCrm
   module MoneyHelper
 
-    def object_price(obj, price_field = :price)
-      price_to_currency(obj.try(price_field), obj.currency, :symbol => true).to_s if obj.respond_to?(:currency)
+    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={})
@@ -29,14 +30,10 @@ module RedmineCrm
       end
     end
 
-    def collection_for_currencies_select(default_currency = ContactsSetting.default_currency)
-      major_currencies_collection(default_currency)
-    end
-
-    def major_currencies_collection(default_currency)
-      currencies = []
+    def collection_for_currencies_select(default_currency='USD')
+      currencies = [] 
       currencies << default_currency.to_s unless default_currency.blank?
-      currencies |= ContactsSetting.major_currencies
+      currencies |= %w(USD EUR GBP RUB CHF)
       currencies.map do |c|
         currency = RedmineCrm::Currency.find(c)
         ["#{currency.iso_code} (#{currency.symbol})", currency.iso_code] if currency
@@ -57,7 +54,7 @@ module RedmineCrm
       currency = "USD" unless currency.is_a?(String)
       currency = RedmineCrm::Currency.find(currency)
       
-      return RedmineCrm::Currency.format(price.to_f, currency)# if currency
+      return RedmineCrm::Currency.format(price.to_f, currency, options)# if currency
       price.to_s
     end
 

data/lib/redmine_crm/rcrm_acts_as_taggable.rb

@@ -93,16 +93,17 @@ module RedmineCrm
         #Example: Question.available_tags(@project_id )
         def available_tags(project=nil, limit=30)
           scope = Tag.where({})
-          scope = scope.where("#{Project.table_name}.id = ?", project) if project
           class_name = quote_value(base_class.name, nil)
           join = []
           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 project
-              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
-          else
-              scope = scope.where("#{table_name}.project_id IS NULL")
+          if self.attribute_names.include? "project_id"
+            if project
+                join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            else
+                scope = scope.where("#{table_name}.project_id IS NULL")
+            end
           end
 
           group_fields = ""

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.14"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-23 00:00:00.000000000 Z
+date: 2015-09-26 00:00:00.000000000 Z
 dependencies: []
 description: plugins for Redmine
 email: