unidom-order 1.1 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 886e0f2fc020d095320a1625b35811e72134a62c
-  data.tar.gz: 1caf01e51ec566eb451937b3c06bff9e42873424
+  metadata.gz: 9aba7cfe4b2be0605fcad15d0f3fe75611ebb70b
+  data.tar.gz: f1f23895e6e7588204f35a8a030e00f0360defa0
 SHA512:
-  metadata.gz: ae16527ac881d663e0f6e2ddaf5cb2b2725abcc13e291642496a8d4570be800bb732b84c854f53142263dbbc3a613f6703d383cb70ca34e5263206ac84f50b5d
-  data.tar.gz: 2ff4125a24922b3f7547474f7dbd4b492adcaa8a9b84e580563818d2642b1e1d84bec51ad3722f3fcc5c585b3fda3d3ec8f24085dfafecd36b716b4dc0c9fdbf
+  metadata.gz: f0bc8751bf0e1175210176029327cbe5a1c12d982de558aa137da9efa3d8f7e4bef037395714cabad7afa2424e3ada8a8205128b181316b5c39fc14959714033
+  data.tar.gz: aac0fc801a68b6b8322dbf06a6eeb898de5abfcc458bec7d40460821e803c4728d8b3b10f2232c88fb3759298fa2edd96f3f6a34895a11f9e00478cc74cc491c

data/README.md

@@ -83,16 +83,22 @@ order.adjustments # Order Adjustments
 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, amount: 20, due_to: 'DSCT'
+Unidom::Order::OrderAdjustment.adjust! order, amount: 20, due_to: 'DSCT', opened_at: Time.now
 # Add the given adjustment into the given order
 ```
 
 ## Include the Concerns
 ```ruby
+include Unidom::Order::AsAdjusted
 include Unidom::Order::AsOrderPlacer
 include Unidom::Order::AsOrderTaker
 ```
 
+### As Adjusted concern
+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)``
+
 ### As Order Placer concern
 The As Order Placer concern do the following tasks for the includer automatically:  
 1. Define the has_many :placed_orders macro as: ``has_many :placed_orders, class_name: 'Unidom::Order::Order', as: :placer``

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

@@ -6,6 +6,22 @@ module Unidom::Order::Concerns::AsAdjusted
 
     has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
 
+    def is_adjusted!(amount, due_to: 'FRGT', at: Time.now)
+      query      = adjustments.adjustment_factor_coded_as(due_to).valid_at(now: at).alive
+      adjustment = query.first
+      if adjustment.present?
+        if 0==amount
+          adjustment.soft_destroy
+        else
+          adjustment.amount = amount
+          adjustment.save!
+        end
+      else
+        adjustment = query.create! amount: amount, opened_at: at
+      end
+      adjustment
+    end
+
   end
 
 end

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

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

data/lib/unidom/order/version.rb

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

metadata

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