unidom-order 0.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2bc8ba284224681a3b72648e4e52f1766c3102e
-  data.tar.gz: d221bcddeb76942316bd8d5e5a141a00de073d94
+  metadata.gz: 96ca7f0fb037a4248a7fb2bc2c3dbdc4a9df971c
+  data.tar.gz: 34414799a3d6ff47bf00e1b8770071f875573ab8
 SHA512:
-  metadata.gz: e8055a0a0b387806e379201d9ce9239768e29c66e50a5685e8affcebd98faeb58a0dd3628151ee55bf0be5fbb741b1f9975c34bed675b0c764d5b217c754251a
-  data.tar.gz: eb2ca7fc49b0349a1ffe32a407b6391472da82274320bc221249408f68114223f51f1c0e59d7ffa7e22672be547f5e62219433b7018c037a69a3507ea9a85cbb
+  metadata.gz: 8c958775d48cae6ee404261c110730556b738c63c7dab26dd81c0695277f23f7861f74cc2a1a9a8fe0c2c2c647701a3dcdfb377f4122a764309e0d9e5195999d
+  data.tar.gz: e14c47b65bb7c08424b6939915e366302b2bdbc92bf89a150512e32788ff3ba055ea3eec1116f0aa333e4354773e4439ff20017bb0c3e380b9bb350f08c72c52

data/README.md

@@ -80,9 +80,9 @@ order = Unidom::Order::Order.where(number: 'ZBCDEFGHIJKL').first
 order.items       # Order Items
 order.adjustments # Order Adjustments
 
-Unidom::Order::OrderItem.order! order, product, 1080.00, 2
+Unidom::Order::OrderItem.order! product, of: order, unit_price: 1080.00, quantity: 2
 # Add the given product into the given order
 
-Unidom::Order::OrderAdjustment.adjust! order, 20, 'DSCT'
+Unidom::Order::OrderAdjustment.adjust! order, amount: 20, due_to: 'DSCT'
 # Add the given adjustment into the given order
 ```

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

@@ -12,13 +12,13 @@ class Unidom::Order::OrderAdjustment < ActiveRecord::Base
 
   scope :adjusted_is, ->(adjusted) { where adjusted: adjusted }
 
-  def self.adjust!(adjusted, amount, adjustment_factor_code = 'FRGT')
-    adjustment = self.adjusted_is(adjusted).adjustment_factor_coded_as(adjustment_factor_code).valid_at.alive.first
+  def self.adjust!(adjusted, amount: 0, due_to: 'FRGT')
+    adjustment = self.adjusted_is(adjusted).adjustment_factor_coded_as(due_to).valid_at.alive.first
     if adjustment.present?
       adjustment.amount = amount
       adjustment.save!
     else
-      create! adjusted: adjusted, amount: amount, adjustment_factor_code: adjustment_factor_code
+      create! adjusted: adjusted, amount: amount, adjustment_factor_code: due_to
     end
   end
 

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

@@ -22,8 +22,8 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
   scope :ordered_is, ->(ordered) { where ordered: ordered }
   scope :placed_by,  ->(placer)  { where placer:  placer  }
 
-  def self.order!(order, ordered, unit_price, quantity = 1, placer = order.placer)
-    item = order.items.ordered_is(ordered).placed_by(placer).valid_at.alive.first
+  def self.order!(ordered, of: nil, by: of.placer, unit_price: 0, quantity: 1)
+    item = of.items.ordered_is(ordered).placed_by(by).valid_at.alive.first
     if item.present?
       item.quantity        += quantity
       item.unit_price      =  unit_price
@@ -31,8 +31,8 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
       item.subtotal_amount =  item.purchase_amount+item.adjustments.valid_at.alive.sum(:amount).to_f
       item.save!
     else
-      ordinal = 1+order.items.valid_at.alive.maximum(:ordinal).to_i
-      order.items.create! ordered: ordered, placer: placer, ordinal: ordinal, quantity: quantity, unit_price: unit_price, purchase_amount: unit_price*quantity, subtotal_amount: unit_price*quantity, opened_at: Time.now
+      ordinal = 1+of.items.valid_at.alive.maximum(:ordinal).to_i
+      of.items.create! ordered: ordered, placer: by, ordinal: ordinal, quantity: quantity, unit_price: unit_price, purchase_amount: unit_price*quantity, subtotal_amount: unit_price*quantity, opened_at: Time.now
     end
   end
 

data/lib/unidom/order/version.rb

@@ -1,5 +1,5 @@
 module Unidom
   module Order
-    VERSION = '0.3'.freeze
+    VERSION = '1.0'.freeze
   end
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '1.0'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-21 00:00:00.000000000 Z
+date: 2016-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.9'
 description: Unidom (UNIfied Domain Object Model) is a series of domain model engines.