unidom-price 1.5 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae7ea7b7ce37f9e2175e1cfb5b6ea571d8e487bf
-  data.tar.gz: cae78a1bdfc17538c70fd939c6fa7698012b8288
+  metadata.gz: 8213fae471e8288934e33eb3998d8e963415a15c
+  data.tar.gz: 3858cd7e5803f75875e33dbfbe44372ef8d10336
 SHA512:
-  metadata.gz: 3d29943e072be1c3109a5efe7964ba99bbf918a26fd3b04ba5b39798f2090ec252893449ba730bd6cc1101bdcfe584d8cad5b547a6f9fa5f03879c556566b853
-  data.tar.gz: 330734b9fcd88e5b2525d4e45a5583bc63653cf41b506f6353bace1316412ebdc9786714241615811fea933a6700592f3b00887036f4fe7778efb31f907b586c
+  metadata.gz: a92d9872083c5354cca02e3aee0045bc09dcb669d8fe172693d7c882233f86a0e20bca455a8578d4e51c062304d33636afaf67945b6ba047d409563ab3a2f712
+  data.tar.gz: 35b588b28ae53121b89fd326c840d2439dccd6f545d5bd382ab21b3c206e1481e3420b9a720165dfea8214b3fc863289b253dcaf66077eb18b350ea82bab37f7

data/README.md

@@ -78,16 +78,22 @@ include Unidom::Price::Concerns::AsPricer
 
 ### As Priced
 
-The As Priced concern do the following tasks for the includer automatically:  
-1. Define the has_many :prices macro as: ``has_many :prices, class_name: 'Unidom::Price::Price', as: :priced``  
-2. Define the #is_priced! method as: ``is_priced!(amount, by: nil, at: Time.now)``  
+The As Priced concern do the following tasks for the includer automatically:
+
+1. Define the has_many :prices macro as: ``has_many :prices, class_name: 'Unidom::Price::Price', as: :priced``
+
+2. Define the #is_priced! method as: ``is_priced!(amount, by: nil, at: Time.now)``
+
 3. Define the #is_priced? method as: ``is_priced?(at: Time.now)``
 
 ### As Pricer
 
-The As Priced concern do the following tasks for the includer automatically:  
-1. Define the has_many :pricings macro as: ``has_many :pricings, class_name: 'Unidom::Price::Price', as: :pricer``  
-2. Define the #price! method as: ``price!(it, amount, at: Time.now)``  
+The As Priced concern do the following tasks for the includer automatically:
+
+1. Define the has_many :pricings macro as: ``has_many :pricings, class_name: 'Unidom::Price::Price', as: :pricer``
+
+2. Define the #price! method as: ``price!(it, amount, at: Time.now)``
+
 3. Define the #price? method as: ``price?(it, at: Time.now)``
 
 
@@ -108,3 +114,12 @@ Unidom::Price::Charging::ONE_TIME    # 一次性收费
 Unidom::Price::Charging::RECURRING   # 重复性收费
 Unidom::Price::Charging::UTILIZATION # 使用率收费
 ```
+
+### Pricing enum code
+
+```ruby
+Unidom::Price::Pricing::BASE                   # 基价
+Unidom::Price::Pricing::DISCOUNT               # 折扣成分
+Unidom::Price::Pricing::SURCHARGE              # 额外收费成分
+Unidom::Price::Pricing::MANUFACTURER_SUGGESTED # 厂家建议价
+```

data/app/types/unidom/price/pricing.rb

@@ -0,0 +1,7 @@
+class Unidom::Price::Pricing < ActiveRecord::Type::Value
+
+  include ProgneTapera::EnumConfig
+
+  enum :unidom_pricing
+
+end

data/config/enum.yml

@@ -8,11 +8,25 @@ enum:
 
   unidom_charging:
     one_time:
-      code: ONCE
+      code:        ONCE
       description: such as for buying a good
     recurring:
-      code: RECR
+      code:        RECR
       description: an ongoing charge such as a monthly fee for a standard type of service
     utilization:
-      code: UTLZ
+      code:        UTLZ
       description: usage of a product
+
+  unidom_pricing:
+    base:
+      code: BASE
+      description: 产品的起始价格
+    discount:
+      code: DSCT
+      description: 相对于基价的有效折扣
+    surcharge:
+      code: SCHG
+      description: 附加收费
+    manufacturer_suggested:
+      code: MFSG
+      description:

data/config/locales/enum.zh-CN.yml

@@ -9,3 +9,9 @@
       one_time:    一次性收费
       recurring:   重复性收费
       utilization: 使用率收费
+
+    unidom_pricing:
+      base:                   基价
+      discount:               折扣成分
+      surcharge:              额外收费成分
+      manufacturer_suggested: 厂家建议价

data/lib/unidom/price/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Price
-    VERSION = '1.5'.freeze
+    VERSION = '1.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-price
 version: !ruby/object:Gem::Version
-  version: '1.5'
+  version: '1.6'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-26 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -48,6 +48,7 @@ files:
 - app/models/unidom/price/price.rb
 - app/types/unidom/price/calculation.rb
 - app/types/unidom/price/charging.rb
+- app/types/unidom/price/pricing.rb
 - app/views/layouts/unidom/price/application.html.erb
 - config/enum.yml
 - config/locales/enum.zh-CN.yml