unidom-order 1.3.3 → 1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8698024aa710976d4888ef36bdd2e93727937cf
-  data.tar.gz: 0c3d619e542fcdc5ab321903d795b15aaba08f66
+  metadata.gz: 2d1fa66d2364b60de3450cfe90fc68f9f72c2db8
+  data.tar.gz: e2adc0a6972748779bcf763951bfa2098900f612
 SHA512:
-  metadata.gz: e895ce053c3203cd6c4ed293e2961d095906ebb75a81a6bd5b0c14a92a22892abe91efd571323b53ee4c495ea6fbc39833f532fbe540817e15c1aacf4a33d0ea
-  data.tar.gz: b82a3401b9158d656f5c078332df2c2ab0ff7b01eb4efd0f027e39485229222ff14c8804b077843d689d22166800e11253cace3188233960023c51575ff9dc71
+  metadata.gz: f7b20de05ccbe2922ed4e7152419c84557fd4732c69e518a7a3c1abe6658af14c845ffafa592e11ffea60665b7c2cf4741334bac8a92b499684d2813a469bf88
+  data.tar.gz: 34f2db87779651a16dff3d2402ba482c5dabdd04cb6fda6fb11af14386376766cda62670321029a9e9b352a81de318b298029b12b7cd77ef0a60fd0588363be2

data/README.md

@@ -126,3 +126,18 @@ The As Order Placer concern do the following tasks for the includer automaticall
 
 The As Order Taker concern do the following tasks for the includer automatically:  
 1. Define the has_many :taken_orders macro as: ``has_many :taken_orders, class_name: 'Unidom::Order::Order', as: :taker``
+
+
+
+## Enum codes
+
+### Adjustment Factor enum code 调整因素
+
+```ruby
+Unidom::Order::AdjustmentFactor::DISCOUNT_ADJUSTMENT           # 折扣调整
+Unidom::Order::AdjustmentFactor::SURCHARGE_ADJUSTMENT          # 额外费调整
+Unidom::Order::AdjustmentFactor::SALES_TAX                     # 销售税
+Unidom::Order::AdjustmentFactor::SHIPPING_AND_HANDLING_CHARGES # 装运和处理费
+Unidom::Order::AdjustmentFactor::FEE                           # 手续费
+Unidom::Order::AdjustmentFactor::MISCELLANEOUS_CHARGE          # 杂项收费
+```

data/app/models/unidom/order/order.rb

@@ -1,3 +1,4 @@
+##
 # Order 是订单。
 
 class Unidom::Order::Order < Unidom::Order::ApplicationRecord

data/app/models/unidom/order/order_adjustment.rb

@@ -1,3 +1,4 @@
+##
 # Order Adjustment 是订单调整项。
 
 class Unidom::Order::OrderAdjustment < Unidom::Order::ApplicationRecord
@@ -5,6 +6,7 @@ class Unidom::Order::OrderAdjustment < Unidom::Order::ApplicationRecord
   self.table_name = 'unidom_order_adjustments'
 
   include Unidom::Common::Concerns::ModelExtension
+  include ProgneTapera::EnumCode
 
   validates :amount, presence: true, numericality: { less_than: 1000000000, greater_than: -1000000000 }
 
@@ -12,6 +14,8 @@ class Unidom::Order::OrderAdjustment < Unidom::Order::ApplicationRecord
 
   scope :adjusted_is, ->(adjusted) { where adjusted: adjusted }
 
+  code :adjustment_factor, Unidom::Order::AdjustmentFactor
+
   def self.adjust!(adjusted, amount: 0, due_to: 'FRGT', opened_at: Time.now)
     query      = adjusted_is(adjusted).adjustment_factor_coded_as(due_to).valid_at(now: opened_at).alive
     adjustment = query.first

data/app/models/unidom/order/order_item.rb

@@ -1,3 +1,4 @@
+##
 # Order Item 是订单项。
 
 class Unidom::Order::OrderItem < Unidom::Order::ApplicationRecord

data/app/types/unidom/order/adjustment_factor.rb

@@ -0,0 +1,9 @@
+# Adjustment Factor 是调整因素。
+
+class Unidom::Order::AdjustmentFactor < ActiveRecord::Type::Value
+
+  include ProgneTapera::EnumConfig
+
+  enum :unidom_adjustment_factor
+
+end

data/config/enum.yml

@@ -0,0 +1,15 @@
+enum:
+
+  unidom_adjustment_factor:
+    discount_adjustment:
+      code: DSCT
+    surcharge_adjustment:
+      code: SCHG
+    sales_tax:
+      code: SLTX
+    shipping_and_handling_charges:
+      code: SPHD
+    fee:
+      code: FEES
+    miscellaneous_charge:
+      code: MISC

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

@@ -0,0 +1,10 @@
+'zh-CN':
+  enum:
+
+    unidom_adjustment_factor:
+      discount_adjustment:           折扣调整
+      surcharge_adjustment:          额外费调整
+      sales_tax:                     销售税
+      shipping_and_handling_charges: 装运和处理费
+      fee:                           手续费
+      miscellaneous_charge:          杂项收费

data/lib/unidom/order/engine.rb

@@ -1,3 +1,5 @@
+require 'unidom/common/yaml_helper'
+
 module Unidom
   module Order
 
@@ -5,6 +7,10 @@ module Unidom
 
       isolate_namespace ::Unidom::Order
 
+      initializer :load_config_initializers do |app|
+        Unidom::Common::YamlHelper.load_enum config: app.config, root: config.root
+      end
+
       initializer :append_migrations do |app|
         config.paths['db/migrate'].expanded.each { |expanded_path| app.config.paths['db/migrate'] << expanded_path } unless app.root.to_s.match root.to_s
       end

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '1.3.3'.freeze
+    VERSION = '1.4'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: '1.4'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -50,7 +50,10 @@ files:
 - app/models/unidom/order/order.rb
 - app/models/unidom/order/order_adjustment.rb
 - app/models/unidom/order/order_item.rb
+- app/types/unidom/order/adjustment_factor.rb
 - app/views/layouts/unidom/order/application.html.erb
+- config/enum.yml
+- config/locales/enum.zh-CN.yml
 - config/routes.rb
 - db/migrate/20020601000000_create_unidom_orders.rb
 - db/migrate/20020602000000_create_unidom_order_items.rb