redmine_crm 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb4edcbb29e05cd8cfc1107b19cf57c3d20f9d2f
-  data.tar.gz: b38fdf655eabf2265a2148a48e19934bb5889394
+  metadata.gz: 7b37a6a71a78445ab8bd0a7943289f7d2de66266
+  data.tar.gz: 7314f12328b7d335d16ab0b188ea97805c17b420
 SHA512:
-  metadata.gz: 6ab2ddf4fb0123cbbe857378ae6fd31a0daa6de544c4efda9f2162dfea355ca0931c5b0d34c25d8bb2c929b4dc653d6a1f813f05a80781c68fe566db877a9f3b
-  data.tar.gz: 8a8c3757b763d17b5035685420650934a3d56608932ccb4d70c3250e8c3d83336e6d30a9d21ad850d2c9cd058be18b576278165f03f2a78550046eba3c2166c2
+  metadata.gz: 5acbbd27b7da55822a2ccd98894623b8c940ae2ce97937b1d5739e37c17a21ac0767a04b055a83ed5b63578e2a24d519bab5e34a35c7d66d6fb82a8e94db22ae
+  data.tar.gz: 5c60eb6ba7e3f5994780dba765274d004e4e37d87322e95fef54d5b1ce2cc00ff1b82c638cc7f2f616ac9f75bb4586f53b36f76e5172a6150e5d01fe17ae42de

data/lib/redmine_crm/currency/formatting.rb

@@ -32,8 +32,14 @@ module RedmineCrm
         rules = normalize_formatting_rules(rules)
         # byebug
         rules = Currency.default_formatting_rules.merge(rules)
-        rules = self.localize_formatting_rules(rules, currency)
-        rules = self.translate_formatting_rules(rules, currency.code) if rules[:translate]
+        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
+          rules[:decimal_places] = currency.decimal_places
+          rules[:subunit_to_unit] = currency.subunit_to_unit
+          rules[:thousands_separator] = currency.thousands_separator
+        end
 
         # if fractional == 0
         if rules[:display_free].respond_to?(:to_str)
@@ -43,11 +49,15 @@ module RedmineCrm
         end
         # end
 
-        symbol_value = currency.symbol
+        symbol_value = currency.try(:symbol) || ""
+        # decimal_mark = rules["decimal_mark"]
+        # decimal_places
+
 
         formatted = value.abs.to_s
 
         # if rules[:rounded_infinite_precision]
+        if currency
           formatted.gsub!(/#{currency.decimal_mark}/, '.') unless '.' == currency.decimal_mark
           formatted = ((BigDecimal(formatted) * currency.subunit_to_unit).round / BigDecimal(currency.subunit_to_unit.to_s)).to_s("F")
           formatted.gsub!(/\..*/) do |decimal_part|
@@ -55,7 +65,7 @@ module RedmineCrm
             decimal_part
           end
           formatted.gsub!(/\./, currency.decimal_mark) unless '.' == currency.decimal_mark
-        # end
+        end
 
         sign = value < 0 ? '-' : ''
 
@@ -63,17 +73,18 @@ module RedmineCrm
           formatted = "#{formatted.to_i}"
         end
 
-        thousands_separator_value = currency.thousands_separator
+        # thousands_separator_value = currency.thousands_separator
         # Determine thousands_separator
         if rules.has_key?(:thousands_separator)
           thousands_separator_value = rules[:thousands_separator] || ''
         end
+        decimal_mark = rules[:decimal_mark]
 
         # Apply thousands_separator
-        formatted.gsub!(regexp_format(formatted, rules, currency.decimal_mark, symbol_value),
+        formatted.gsub!(regexp_format(formatted, rules, decimal_mark, symbol_value),
                         "\\1#{thousands_separator_value}")
 
-        symbol_position = symbol_position_from(rules, currency)
+        symbol_position = symbol_position_from(rules, currency) if currency
 
         if rules[:sign_positive] == true && (value >= 0)
           sign = '+'
@@ -98,7 +109,7 @@ module RedmineCrm
           formatted="#{sign_before}#{sign}#{formatted}"
         end
 
-        apply_decimal_mark_from_rules(formatted, rules)
+        # apply_decimal_mark_from_rules(formatted, rules)
 
         if rules[:with_currency]
           formatted << " "
@@ -110,8 +121,11 @@ module RedmineCrm
       end
 
       def default_formatting_rules
-        # byebug
-        {}
+        {
+          :decimal_mark =>".",
+          :thousands_separator => ",",
+          :subunit_to_unit => 100
+        }
       end
 
       def regexp_format(formatted, rules, decimal_mark, symbol_value)
@@ -206,10 +220,10 @@ module RedmineCrm
       # @param [String] formatted
       # @param [Hash]   rules
       def apply_decimal_mark_from_rules(formatted, rules)
-        if rules.has_key?(:decimal_mark) && rules[:decimal_mark] &&
-          rules[:decimal_mark] != decimal_mark
+        if rules.has_key?(:decimal_mark) && rules[:decimal_mark]
+          # && rules[:decimal_mark] != decimal_mark
 
-          regexp_decimal = Regexp.escape(decimal_mark)
+          regexp_decimal = Regexp.escape(rules[:decimal_mark])
           formatted.sub!(/(.*)(#{regexp_decimal})(.*)\Z/,
                          "\\1#{rules[:decimal_mark]}\\3")
         end

data/lib/redmine_crm/money_helper.rb

@@ -57,7 +57,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)# if currency
       price.to_s
     end
 

data/lib/redmine_crm/rcrm_acts_as_votable.rb

@@ -52,7 +52,7 @@ module RedmineCrm
 
       def drop_votable_table options = {}
         votes_name_table      = options[:votes] || :votes
-        if !self.connection.table_exists?(votes_name_table)
+        if self.connection.table_exists?(votes_name_table)
           self.connection.drop_table votes_name_table
         end
       end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/test/money_helper_test.rb

@@ -6,7 +6,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 ₽", price_to_currency(3265.65, "RUB")
-    assert_equal "3200", price_to_currency(3200, "")
-    assert_equal "3200", price_to_currency(3200, "Foo")
+    assert_equal "3,200.0", price_to_currency(3200, "")
+    assert_equal "3,200.0", price_to_currency(3200, "Foo")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-24 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies: []
 description: plugins for Redmine
 email: