unidom-shipment 0.5.1 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30038ff2d5cf92a198bb784b5abaca7418b3450d
-  data.tar.gz: 0e7fdfd69b1aacb30c2e47212a28a99478f9cef1
+  metadata.gz: 72f9a1eb9afc7121908038c8d96b5def3a1301e5
+  data.tar.gz: 485a2c6e736e9fd26f704eb1a19f4293533a2ee6
 SHA512:
-  metadata.gz: 9a018782afb78d3ef85a39617bc7682b76dd1e841b0bc2c08185c7de04a1ced0edcc3f334344d67b65ac56ccbf14ba71fd2888045c21a38ef227aabd05753898
-  data.tar.gz: 8d2177620b4e332d7d75a422108155d2cda8d27bd57bc3d48e27f9cbc9a4e925e5315ea260547e379c4d93ca250a5886a68e952c7ed29e0bfbc476d63791e17f
+  metadata.gz: b4f91b27ce41acedda4d1b30837ccb0ec6f80b79297b5109fa3bb7b35b130fb8ee0d3d99705cdd30e3ecd3d80e4f7eb9af0c2d23d973564c7e5a911dd9581453
+  data.tar.gz: 9c09a19bdc10b9f343966ad572465967dcc0fd59eab9cbbf8ba98ec3bac1c27d96b02b5506c6ce7ccddb4773e3229f639a94e058b360bcaee5165e296a4eaa6b

data/README.md

@@ -59,3 +59,18 @@ include Unidom::Shipment::Concerns::AsShipped
 The As Shipped concern do the following tasks for the includer automatically:  
 1. Define the has_many :shipment_items macro as: ``has_many :shipment_items, class_name: 'Unidom::Shipment::ShipmentItem', foreign_key: :shipped_id``  
 2. Define the has_many :shipment_receipts macro as: ``has_many :shipment_receipts, class_name: 'Unidom::Shipment::ShipmentReceipt', foreign_key: :shipped_id``
+
+
+
+## Enum codes
+
+### Conveyance enum code
+
+```ruby
+Unidom::Shipment::Conveyance::customer_shipment # 客户装运
+Unidom::Shipment::Conveyance::customer_return   # 客户退回
+Unidom::Shipment::Conveyance::purchase_shipment # 购买装运
+Unidom::Shipment::Conveyance::purchase_return   # 进货退回
+Unidom::Shipment::Conveyance::transfer          # 转运
+Unidom::Shipment::Conveyance::drop_shipment     # 直接装运
+```

data/app/models/unidom/shipment/shipment.rb

@@ -1,3 +1,4 @@
+##
 # Shipment 是装运。
 # conveyance_code 是运送代码，可以是以下取值：
 # CSSP: Customer Shipment 客户装运，把货物发给客户。
@@ -12,6 +13,7 @@ class Unidom::Shipment::Shipment < Unidom::Shipment::ApplicationRecord
   self.table_name = 'unidom_shipments'
 
   include Unidom::Common::Concerns::ModelExtension
+  include ProgneTapera::EnumCode
 
   validates :estimated_amount, presence: true, numericality: { greater_than_or_equal_to: 0 }
   validates :actual_amount,    presence: true, numericality: { greater_than_or_equal_to: 0 }
@@ -28,4 +30,6 @@ class Unidom::Shipment::Shipment < Unidom::Shipment::ApplicationRecord
 
   has_many :items, class_name: 'Unidom::Shipment::ShipmentItem'
 
+  code :conveyance, Unidom::Shipment::Conveyance
+
 end

data/app/models/unidom/shipment/shipment_item.rb

@@ -1,3 +1,4 @@
+##
 # Shipment Item 是装运项。
 
 class Unidom::Shipment::ShipmentItem < Unidom::Shipment::ApplicationRecord

data/app/models/unidom/shipment/shipment_package.rb

@@ -1,3 +1,4 @@
+##
 # Shipment Package 是装运包裹。
 # #items 是包裹项。
 # #receipts 是收据。

data/app/models/unidom/shipment/shipment_package_item.rb

@@ -1,3 +1,4 @@
+##
 # Shipment Package Item 是装运包裹内容。
 
 class Unidom::Shipment::ShipmentPackageItem < Unidom::Shipment::ApplicationRecord

data/app/models/unidom/shipment/shipment_receipt.rb

@@ -1,3 +1,4 @@
+##
 # Shipment Receipt 是装运收据。
 # #package 是装运包裹。
 # #shipped 是被装运的产品、货物等。

data/app/types/unidom/shipment/conveyance.rb

@@ -0,0 +1,7 @@
+class Unidom::Shipment::Conveyance < ActiveRecord::Type::Value
+
+  include ProgneTapera::EnumConfig
+
+  enum :unidom_conveyance
+
+end

data/config/enum.yml

@@ -0,0 +1,15 @@
+enum:
+
+  unidom_conveyance:
+    customer_shipment:
+      code: CSSP
+    customer_return:
+      code: CSRT
+    purchase_shipment:
+      code: PCSP 
+    purchase_return:
+      code: PCRT
+    transfer:
+      code: TRSF
+    drop_shipment:
+      code: DROP

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

@@ -0,0 +1,10 @@
+'zh-CN':
+  enum:
+
+    unidom_conveyance:
+      customer_shipment: 客户装运 # 把货物发给客户。
+      customer_return:   客户退回 # 从购买了产品的客户那里把退回的产品运回来。
+      purchase_shipment: 购买装运 # 从供应商那里把购买的货物运进来。
+      purchase_return:   进货退回 # 把发来的货物返回给供应商。
+      transfer:          转运     # 从内部组织到另一个内部组织调拨。
+      drop_shipment:     直接装运 # 销售商把产品从供应商那里直接运送给客户。

data/lib/unidom/shipment/engine.rb

@@ -1,3 +1,5 @@
+require 'unidom/common/yaml_helper'
+
 module Unidom
   module Shipment
 
@@ -5,6 +7,10 @@ module Unidom
 
       isolate_namespace ::Unidom::Shipment
 
+      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/shipment/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Shipment
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-shipment
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: '0.6'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-06 00:00:00.000000000 Z
+date: 2016-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -50,7 +50,10 @@ files:
 - app/models/unidom/shipment/shipment_package.rb
 - app/models/unidom/shipment/shipment_package_item.rb
 - app/models/unidom/shipment/shipment_receipt.rb
+- app/types/unidom/shipment/conveyance.rb
 - app/views/layouts/unidom/shipment/application.html.erb
+- config/enum.yml
+- config/locales/enum.zh-CN.yml
 - config/routes.rb
 - db/migrate/20021001000000_create_unidom_shipments.rb
 - db/migrate/20021002000000_create_unidom_shipment_items.rb