erp_orders 4.0.0 → 4.2.0

data/db/migrate/20150624000721_add_internal_identifier_to_charge_type.rb

@@ -0,0 +1,5 @@
+class AddInternalIdentifierToChargeType < ActiveRecord::Migration
+  def change
+    add_column :charge_types, :internal_identifier, :string unless column_exists? :charge_types, :internal_identifier
+  end
+end

data/db/migrate/20160310163060_add_created_by_updated_by_to_erp_orders.rb

@@ -0,0 +1,35 @@
+class AddCreatedByUpdatedByToErpOrders < ActiveRecord::Migration
+  def up
+    %w{charge_lines order_line_items}.each do |table|
+
+      unless column_exists? table.to_sym, :created_by_party_id
+        add_column table.to_sym, :created_by_party_id, :integer
+
+        add_index table.to_sym, :created_by_party_id, name: "#{table}_created_by_pty_idx"
+      end
+
+      unless column_exists? table.to_sym, :updated_by_party_id
+        add_column table.to_sym, :updated_by_party_id, :integer
+
+        add_index table.to_sym, :updated_by_party_id, name: "#{table}_updated_by_pty_idx"
+      end
+
+    end
+
+  end
+
+  def down
+    %w{charge_lines order_line_items}.each do |table|
+
+      if column_exists? table.to_sym, :created_by_party_id
+        remove_column table.to_sym, :created_by_party_id
+      end
+
+      if column_exists? table.to_sym, :updated_by_party_id
+        remove_column table.to_sym, :updated_by_party_id
+      end
+    end
+
+  end
+
+end

data/lib/erp_orders.rb

@@ -1,5 +1,7 @@
 require 'erp_base_erp_svcs'
 
+require "erp_orders/taxation"
+
 require "erp_orders/version"
 require "erp_orders/extensions"
 require "erp_orders/engine"

data/lib/erp_orders/engine.rb

@@ -1,10 +1,6 @@
 module ErpOrders
   class Engine < Rails::Engine
     isolate_namespace ErpOrders
-    
-    initializer "erp_orders_assets.merge_public" do |app|
-      app.middleware.insert_before Rack::Runtime, ::ActionDispatch::Static, "#{root}/public"
-    end
 	  
 	  ActiveSupport.on_load(:active_record) do
       include ErpOrders::Extensions::ActiveRecord::ActsAsOrderTxn

data/lib/erp_orders/extensions/active_record/acts_as_order_line_item.rb

@@ -38,7 +38,8 @@ module ErpOrders
               :quantity, 
               :quantity=,
               :unit_of_measurement,
-              :unit_of_measurement=
+              :unit_of_measurement=,
+              :dba_organization
             ].each do |m| 
               delegate m, :to => :order_line_item 
             end        

data/lib/erp_orders/extensions/active_record/acts_as_order_txn.rb

@@ -68,7 +68,7 @@ module ErpOrders
              :authorize_payments,
              :capture_payments,
              :rollback_authorizations,
-             :submit, :get_total_charges
+             :submit, :total_amount
             ].each { |m| delegate m, :to => :order_txn }
 
             #from OrderTxn And BizTxnEvent

data/lib/erp_orders/taxation.rb

@@ -0,0 +1,49 @@
+require 'yaml'
+
+module ErpOrders
+  class Taxation
+
+    def calculate_tax(taxed_record, ctx)
+
+      if ctx[:is_online_sale]
+        calculate_online_tax(taxed_record, ctx)
+      end
+
+    end
+
+    # for online sales tax is only applied if the item purchased is being shipped to the
+    # same state the product is being shipped from
+    def calculate_online_tax(taxed_record, ctx)
+      # use yaml file for now, eventually needs to be updated to use tax service
+      tax_service = YAML.load_file(File.join(Rails.root, 'config', 'taxes.yml')).symbolize_keys
+
+      # if the origin state is the same as the destination state
+      # determine taxes else taxes are 0
+      if ctx[:origin_address][:state] == ctx[:destination_address][:state]
+        taxes = (tax_service[:state_tax_rate] * ctx[:amount]).round(2)
+        taxed_record.taxed = true
+        taxed_record.sales_tax = taxes
+        taxed_record.save!
+
+        # create a tax line to record the tax rate
+        if taxed_record.sales_tax_lines.empty?
+          sales_tax_line = SalesTaxLine.new
+          sales_tax_line.taxed_record = taxed_record
+        else
+          sales_tax_line = taxed_record.sales_tax_lines.first
+        end
+
+        sales_tax_line.rate = tax_service[:state_tax_rate]
+        sales_tax_line.save!
+      else
+        taxes = 0
+        taxed_record.taxed = false
+        taxed_record.sales_tax = taxes
+        taxed_record.save
+      end
+
+      taxes
+    end
+
+  end # Taxation
+end # ErpOrders

data/lib/erp_orders/version.rb

@@ -1,7 +1,7 @@
 module ErpOrders
   module VERSION #:nodoc:
     MAJOR = 4
-    MINOR = 0
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erp_orders
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Rick Koloski, Russell Holmes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2016-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_products
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: erp_txns_and_accts
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
 description: The Orders Engine in CompassAE implements models for Orders, Order Items
   and Order status tracking. It also houses models for charge lines associated with
   Orders (although it could be argued that this functionality should reside in Commerce).
@@ -65,7 +65,7 @@ files:
 - README.rdoc
 - Rakefile
 - app/models/charge_line.rb
-- app/models/charge_line_payment_txn.rb
+- app/models/charge_type.rb
 - app/models/extensions/agreement.rb
 - app/models/extensions/money.rb
 - app/models/extensions/party.rb
@@ -73,22 +73,31 @@ files:
 - app/models/extensions/product_type.rb
 - app/models/order_line_item.rb
 - app/models/order_line_item_pty_role.rb
+- app/models/order_line_item_rel_type.rb
+- app/models/order_line_item_relationship.rb
 - app/models/order_line_item_type.rb
 - app/models/order_txn.rb
 - app/models/order_txn_type.rb
+- app/models/sales_tax_line.rb
+- app/models/sales_tax_policy.rb
 - config/routes.rb
 - db/data_migrations/20110605231556_create_order_party_roles.rb
+- db/data_migrations/20141214150732_add_order_tracked_statues.rb
+- db/data_migrations/20150309004308_add_base_charge_types.rb
 - db/migrate/20080805000060_base_orders.rb
-- db/migrate/20130620203217_add_quantity_to_order_line_items.rb
-- db/migrate/20131005232344_update_order_line_pty_role_indexes.erp_orders.rb
-- db/migrate/20131005232611_remove_order_line_specific_rtype.rb
-- db/migrate/20140129200040_add_uom_to_order_line_item.rb
-- db/migrate/20140930152140_add_custom_fields_to_order_txn.rb
+- db/migrate/20150309003812_add_charge_type_to_charge_lines.rb
+- db/migrate/20150309004440_create_charge_types.rb
+- db/migrate/20150311160005_add_unit_price_to_order_line_items.rb
+- db/migrate/20150622151009_add_tax_policy.rb
+- db/migrate/20150622170438_update_taxation_for_orders.rb
+- db/migrate/20150624000721_add_internal_identifier_to_charge_type.rb
+- db/migrate/20160310163060_add_created_by_updated_by_to_erp_orders.rb
 - lib/erp_orders.rb
 - lib/erp_orders/engine.rb
 - lib/erp_orders/extensions.rb
 - lib/erp_orders/extensions/active_record/acts_as_order_line_item.rb
 - lib/erp_orders/extensions/active_record/acts_as_order_txn.rb
+- lib/erp_orders/taxation.rb
 - lib/erp_orders/version.rb
 - lib/tasks/erp_orders_tasks.rake
 - spec/dummy/Rakefile
@@ -145,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: The Orders Engine in CompassAE implements models for Orders, Order Items

data/app/models/charge_line_payment_txn.rb

@@ -1,7 +0,0 @@
-class ChargeLinePaymentTxn < ActiveRecord::Base
-  attr_protected :created_at, :updated_at
-
-  belongs_to :charge_line
-  belongs_to :payment_txn, :polymorphic => true
-  belongs_to :financial_txn, :class_name => "FinancialTxn",:foreign_key => "payment_txn_id"
-end

data/db/migrate/20130620203217_add_quantity_to_order_line_items.rb

@@ -1,13 +0,0 @@
-class AddQuantityToOrderLineItems < ActiveRecord::Migration
-  def up
-    unless columns(:order_line_items).collect {|c| c.name}.include?('quantity')
-      add_column :order_line_items, :quantity, :integer
-    end
-  end
-
-  def down
-    if columns(:order_line_items).collect {|c| c.name}.include?('quantity')
-      remove_column :order_line_items, :quantity
-    end
-  end
-end

data/db/migrate/20131005232344_update_order_line_pty_role_indexes.erp_orders.rb

@@ -1,19 +0,0 @@
-# This migration comes from erp_orders (originally 20131005232344)
-class UpdateOrderLinePtyRoleIndexes < ActiveRecord::Migration
-  def change
-
-    execute 'DROP INDEX index_order_line_item_pty_roles_on_biz_txn_acct_root_id;'
-    execute 'DROP INDEX index_order_line_item_pty_roles_on_order_line_item_id;'
-    execute 'DROP INDEX index_order_line_item_pty_roles_on_line_item_role_type_id;'
-
-    remove_column :order_line_item_pty_roles, :line_item_role_type_id
-
-    add_column :order_line_item_pty_roles, :role_type_id, :integer
-    add_index  :order_line_item_pty_roles, :role_type_id, :name => 'order_line_item_pty_role_role_type_idx'
-
-    add_index  :order_line_item_pty_roles, :biz_txn_acct_root_id, :name => 'order_line_item_pty_role_biz_txn_acct_root_idx'
-    add_index  :order_line_item_pty_roles, :order_line_item_id, :name => 'order_line_item_pty_role_order_line_item_idx'
-
-  end
-
-end

data/db/migrate/20131005232611_remove_order_line_specific_rtype.rb

@@ -1,32 +0,0 @@
-class RemoveOrderLineSpecificRtype < ActiveRecord::Migration
-  def up
-
-    #this is being replaced with the standard role types
-    if table_exists?(:line_item_role_types)
-      drop_table :line_item_role_types
-    end
-  end
-
-  def down
-
-    #Put the old table back on the 'down' migration
-
-    unless table_exists?(:line_item_role_types)
-      create_table :line_item_role_types do |t|
-        t.column  	:parent_id,    			:integer
-        t.column  	:lft,          			:integer
-        t.column  	:rgt,          			:integer
-        #custom columns go here
-        t.column  :description,         :string
-        t.column  :comments,            :string
-        t.column 	:internal_identifier, :string
-        t.column 	:external_identifier, :string
-        t.column 	:external_id_source, 	:string
-        t.timestamps
-      end
-
-      add_index :line_item_role_types, :parent_id
-    end
-
-  end
-end

data/db/migrate/20140129200040_add_uom_to_order_line_item.rb

@@ -1,13 +0,0 @@
-class AddUomToOrderLineItem < ActiveRecord::Migration
-  def up
-    unless columns(:order_line_items).collect {|c| c.name}.include?('unit_of_measurement_id')
-      add_column :order_line_items, :unit_of_measurement_id, :integer
-    end
-  end
-
-  def self.down
-    if columns(:order_line_items).collect {|c| c.name}.include?('unit_of_measurement_id')
-      remove_column :order_line_items, :unit_of_measurement_id
-    end
-  end
-end

data/db/migrate/20140930152140_add_custom_fields_to_order_txn.rb

@@ -1,12 +0,0 @@
-class AddCustomFieldsToOrderTxn < ActiveRecord::Migration
-  def change
-    if ::ActiveRecord::Base.connection.instance_values["config"][:adapter] == 'postgresql'
-      execute('CREATE EXTENSION IF NOT EXISTS hstore;')
-
-      add_column :order_txns, :custom_fields, :hstore
-      add_hstore_index :order_txns, :custom_fields
-    else
-      add_column :order_txns, :custom_fields, :text
-    end
-  end
-end