unidom-order 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48fc36ed07eb4d1292f6856c7a5694c9a1dab93
-  data.tar.gz: 510ec88e40c91d544bde97f3d8d638bafba94330
+  metadata.gz: c2bc8ba284224681a3b72648e4e52f1766c3102e
+  data.tar.gz: d221bcddeb76942316bd8d5e5a141a00de073d94
 SHA512:
-  metadata.gz: 7bee6beff82b5af562010d99c05537388c7e1fecd2f5dc9ea873459fde8ddef14ae14ee392694517a807a88f6938df96b85dcdfcc480e5a35ed6ea397b396139
-  data.tar.gz: 92847436f2c53d716ead22e6c3dd9bb2ffd5934e6617182c156562d2d2fb7201d8f8e98c128b3be7682ff6fe30ab17ea333d3da65b3f0d8f3a2927253fb0e13d
+  metadata.gz: e8055a0a0b387806e379201d9ce9239768e29c66e50a5685e8affcebd98faeb58a0dd3628151ee55bf0be5fbb741b1f9975c34bed675b0c764d5b217c754251a
+  data.tar.gz: eb2ca7fc49b0349a1ffe32a407b6391472da82274320bc221249408f68114223f51f1c0e59d7ffa7e22672be547f5e62219433b7018c037a69a3507ea9a85cbb

data/README.md

@@ -6,6 +6,10 @@
 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'
@@ -15,10 +19,70 @@ gem 'unidom-order'
 ```shell
 rake db:migrate
 ```
+The migration versions start with 200206.
 
 ## Call the Model
 ```ruby
-order = Unidom::Order::Order.valid_at.alive.first
-order.items.valid_at.alive
-order.adjustments.valid_at.alive
+lady = Person.create name: 'Ann'
+shop = Shop.create   name: 'WalMart'
+
+order = Unidom::Order::Order.create(placer: lady,
+  taker:       shop,
+  number:      'ZBCDEFGHIJKL',
+  instruction: 'Please mail to me as soon as possible.',
+  description: 'gifts for my kids',
+  opened_at:   Time.now)
+
+game = Product.create name: 'World War II'
+ball = Product.create name: 'Basketball'
+
+order.items.create(ordered: game,
+  placer:          lady,
+  ordinal:         1,
+  unit_price:      19.99,
+  quantity:        1,
+  purchase_amount: 19.99,
+  subtotal_amount: 23.98,
+  instruction:     'We need the 2nd version.',
+  description:     'video game',
+  opened_at:       Time.now)
+order.items.create(ordered: ball,
+  placer:          lady,
+  ordinal:         2,
+  unit_price:      35.00,
+  quantity:        2,
+  purchase_amount: 70.00,
+  subtotal_amount: 70.00,
+  instruction:     'We need 2 balls.',
+  description:     'video game',
+  opened_at:       Time.now)
+
+order.adjustments.create(
+  adjustment_factor_code: 'FRGT',
+  calculation_code:       'AMNT',
+  amount:                 5.00,
+  instruction:            'arrive in 3 days',
+  description:            'freight',
+  opened_at:              Time.now)
+order.items.first.create(
+  adjustment_factor_code: 'TAXF',
+  calculation_code:       'PCNT',
+  amount:                 15.00,
+  instruction:            'tax rate is 15%',
+  description:            'tax',
+  opened_at:              Time.now)
+
+order.purchase_amount  = order.items.sum('purchase_amount')
+order.aggregate_amount = order.items.sum('subtotal_amount')+order.adjustments.sum('amount')
+order.save
+
+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
+# Add the given product into the given order
+
+Unidom::Order::OrderAdjustment.adjust! order, 20, 'DSCT'
+# Add the given adjustment into the given order
 ```

data/app/assets/javascripts/unidom/order/application.js

@@ -10,4 +10,4 @@
 // Read Sprockets README (https://github.com/rails/sprockets#sprockets-directives) for details
 // about supported directives.
 //
-//= require_tree .
+//= require_self

data/app/assets/stylesheets/unidom/order/application.css

@@ -10,6 +10,5 @@
  * defined in the other CSS/SCSS files in this directory. It is generally better to create a new
  * file per style scope.
  *
- *= require_tree .
  *= require_self
  */

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

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

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

@@ -4,12 +4,22 @@ class Unidom::Order::OrderAdjustment < ActiveRecord::Base
 
   self.table_name = 'unidom_order_adjustments'
 
+  include Unidom::Common::Concerns::ModelExtension
+
   validates :amount, presence: true, numericality: { less_than: 1000000000, greater_than: -1000000000 }
 
   belongs_to :adjusted, polymorphic: true
 
-  scope :adjusted_by, ->(adjusted) { where adjusted: adjusted }
+  scope :adjusted_is, ->(adjusted) { where adjusted: adjusted }
 
-  include Unidom::Common::Concerns::ModelExtension
+  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
+    if adjustment.present?
+      adjustment.amount = amount
+      adjustment.save!
+    else
+      create! adjusted: adjusted, amount: amount, adjustment_factor_code: adjustment_factor_code
+    end
+  end
 
 end

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

@@ -4,6 +4,8 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
 
   self.table_name = 'unidom_order_items'
 
+  include Unidom::Common::Concerns::ModelExtension
+
   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 }
@@ -20,6 +22,18 @@ class Unidom::Order::OrderItem < ActiveRecord::Base
   scope :ordered_is, ->(ordered) { where ordered: ordered }
   scope :placed_by,  ->(placer)  { where placer:  placer  }
 
-  include Unidom::Common::Concerns::ModelExtension
+  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
+    if item.present?
+      item.quantity        += quantity
+      item.unit_price      =  unit_price
+      item.purchase_amount =  item.unit_price*item.quantity
+      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
+    end
+  end
 
 end

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

@@ -2,13 +2,14 @@
 <html>
 <head>
   <title>Order</title>
-  <%= stylesheet_link_tag    "order/application", media: "all" %>
-  <%= javascript_include_tag "order/application" %>
+  <%= stylesheet_link_tag "order/application", media: "all" %>
   <%= csrf_meta_tags %>
 </head>
 <body>
 
 <%= yield %>
 
+<%= javascript_include_tag 'order/application' %>
+
 </body>
 </html>

data/db/migrate/20020601000000_create_unidom_orders.rb

@@ -30,8 +30,8 @@ class CreateUnidomOrders < ActiveRecord::Migration
 
     add_index :unidom_orders, :placer_id
     add_index :unidom_orders, :taker_id
-    add_index :unidom_orders, :slug,   unique: true
     add_index :unidom_orders, :number, unique: true
+    add_index :unidom_orders, :slug,   unique: true
 
   end
 

data/lib/unidom/order/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unidom-order
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Topbit Du
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: unidom-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.9'
 description: 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 (统一领域对象模型)是一系列的领域模型引擎。订单领域模型引擎包括订单、订单项和订单调整的模型。
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Unidom Order Domain Model Engine 订单领域模型引擎