erp_commerce 4.0.0 → 4.2.0

data/db/migrate/20160310163057_add_created_by_updated_by_to_erp_commerce.rb

@@ -0,0 +1,35 @@
+class AddCreatedByUpdatedByToErpCommerce < ActiveRecord::Migration
+  def up
+    %w{credit_cards}.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{credit_cards}.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_commerce.rb

@@ -10,11 +10,10 @@ require 'erp_products'
 require 'erp_orders'
 
 require "erp_commerce/version"
-require 'erp_commerce/active_merchant_wrappers'
 require 'erp_commerce/extensions'
 require 'erp_commerce/config'
 require "erp_commerce/engine"
-require 'erp_commerce/order_helper'
+
 
 module ErpCommerce
 end

data/lib/erp_commerce/config.rb

@@ -1,12 +1,11 @@
 module ErpCommerce
   module Config
     class << self
-      attr_accessor :encryption_key, :active_merchant_gateway_wrapper
+      attr_accessor :encryption_key
 
       def init!
         @defaults = {
-          :@encryption_key => 'my_secret_code',
-          :@active_merchant_gateway_wrapper => ErpCommerce::ActiveMerchantWrappers::BrainTreeGatewayWrapper
+          :@encryption_key => 'cd6fae94-9c2f-11e4-89d3-123b93f75cba'
         }
       end
 

data/lib/erp_commerce/engine.rb

@@ -3,11 +3,7 @@ module ErpCommerce
     isolate_namespace ErpCommerce
 
     config.erp_commerce = ErpCommerce::Config
-    
-    initializer "erp_commerce.merge_public" do |app|
-      app.middleware.insert_before Rack::Runtime, ::ActionDispatch::Static, "#{root}/public"
-    end
-	  
+
 	  ActiveSupport.on_load(:active_record) do
       include ErpCommerce::Extensions::ActiveRecord::ActsAsFee
       include ErpCommerce::Extensions::ActiveRecord::ActsAsPriceable

data/lib/erp_commerce/extensions/active_record/acts_as_priceable.rb

@@ -37,8 +37,7 @@ module ErpCommerce
           end
 
           def get_current_simple_plan
-            self.pricing_plans.find(:first, 
-              :conditions => ['is_simple_amount = ? and from_date <= ? and thru_date >= ?', true, Date.today, Date.today])
+            self.pricing_plans.where('is_simple_amount = ? and (from_date <= ? and thru_date >= ? or (from_date is null and thru_date is null))', true, Date.today, Date.today).first
           end
 
           class Helper

data/lib/erp_commerce/version.rb

@@ -1,7 +1,7 @@
 module ErpCommerce
   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_commerce
 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: activemerchant
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.3
+        version: 1.49.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.29.3
+        version: 1.49.0
 - !ruby/object:Gem::Dependency
   name: erp_orders
   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 CompassAE Commerce Engine uses the engines that implement Parties,
   Products and Orders, and adds the ability to conduct commerce. It implements a pricing
   engine, fees, payment gateways.
@@ -64,7 +64,6 @@ files:
 - GPL-3-LICENSE
 - README.md
 - Rakefile
-- app/mailers/checkout_mailer.rb
 - app/models/accepted_credit_card.rb
 - app/models/bank_account.rb
 - app/models/bank_account_type.rb
@@ -81,6 +80,7 @@ files:
 - app/models/extensions/party.rb
 - app/models/extensions/product_instance.rb
 - app/models/extensions/product_type.rb
+- app/models/extensions/simple_product_offer.rb
 - app/models/fee.rb
 - app/models/fee_type.rb
 - app/models/payment.rb
@@ -93,38 +93,18 @@ files:
 - app/models/pricing_plan_assignment.rb
 - app/models/pricing_plan_component.rb
 - app/models/valid_price_plan_component.rb
-- app/views/checkout_mailer/email_confirmation.html.erb
-- app/widgets/orders/base.rb
-- app/widgets/orders/javascript/orders.js
-- app/widgets/orders/views/index.html.erb
-- app/widgets/product_catalog/base.rb
-- app/widgets/product_catalog/javascript/product_catalog.js
-- app/widgets/product_catalog/views/add_to_cart.html.erb
-- app/widgets/product_catalog/views/index.html.erb
-- app/widgets/product_catalog/views/show.html.erb
-- app/widgets/shopping_cart/base.rb
-- app/widgets/shopping_cart/javascript/shopping_cart.js
-- app/widgets/shopping_cart/views/cart_items.html.erb
-- app/widgets/shopping_cart/views/confirmation.html.erb
-- app/widgets/shopping_cart/views/demographics.html.erb
-- app/widgets/shopping_cart/views/login.html.erb
-- app/widgets/shopping_cart/views/payment.html.erb
-- app/widgets/shopping_cart/views/price_summary.html.erb
 - config/routes.rb
 - db/data_migrations/20101011152441_payment_gateway_actions.rb
 - db/data_migrations/20130408200643_add_credit_card_biz_txn_acct_types.rb
+- db/data_migrations/20150125202814_add_payment_transaction_types.rb
 - db/migrate/20100823174238_erp_commerce_base.rb
+- db/migrate/20160310163057_add_created_by_updated_by_to_erp_commerce.rb
 - lib/erp_commerce.rb
-- lib/erp_commerce/active_merchant_wrappers.rb
-- lib/erp_commerce/active_merchant_wrappers/authorize_net_wrapper.rb
-- lib/erp_commerce/active_merchant_wrappers/brain_tree_gateway_wrapper.rb
-- lib/erp_commerce/active_merchant_wrappers/credit_card_validation.rb
 - lib/erp_commerce/config.rb
 - lib/erp_commerce/engine.rb
 - lib/erp_commerce/extensions.rb
 - lib/erp_commerce/extensions/active_record/acts_as_fee.rb
 - lib/erp_commerce/extensions/active_record/acts_as_priceable.rb
-- lib/erp_commerce/order_helper.rb
 - lib/erp_commerce/version.rb
 - lib/tasks/erp_commerce_tasks.rake
 - spec/dummy/Rakefile
@@ -190,7 +170,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 CompassAE Commerce Engine uses the engines that implement Parties, Products

data/app/mailers/checkout_mailer.rb

@@ -1,9 +0,0 @@
-class CheckoutMailer < ActionMailer::Base
-  default :from => ErpTechSvcs::Config.email_notifications_from
-
-  def email_confirmation(to_email, order, payment)
-    @order = order
-    @payment = payment
-    mail(:to => to_email, :subject => 'Your Confirmation')
-  end
-end

data/app/views/checkout_mailer/email_confirmation.html.erb

@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
-  </head>
-  <body>
-    <h1>This is your confirmation</h1>
-    <p>Your order is complete.
-      <br/>Confirmation Number <%=@payment.authorization_code%>
-      <br/>Your order number is <%=@order.order_number%>
-      <br/>Your order status is <%=@order.status%>
-      <br/>Total for this order was <%=number_to_currency(@order.get_total_charges.sum{|money| money.amount})%>
-    </p>
-  </body>
-</html>

data/app/widgets/orders/base.rb

@@ -1,36 +0,0 @@
-module Widgets
-  module Orders
-    class Base < ErpApp::Widgets::Base
-      def index
-        @orders = OrderTxn.find_by_party_role('payor', current_user.party)
-        @orders = @orders.select{|order| order.status != "Initialized"}
-        render
-      end
-
-      #should not be modified
-      #modify at your own risk
-      def locate
-        File.dirname(__FILE__)
-      end
-
-      class << self
-        def title
-          "Orders"
-        end
-        
-        def widget_name
-          File.basename(File.dirname(__FILE__))
-        end
-
-        def base_layout
-          begin
-            file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")
-            IO.read(file)
-          rescue
-            return nil
-          end
-        end
-      end
-    end#Base
-  end#Orders
-end#Widgets

data/app/widgets/orders/javascript/orders.js

@@ -1,12 +0,0 @@
-Compass.ErpApp.Widgets.Orders = {
-    template: new Ext.Template("<%= render_widget :orders %>"),
-    add:function(){
-        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.Orders.template.apply());
-    }
-}
-
-Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name:'Orders',
-    iconUrl:'/images/icons/package/package_48x48.png',
-    onClick:Compass.ErpApp.Widgets.Orders.add
-});

data/app/widgets/orders/views/index.html.erb

@@ -1,63 +0,0 @@
-<style type="text/css">
-  #products-view {
-    font-family:'Lucida Grande','Lucida Sans Unicode',sans-serif;
-    text-align:center;
-    font-size:14px;
-    width:100%;
-    border-collapse: collapse;
-    border: 2px solid #CCCCCC;
-  }
-
-  #products-view a {
-    text-decoration:none;
-  }
-
-  #products-view img {
-    height:60px;
-    width:65px;
-    padding-right:15px;
-  }
-
-  #products-view div
-  {
-    float:left;
-    text-align:left;
-  }
-
-  #products-view th {
-    padding: 0 0.5em;
-    height:30px;
-    text-align:center;
-    background:url("/images/knitkit/footer.png") repeat-x scroll 0 0 #29425E;
-  }
-
-  .highlight:hover
-  {
-    background-color:#FFFFEE;
-  }
-
-  #products-view td+td {
-    border-left: 1px solid #CCC;
-    text-align: center;
-  }
-</style>
-<table id="products-view">
-  <thead>
-    <tr>
-      <th>Order Number</th>
-      <th>Order At</th>
-      <th>Status</th>
-      <th>Amount</th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @orders.each do |order| %>
-    <tr>
-      <td><%=order.order_number%></td>
-      <td><%=order.created_at.to_time.strftime("%m/%d/%Y %I:%M%p")%></td>
-      <td><%=order.status%></td>
-      <td><%=number_to_currency(order.get_total_charges.sum{|money| money.amount})%></td>
-    </tr>
-    <% end %>
-  </tbody>
-</table>

data/app/widgets/product_catalog/base.rb

@@ -1,52 +0,0 @@
-module Widgets
-  module ProductCatalog
-    class Base < ErpApp::Widgets::Base      
-      def index
-        render
-      end
-      
-      def back_to_catalog
-        render :update => {:id => "#{@uuid}_result", :view => 'index'}
-      end
-
-      def show
-        @product_type = ProductType.find(params[:id])
-        render :update => {:id => "#{@uuid}_result", :view => 'show'}
-      end  
-
-      def add_to_cart
-        @product_type   = ProductType.find(params[:id])
-        @cart_items_url = params[:cart_items_url]
-        ErpCommerce::OrderHelper.new(self).add_to_cart(@product_type)
-    
-        render :update => {:id => "#{@uuid}_result", :view => 'add_to_cart'}
-      end
-  
-      #should not be modified
-      #modify at your own risk
-      def locate
-        File.dirname(__FILE__)
-      end
-  
-      class << self
-        def title
-          "Product Catalog"
-        end
-    
-        def widget_name
-          File.basename(File.dirname(__FILE__))
-        end
-    
-        def base_layout
-          begin
-            file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")
-            IO.read(file)
-          rescue
-            return nil
-          end
-        end
-      end
-    end#Base
-  end#ProductCatalog
-end#Widgets
-

data/app/widgets/product_catalog/javascript/product_catalog.js

@@ -1,64 +0,0 @@
-Compass.ErpApp.Widgets.ProductCatalog = {
-    template: new Ext.XTemplate("<%= render_widget :product_catalog,\n",
-        "   :action => :index,\n",
-        "   :params => {:cart_items_url => '{cartItemsUrl}'} %>"),
-
-    add: function () {
-        var addProductCatalogWidgetWindow = Ext.create("Ext.window.Window", {
-            layout: 'fit',
-            width: 300,
-            title: 'Add Product Catalog Widget',
-            height: 100,
-            buttonAlign: 'center',
-            items: Ext.create("Ext.form.Panel", {
-                labelWidth: 100,
-                frame: false,
-                bodyStyle: 'padding:5px 5px 0',
-                defaults: {
-                    width: 225
-                },
-                items: [
-                    {
-                        xtype: 'textfield',
-                        fieldLabel: 'Cart Items Url',
-                        name: 'cartItemsUrl',
-                        hidden: false,
-                        value: '/cart-items'
-                    }
-                ]
-            }),
-            buttons: [
-                {
-                    text: 'Submit',
-                    handler: function (button) {
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        var basicForm = formPanel.getForm();
-                        var cartItemsUrl = basicForm.findField('cartItemsUrl').getValue();
-                        var data = {
-                            cartItemsUrl: cartItemsUrl
-                        };
-
-                        //add rendered template to center region editor
-                        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.ProductCatalog.template.apply(data));
-                        addProductCatalogWidgetWindow.close();
-                    }
-                },
-                {
-                    text: 'Close',
-                    handler: function () {
-                        addProductCatalogWidgetWindow.close();
-                    }
-                }
-            ]
-
-        });
-        addProductCatalogWidgetWindow.show();
-    }
-}
-
-Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name: 'Product Catalog',
-    iconUrl: '/images/icons/product/product_48x48.png',
-    onClick: Compass.ErpApp.Widgets.ProductCatalog.add
-});