erp_products 3.0.1 → 3.0.2

data/app/controllers/erp_products/erp_app/desktop/product_manager/base_controller.rb

@@ -3,19 +3,41 @@ module ErpProducts
     module Desktop
       module ProductManager
         class BaseController < ::ErpApp::Desktop::BaseController
+
           def index
-            products = ProductType.all.collect do |product_type|
-              {
-                :id => product_type.id,
-                :title => product_type.description,
-                :imageUrl => product_type.images.empty? ? '/images/img_blank.png' : product_type.images.first.data.url(nil, :escape => false),
-                :price => product_type.get_current_simple_amount_with_currency.nil? ? 'no price set' : product_type.get_current_simple_amount_with_currency,
-                :available => product_type.inventory_entries.first.number_available,
-                :sold => product_type.inventory_entries.first.number_sold,
-                :sku => product_type.inventory_entries.first.sku.nil? ? '' : product_type.inventory_entries.first.sku
-              }
-            end
+            products = []
+            ProductType.all.each do |product_type|
+              product_hash = product_type.to_hash(
+                :only => [:id, :description => :title],
+                :additional_values => {
+                  :imageUrl => (product_type.images.empty? ? '/images/img_blank.png' : product_type.images.first.data.url(nil, :escape => false))
+                })
+
+              #I do not like this, need to find a better way
+              if product_type.respond_to?(:get_current_simple_amount_with_currency)
+                product_hash[:price] = product_type.get_current_simple_amount_with_currency.nil? ? 'no price set' : product_type.get_current_simple_amount_with_currency
+              end
+
+              #I do not like this, need to find a better way
+              if product_type.respond_to?(:inventory_entries)
+                inventory_entry = if product_type.inventory_entries.empty?
+                  InventoryEntry.create(
+                    :product_type => product_type,
+                    :number_available => 0,
+                    :number_sold => 0,
+                    :description => product_type.description
+                  )
+                else
+                  product_type.inventory_entries.first
+                end
 
+                product_hash[:available] = inventory_entry.number_available
+                product_hash[:sold] = inventory_entry.number_sold
+                product_hash[:sku] = inventory_entry.sku.nil? ? '' : inventory_entry.sku
+              end
+              
+              products << product_hash
+            end
             render :json => {:products => products}
           end
 
@@ -40,8 +62,6 @@ module ErpProducts
           end
 
           def new
-            result = {}
-
             title = params[:title]
             description = params[:description]
 
@@ -55,27 +75,10 @@ module ErpProducts
             )
 
             if product_type.save
-              #create inventory
-              inventory_entry = InventoryEntry.new(
-                :product_type => product_type,
-                :number_available => 0,
-                :number_sold => 0,
-                :description => product_type.description
-              )
-
-              if inventory_entry.save
-                result[:success] = true
-                result[:id] = product_type.id
-              else
-                product_type.destroy
-                result[:success] = false
-              end
-
+              render :json => {:success => true, :id => product_type.id}
             else
-              result[:success] = false
+              render :json => {:success => false}
             end
-
-            render :json => result
           end
 
           def delete
@@ -101,7 +104,7 @@ module ErpProducts
             result = {}
 
             begin
-              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']          
+              name = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data].original_filename : request.env['HTTP_X_FILE_NAME']
               data = request.env['HTTP_X_FILE_NAME'].blank? ? params[:file_data] : request.raw_post
 
               product_type = ProductType.find(params[:product_type_id])
@@ -124,110 +127,9 @@ module ErpProducts
             render :json => (FileAsset.find(params[:id]).destroy) ? {:success => true} : {:success => false}
           end
 
-          #
-          #Prices
-          #
-
-          def currencies
-            Currency.include_root_in_json = false
-            render :inline => "{currencies:#{Currency.all.to_json(:only => [:id, :internal_identifier])}}"
-          end
-
-          def prices
-            result = {:prices => []}
-
-            product_type = ProductType.find(params[:id])
-            product_type.pricing_plans.each do |pricing_plan|
-              result[:prices] << {
-                :pricing_plan_id => pricing_plan.id,
-                :price => pricing_plan.money_amount,
-                :currency => pricing_plan.currency.id,
-                :currency_display => pricing_plan.currency.internal_identifier,
-                :from_date => pricing_plan.from_date,
-                :thru_date => pricing_plan.thru_date,
-                :description => pricing_plan.description,
-                :comments => pricing_plan.comments
-              }
-            end
-
-            render :json => result
-          end
-
-
-          #pricing uses one form for new models and updates. So we use one action
-          def new_and_update_price
-            result = {}
-
-            if params[:pricing_plan_id].blank?
-              pricing_plan = PricingPlan.new(
-                :money_amount => params[:price],
-                :comments => params[:comments],
-                :currency => Currency.find(params[:currency]),
-                :from_date => Date.strptime(params[:from_date], '%m/%d/%Y').to_date,
-                :thru_date => Date.strptime(params[:thru_date], '%m/%d/%Y').to_date,
-                :description => params[:description],
-                :is_simple_amount => true
-              )
-
-              if pricing_plan.save
-                product_type = ProductType.find(params[:product_type_id])
-                product_type.pricing_plans << pricing_plan
-                if product_type.save
-                  result[:success] = true
-                else
-                  pricing_plan.destroy
-                  result[:success] = false
-                end
-              else
-                result[:success] = false
-              end
-            else
-              pricing_plan = PricingPlan.find(params[:pricing_plan_id])
-              pricing_plan.money_amount = params[:price]
-              pricing_plan.currency = Currency.find(params[:currency])
-              pricing_plan.from_date = Date.strptime(params[:from_date], '%m/%d/%Y').to_date
-              pricing_plan.thru_date = Date.strptime(params[:thru_date], '%m/%d/%Y').to_date
-              pricing_plan.description = params[:description]
-              pricing_plan.comments = params[:comments]
-
-              if pricing_plan.save
-                result[:success] = true
-              else
-                result[:success] = false
-              end
-            end
-
-            render :json => result
-          end
-
-          def delete_price
-            render :json => (PricingPlan.find(params[:id]).destroy) ? {:success => true} : {:success => false}
-          end
-
-          #
-          #Inventory
-          #
-
-          def inventory
-            result = {}
-
-            inventory_entry = InventoryEntry.find_by_product_type_id(params[:id])
-            result[:number_available] = inventory_entry.number_available
-            result[:sku] = inventory_entry.sku
-
-            render :json => result
-          end
-
-          def update_inventory
-            inventory_entry = InventoryEntry.find_by_product_type_id(params[:product_type_id])
-            inventory_entry.sku = params[:sku]
-            inventory_entry.number_available = params[:number_available]
-
-            render :json => (inventory_entry.save) ? {:success => true} : {:success => false}
-          end
 
-        end
-      end
-    end
-  end
-end
+        end#BaseController
+      end#ProductManager
+    end#Desktop
+  end#ErpApp
+end#ErpProducts

data/app/models/product_instance.rb

@@ -1,7 +1,6 @@
 class ProductInstance < ActiveRecord::Base
   acts_as_nested_set
   include ErpTechSvcs::Utils::DefaultNestedSetMethods
-  acts_as_priceable
   
   belongs_to :product_type	
   belongs_to :product_instance_status_type

data/app/models/product_type.rb

@@ -1,8 +1,7 @@
 class ProductType < ActiveRecord::Base
   acts_as_nested_set
   include ErpTechSvcs::Utils::DefaultNestedSetMethods
-  
-  acts_as_priceable
+ 
   has_file_assets
   is_describable
   

data/lib/erp_products/version.rb

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

data/public/javascripts/erp_app/desktop/applications/product_manager/module.js

@@ -36,6 +36,9 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager",{
   }
 });
 
+Compass.ErpApp.Desktop.Applications.ProductManager.widgets = [];
+Compass.ErpApp.Desktop.Applications.ProductManager.selectedProductTypeId = null;
+
 //
 //form to manage description and title
 //
@@ -44,7 +47,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductDescriptio
   extend:"Ext.form.Panel",
   alias:'widget.productmanager_productdescriptionform',
   initComponent: function() {
-    Compass.ErpApp.Desktop.Applications.ProductManager.ProductDescriptionForm.superclass.initComponent.call(this, arguments);
+    this.callParent(arguments);
 
     this.addEvents(
       /**
@@ -136,338 +139,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductDescriptio
       ]
     }, config);
 
-    Compass.ErpApp.Desktop.Applications.ProductManager.ProductDescriptionForm.superclass.constructor.call(this, config);
-  }
-});
-
-//
-//form to manage pricing
-//
-
-Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductPricingPanel",{
-  extend:"Ext.panel.Panel",
-  alias:'widget.productmanager_productpricingpanel',
-  updatePrice : function(rec){
-    this.addEditPriceBtn.setText('Update Price');
-    this.cancelBtn.show();
-    this.addPriceFormPanel.getForm().setValues(rec.data);
-  },
-
-  deletePrice : function(rec){
-    var self = this;
-    Ext.MessageBox.confirm('Confirm', 'Are you sure you want to delete this price?', function(btn){
-      if(btn == 'no'){
-        return false;
-      }
-      else
-      {
-        Ext.Ajax.request({
-          url: '/erp_products/erp_app/desktop/product_manager/delete_price/'+rec.get('pricing_plan_id'),
-          success: function(response) {
-            var obj =  Ext.decode(response.responseText);
-            if(obj.success){
-              Ext.getCmp('productListPanel').loadProducts();
-              self.pricesGridPanel.getStore().load();
-            }
-            else{
-              Ext.Msg.alert('Error', 'Error deleting price.');
-            }
-          },
-          failure: function(response) {
-            Ext.Msg.alert('Error', 'Error deleting price.');
-          }
-        });
-      }
-    });
-  },
-
-  initComponent: function() {
-    Compass.ErpApp.Desktop.Applications.ProductManager.ProductPricingPanel.superclass.initComponent.call(this, arguments);
-  },
-
-  constructor : function(config) {
-    var self = this;
-
-    this.pricesGridPanel = Ext.create("Ext.grid.Panel",{
-      layout:'fit',
-      region:'center',
-      split:true,
-      columns: [
-      {
-        header:'Description',
-        width:310,
-        sortable: false,
-        dataIndex: 'description'
-      },
-      {
-        header: 'Price',
-        width: 75,
-        sortable: true,
-        dataIndex: 'price',
-        renderer:function(v){
-          return v.toFixed(2);
-        }
-      },
-      {
-        header: 'Currency',
-        width: 75,
-        sortable: true,
-        dataIndex: 'currency_display'
-      },
-      {
-        header: 'From Date',
-        width: 90,
-        sortable: true,
-        dataIndex: 'from_date',
-        renderer: Ext.util.Format.dateRenderer('m/d/Y')
-      },
-      {
-        header: 'Thru Date',
-        width: 90,
-        sortable: true,
-        dataIndex: 'thru_date',
-        renderer: Ext.util.Format.dateRenderer('m/d/Y')
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Update',
-        align:'center',
-        width:60,
-        items:[{
-          icon:'/images/icons/edit/edit_16x16.png',
-          tooltip:'Update',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.updatePrice(rec);
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Delete',
-        align:'center',
-        width:60,
-        items:[{
-          icon:'/images/icons/delete/delete_16x16.png',
-          tooltip:'Delete',
-          handler :function(grid, rowIndex, colIndex){
-            var rec = grid.getStore().getAt(rowIndex);
-            self.deletePrice(rec);
-          }
-        }]
-      },
-      {
-        menuDisabled:true,
-        resizable:false,
-        xtype:'actioncolumn',
-        header:'Comment',
-        align:'center',
-        width:60,
-        items:[{
-          getClass: function(v, meta, rec) {  // Or return a class from a function
-            this.items[0].tooltip = rec.get('comments');
-            return 'info-col';
-          },
-          handler: function(grid, rowIndex, colIndex) {
-            return false;
-          }
-        }]
-      }
-      ],
-      loadMask: true,
-      stripeRows: true,
-      store: Ext.create("Ext.data.Store",{
-        autoLoad: true,
-        proxy:{
-          type:'ajax',
-          url: '/erp_products/erp_app/desktop/product_manager/prices/'+config.productTypeId,
-          reader:{
-            root: 'prices',
-            type:'json'
-          }
-        },
-        fields:[{
-          name:'price',
-          type:'decimal'
-        }, 'currency', 'currency_display', 'from_date', 'thru_date', 'description','comments','pricing_plan_id']
-      })
-    });
-
-    this.addEditPriceBtn = Ext.create("Ext.button.Button",{
-      scope:this,
-      text:'Add Price',
-      handler:function(btn){
-        var formPanel = btn.findParentByType('form');
-        var basicForm = formPanel.getForm();
-
-        basicForm.submit({
-          reset:true,
-          success:function(form, action){
-            var obj =  Ext.decode(action.response.responseText);
-            if(obj.success){
-              self.addEditPriceBtn.setText('Add Price');
-              self.cancelBtn.hide();
-              Ext.getCmp('productListPanel').loadProducts();
-              self.pricesGridPanel.getStore().load();
-            }
-            else{
-              Ext.Msg.alert("Error", 'Error creating price');
-            }
-          },
-          failure:function(form, action){
-            Ext.Msg.alert("Error", 'Error creating price');
-          }
-        });
-      }
-    });
-
-    this.cancelBtn = Ext.create("Ext.button.Button",{
-      text:'Cancel',
-      hidden:true,
-      handler:function(btn){
-        var formPanel = btn.findParentByType('form');
-        var basicForm = formPanel.getForm();
-        basicForm.reset();
-        self.addEditPriceBtn.setText('Add Price');
-        self.cancelBtn.hide();
-      }
-    });
-
-    this.addPriceFormPanel = Ext.create("Ext.form.Panel",{
-      layout:'anchor',
-      collapsible:true,
-      split:true,
-      height:175,
-      frame:true,
-      region:'south',
-      buttonAlign:'center',
-      bodyStyle:'padding:5px 5px 0',
-      url:'/erp_products/erp_app/desktop/product_manager/new_and_update_price',
-      items: [
-      {
-        xtype:'textfield',
-        width:400,
-        name:'description',
-        fieldLabel:'Description'
-      },
-      {
-        layout:'column',
-        xtype:'container',
-        frame:false,
-        border:false,
-        defaults:{
-          columnWidth:0.25,
-          border:false,
-          frame:false,
-          xtype:'container',
-          bodyStyle:'padding:0 18px 0 0'
-        },
-        items:[{
-          items:[
-          {
-            fieldLabel:'Price',
-            xtype:'numberfield',
-            width:200,
-            layout:'anchor',
-            allowBlank:false,
-            name:'price'
-          }
-          ]
-        },
-        {
-          items:[
-          {
-            fieldLabel:'Currency',
-            xtype:'combo',
-            width:200,
-            id : 'call_center_party_country',
-            allowBlank : false,
-            store :Ext.create("Ext.data.Store",{
-              autoLoad: true,
-              proxy:{
-                type:'ajax',
-                url: '/erp_products/erp_app/desktop/product_manager/currencies',
-                reader:{
-                  root: 'currencies',
-                  type:'json'
-                }
-              },
-              fields: [
-              {
-                name:'internal_identifier'
-              },
-              {
-                name:'id'
-              }
-              ]
-            }),
-            hiddenName: 'currency',
-            hiddenField: 'currency',
-            valueField: 'id',
-            displayField: 'internal_identifier',
-            forceSelection : true,
-            triggerAction : 'all',
-            name:'currency'
-          }
-          ]
-        },
-        {
-          items:[
-          {
-            fieldLabel:'From Date',
-            xtype:'datefield',
-            width:200,
-            allowBlank:false,
-            name:'from_date'
-          }
-          ]
-        },
-        {
-          items:[
-          {
-            fieldLabel:'Thru Date',
-            xtype:'datefield',
-            width:200,
-            allowBlank:false,
-            name:'thru_date'
-          }
-          ]
-        }]
-      },
-      {
-        xtype:'textarea',
-        height:50,
-        width:400,
-        name:'comments',
-        fieldLabel:'Comments'
-      },
-      {
-        xtype:'hidden',
-        name:'product_type_id',
-        value:config.productTypeId
-      },
-      {
-        xtype:'hidden',
-        name:'pricing_plan_id'
-      }
-      ],
-      buttons:[
-      this.addEditPriceBtn,
-      this.cancelBtn
-      ]
-    });
-
-    config = Ext.apply({
-      title:'Pricing',
-      layout:'border',
-      items:[this.pricesGridPanel,this.addPriceFormPanel]
-    }, config);
-
-    Compass.ErpApp.Desktop.Applications.ProductManager.ProductPricingPanel.superclass.constructor.call(this, config);
+    this.callParent([config]);
   }
 });
 
@@ -588,74 +260,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductImagesPane
       }
     }, config);
 
-    Compass.ErpApp.Desktop.Applications.ProductManager.ProductImagesPanel.superclass.constructor.call(this, config);
-  }
-});
-
-//
-//Inventory Management
-//
-
-Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.InventoryFormPanel",{
-  extend:"Ext.form.Panel",
-  alias:'widget.productmanager_inventoryformpanel',
-  initComponent: function() {
-    Compass.ErpApp.Desktop.Applications.ProductManager.InventoryFormPanel.superclass.initComponent.call(this, arguments);
-  },
-
-  constructor : function(config) {
-    config = Ext.apply({
-      title:'Inventory',
-      frame:true,
-      buttonAlign:'left',
-      bodyStyle:'padding:5px 5px 0',
-      url:'/erp_products/erp_app/desktop/product_manager/update_inventory',
-      items:[
-      {
-        fieldLabel:'SKU #',
-        xtype:'textfield',
-        allowBlank:true,
-        name:'sku'
-      },{
-        fieldLabel:'# Available',
-        xtype:'numberfield',
-        allowBlank:false,
-        name:'number_available'
-      },
-      {
-        xtype:'hidden',
-        name:'product_type_id',
-        value:config.productTypeId
-      },
-      ],
-      buttons:[
-      {
-        text:'Update',
-        handler:function(btn){
-          var formPanel = btn.findParentByType('form');
-          var basicForm = formPanel.getForm();
-
-          basicForm.submit({
-            reset:false,
-            success:function(form, action){
-              var obj = Ext.decode(action.response.responseText);
-              if(obj.success){
-                Ext.getCmp('productListPanel').loadProducts();
-              }
-              else{
-                Ext.Msg.alert("Error", 'Error creating price');
-              }
-            },
-            failure:function(form, action){
-              Ext.Msg.alert("Error", 'Error creating price');
-            }
-          });
-        }
-      }
-      ]
-    }, config);
-
-    Compass.ErpApp.Desktop.Applications.ProductManager.InventoryFormPanel.superclass.constructor.call(this, config);
+     this.callParent([config]);
   }
 });
 
@@ -666,9 +271,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.InventoryFormPane
 Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.AddProductWindow",{
   extend:"Ext.window.Window",
   alias:'widget.productmanager_addproductwindow',
-  initComponent: function() {
-    Compass.ErpApp.Desktop.Applications.ProductManager.AddProductWindow.superclass.initComponent.call(this, arguments);
-  },
 
   constructor : function(config) {
     var self = this;
@@ -695,7 +297,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.AddProductWindow"
       }
     }, config);
 
-    Compass.ErpApp.Desktop.Applications.ProductManager.AddProductWindow.superclass.constructor.call(this, config);
+    this.callParent([config]);
   }
 });
 
@@ -706,13 +308,10 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.AddProductWindow"
 Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.UpdateProductWindow",{
   extend:"Ext.window.Window",
   alias:'widget.productmanager_updateproductwindow',
-  initComponent: function() {
-    Compass.ErpApp.Desktop.Applications.ProductManager.UpdateProductWindow.superclass.initComponent.call(this, arguments);
-  },
-
   constructor : function(config) {
     var self = this;
     var activeTab = config['activeTab'] | 0
+    Compass.ErpApp.Desktop.Applications.ProductManager.selectedProductTypeId = config.productTypeId;
 
     var tabLayout = {
       xtype:'tabpanel',
@@ -748,29 +347,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.UpdateProductWind
       {
         xtype:'productmanager_productimagespanel',
         productTypeId:config.productTypeId
-      },
-      {
-        xtype:'productmanager_productpricingpanel',
-        productTypeId:config.productTypeId
-      },
-      {
-        xtype:'productmanager_inventoryformpanel',
-        productTypeId:config.productTypeId,
-        listeners:{
-          'activate':function(panel){
-            var self = this;
-            Ext.Ajax.request({
-              url: '/erp_products/erp_app/desktop/product_manager/inventory/'+panel.initialConfig['productTypeId'],
-              success: function(response) {
-                var obj = Ext.decode(response.responseText);
-                self.getForm().setValues(obj);
-              },
-              failure: function(response) {
-                Ext.Msg.alert('Error', 'Error loading inventory.');
-              }
-            });
-          }
-        }
       }
       ]
     }
@@ -784,11 +360,17 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.UpdateProductWind
       items:[tabLayout],
       listeners:{
         show:function(comp){
-          comp.query('tabpanel')[0].setActiveTab(activeTab);
+          var tabPanel = comp.down('tabpanel');
+          
+          Ext.each(Compass.ErpApp.Desktop.Applications.ProductManager.widgets,function(widget){
+              tabPanel.add(widget);
+          });
+
+          tabPanel.setActiveTab(activeTab);
         }
       }
     }, config);
 
-    Compass.ErpApp.Desktop.Applications.ProductManager.UpdateProductWindow.superclass.constructor.call(this, config);
+    this.callParent([config]);
   }
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_products
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_app
-  requirement: &70708660 !ruby/object:Gem::Requirement
+  requirement: &2153107000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70708660
-- !ruby/object:Gem::Dependency
-  name: erp_agreements
-  requirement: &70706130 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - =
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *70706130
+  version_requirements: *2153107000
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70730990 !ruby/object:Gem::Requirement
+  requirement: &2153106500 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70730990
+  version_requirements: *2153106500
 description: ! 'The Products Engine implements ProductType and ProductInstance, as
   well as a number of classes to support product catalog-type functions and search/shopping
   scenarios. '
@@ -53,81 +42,80 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- public/stylesheets/erp_app/desktop/applications/product_manager/style.css
-- public/javascripts/erp_app/desktop/applications/product_manager/product_list_panel.js
 - public/javascripts/erp_app/desktop/applications/product_manager/module.js
-- app/assets/stylesheets/erp_products/application.css
+- public/javascripts/erp_app/desktop/applications/product_manager/product_list_panel.js
+- public/stylesheets/erp_app/desktop/applications/product_manager/style.css
 - app/assets/javascripts/erp_products/application.js
-- app/views/layouts/erp_products/application.html.erb
-- app/models/product_package.rb
+- app/assets/stylesheets/erp_products/application.css
+- app/controllers/erp_products/erp_app/desktop/product_manager/base_controller.rb
+- app/helpers/erp_products/application_helper.rb
 - app/models/prod_availability_status_type.rb
+- app/models/prod_instance_reln.rb
+- app/models/prod_instance_reln_type.rb
 - app/models/prod_instance_role_type.rb
 - app/models/prod_type_reln.rb
-- app/models/product_type.rb
-- app/models/product_offer.rb
-- app/models/simple_product_offer.rb
-- app/models/prod_instance_reln_type.rb
-- app/models/prod_instance_reln.rb
-- app/models/prod_type_role_type.rb
 - app/models/prod_type_reln_type.rb
+- app/models/prod_type_role_type.rb
 - app/models/product_instance.rb
-- app/helpers/erp_products/application_helper.rb
-- app/controllers/erp_products/erp_app/desktop/product_manager/base_controller.rb
+- app/models/product_offer.rb
+- app/models/product_package.rb
+- app/models/product_type.rb
+- app/models/simple_product_offer.rb
 - config/routes.rb
-- db/migrate/20080805000040_base_products.rb
-- db/migrate/20080805000041_base_products_indexes.rb
+- db/data_migrations/20110324010232_product_role_types.rb
 - db/data_migrations/20110527160807_add_default_prod_avail_types.rb
 - db/data_migrations/20110728201730_create_desktop_app_product_manager.rb
-- db/data_migrations/20110324010232_product_role_types.rb
+- db/migrate/20080805000040_base_products.rb
+- db/migrate/20080805000041_base_products_indexes.rb
 - lib/erp_products/engine.rb
-- lib/erp_products/extensions.rb
-- lib/erp_products/extensions/active_record/acts_as_product_type.rb
-- lib/erp_products/extensions/active_record/acts_as_product_offer.rb
 - lib/erp_products/extensions/active_record/acts_as_product_instance.rb
+- lib/erp_products/extensions/active_record/acts_as_product_offer.rb
+- lib/erp_products/extensions/active_record/acts_as_product_type.rb
+- lib/erp_products/extensions.rb
 - lib/erp_products/version.rb
 - lib/erp_products.rb
 - lib/tasks/erp_products_tasks.rake
 - GPL-3-LICENSE
 - Rakefile
 - README.rdoc
-- spec/spec_helper.rb
-- spec/models/prod_type_role_type_spec.rb
-- spec/models/prod_type_reln_spec.rb
-- spec/models/product_package_spec.rb
-- spec/models/prod_instance_reln_type_spec.rb
-- spec/models/prod_instance_role_type_spec.rb
-- spec/models/simple_product_offer_spec.rb
-- spec/models/prod_type_reln_type_spec.rb
-- spec/models/product_instance_spec.rb
-- spec/models/prod_instance_reln_spec.rb
-- spec/models/prod_availability_status_type_spec.rb
-- spec/models/product_offer_spec.rb
-- spec/models/product_type_spec.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/config.ru
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/boot.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/environments/spec.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config.ru
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/models/prod_availability_status_type_spec.rb
+- spec/models/prod_instance_reln_spec.rb
+- spec/models/prod_instance_reln_type_spec.rb
+- spec/models/prod_instance_role_type_spec.rb
+- spec/models/prod_type_reln_spec.rb
+- spec/models/prod_type_reln_type_spec.rb
+- spec/models/prod_type_role_type_spec.rb
+- spec/models/product_instance_spec.rb
+- spec/models/product_offer_spec.rb
+- spec/models/product_package_spec.rb
+- spec/models/product_type_spec.rb
+- spec/models/simple_product_offer_spec.rb
+- spec/spec_helper.rb
 homepage: http://development.compassagile.com
 licenses: []
 post_install_message: 
@@ -148,48 +136,48 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The Products Engine implements ProductType and ProductInstance, as well as
   a number of classes to support product catalog-type functions and search/shopping
   scenarios.
 test_files:
-- spec/spec_helper.rb
-- spec/models/prod_type_role_type_spec.rb
-- spec/models/prod_type_reln_spec.rb
-- spec/models/product_package_spec.rb
-- spec/models/prod_instance_reln_type_spec.rb
-- spec/models/prod_instance_role_type_spec.rb
-- spec/models/simple_product_offer_spec.rb
-- spec/models/prod_type_reln_type_spec.rb
-- spec/models/product_instance_spec.rb
-- spec/models/prod_instance_reln_spec.rb
-- spec/models/prod_availability_status_type_spec.rb
-- spec/models/product_offer_spec.rb
-- spec/models/product_type_spec.rb
-- spec/dummy/public/422.html
-- spec/dummy/public/404.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/dummy/config.ru
-- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
-- spec/dummy/config/routes.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/boot.rb
+- spec/dummy/app/helpers/application_helper.rb
+- spec/dummy/app/views/layouts/application.html.erb
 - spec/dummy/config/application.rb
+- spec/dummy/config/boot.rb
+- spec/dummy/config/database.yml
+- spec/dummy/config/environment.rb
 - spec/dummy/config/environments/spec.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
 - spec/dummy/config/initializers/inflections.rb
+- spec/dummy/config/initializers/mime_types.rb
 - spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/database.yml
+- spec/dummy/config/initializers/session_store.rb
+- spec/dummy/config/initializers/wrap_parameters.rb
+- spec/dummy/config/locales/en.yml
+- spec/dummy/config/routes.rb
+- spec/dummy/config.ru
+- spec/dummy/public/404.html
+- spec/dummy/public/422.html
+- spec/dummy/public/500.html
+- spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/script/rails
+- spec/models/prod_availability_status_type_spec.rb
+- spec/models/prod_instance_reln_spec.rb
+- spec/models/prod_instance_reln_type_spec.rb
+- spec/models/prod_instance_role_type_spec.rb
+- spec/models/prod_type_reln_spec.rb
+- spec/models/prod_type_reln_type_spec.rb
+- spec/models/prod_type_role_type_spec.rb
+- spec/models/product_instance_spec.rb
+- spec/models/product_offer_spec.rb
+- spec/models/product_package_spec.rb
+- spec/models/product_type_spec.rb
+- spec/models/simple_product_offer_spec.rb
+- spec/spec_helper.rb

data/app/views/layouts/erp_products/application.html.erb

@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>ErpProducts</title>
-  <%= stylesheet_link_tag    "erp_products/application" %>
-  <%= javascript_include_tag "erp_products/application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>