erp_products 3.0.3 → 3.0.4

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

@@ -104,18 +104,18 @@ module ErpProducts
             result = {}
 
             begin
-              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
+              name = params[:name]
+              data = request.raw_post
 
               product_type = ProductType.find(params[:product_type_id])
               #build path
               path = File.join(product_type.images_path,name)
-
+              Rails.logger.info "@@@@@@@@ #{path}"
               product_type.add_file(data, path)
               result = {:success => true}
             rescue Exception=>ex
-              logger.error ex.message
-              logger.error ex.backtrace.join("\n")
+              Rails.logger.error ex.message
+              Rails.logger.error ex.backtrace.join("\n")
               result = {:success => false, :error => "Error uploading #{name}"}
             end
             

data/db/migrate/20080805000040_base_products.rb

@@ -69,7 +69,7 @@ class BaseProducts < ActiveRecord::Migration
       create_table :simple_product_offers do |t|
         t.column  :description,   :string
         t.column  :product_id,    :integer
-        t.column  :base_price,    :float
+        t.column  :base_price,    :decimal, :precision => 8, :scale => 2
         t.column  :uom,           :integer
         t.timestamps
       end

data/lib/erp_products/version.rb

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

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

@@ -98,7 +98,7 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductDescriptio
           ['JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock','-','BidiLtr','BidiRtl'],
           ['BidiLtr', 'BidiRtl' ],
           ['Link','Unlink','Anchor'],
-          ['jwplayer','Flash','Table','HorizontalRule',,'SpecialChar','PageBreak',],
+          ['jwplayer','Flash','Table','HorizontalRule','SpecialChar','PageBreak',],
           [ 'Styles','Format','Font','FontSize' ],
           ['Maximize', 'ShowBlocks','-','About']
           ]
@@ -240,8 +240,6 @@ Ext.define("Compass.ErpApp.Desktop.Applications.ProductManager.ProductImagesPane
           handler:function(btn){
             var uploadWindow = Ext.create("Compass.ErpApp.Shared.UploadWindow",{
               standardUploadUrl:uploadUrl,
-              flashUploadUrl:uploadUrl,
-              xhrUploadUrl:uploadUrl,
               extraPostData:{
                 product_type_id:productTypeId
               },

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: erp_products
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_app
-  requirement: &70179786697380 !ruby/object:Gem::Requirement
+  requirement: &70211132069280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70179786697380
+  version_requirements: *70211132069280
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70179786695080 !ruby/object:Gem::Requirement
+  requirement: &70211132068780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70179786695080
+  version_requirements: *70211132068780
 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. '