erp_products 3.0.0 → 3.0.1

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

@@ -8,7 +8,7 @@ module ErpProducts
               {
                 :id => product_type.id,
                 :title => product_type.description,
-                :imageUrl => product_type.images.empty? ? '/images/img_blank.png' : product_type.images.first.data.url,
+                :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,

data/app/models/product_type.rb

@@ -30,8 +30,8 @@ class ProductType < ActiveRecord::Base
   end
   
   def images_path
-    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::FileSupport.options[:storage])
-    File.join(file_support.root,'products/images',"#{self.description.underscore}_#{self.id}")
+    file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
+    File.join(file_support.root,Rails.application.config.erp_tech_svcs.file_assets_location,'products','images',"#{self.description.underscore}_#{self.id}")
   end
   
 end

data/lib/erp_products/engine.rb

@@ -11,6 +11,12 @@ module ErpProducts
       include ErpProducts::Extensions::ActiveRecord::ActsAsProductOffer
 	    include ErpProducts::Extensions::ActiveRecord::ActsAsProductType
     end
-    
+
+    #TODO
+    #this will be removed once rails 3.2 adds the ability to set the order of engine loading
+    engine = self
+    config.to_prepare do
+      ErpBaseErpSvcs.register_compass_ae_engine(engine)
+    end
   end
 end

data/lib/erp_products/version.rb

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

data/lib/erp_products.rb

@@ -1,3 +1,4 @@
+require "erp_products/version"
 require "erp_products/extensions"
 require "erp_products/engine"