unidom-order 1.0.1 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55c5078b2fea9eb930fa000af80202be6d9f521a
-  data.tar.gz: 655d247081fdd06b42c5015b53180615dd01de5d
+  metadata.gz: 886e0f2fc020d095320a1625b35811e72134a62c
+  data.tar.gz: 1caf01e51ec566eb451937b3c06bff9e42873424
 SHA512:
-  metadata.gz: e51b95e4363dfe8aaf0f07b39b2cd2dde1fedbe7582b0168893ff4d632dc700b25dee3d1bdd97ccf0879e7d0b171156e10ae8793c521d6004c28d185c616b8fd
-  data.tar.gz: 44cd9a09758f125e2013e931fa6d7b95c058d2435c498b0aa29436af80efbf2490cf8eeef0689995fb7fb09ad9747a2f824fa19304efa137f681b385458f17fc
+  metadata.gz: ae16527ac881d663e0f6e2ddaf5cb2b2725abcc13e291642496a8d4570be800bb732b84c854f53142263dbbc3a613f6703d383cb70ca34e5263206ac84f50b5d
+  data.tar.gz: 2ff4125a24922b3f7547474f7dbd4b492adcaa8a9b84e580563818d2642b1e1d84bec51ad3722f3fcc5c585b3fda3d3ec8f24085dfafecd36b716b4dc0c9fdbf

data/README.md

@@ -86,3 +86,17 @@ Unidom::Order::OrderItem.order! product, of: order, unit_price: 1080.00, quantit
 Unidom::Order::OrderAdjustment.adjust! order, amount: 20, due_to: 'DSCT'
 # Add the given adjustment into the given order
 ```
+
+## Include the Concerns
+```ruby
+include Unidom::Order::AsOrderPlacer
+include Unidom::Order::AsOrderTaker
+```
+
+### 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``
+
+### As Order Taker concern
+The As Order Taker concern do the following tasks for the includer automatically:  
+1. Define the has_many :taken_orders macro as: ``has_many :taken_orders, class_name: 'Unidom::Order::Order', as: :taker``

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

@@ -0,0 +1,11 @@
+module Unidom::Order::Concerns::AsAdjusted
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
+
+  end
+
+end

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

@@ -0,0 +1,11 @@
+module Unidom::Order::Concerns::AsOrderPlacer
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :placed_orders, class_name: 'Unidom::Order::Order', as: :placer
+
+  end
+
+end

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

@@ -0,0 +1,11 @@
+module Unidom::Order::Concerns::AsOrderTaker
+
+  extend ActiveSupport::Concern
+
+  included do |includer|
+
+    has_many :taken_orders, class_name: 'Unidom::Order::Order', as: :taker
+
+  end
+
+end

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

@@ -5,6 +5,7 @@ class Unidom::Order::Order < ActiveRecord::Base
   self.table_name = 'unidom_orders'
 
   include Unidom::Common::Concerns::ModelExtension
+  include Unidom::Order::Concerns::AsAdjusted
 
   validates :number,           presence: true, length:       { is: self.columns_hash['number'].limit  }
   validates :purchase_amount,  presence: true, numericality: { less_than: 1000000000, greater_than: 0 }
@@ -13,8 +14,7 @@ class Unidom::Order::Order < ActiveRecord::Base
   belongs_to :placer, polymorphic: true
   belongs_to :taker,  polymorphic: true
 
-  has_many :items,       class_name: 'Unidom::Order::OrderItem'
-  has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
+  has_many :items, class_name: 'Unidom::Order::OrderItem'
 
   scope :placed_by, ->(placer) { where placer: placer }
   scope :taken_by,  ->(taker)  { where taker:  taker  }

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

@@ -17,6 +17,7 @@ class Unidom::Order::OrderAdjustment < ActiveRecord::Base
     if adjustment.present?
       adjustment.amount = amount
       adjustment.save!
+      adjustment
     else
       create! adjusted: adjusted, amount: amount, adjustment_factor_code: due_to
     end

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

@@ -5,6 +5,7 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
   self.table_name = 'unidom_order_items'
 
   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 }
@@ -16,8 +17,6 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
   belongs_to :ordered, polymorphic: true
   belongs_to :placer,  polymorphic: true
 
-  has_many :adjustments, class_name: 'Unidom::Order::OrderAdjustment', as: :adjusted
-
   scope :order_is,   ->(order)   { where order_id: (order.respond_to?(:id) ? order.id : order) }
   scope :ordered_is, ->(ordered) { where ordered: ordered }
   scope :placed_by,  ->(placer)  { where placer:  placer  }

data/app/views/layouts/unidom/order/application.html.erb

@@ -9,7 +9,7 @@
 
 <%= yield %>
 
-<%= javascript_include_tag 'order/application' %>
+<%= javascript_include_tag 'unidom/order/application' %>
 
 </body>
 </html>

data/lib/unidom/order/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: '1.1'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -40,6 +40,9 @@ files:
 - app/assets/stylesheets/unidom/order/application.css
 - app/controllers/unidom/order/application_controller.rb
 - app/helpers/unidom/order/application_helper.rb
+- app/models/unidom/order/concerns/as_adjusted.rb
+- app/models/unidom/order/concerns/as_order_placer.rb
+- app/models/unidom/order/concerns/as_order_taker.rb
 - app/models/unidom/order/order.rb
 - app/models/unidom/order/order_adjustment.rb
 - app/models/unidom/order/order_item.rb