unidom-order 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9aba7cfe4b2be0605fcad15d0f3fe75611ebb70b
-  data.tar.gz: f1f23895e6e7588204f35a8a030e00f0360defa0
+  metadata.gz: 2a122ad78313c41f4eb11d252867052ca9e2162f
+  data.tar.gz: 7084f6f7a1330793c369198f84d802e60f1174b2
 SHA512:
-  metadata.gz: f0bc8751bf0e1175210176029327cbe5a1c12d982de558aa137da9efa3d8f7e4bef037395714cabad7afa2424e3ada8a8205128b181316b5c39fc14959714033
-  data.tar.gz: aac0fc801a68b6b8322dbf06a6eeb898de5abfcc458bec7d40460821e803c4728d8b3b10f2232c88fb3759298fa2edd96f3f6a34895a11f9e00478cc74cc491c
+  metadata.gz: c769c8a144ee715e1c5002be583d90f879601b8180655118dd8bab71b51ffe5ef18819b638ee2e8318b9b9f51d106605dc4b7cf3319895c405bd42eb3c0fbe41
+  data.tar.gz: 9aae203adde1f5e273323251a667aff492f0f900f91f86d3499a439c38f804112ef46be78814b2b381b5d164b680afb2d1adacd4caf04e658ac6a67fb6a0270b

data/README.md

@@ -6,22 +6,34 @@
 Unidom (UNIfied Domain Object Model) is a series of domain model engines. The Order domain model engine includes Order, Order Item, and Order Adjustment models.
 Unidom (统一领域对象模型)是一系列的领域模型引擎。订单领域模型引擎包括订单、订单项和订单调整的模型。
 
+
+
 ## Recent Update
+
 Check out the [Road Map](ROADMAP.md) to find out what's the next.
 Check out the [Change Log](CHANGELOG.md) to find out what's new.
 
+
+
 ## Usage in Gemfile
+
 ```ruby
 gem 'unidom-order'
 ```
 
+
+
 ## Run the Database Migration
+
 ```shell
 rake db:migrate
 ```
 The migration versions start with 200206.
 
+
+
 ## Call the Model
+
 ```ruby
 lady = Person.create name: 'Ann'
 shop = Shop.create   name: 'WalMart'
@@ -87,7 +99,10 @@ Unidom::Order::OrderAdjustment.adjust! order, amount: 20, due_to: 'DSCT', opened
 # Add the given adjustment into the given order
 ```
 
+
+
 ## Include the Concerns
+
 ```ruby
 include Unidom::Order::AsAdjusted
 include Unidom::Order::AsOrderPlacer
@@ -98,6 +113,7 @@ include Unidom::Order::AsOrderTaker
 The As Adjusted concern do the following tasks for the includer automatically:  
 1. Define the has_many :adjustments macro as: ``has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted``
 2. Define the #is_adjusted! method as: ``is_adjusted!(amount, due_to: 'FRGT', at: Time.now)``
+3. Define the #is_adjusted? method as: ``is_adjusted?(due_to: 'FRGT', at: Time.now)``
 
 ### As Order Placer concern
 The As Order Placer concern do the following tasks for the includer automatically:  

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

@@ -22,6 +22,13 @@ module Unidom::Order::Concerns::AsAdjusted
       adjustment
     end
 
+    def is_adjusted?(due_to: 'FRGT', at: Time.now)
+      adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive.exists?
+    end
+
+  end
+
+  module ClassMethods
   end
 
 end

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

@@ -8,4 +8,7 @@ module Unidom::Order::Concerns::AsOrderPlacer
 
   end
 
+  module ClassMethods
+  end
+
 end

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

@@ -8,4 +8,7 @@ module Unidom::Order::Concerns::AsOrderTaker
 
   end
 
+  module ClassMethods
+  end
+
 end

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

@@ -7,11 +7,11 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
   include Unidom::Common::Concerns::ModelExtension
   include Unidom::Order::Concerns::AsAdjusted
 
-  validates :ordinal,         presence: true, numericality: { only_integer: true, greater_than: 0, less_than: 1000000000 }
-  validates :unit_price,      presence: true, numericality: { less_than: 1000000000, greater_than: 0 }
-  validates :quantity,        presence: true, numericality: { less_than: 1000000000, greater_than: 0 }
-  validates :purchase_amount, presence: true, numericality: { less_than: 1000000000, greater_than: 0 }
-  validates :subtotal_amount, presence: true, numericality: { less_than: 1000000000, greater_than: 0 }
+  validates :ordinal,         presence: true, numericality: { only_integer: true, greater_than: 0, less_than: 1_000_000_000 }
+  validates :unit_price,      presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
+  validates :quantity,        presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
+  validates :purchase_amount, presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
+  validates :subtotal_amount, presence: true, numericality: { less_than: 1_000_000_000, greater_than: 0 }
 
   belongs_to :order,   class_name:  'Unidom::Order::Order'
   belongs_to :ordered, polymorphic: true

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '1.2'.freeze
+    VERSION = '1.3'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-10 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common