redmine_crm 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1f2c458c8bf5227d929dfeff97a5d824671a2e
-  data.tar.gz: 9ec12c869d0b7ff00b2bda0d45d37a7b1f371ceb
+  metadata.gz: 81f91096391decad0088cb36a6242442bd3ac138
+  data.tar.gz: 4095681d0e312ef4d79ab1d0b0c8f182b5c54126
 SHA512:
-  metadata.gz: 61394ed77de656deb18da9c45f85991baa65b03d67e4ea297ab87c240cc6f06e98511751c384dd2e6dddd9ff574bf35b1cbeb2c8d8a2a5b864ebe8429cb2d484
-  data.tar.gz: 84d63bc16b071b8c57ca45d467f649a2a6f5ed8e23152f671d812232794f7ad9854e7a0f9eef86dee16e3eb1084de342243c2a5ab754b19b9cbece24fd946ec6
+  metadata.gz: 971e7b697e2a3f57b9933ccdb37ba19b08cc88a3996bab34a2679fc4016d2f16b3cba2fd3f09869b65e7d71f55f6212fc1c93579b4d117d0f12c4608863b1b36
+  data.tar.gz: 0f5ea97bc5eae151e18f726ab48562641d7db6d93ecd1e6acbae52f1a3ff941fc23265d19aa47f3ecd2ae868d1d2090a1be227a0f93e8cb552f7e015aa70389f

data/doc/CHANGELOG

@@ -3,6 +3,10 @@
 Redmine crm gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2015 RedmineCRM
 http://www.redminecrm.com/
+== 2015-10-29 v0.0.21
+
+* Added space for CHF in currency format
+* Changed collection_for_currencies_select helper for major currencies
 
 == 2015-10-29 v0.0.20
 

data/lib/redmine_crm/currency/formatting.rb

@@ -92,7 +92,6 @@ module RedmineCrm
 
         if symbol_value && !symbol_value.empty?
           symbol_value = "<span class=\"currency_symbol\">#{symbol_value}</span>" if rules[:html_wrap_symbol]
-
           formatted = if symbol_position == :before
             symbol_space = rules[:symbol_before_without_space] === false ? " " : ""
             "#{sign_before}#{symbol_value}#{symbol_space}#{sign}#{formatted}"
@@ -151,6 +150,8 @@ module RedmineCrm
           rules[:symbol] = "円" unless rules[:symbol] == false
           rules[:symbol_position] = :after
           rules[:symbol_after_without_space] = true
+        elsif currency.iso_code == "CHF"
+          rules[:symbol_before_without_space] = false
         end
         rules
       end

data/lib/redmine_crm/money_helper.rb

@@ -30,10 +30,10 @@ module RedmineCrm
       end
     end
 
-    def collection_for_currencies_select(default_currency='USD')
-      currencies = [] 
+    def collection_for_currencies_select(default_currency = 'USD', major_currencies = %w(USD EUR GBP RUB CHF))
+      currencies = []
       currencies << default_currency.to_s unless default_currency.blank?
-      currencies |= %w(USD EUR GBP RUB CHF)
+      currencies |= major_currencies
       currencies.map do |c|
         currency = RedmineCrm::Currency.find(c)
         ["#{currency.iso_code} (#{currency.symbol})", currency.iso_code] if currency
@@ -50,10 +50,10 @@ module RedmineCrm
 
     def price_to_currency(price, currency="USD", options={})
       return '' if price.blank?
-      
+
       currency = "USD" unless currency.is_a?(String)
       currency = RedmineCrm::Currency.find(currency)
-      
+
       return RedmineCrm::Currency.format(price.to_f, currency, options)# if currency
       price.to_s
     end
@@ -64,4 +64,4 @@ end
 
 unless ActionView::Base.included_modules.include?(RedmineCrm::MoneyHelper)
   ActionView::Base.send(:include, RedmineCrm::MoneyHelper)
-end
+end

data/lib/redmine_crm/version.rb

@@ -1,3 +1,3 @@
 module RedmineCrm
-  VERSION = "0.0.20"
+  VERSION = "0.0.21"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_crm
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - RedmineCRM
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies: []
 description: Common libraries for RedmineCRM plugins for Redmine. Requered Redmine
   from http://redmine.org