unidom-order 1.5.5 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37f14a5fc4f78c947ea45ca34db35c679067e70b
-  data.tar.gz: c7e1a8e957fe3a99df0cb455395bb2024eb43569
+  metadata.gz: c5c3bfc09e3b888292b6148bee326d99bcecfffa
+  data.tar.gz: dd0714bbe35e4e9f06207add90aac766ddb09425
 SHA512:
-  metadata.gz: 3b19a7210b00dd49b6075e127cf8e0fe1f72ac12f081581f19d3a0b870afae3e2e3694f8702ccf28ee9bc33f1f9e9461e0e7da3c45e931dab7c124ab312eb0d2
-  data.tar.gz: 44acfd90da53125b0884758d0f61b3a50c86fdf861b34c7f4327fbc0bf82e8aafa2662a8a73aafc503908bc98b4652b548ba2ee7a40adb3f27eab3d2ec0e1867
+  metadata.gz: bdc23e284f05a35246495d3af7923b243a93dcb1b1232e541f2d67724c3dc342766a8b377d10dfb533cb7a82097c2764a76c7f875a9c1514d504289f7c0a3435
+  data.tar.gz: 2d1431fb93c6f974ddfc51bc806ef12c74845118e3e2a32da4c4366e73ff764cb26fa7c08ac83f4f31c9a2f183ec424cbc83d4fe26a8e32709c095a95e7b26c3

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

@@ -20,6 +20,12 @@ class Unidom::Order::OrderAdjustment < Unidom::Order::ApplicationRecord
   # 对订单或者订单项 adjusted 进行调整。调整金额为 amount ，缺省为 0 。调整原因是 due_to ，缺省是 FRGT 。调整时间是 opened_at ，缺省为当前时间。如：
   # Unidom::Order::OrderAdjustment.adjust! order, amount: 7.90, due_to: 'LTAX'
   def self.adjust!(adjusted, amount: 0, due_to: 'FRGT', opened_at: Time.now)
+
+    assert_present! :adjusted,  adjusted
+    assert_present! :amount,    amount
+    assert_present! :due_to,    due_to
+    assert_present! :opened_at, opened_at
+
     query      = adjusted_is(adjusted).adjustment_factor_coded_as(due_to).valid_at(now: opened_at).alive
     adjustment = query.first
     if adjustment.present?

data/lib/rspec/models/unidom/order/order_adjustment_spec.rb

@@ -21,8 +21,6 @@ describe Unidom::Order::OrderAdjustment, type: :model do
     it_behaves_like 'validates numericality', model_attributes, :amount,
       range: -1_000_000_000..1_000_000_000, minimum_inclusive: true,  maximum_inclusive: true
 
-    it_behaves_like 'ProgneTapera::EnumCode', described_class.new(model_attributes), :adjustment_factor, Unidom::Order::AdjustmentFactor
-
     order_attributes = {
       placer_id:        SecureRandom.uuid,
       placer_type:      'Unidom::Order::Placer::Mock',
@@ -51,6 +49,11 @@ describe Unidom::Order::OrderAdjustment, type: :model do
 
     it_behaves_like 'polymorphic scope', model_attributes, :adjusted_is, :adjusted, [ Unidom::Order::Order, Unidom::Order::OrderItem ]
 
+    it_behaves_like 'ProgneTapera::EnumCode', described_class.new(model_attributes), :adjustment_factor, Unidom::Order::AdjustmentFactor
+
+    adjusted = Unidom::Order::Order.create! order_attributes
+    it_behaves_like 'assert_present!', described_class, :adjust!, [ adjusted, amount: 0, due_to: 'FRGT', opened_at: Time.now ], [ { 0 => :adjusted }, :amount, :due_to, :opened_at ]
+
   end
 
 end

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '1.5.5'.freeze
+    VERSION = '1.5.6'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.6
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-25 00:00:00.000000000 Z
+date: 2017-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common