erp_orders 3.1.1 → 4.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1e462b6d0534235ea385e6837474e1305e8be2f5
+  data.tar.gz: 1d7127f89c3657cb616464755fc125924572908c
+SHA512:
+  metadata.gz: 97c4b54627004f27ff46faa7f4cc49472d28426c63e3191cc76872e87b97f0deb27cf6d848d092ee41d16a01fb983dcf41d1692a6565dcd1abd83dccbfc26358
+  data.tar.gz: d7db617036bd2dac557a01ad6ed246608d466fc1ae7ef9fddc8e4be88cf4cc7131a1e1e3e3e5168d0483f15c856bde9b5045c7149aab561e6634b7987cd31a6d

data/app/models/order_line_item.rb

@@ -9,6 +9,12 @@ class OrderLineItem < ActiveRecord::Base
   belongs_to :product_instance
   belongs_to :product_type
 
+  has_many :order_line_item_pty_roles, :dependent => :destroy
+  has_many :role_types, :through => :order_line_item_pty_roles
+
+  ## Allow for polymorphic subtypes of this class
+  belongs_to :order_line_record, :polymorphic => true
+
   def get_total_charges
     # get all of the charge lines associated with the order_line
     total_hash = Hash.new

data/app/models/order_line_item_pty_role.rb

@@ -8,7 +8,7 @@ class OrderLineItemPtyRole < ActiveRecord::Base
 
   belongs_to :order_line_item
   belongs_to :party
-  belongs_to :line_item_role_type
+  belongs_to :role_type
 
 #***************************************************************************
 # The association of a transaction to an account happens in the context of

data/app/models/order_txn.rb

@@ -1,14 +1,17 @@
 class OrderTxn < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
+  # serialize custom attributes
+  is_json :custom_fields
+
   acts_as_biz_txn_event
 
-	belongs_to :order_txn_record, :polymorphic => true
+  belongs_to :order_txn_record, :polymorphic => true
   has_many   :order_line_items, :dependent => :destroy
   has_many   :charge_lines, :as => :charged_item
 
-	alias :line_items :order_line_items
-
+  alias :line_items :order_line_items
+  
   # validation
   validates_format_of :email, :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i, :on => :update, :allow_nil => true
 

data/config/routes.rb

@@ -1,14 +1,4 @@
 ErpOrders::Engine.routes.draw do
-  #Desktop Applications
-  #
-  #order_manager
-  match '/erp_app/desktop/order_manager(/:action(/:id))' => 'erp_app/desktop/order_manager/base'
-
-
-  #Organizer Applications
-  #
-  #order_management
-  match '/erp_app/organizer/order_management(/:action(/:id))' => 'erp_app/organizer/order_management/base'
 end
 
 

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

@@ -0,0 +1,19 @@
+# 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

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,12 @@
+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

data/lib/erp_orders/engine.rb

@@ -3,11 +3,12 @@ module ErpOrders
     isolate_namespace ErpOrders
     
     initializer "erp_orders_assets.merge_public" do |app|
-      app.middleware.insert_before Rack::Lock, ::ActionDispatch::Static, "#{root}/public"
+      app.middleware.insert_before Rack::Runtime, ::ActionDispatch::Static, "#{root}/public"
     end
 	  
 	  ActiveSupport.on_load(:active_record) do
       include ErpOrders::Extensions::ActiveRecord::ActsAsOrderTxn
+      include ErpOrders::Extensions::ActiveRecord::ActsAsOrderLineItem
     end
 
     ErpBaseErpSvcs.register_as_compass_ae_engine(config, self)

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

@@ -0,0 +1,71 @@
+module ErpOrders
+  module Extensions
+    module ActiveRecord
+      module ActsAsOrderLineItem
+
+        def self.included(base)
+          base.extend(ClassMethods)
+        end
+
+        module ClassMethods
+          def acts_as_order_line_item
+            extend ActsAsOrderLineItem::SingletonMethods
+            include ActsAsOrderLineItem::InstanceMethods
+        
+            after_initialize :new_order_line_item
+            after_update     :save_order_line_item
+            after_save       :save_order_line_item
+            after_destroy    :destroy_order_line_item
+        
+            has_one :order_line_item, :as => :order_line_record
+        
+            [ :product_description,
+              :product_description=,
+              :product_instance,
+              :product_instance=,
+              :product_instance_description,
+              :product_instance_description=,
+              :product_type,
+              :product_type=,
+              :product_type_description,
+              :product_type_description=,
+              :sold_price,
+              :sold_price=,
+              :sold_amount,
+              :sold_amount=,
+              :product_offer,
+              :product_offer=,
+              :quantity, 
+              :quantity=,
+              :unit_of_measurement,
+              :unit_of_measurement=
+            ].each do |m| 
+              delegate m, :to => :order_line_item 
+            end        
+          end
+        end
+
+        module SingletonMethods
+        end
+
+        module InstanceMethods
+          def save_order_line_item
+            self.order_line_item.save
+          end
+
+          def destroy_order_line_item
+            self.order_line_item.destroy
+          end
+
+          def new_order_line_item
+            if self.new_record? and self.order_line_item.nil?
+              order_line_item = OrderLineItem.new
+              self.order_line_item = order_line_item
+              order_line_item.order_line_record = self
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -2,8 +2,9 @@ module ErpOrders
   module Extensions
     module ActiveRecord
       module ActsAsOrderTxn
+
         def self.included(base)
-              base.extend(ClassMethods)
+          base.extend(ClassMethods)
         end
 
         module ClassMethods
@@ -11,75 +12,75 @@ module ErpOrders
           def acts_as_order_txn
             extend ActsAsOrderTxn::SingletonMethods
             include ActsAsOrderTxn::InstanceMethods
-            
+
             after_initialize :initialize_order_txn
             after_create :save_order_txn
             after_update :save_order_txn
             after_destroy :destroy_order_txn
-            
+
             has_one :order_txn, :as => :order_txn_record
 
             #from OrderTxn
-            [ :bill_to_address_line_1,:bill_to_address_line_1=,
-              :bill_to_city,:bill_to_city=,
-              :bill_to_country,:bill_to_country=,
-              :bill_to_country_name,:bill_to_country_name=,
-              :bill_to_first_name,:bill_to_first_name=,
-              :bill_to_last_name,:bill_to_last_name=,
-              :bill_to_postal_code,:bill_to_postal_code=,
-              :bill_to_state,:bill_to_state=,
-              :Company,:Company=,
-              :credit_card_id,:credit_card_id=,
-              :customer_ip,:customer_ip=,
-              :email,:email=,
-              :error_message,:error_message=,
-              :Fax,:Fax=,
-              :description,:description=,
-              :order_number,:order_number=,
-              :order_txn_type_id,:order_txn_type_id=,
-              :payment_gateway_txn_id,:payment_gateway_txn_id=,
-              :Phone2,:Phone2=,
-              :phone_number,:phone_number=,
-              :ship_to_phone2, :ship_to_phone2=,
-              :Salutation,:Salutation=,
-              :ship_to_company,:ship_to_company=,
-              :ship_to_address_line_1,:ship_to_address_line_1=,
-              :ship_to_city,:ship_to_city=,
-              :ship_to_country,:ship_to_country=,
-              :ship_to_country_name,:ship_to_country_name=,
-              :ship_to_salutation,:ship_to_salutation=,
-              :ship_to_first_name,:ship_to_first_name=,
-              :ship_to_last_name,:ship_to_last_name=,
-              :ship_to_postal_code,:ship_to_postal_code=,
-              :ship_to_state,:ship_to_state=,
-              :ship_to_fax,:ship_to_fax=,
-              :state_machine,:state_machine=,
-              :status,:status=,
-              :add_line_item,
-              :line_items,
-              :order_line_items,
-              :determine_txn_party_roles,
-              :determine_charge_elements,
-              :determine_charge_accounts,
-              :process,
-              :set_shipping_info,
-              :set_billing_info,
-              :authorize_payments,
-              :capture_payments,
-              :rollback_authorizations,
-              :submit,:get_total_charges
+            [:bill_to_address_line_1, :bill_to_address_line_1=,
+             :bill_to_city, :bill_to_city=,
+             :bill_to_country, :bill_to_country=,
+             :bill_to_country_name, :bill_to_country_name=,
+             :bill_to_first_name, :bill_to_first_name=,
+             :bill_to_last_name, :bill_to_last_name=,
+             :bill_to_postal_code, :bill_to_postal_code=,
+             :bill_to_state, :bill_to_state=,
+             :Company, :Company=,
+             :credit_card_id, :credit_card_id=,
+             :customer_ip, :customer_ip=,
+             :email, :email=,
+             :error_message, :error_message=,
+             :Fax, :Fax=,
+             :description, :description=,
+             :order_number, :order_number=,
+             :order_txn_type_id, :order_txn_type_id=,
+             :payment_gateway_txn_id, :payment_gateway_txn_id=,
+             :Phone2, :Phone2=,
+             :phone_number, :phone_number=,
+             :ship_to_phone2, :ship_to_phone2=,
+             :Salutation, :Salutation=,
+             :ship_to_company, :ship_to_company=,
+             :ship_to_address_line_1, :ship_to_address_line_1=,
+             :ship_to_city, :ship_to_city=,
+             :ship_to_country, :ship_to_country=,
+             :ship_to_country_name, :ship_to_country_name=,
+             :ship_to_salutation, :ship_to_salutation=,
+             :ship_to_first_name, :ship_to_first_name=,
+             :ship_to_last_name, :ship_to_last_name=,
+             :ship_to_postal_code, :ship_to_postal_code=,
+             :ship_to_state, :ship_to_state=,
+             :ship_to_fax, :ship_to_fax=,
+             :state_machine, :state_machine=,
+             :status, :status=,
+             :add_line_item,
+             :line_items,
+             :order_line_items,
+             :determine_txn_party_roles,
+             :determine_charge_elements,
+             :determine_charge_accounts,
+             :process,
+             :set_shipping_info,
+             :set_billing_info,
+             :authorize_payments,
+             :capture_payments,
+             :rollback_authorizations,
+             :submit, :get_total_charges
             ].each { |m| delegate m, :to => :order_txn }
 
-             #from OrderTxn And BizTxnEvent
-             [:biz_txn,
-              :biz_txn_event,
-              :root_txn,
-              :find_party_by_role,
-              :txn_type,:txn_type=,
-              :txn_type_iid,:txn_type_iid=,:create_dependent_txns,
-              :biz_txn_type_id,:biz_txn_type_id=,
-              :external_id_source,:external_id_source=,
-              :account,:account=].each { |m| delegate m, :to => :order_txn }
+            #from OrderTxn And BizTxnEvent
+            [:biz_txn,
+             :biz_txn_event,
+             :root_txn,
+             :find_party_by_role,
+             :txn_type, :txn_type=,
+             :txn_type_iid, :txn_type_iid=, :create_dependent_txns,
+             :biz_txn_type_id, :biz_txn_type_id=,
+             :external_id_source, :external_id_source=,
+             :account, :account=].each { |m| delegate m, :to => :order_txn }
           end
         end
 

data/lib/erp_orders/extensions.rb

@@ -1 +1,2 @@
-require 'erp_orders/extensions/active_record/acts_as_order_txn'
+require 'erp_orders/extensions/active_record/acts_as_order_txn'
+require 'erp_orders/extensions/active_record/acts_as_order_line_item'

data/lib/erp_orders/version.rb

@@ -1,9 +1,13 @@
 module ErpOrders
   module VERSION #:nodoc:
-    MAJOR = 3
-    MINOR = 1
-    TINY  = 1
+    MAJOR = 4
+    MINOR = 0
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
+
+  def self.version
+    ErpOrders::VERSION::STRING
+  end
 end