Move products into a plugin

This will many further improvements to the products, such as: - Interaction with other plugins such as suppliers, stock and currencies. The inteface can change in such a way that if done usings hotspots would hurt usability and coherence. - More autonomy to develop and integrate other features (in the next months we will integrate batch edition and stock, currencies might come next) - More declouping from core and other components

Move products into a plugin
This will many further improvements to the products, such as: - Interaction with other plugins such as suppliers, stock and currencies. The inteface can change in such a way that if done usings hotspots would hurt usability and coherence. - More autonomy to develop and integrate other features (in the next months we will integrate batch edition and stock, currencies might come next) - More declouping from core and other components
Braulio Bhavamitra
1 parent bb150fb8
Showing 299 changed files with 8263 additions and 7886 deletions Show diff stats
app/controllers/admin/categories_controller.rb
app/controllers/admin/edit_template_controller.rb
app/controllers/admin/environment_design_controller.rb
app/controllers/my_profile/cms_controller.rb
app/controllers/my_profile/manage_products_controller.rb
app/controllers/my_profile/profile_design_controller.rb
app/controllers/public/catalog_controller.rb
app/controllers/public/search_controller.rb
app/helpers/action_tracker_helper.rb
app/helpers/application_helper.rb
app/helpers/catalog_helper.rb
app/helpers/categories_helper.rb
app/helpers/display_helper.rb
app/helpers/enterprise_homepage_helper.rb
app/helpers/manage_products_helper.rb
app/helpers/profile_image_helper.rb
app/models/article.rb
app/models/box.rb
app/models/category.rb
app/models/certifier.rb
@@ -7,7 +7,6 @@ class CategoriesController &lt; AdminController
   def index
     @categories = environment.categories.where("parent_id is null AND type is null")
     @regions = environment.regions.where(:parent_id => nil)
-    @product_categories = environment.product_categories.where(:parent_id => nil)
   end
  
   def get_children
 class EditTemplateController < AdminController
-  
+
   protect 'edit_environment_design', :environment
-  
+
   #FIXME
   #design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
  
@@ -9,7 +9,6 @@ class EditTemplateController &lt; AdminController
     %w[
        FavoriteLinks
        ListBlock
-       SellersSearchBlock
      ]
   end
  
 class EnvironmentDesignController < BoxOrganizerController
-  
+
   protect 'edit_environment_design', :environment
  
   def available_blocks
-    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
+    @available_blocks ||= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
     @available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
   end
  
@@ -409,9 +409,6 @@ class CmsController &lt; MyProfileController
     ]
     articles += special_article_types if params && params[:cms]
     parent_id = params ? params[:parent_id] : nil
-    if profile.enterprise?
-      articles << EnterpriseHomepage
-    end
     if @parent && @parent.blog?
       articles -= Article.folder_types.map(&:constantize)
     end
@@ -1,229 +0,0 @@
-class ManageProductsController < ApplicationController
-  needs_profile
-
-  protect 'manage_products', :profile, :except => [:show]
-  before_filter :check_environment_feature
-  before_filter :login_required, :except => [:show]
-  before_filter :create_product?, :only => [:new]
-
-  protected
-
-  def check_environment_feature
-    unless profile.environment.enabled?('products_for_enterprises')
-      render_not_found
-      return
-    end
-  end
-
-  def create_product?
-    if !profile.create_product?
-      render_access_denied
-      return
-    end
-  end
-
-  public
-
-  def index
-    @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
-  end
-
-  def show
-    @product = @profile.products.find(params[:id])
-    @inputs = @product.inputs
-    @allowed_user = user && user.has_permission?('manage_products', profile)
-  end
-
-  def categories_for_selection
-    @category = environment.categories.find_by id: params[:category_id]
-    @object_name = params[:object_name]
-    if @category
-      @categories = @category.children
-      @level = @category.leaf? ? @category.level : @categories.first.level
-    else
-      @categories = ProductCategory.top_level_for(environment)
-      @level = 0
-    end
-    render :partial => 'categories_for_selection', :locals => { :categories => @categories, :level => @level }
-  end
-
-  def new
-    @no_design_blocks = true
-    @category = params[:selected_category_id] ? Category.find(params[:selected_category_id]) : nil
-    @product = @profile.products.build(:product_category => @category)
-    @categories = ProductCategory.top_level_for(environment)
-    @level = 0
-    if request.post?
-      if @product.save
-        session[:notice] = _('Product succesfully created')
-        render :partial => 'shared/redirect_via_javascript',
-          :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
-      else
-        render_dialog_error_messages 'product'
-      end
-    end
-  end
-
-  def edit
-    @product = @profile.products.find(params[:id])
-    field = params[:field]
-    if request.post?
-      begin
-        @product.update!(params[:product])
-        render :partial => "display_#{field}", :locals => {:product => @product}
-      rescue Exception => e
-        render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
-      end
-    else
-      render :partial => "edit_#{field}", :locals => {:product => @product, :errors => false}
-    end
-  end
-
-  def edit_category
-    @product = @profile.products.find(params[:id])
-    @category = @product.product_category || ProductCategory.first
-    @categories = ProductCategory.top_level_for(environment)
-    @edit = true
-    @level = @category.level
-    if request.post?
-      if @product.update({:product_category_id => params[:selected_category_id]}, :without_protection => true)
-        render :partial => 'shared/redirect_via_javascript',
-          :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
-      else
-        render_dialog_error_messages 'product'
-      end
-    end
-  end
-
-  def show_category_tree
-    @category = environment.categories.find params[:category_id]
-    render :partial => 'selected_category_tree'
-  end
-
-  def search_categories
-    @term = params[:term].downcase
-    conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
-    @categories = ProductCategory.where(conditions).limit(10)
-    render :json => (@categories.map do |category|
-      {:label => category.name, :value => category.id}
-    end)
-  end
-
-  def add_input
-    @product = @profile.products.find(params[:id])
-    @input = @product.inputs.build
-    @categories = ProductCategory.top_level_for(environment)
-    @level = 0
-    if request.post?
-      if @input.update(:product_category_id => params[:selected_category_id])
-        @inputs = @product.inputs
-        render :partial => 'display_inputs'
-      else
-        render_dialog_error_messages 'product'
-      end
-    else
-      render :partial => 'add_input'
-    end
-  end
-
-  def manage_product_details
-    @product = @profile.products.find(params[:id])
-    if request.post?
-      @product.update_price_details(params[:price_details]) if params[:price_details]
-      render :partial => 'display_price_details'
-    else
-      render :partial => 'manage_product_details'
-    end
-  end
-
-  def remove_price_detail
-    @product = @profile.products.find(params[:product])
-    @price_detail = @product.price_details.find(params[:id])
-    @product = @price_detail.product
-    if request.post?
-      @price_detail.destroy
-      render :nothing => true
-    end
-  end
-
-  def display_price_composition_bar
-    @product = @profile.products.find(params[:id])
-    render :partial => 'price_composition_bar'
-  end
-
-  def display_inputs_cost
-    @product = @profile.products.find(params[:id])
-    render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
-  end
-
-  def destroy
-    @product = @profile.products.find(params[:id])
-    if @product.destroy
-      session[:notice] = _('Product succesfully removed')
-      redirect_back_or_default :action => 'index'
-    else
-      session[:notice] = _('Could not remove the product')
-      redirect_back_or_default :action => 'show', :id => @product
-    end
-  end
-
-  def edit_input
-    if request.xhr?
-      @input = @profile.inputs.find_by id: params[:id]
-      if @input
-        if request.post?
-          if @input.update(params[:input])
-            render :partial => 'display_input', :locals => {:input => @input}
-          else
-            render :partial => 'edit_input'
-          end
-        else
-          render :partial => 'edit_input'
-        end
-      else
-        render :text => _('The input was not found')
-      end
-    end
-  end
-
-  def order_inputs
-    @product = @profile.products.find(params[:id])
-    @product.order_inputs!(params[:input]) if params[:input]
-    render :nothing => true
-  end
-
-  def remove_input
-    @input = @profile.inputs.find(params[:id])
-    @product = @input.product
-    if request.post?
-      if @input.destroy
-        @inputs = @product.inputs
-        render :partial => 'display_inputs'
-      else
-        render_dialog_error_messages 'input'
-      end
-    end
-  end
-
-  def certifiers_for_selection
-    @qualifier = Qualifier.exists?(:id => params[:id]) ? Qualifier.find(params[:id]) : nil
-    render :update do |page|
-      page.replace_html params[:certifier_area], :partial => 'certifiers_for_selection'
-    end
-  end
-
-  def create_production_cost
-    cost = @profile.production_costs.create(:name => params[:id])
-    if cost.valid?
-      cost.save
-      render :text => {:name => cost.name,
-                       :id => cost.id,
-                       :ok => true
-                      }.to_json
-    else
-      render :text => {:ok => false,
-                       :error_msg => _(cost.errors['name'].join('\n')) % {:fn => _('Name')}
-                      }.to_json
-    end
-  end
-end
@@ -45,17 +45,10 @@ class ProfileDesignController &lt; BoxOrganizerController
     if profile.enterprise?
       blocks << DisabledEnterpriseMessageBlock
       blocks << HighlightsBlock
-      blocks << ProductCategoriesBlock
-      blocks << FeaturedProductsBlock
       blocks << FansBlock
       blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
     end
  
-    # product block exclusive for enterprises in environments that permits it
-    if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
-      blocks << ProductsBlock
-    end
-
     # block exclusive to profiles that have blog
     if profile.has_blog?
       blocks << BlogArchivesBlock
@@ -1,19 +0,0 @@
-class CatalogController < PublicController
-  needs_profile
-
-  before_filter :check_enterprise_and_environment
-
-  def index
-    extend CatalogHelper
-    catalog_load_index
-  end
-
-  protected
-
-  def check_enterprise_and_environment
-    unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
-      redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
-    end
-  end
-
-end
@@ -52,7 +52,6 @@ class SearchController &lt; PublicController
     [
       [ :people, _('People'), :recent_people ],
       [ :enterprises, _('Enterprises'), :recent_enterprises ],
-      [ :products, _('Products'), :recent_products ],
       [ :events, _('Upcoming events'), :upcoming_events ],
       [ :communities, _('Communities'), :recent_communities ],
       [ :articles, _('Contents'), :recent_articles ]
@@ -78,16 +77,17 @@ class SearchController &lt; PublicController
     full_text_search
   end
  
-  def products
-    @scope = @environment.products
-    full_text_search
-  end
-
   def enterprises
     @scope = visible_profiles(Enterprise)
     full_text_search
   end
  
+  # keep URL compatibility
+  def products
+    return render_not_found unless defined? ProductsPlugin
+    redirect_to url_for(params.merge controller: 'products_plugin/search', action: :products)
+  end
+
   def communities
     @scope = visible_profiles(Community)
     full_text_search
@@ -186,7 +186,6 @@ class SearchController &lt; PublicController
       people:      _('People'),
       communities: _('Communities'),
       enterprises: _('Enterprises'),
-      products:    _('Products and Services'),
       events:      _('Events'),
     }
   end
@@ -260,12 +259,11 @@ class SearchController &lt; PublicController
   end
  
   def available_assets
-    assets = {
+    {
       articles:    _('Contents'),
       enterprises: _('Enterprises'),
       people:      _('People'),
       communities: _('Communities'),
-      products:    _('Products and Services'),
     }
   end
  
@@ -67,24 +67,6 @@ module ActionTrackerHelper
     }
   end
  
-  def create_product_description ta
-    _('created the product %{title}') % {
-      title: link_to(truncate(ta.get_name), ta.get_url),
-    }
-  end
-
-  def update_product_description ta
-    _('updated the product %{title}') % {
-      title: link_to(truncate(ta.get_name), ta.get_url),
-    }
-  end
-
-  def remove_product_description ta
-    _('removed the product %{title}') % {
-      title: truncate(ta.get_name),
-    }
-  end
-
   def favorite_enterprise_description ta
     _('favorited enterprise %{title}') % {
       title: link_to(truncate(ta.get_enterprise_name), ta.get_enterprise_url),
@@ -44,8 +44,6 @@ module ApplicationHelper
  
   include TokenHelper
  
-  include CatalogHelper
-
   include PluginsHelper
  
   include ButtonsHelper
@@ -787,7 +785,7 @@ module ApplicationHelper
     return "" if categories.blank?
     content_tag(:ul) do
       categories.map do |category|
-        category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
+        category_path = { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
         if category.display_in_menu?
           content_tag(:li) do
             if !category.is_leaf_displayable_in_menu?
@@ -1,45 +0,0 @@
-module CatalogHelper
-
-  include DisplayHelper
-  include ManageProductsHelper
-
-  def catalog_load_index options = {:page => params[:page], :show_categories => true}
-    if options[:show_categories]
-      @category = params[:level] ? ProductCategory.find(params[:level]) : nil
-      @categories = ProductCategory.on_level(params[:level]).order(:name)
-    end
-
-    @products = profile.products.from_category(@category).
-      reorder('available desc, highlighted desc, name asc').
-      paginate(:per_page => @profile.products_per_catalog_page, :page => options[:page])
-  end
-
-  def breadcrumb(category)
-    start = link_to(_('Start'), {:controller => :catalog, :action => 'index'})
-    ancestors = category.ancestors.map { |c| link_to(c.name, {:controller => :catalog, :action => 'index', :level => c.id}) }.reverse
-    current_level = content_tag('strong', category.name)
-    all_items = [start] + ancestors + [current_level]
-    content_tag('div', safe_join(all_items, ' &rarr; '), :id => 'breadcrumb')
-  end
-
-  def category_link(category)
-    count = profile.products.from_category(category).count
-    name = truncate(category.name, :length => 22 - count.to_s.size)
-    link = link_to(name, {:controller => 'catalog', :action => 'index', :level => category.id}, :title => category.name)
-    content_tag('div', "#{link} <span class=\"count\">#{count}</span>".html_safe) if count > 0
-  end
-
-  def category_with_sub_list(category)
-    content_tag 'li', "#{category_link(category)}\n#{sub_category_list(category)}".html_safe
-  end
-
-  def sub_category_list(category)
-    sub_categories = []
-    category.children.order(:name).each do |sub_category|
-      cat_link = category_link sub_category
-      sub_categories << content_tag('li', cat_link) unless cat_link.nil?
-    end
-    content_tag('ul', sub_categories.join.html_safe) if sub_categories.size > 0
-  end
-
-end
@@ -2,7 +2,6 @@ module CategoriesHelper
  
   TYPES = [
     [ _('General Category'), Category.to_s ],
-    [ _('Product Category'), ProductCategory.to_s ],
     [ _('Region'), Region.to_s ],
   ]
  
 module DisplayHelper
  
-  def link_to_product(product, opts={})
-    return _('No product') unless product
-    target = product_path(product)
-    link_to content_tag( 'span', product.name ),
-            target,
-            opts
-  end
-
   def themed_path(file)
     if File.exists?(File.join(Rails.root, 'public', theme_path, file))
       File.join(theme_path, file)
@@ -16,42 +8,21 @@ module DisplayHelper
     end
   end
  
-  def image_link_to_product(product, opts={})
-    return _('No product') unless product
-    target = product_path(product)
-    link_to image_tag(product.default_image(:big), :alt => product.name),
-            target,
-            opts
-  end
-
   def price_span(price, options = {})
     content_tag 'span',
       number_to_currency(price, :unit => environment.currency_unit, :delimiter => environment.currency_delimiter, :separator => environment.currency_separator),
       options
   end
  
-  def product_path(product)
-    product.enterprise.enabled? ? product.enterprise.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => product) : product.enterprise.url
-  end
-
   def link_to_tag(tag, html_options = {})
     link_to tag.name, {:controller => 'search', :action => 'tag', :tag => tag.name}, html_options
   end
  
   def link_to_category(category, full = true, html_options = {})
-    return _('Uncategorized product') unless category
     name = full ? category.full_name(' &rarr; ') : category.name
     link_to name, Noosfero.url_options.merge({:controller => 'search', :action => 'category_index', :category_path => category.path.split('/'),:host => category.environment.default_hostname }), html_options
   end
  
-  def link_to_product_category(category)
-    if category
-      link_to(category.name, :controller => 'search', :action => 'products', :category_path => category.explode_path)
-    else
-      _('Uncategorized product')
-    end
-  end
-
   def txt2html(txt)
     ret = txt.strip.
       gsub( /\s*\n\s*\n\s*/, "\r<p/>\r" ).
@@ -1,25 +0,0 @@
-module EnterpriseHomepageHelper
-
-  def display_profile_info(profile)
-    data = ''
-    [
-      [ _('Contact person:'),    :contact_person    ],
-      [ _('e-Mail:'),            :contact_email     ],
-      [ _('Phone(s):'),          :contact_phone     ],
-      [ _('Location:'),          :location          ],
-      [ _('Address:'),           :address           ],
-      [ _('Economic activity:'), :economic_activity ]
-    ].each { | name, att |
-      if profile.send( att ) and not profile.send( att ).blank?
-        data << content_tag( 'li', content_tag('strong', name) +' '+ profile.send( att ).to_s ) +"\n"
-      end
-    }
-    if profile.respond_to?(:distance) and !profile.distance.nil?
-      data << content_tag( 'li',
-                           content_tag('strong',_('Distance:')) +' '+
-                           "%.2f%" % profile.distance
-                         ) + "\n"
-    end
-    content_tag('div', content_tag('ul', data), :class => 'enterprise-info')
-  end
-end
@@ -1,289 +0,0 @@
-# encoding: UTF-8
-
-module ManageProductsHelper
-
-  def remote_function_to_update_categories_selection(container_id, options = {})
-    remote_function({
-      :update => container_id,
-      :url => { :action => "categories_for_selection" },
-      :loading => "loading('hierarchy_navigation', '#{ _('loading…') }'); loading('#{container_id}', '&nbsp;')",
-      :complete => "loading_done('hierarchy_navigation'); loading_done('#{container_id}')"
-    }.merge(options))
-  end
-
-  def hierarchy_category_item(category, make_links, title = nil)
-    title ||= category.name
-    if make_links
-      link_to(title, '#',
-        :title => title,
-        :onclick => remote_function_to_update_categories_selection("categories_container_level#{ category.level + 1 }",
-          :with => "'category_id=#{ category.id }'"
-        )
-      )
-    else
-      title
-    end
-  end
-
-  def hierarchy_category_navigation(current_category, options = {})
-    hierarchy = []
-    if current_category
-      hierarchy << current_category.name unless options[:hide_current_category]
-      ancestors = current_category.ancestors
-      ancestors.each do |category|
-        hierarchy << hierarchy_category_item(category, options[:make_links])
-      end
-    end
-    hierarchy.reverse.join(options[:separator] || ' &rarr; ')
-  end
-
-  def options_for_select_categories(categories, selected = nil)
-    safe_join(categories.sort_by{ |cat|
-      cat.name.transliterate}.map do |category|
-        selected_attribute = selected.nil? ? '' : (category == selected ? "selected='selected'" : '')
-          "<option value='#{category.id}' title='#{category.name}' #{selected_attribute}>#{category.name + (category.leaf? ? '': ' &raquo;')}</option>".html_safe
-    end, "\n")
-  end
-
-  def build_selects_for_ancestors(ancestors, current_category)
-    current_ancestor = ancestors.shift
-    if current_ancestor.nil?
-      select_for_new_category(current_category.children, current_category.level + 1)
-    else
-      content_tag('div',
-        select_tag('category_id',
-          options_for_select_categories(current_ancestor.siblings + [current_ancestor], current_ancestor),
-          :size => 10,
-          :onchange => remote_function_to_update_categories_selection("categories_container_level#{ current_ancestor.level + 1 }", :with => "'category_id=' + this.value")
-        ) +
-        build_selects_for_ancestors(ancestors, current_category),
-        :class => 'categories_container',
-        :id => "categories_container_level#{ current_ancestor.level }"
-      )
-    end
-  end
-
-  def selects_for_all_ancestors(current_category)
-    build_selects_for_ancestors(current_category.ancestors.reverse + [current_category], current_category)
-  end
-
-  def select_for_new_category(categories, level)
-    content_tag('div',
-      render(:partial => 'categories_for_selection', :locals => { :categories => categories, :level => level }),
-      :class => 'categories_container',
-      :id => "categories_container_level#{ level }"
-    )
-  end
-
-  def categories_container(categories_selection_html, hierarchy_html = '')
-    content_tag 'div',
-      safe_join(
-        [
-          render('categories_autocomplete'),
-          hidden_field_tag('selected_category_id'),
-          content_tag('div', hierarchy_html, :id => 'hierarchy_navigation'),
-          content_tag('div', categories_selection_html, :id => 'categories_container_wrapper')
-        ], ''),
-    :id => 'categories-container'
-  end
-
-  def select_for_categories(categories, level = 0)
-    if categories.empty?
-      content_tag('div', '', :id => 'no_subcategories')
-    else
-      select_tag('category_id',
-        options_for_select_categories(categories),
-        :size => 10,
-        :onchange => remote_function_to_update_categories_selection("categories_container_level#{ level + 1 }", :with => "'category_id=' + this.value")
-      ) +
-      content_tag('div', '', :class => 'categories_container', :id => "categories_container_level#{ level + 1 }")
-    end
-  end
-
-  def edit_link(label, url, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    link_to(label, url, html_options)
-  end
-
-  def edit_product_link_to_remote(product, field, label, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    options = html_options.merge(:id => 'link-edit-product-' + field)
-    options[:class] = options[:class] ? options[:class] + ' link-to-remote' : 'link-to-remote'
-
-    link_to_remote(label,
-                   {:update => "product-#{field}",
-                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
-                   :method => :get,
-                   :loading => "loading_for_button('#link-edit-product-#{field}')"},
-                   options)
-  end
-
-  def edit_button(type, label, url, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    button(type, label, url, html_options)
-  end
-
-  def edit_product_button_to_remote(product, field, label, html_options = {})
-    the_class = 'button with-text icon-edit'
-    if html_options.has_key?(:class)
-     the_class << ' ' << html_options[:class]
-    end
-    edit_product_link_to_remote(product, field, label, html_options.merge(:class => the_class))
-  end
-
-  def edit_ui_button(label, url, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    ui_button(label, url, html_options)
-  end
-
-  def edit_product_ui_button_to_remote(product, field, label, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    id = 'edit-product-remote-button-ui-' + field
-    options = html_options.merge(:id => id)
-
-    ui_button_to_remote(label,
-                   {:update => "product-#{field}",
-                   :url => { :controller => 'manage_products', :action => "edit", :id => product.id, :field => field },
-                   :complete => "jQuery('#edit-product-button-ui-#{field}').hide()",
-                   :method => :get,
-                   :loading => "loading_for_button('##{id}')"},
-                   options)
-  end
-
-  def cancel_edit_product_link(product, field, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    button_to_function(:cancel, _('Cancel'), nil, html_options) do |page|
-      page.replace_html "product-#{field}", CGI::escapeHTML(render :partial => "display_#{field}", :locals => {:product => product})
-    end
-  end
-
-  def edit_product_category_link(product, html_options = {})
-    return '' unless (user && user.has_permission?('manage_products', profile))
-    options = html_options.merge(:id => 'link-edit-product-category')
-    link_to(_('Change category'), { :action => 'edit_category', :id => product.id}, options)
-  end
-
-  def display_value(product)
-    price = product.price
-    return '' if price.blank? || price.zero?
-    discount = product.discount
-    if discount.blank? || discount.zero?
-      result = display_price(_('Price: '), price)
-    else
-      result = display_price_with_discount(price, product.price_with_discount)
-    end
-    content_tag('span', content_tag('span', result, :class => 'product-price'), :class => "#{product.available? ? '' : 'un'}available-product")
-  end
-
-  def display_availability(product)
-    if !product.available?
-      ui_highlight(_('Product not available!'))
-    end
-  end
-
-  def display_price(label, price)
-    content_tag('span', label, :class => 'field-name') +
-    content_tag('span', float_to_currency(price), :class => 'field-value')
-  end
-
-  def display_price_with_discount(price, price_with_discount)
-    original_value = content_tag('span', display_price(_('List price: '), price), :class => 'list-price')
-    discount_value = content_tag('span', display_price(_('On sale: '), price_with_discount), :class => 'on-sale-price')
-    original_value + tag('br') + discount_value
-  end
-
-  def display_qualifiers(product)
-    data = ''
-    product.product_qualifiers.each do |pq|
-      certified_by = ''
-      certifier = pq.certifier
-      if certifier
-        certifier_name = certifier.link.blank? ? certifier.name : link_to(certifier.name, certifier.link)
-        certified_by = _('certified by %s') % certifier_name
-      else
-        certified_by = _('(Self declared)')
-      end
-      data << content_tag('li', "✔ #{pq.qualifier.name} #{certified_by}", :class => 'product-qualifiers-item')
-    end
-    content_tag('ul', data, :id => 'product-qualifiers')
-  end
-
-  def qualifiers_for_select
-    [[_('Select...'), nil]] + environment.qualifiers.sort.map{ |c| [c.name, c.id] }
-  end
-  def certifiers_for_select(qualifier)
-    [[_('Self declared'), nil]] + qualifier.certifiers.sort.map{ |c| [c.name, c.id] }
-  end
-  def select_qualifiers(product, selected = nil)
-    select_tag('selected_qualifier', options_for_select(qualifiers_for_select, selected),
-      :onchange => remote_function(
-        :url => {:action => 'certifiers_for_selection'},
-        :with => "'id=' + value + '&certifier_area=' + jQuery(this).parent().next().attr('id')",
-        :before => "small_loading(jQuery(this).parent().next().attr('id'), '&nbsp;')"
-      ),
-      :id => nil
-    )
-  end
-  def select_certifiers(qualifier, product = nil)
-    if qualifier
-      selected = product ? product.product_qualifiers.find_by(qualifier_id: qualifier.id).certifier_id : nil
-      select_tag("product[qualifiers_list][#{qualifier.id}]", options_for_select(certifiers_for_select(qualifier), selected))
-    else
-      select_tag("product[qualifiers_list][nil]")
-    end
-  end
-
-  def remove_qualifier_button
-    button_to_function(:delete, content_tag('span', _('Delete qualifier')), "jQuery(this).parents('tr').remove()")
-  end
-
-  def select_unit(object)
-    collection_select(object.class.name.downcase, :unit_id, environment.units, :id, :singular, {:include_blank => _('Select the unit')})
-  end
-
-  def input_icon(input)
-    if input.is_from_solidarity_economy?
-      hint = _('Product from solidarity economy')
-      image_tag("/images/solidarity-economy.png", :class => 'solidatiry-economy-icon', :alt => hint, :title => hint)
-    end
-  end
-
-  def display_price_by(unit)
-    selected_unit = content_tag('span', unit, :class => 'selected-unit')
-    content_tag('span', _('by') + ' ' + selected_unit, :class => 'price-by-unit')
-  end
-
-  def label_amount_used(input)
-    product_unit = input.product.unit
-    if product_unit.blank?
-       _('Amount used in this product or service')
-    else
-       _('Amount used by %s of this product or service') % product_unit.singular.downcase
-    end
-  end
-
-  def display_unit(input)
-    input_amount_used = content_tag('span', input.formatted_amount, :class => 'input-amount-used')
-    return input_amount_used if input.unit.blank?
-    n_('1 %{singular_unit}', '%{num} %{plural_unit}', input.amount_used.to_f) % { :num => input_amount_used, :singular_unit => content_tag('span', input.unit.singular, :class => 'input-unit'), :plural_unit => content_tag('span', input.unit.plural, :class => 'input-unit') }
-  end
-
-  def select_production_cost(product,selected=nil)
-    url = url_for( :controller => 'manage_products', :action => 'create_production_cost' )
-    prompt_msg = _('Insert the name of the new cost:')
-    error_msg = _('Something went wrong. Please, try again')
-    select_tag('price_details[][production_cost_id]',
-               '<option value="" disabled="disabled">' + _('Select...') + '</option>' +
-               options_for_select(product.available_production_costs.map {|item| [truncate(item.name, {:length => 10, :omission => '...'}), item.id]} + [[_('Other cost'), '']], selected),
-               {:class => 'production-cost-selection',
-                :onchange => "productionCostTypeChange(this, '#{url}', '#{prompt_msg}', '#{error_msg}')"})
-  end
-
-  def price_composition_progressbar_text(product, args = {})
-    currency = environment.currency_unit
-    production_cost = args[:production_cost_value] || product.formatted_value(:total_production_cost)
-    product_price = args[:product_price] || product.formatted_value(:price)
-
-    _("%{currency} %{production_cost} of %{currency} %{product_price}") % {:currency => currency, :production_cost => content_tag('span', production_cost, :class => 'production_cost'), :product_price => content_tag('span', product_price, :class => 'product_price')}
-  end
-end
@@ -82,7 +82,6 @@ module ProfileImageHelper
         ]
       elsif profile.kind_of?(Enterprise)
         [
-          {_('Products') => {:href => catalog_path(profile.identifier)}},
           {_('Members') => {:href => url_for(:controller => :profile, :action => :members, :profile => profile.identifier)}},
           {_('Agenda') => {:href => url_for(:controller => :profile, :action => :events, :profile => profile.identifier)}},
           {_('Send an e-mail') => {:href => url_for(:profile => profile.identifier, :controller => 'contact', :action => 'new'), :class => 'send-an-email', :style => 'display: none'}},
@@ -604,7 +604,7 @@ class Article &lt; ApplicationRecord
   end
  
   def accept_category?(cat)
-    !cat.is_a?(ProductCategory)
+    true
   end
  
   def public?
@@ -41,7 +41,6 @@ class Box &lt; ApplicationRecord
       ProfileImageBlock,
       RawHTMLBlock,
       RecentDocumentsBlock,
-      SellersSearchBlock,
       TagsBlock ]
   end
  
@@ -54,21 +53,17 @@ class Box &lt; ApplicationRecord
       EnterprisesBlock,
       FansBlock,
       FavoriteEnterprisesBlock,
-      FeaturedProductsBlock,
       FeedReaderBlock,
       HighlightsBlock,
       LinkListBlock,
       LocationBlock,
       LoginBlock,
       MyNetworkBlock,
-      ProductsBlock,
-      ProductCategoriesBlock,
       ProfileImageBlock,
       ProfileInfoBlock,
       ProfileSearchBlock,
       RawHTMLBlock,
       RecentDocumentsBlock,
-      SellersSearchBlock,
       SlideshowBlock,
       TagsBlock
     ]
@@ -35,8 +35,6 @@ class Category &lt; ApplicationRecord
   has_many :people, :through => :profile_categorizations, :source => :profile, :class_name => 'Person'
   has_many :communities, :through => :profile_categorizations, :source => :profile, :class_name => 'Community'
  
-  has_many :products, :through => :enterprises
-
   acts_as_having_image
  
   before_save :normalize_display_color
@@ -64,10 +62,6 @@ class Category &lt; ApplicationRecord
     self.communities.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
   end
  
-  def recent_products(limit = 10)
-    self.products.reorder('created_at DESC, id DESC').paginate(page: 1, per_page: limit)
-  end
-
   def recent_articles(limit = 10)
     self.articles.recent(limit)
   end
@@ -1,35 +0,0 @@
-class Certifier < ApplicationRecord
-
-  attr_accessible :name, :environment
-
-  SEARCHABLE_FIELDS = {
-    :name => {:label => _('Name'), :weight => 10},
-    :description => {:label => _('Description'), :weight => 3},
-    :link => {:label => _('Link'), :weight => 1},
-  }
-
-  belongs_to :environment
-
-  has_many :qualifier_certifiers, :dependent => :destroy
-  has_many :qualifiers, :through => :qualifier_certifiers
-
-  has_many :product_qualifiers
-  has_many :products, :through => :product_qualifiers, :source => :product
-
-  validates_presence_of :environment_id
-  validates_presence_of :name
-
-  def destroy
-    product_qualifiers.each { |pq| pq.update! :certifier => nil }
-    super
-  end
-
-  def link
-    self[:link] || ''
-  end
-
-  def <=>(b)
-    self.name.downcase.transliterate <=> b.name.downcase.transliterate
-  end
-
-end
-# An enterprise is a kind of organization. According to the system concept,
-# only enterprises can offer products and services.
 class Enterprise < Organization
  
-  attr_accessible :business_name, :address_reference, :district, :tag_list, :organization_website, :historic_and_current_context, :activities_short_description, :products_per_catalog_page
+  attr_accessible :business_name, :address_reference, :district, :tag_list,
+    :organization_website, :historic_and_current_context, :activities_short_description
  
   SEARCH_FILTERS = {
     :order => %w[more_recent more_popular more_active],
@@ -17,11 +16,6 @@ class Enterprise &lt; Organization
  
   acts_as_trackable after_add: proc{ |p, t| notify_activity t }
  
-  has_many :products, :foreign_key => :profile_id, :dependent => :destroy
-  has_many :product_categories, :through => :products
-  has_many :inputs, :through => :products
-  has_many :production_costs, :as => :owner
-
   has_many :favorite_enterprise_people
   has_many :fans, source: :person, through: :favorite_enterprise_people
  
@@ -29,10 +23,6 @@ class Enterprise &lt; Organization
  
   settings_items :organization_website, :historic_and_current_context, :activities_short_description
  
-  settings_items :products_per_catalog_page, :type => :integer, :default => 6
-  alias_method :products_per_catalog_page_before_type_cast, :products_per_catalog_page
-  validates_numericality_of :products_per_catalog_page, :allow_nil => true, :greater_than => 0
-
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
  
@@ -66,10 +56,6 @@ class Enterprise &lt; Organization
     environment ? environment.active_enterprise_fields : []
   end
  
-  def highlighted_products_with_image(options = {})
-    Product.where(:highlighted => true).joins(:image)
-  end
-
   def required_fields
     environment ? environment.required_enterprise_fields : []
   end
@@ -136,19 +122,14 @@ class Enterprise &lt; Organization
     links = [
       {:name => _("Enterprises's profile"), :address => '/profile/{profile}', :icon => 'ok'},
       {:name => _('Blog'), :address => '/{profile}/blog', :icon => 'edit'},
-      {:name => _('Products'), :address => '/catalog/{profile}', :icon => 'new'},
     ]
     blocks = [
       [MainBlock.new],
       [ ProfileImageBlock.new,
         LinkListBlock.new(:links => links),
-        ProductCategoriesBlock.new
       ],
       [LocationBlock.new]
     ]
-    if environment.enabled?('products_for_enterprises')
-      blocks[2].unshift ProductsBlock.new
-    end
     blocks
   end
  
@@ -189,14 +170,6 @@ class Enterprise &lt; Organization
     {:title => _('Enterprise Info and settings'), :icon => 'edit-profile-enterprise'}
   end
  
-  def create_product?
-    true
-  end
-
-  def catalog_url
-    { :profile => identifier, :controller => 'catalog'}
-  end
-
   def more_recent_label
     ''
   end
@@ -205,5 +178,4 @@ class Enterprise &lt; Organization
     super or self.fans.where(id: person.id).count > 0
   end
  
-
 end
@@ -1,42 +0,0 @@
-class EnterpriseHomepage < Article
-
-  def self.type_name
-    _('Homepage')
-  end
-
-  def self.short_description
-    _('Enterprise homepage')
-  end
-
-  def self.description
-    _('Display the summary of profile.')
-  end
-
-  def name
-    profile.nil? ? _('Homepage') : profile.name
-  end
-
-  def to_html(options = {})
-    enterprise_homepage = self
-    proc do
-      extend EnterpriseHomepageHelper
-      extend CatalogHelper
-      catalog_load_index :page => 1, :show_categories => false
-      render :partial => 'content_viewer/enterprise_homepage', :object => enterprise_homepage
-    end
-  end
-
-  # disable cache because of products
-  def cache_key params = {}, the_profile = nil, language = 'en'
-    rand
-  end
-
-  def can_display_hits?
-    false
-  end
-
-  def can_display_media_panel?
-    true
-  end
-
-end
@@ -128,7 +128,6 @@ class Environment &lt; ApplicationRecord
       'disable_asset_enterprises' => _('Disable search for enterprises'),
       'disable_asset_people' => _('Disable search for people'),
       'disable_asset_communities' => _('Disable search for communities'),
-      'disable_asset_products' => _('Disable search for products'),
       'disable_asset_events' => _('Disable search for events'),
       'disable_categories' => _('Disable categories'),
       'disable_header_and_footer' => _('Disable header/footer editing by users'),
@@ -139,7 +138,6 @@ class Environment &lt; ApplicationRecord
       'disable_contact_community' => _('Disable contact for groups/communities'),
       'forbid_destroy_profile' => _('Forbid users of removing profiles'),
  
-      'products_for_enterprises' => _('Enable products for enterprises'),
       'enterprise_registration' => _('Enterprise registration'),
       'enterprise_activation' => _('Enable activation of enterprises'),
       'enterprises_are_disabled_when_created' => _('Enterprises are disabled when created'),
@@ -226,7 +224,6 @@ class Environment &lt; ApplicationRecord
  
   has_many :organizations
   has_many :enterprises
-  has_many :products, :through => :enterprises
   has_many :people
   has_many :communities
   has_many :licenses
@@ -236,23 +233,16 @@ class Environment &lt; ApplicationRecord
     order('display_color').where('display_color is not null and parent_id is null')
   }, class_name: 'Category'
  
-  has_many :product_categories, -> { where type: 'ProductCategory'}
   has_many :regions
   has_many :states
   has_many :cities
  
   has_many :roles, :dependent => :destroy
  
-  has_many :qualifiers
-  has_many :certifiers
-
   has_many :mailings, :class_name => 'EnvironmentMailing', :foreign_key => :source_id, :as => 'source'
  
   acts_as_accessible
  
-  has_many :units, -> { order 'position' }
-  has_many :production_costs, :as => :owner
-
   def superior_intances
     [self, nil]
   end
@@ -441,9 +431,7 @@ class Environment &lt; ApplicationRecord
   end
  
   DEFAULT_FEATURES = %w(
-    disable_asset_products
     disable_gender_icon
-    products_for_enterprises
     disable_select_city_for_contact
     enterprise_registration
     media_panel
@@ -968,10 +956,6 @@ class Environment &lt; ApplicationRecord
     end
   end
  
-  def highlighted_products_with_image(options = {})
-    self.products.where(highlighted: true).joins(:image).order('created_at ASC')
-  end
-
   settings_items :home_cache_in_minutes, :type => :integer, :default => 5
   settings_items :general_cache_in_minutes, :type => :integer, :default => 15
   settings_items :profile_cache_in_minutes, :type => :integer, :default => 15
@@ -1,35 +0,0 @@
-class FeaturedProductsBlock < Block
-
-  attr_accessible :product_ids, :groups_of, :speed, :reflect
-
-  settings_items :product_ids, :type => Array, :default => []
-  settings_items :groups_of, :type => :integer, :default => 3
-  settings_items :speed, :type => :integer, :default => 1000
-  settings_items :reflect, :type => :boolean, :default => true
-
-  before_save do |block|
-    if block.owner.kind_of?(Environment) && block.product_ids.blank?
-      total = block.owner.products.count
-      offset = rand([(total - block.groups_of * 3) + 1, 1].max)
-      block.product_ids = block.owner.highlighted_products_with_image.offset(offset).limit(block.groups_of * 3).map(&:id)
-    end
-    block.groups_of = block.groups_of.to_i
-  end
-
-  def self.description
-    _('Featured Products')
-  end
-
-  def self.pretty_name
-    _('Featured Products')
-  end
-
-  def products
-    Product.find(self.product_ids) || []
-  end
-
-  def products_for_selection
-    self.owner.highlighted_products_with_image
-  end
-
-end
@@ -1,71 +0,0 @@
-class Input < ApplicationRecord
-
-  attr_accessible :product, :product_id, :product_category, :product_category_id,
-    :amount_used, :unit_id, :price_per_unit, :relevant_to_price, :is_from_solidarity_economy
-
-  belongs_to :product
-  belongs_to :product_category
-
-  validates_presence_of :product
-  validates_presence_of :product_category
-
-  acts_as_list scope: -> input { where product_id: input.product_id }
-
-  belongs_to :unit
-
-  scope :relevant_to_price, -> { where relevant_to_price: true }
-
-  include FloatHelper
-
-  def price_per_unit=(value)
-    if value.is_a?(String)
-      super(decimal_to_float(value))
-    else
-      super(value)
-    end
-  end
-
-  def amount_used=(value)
-    if value.is_a?(String)
-      super(decimal_to_float(value))
-    else
-      super(value)
-    end
-  end
-
-  def name
-    product_category.name
-  end
-
-  def formatted_value(value)
-    ("%.2f" % self[value]).to_s.gsub('.', product.enterprise.environment.currency_separator) if self[value]
-  end
-
-  def formatted_amount
-    amount = self.amount_used
-    return '' if amount.blank? || amount.zero?
-    ("%.2f" % amount).to_s.gsub('.00', '').gsub('.', product.enterprise.environment.currency_separator)
-  end
-
-  def has_price_details?
-    %w[price_per_unit amount_used].each do |field|
-      return true unless self.send(field).blank?
-    end
-    false
-  end
-
-  def has_all_price_details?
-    %w[price_per_unit unit amount_used].each do |field|
-      return false if self.send(field).blank?
-    end
-    true
-  end
-
-  def cost
-    return 0 if self.amount_used.blank? || self.price_per_unit.blank?
-    self.amount_used * self.price_per_unit
-  end
-
-  alias_method :price, :cost
-
-end
@@ -1,33 +0,0 @@
-class PriceDetail < ApplicationRecord
-
-  attr_accessible :price, :production_cost_id
-
-  belongs_to :product
-  validates_presence_of :product_id
-
-  belongs_to :production_cost
-  # Do not validates_presence_of production_cost. We may have undefined other costs.
-  validates_uniqueness_of :production_cost_id, :scope => :product_id
-
-  def name
-    production_cost.nil? ? _('Other costs') : production_cost.name
-  end
-
-  def price
-    self[:price] || 0
-  end
-
-  include FloatHelper
-  def price=(value)
-    if value.is_a?(String)
-      super(decimal_to_float(value))
-    else
-      super(value)
-    end
-  end
-
-  def formatted_value(value)
-    ("%.2f" % self[value]).to_s.gsub('.', product.enterprise.environment.currency_separator) if self[value]
-  end
-
-end
@@ -1,291 +0,0 @@
-class Product < ApplicationRecord
-
-  SEARCHABLE_FIELDS = {
-    :name => {:label => _('Name'), :weight => 10},
-    :description => {:label => _('Description'), :weight => 1},
-  }
-
-  SEARCH_FILTERS = {
-    :order => %w[more_recent],
-    :display => %w[full map]
-  }
-
-  attr_accessible :name, :product_category, :profile, :profile_id, :enterprise,
-    :highlighted, :price, :image_builder, :description, :available, :qualifiers, :unit_id, :discount, :inputs, :qualifiers_list
-
-  def self.default_search_display
-    'full'
-  end
-
-  belongs_to :profile
-  # backwards compatibility
-  belongs_to :enterprise, :foreign_key => :profile_id, :class_name => 'Profile'
-  alias_method :enterprise=, :profile=
-  alias_method :enterprise, :profile
-
-  has_one :region, :through => :profile
-  validates_presence_of :profile
-
-  belongs_to :product_category
-
-  has_many :inputs, -> { order 'position' }, dependent: :destroy
-  has_many :price_details, :dependent => :destroy
-  has_many :production_costs, :through => :price_details
-
-  has_many :product_qualifiers, :dependent => :destroy
-  has_many :qualifiers, :through => :product_qualifiers
-  has_many :certifiers, :through => :product_qualifiers
-
-  acts_as_having_settings :field => :data
-
-  track_actions :create_product, :after_create, :keep_params => [:name, :url ], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
-  track_actions :update_product, :before_update, :keep_params => [:name, :url], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
-  track_actions :remove_product, :before_destroy, :keep_params => [:name], :if => Proc.new { |a| a.is_trackable? }, :custom_user => :action_tracker_user
-
-  validates_uniqueness_of :name, :scope => :profile_id, :allow_nil => true, :if => :validate_uniqueness_of_column_name?
-
-  validates_presence_of :product_category_id
-  validates_associated :product_category
-
-  validates_numericality_of :price, :allow_nil => true
-  validates_numericality_of :discount, :allow_nil => true
-
-  scope :more_recent, -> { order 'created_at DESC' }
-
-  scope :from_category, -> category {
-    joins(:product_category).where('categories.path LIKE ?', "%#{category.slug}%") if category
-  }
-
-  scope :visible_for_person, lambda { |person|
-    joins('INNER JOIN "profiles" enterprises ON enterprises."id" = "products"."profile_id"')
-    .joins('LEFT JOIN "role_assignments" ON ("role_assignments"."resource_id" = enterprises."id"
-          AND "role_assignments"."resource_type" = \'Profile\') OR (
-          "role_assignments"."resource_id" = enterprises."environment_id" AND
-          "role_assignments"."resource_type" = \'Environment\' )')
-    .joins('LEFT JOIN "roles" ON "role_assignments"."role_id" = "roles"."id"')
-    .where(
-      ['( (roles.key = ? OR roles.key = ?) AND role_assignments.accessor_type = \'Profile\' AND role_assignments.accessor_id = ? )
-        OR
-        ( ( ( role_assignments.accessor_type = \'Profile\' AND
-              role_assignments.accessor_id = ? ) OR
-            ( enterprises.public_profile = ? AND enterprises.enabled = ? ) ) AND
-          ( enterprises.visible = ? ) )',
-      'profile_admin', 'environment_administrator', person.id, person.id,
-      true, true, true]
-    ).uniq
-  }
-
-  scope :recent, -> limit=nil { order('id DESC').limit(limit) }
-
-  after_update :save_image
-
-  def lat
-    self.profile.lat
-  end
-  def lng
-    self.profile.lng
-  end
-
-  xss_terminate :only => [ :name ], :on => 'validation'
-  xss_terminate :only => [ :description ], :with => 'white_list', :on => 'validation'
-
-  belongs_to :unit
-
-  include FloatHelper
-
-  include WhiteListFilter
-  filter_iframes :description
-
-  def iframe_whitelist
-    self.profile && self.profile.environment && self.profile.environment.trusted_sites_for_iframe
-  end
-
-  def name
-    self[:name].blank? ? category_name : self[:name]
-  end
-
-  def name=(value)
-    if (value == category_name)
-      self[:name] = nil
-    else
-      self[:name] = value
-    end
-  end
-
-  def name_is_blank?
-    self[:name].blank?
-  end
-
-  def default_image(size='thumb')
-    image ? image.public_filename(size) : '/images/icons-app/product-default-pic-%s.png' % size
-  end
-
-  acts_as_having_image
-
-  def save_image
-    image.save if image
-  end
-
-  def category_name
-    product_category ? product_category.name : _('Uncategorized product')
-  end
-
-  def url
-    self.profile.public_profile_url.merge(:controller => 'manage_products', :action => 'show', :id => id)
-  end
-
-  def public?
-    self.profile.public?
-  end
-
-  def formatted_value(method)
-    value = self[method] || self.send(method)
-    ("%.2f" % value).to_s.gsub('.', self.profile.environment.currency_separator) if value
-  end
-
-  def price_with_discount
-    discount ? (price - discount) : price
-  end
-
-  def price=(value)
-    if value.is_a?(String)
-      super(decimal_to_float(value))
-    else
-      super(value)
-    end
-  end
-
-  def discount=(value)
-    if value.is_a?(String)
-      super(decimal_to_float(value))
-    else
-      super(value)
-    end
-  end
-
-  def inputs_prices?
-    return false if self.inputs.count <= 0
-    self.inputs.each do |input|
-      return false if input.has_price_details? == false
-    end
-    true
-  end
-
-  def any_inputs_details?
-    return false if self.inputs.count <= 0
-    self.inputs.each do |input|
-      return true if input.has_all_price_details? == true
-    end
-    false
-  end
-
-  def has_basic_info?
-    %w[unit price discount].each do |field|
-      return true if !self.send(field).blank?
-    end
-    false
-  end
-
-  def qualifiers_list=(qualifiers)
-    self.product_qualifiers.destroy_all
-    qualifiers.each do |qualifier_id, certifier_id|
-      if qualifier_id != 'nil'
-        product_qualifier = ProductQualifier.new
-        product_qualifier.product = self
-        product_qualifier.qualifier_id = qualifier_id
-        product_qualifier.certifier_id = certifier_id
-        product_qualifier.save!
-      end
-    end
-  end
-
-  def order_inputs!(order = [])
-    order.each_with_index do |input_id, array_index|
-      input = self.inputs.find(input_id)
-      input.position = array_index + 1
-      input.save!
-    end
-  end
-
-  def name_with_unit
-    unit.blank? ? name : "#{name} - #{unit.name.downcase}"
-  end
-
-  def display_supplier_on_search?
-    true
-  end
-
-  def inputs_cost
-    return 0 if inputs.empty?
-    inputs.relevant_to_price.map(&:cost).inject { |sum,price| sum + price }
-  end
-
-  def total_production_cost
-    return inputs_cost if price_details.empty?
-    inputs_cost + price_details.map(&:price).inject(0){ |sum,price| sum + price }
-  end
-
-  def price_described?
-    return false if price.blank? or price == 0
-    (price - total_production_cost.to_f).zero?
-  end
-
-  def update_price_details(new_price_details)
-    price_details.destroy_all
-    new_price_details.each do |detail|
-      price_details.create(detail)
-    end
-    reload # to remove temporary duplicated price_details
-    price_details
-  end
-
-  def price_description_percentage
-    return 0 if price.blank? || price.zero?
-    total_production_cost * 100 / price
-  end
-
-  def available_production_costs
-    self.profile.environment.production_costs + self.profile.production_costs
-  end
-
-  include Rails.application.routes.url_helpers
-  def price_composition_bar_display_url
-    url_for({:host => self.profile.default_hostname, :controller => 'manage_products', :action => 'display_price_composition_bar', :profile => self.profile.identifier, :id => self.id }.merge(Noosfero.url_options))
-  end
-
-  def inputs_cost_update_url
-    url_for({:host => self.profile.default_hostname, :controller => 'manage_products', :action => 'display_inputs_cost', :profile => self.profile.identifier, :id => self.id }.merge(Noosfero.url_options))
-  end
-
-  def percentage_from_solidarity_economy
-    se_i = t_i = 0
-    self.inputs.each{ |i| t_i += 1; se_i += 1 if i.is_from_solidarity_economy }
-    t_i = 1 if t_i == 0 # avoid division by 0
-    p = case (se_i.to_f/t_i)*100
-        when 0 then [0, '']
-        when 0..24.999 then [0, _("0%")];
-        when 25..49.999 then [25, _("25%")];
-        when 50..74.999 then [50, _("50%")];
-        when 75..99.999 then [75, _("75%")];
-        when 100 then [100, _("100%")];
-        end
-  end
-
-  delegate :enabled, :region, :region_id, :environment, :environment_id, :to => :profile, allow_nil: true
-
-  protected
-
-  def validate_uniqueness_of_column_name?
-    true
-  end
-
-  def is_trackable?
-    # shopping_cart create products without profile
-    self.profile.present?
-  end
-
-  def action_tracker_user
-    self.profile
-  end
-
-end
@@ -1,30 +0,0 @@
-class ProductCategoriesBlock < Block
-
-  def self.description
-    _('Product category menu')
-  end
-
-  # the title of the block. Probably will be overriden in subclasses.
-  def default_title
-    _('Catalog')
-  end
-
-  def help
-    _('Helps to filter the products catalog.')
-  end
-
-  DISPLAY_OPTIONS = DISPLAY_OPTIONS.merge('catalog_only' => _('Only on the catalog'))
-
-  def display
-    settings[:display].nil? ? 'catalog_only' : super
-  end
-
-  def display_catalog_only(context)
-    context[:params][:controller] == 'catalog'
-  end
-
-  def visible?(*args)
-    box.environment.enabled?('products_for_enterprises') ? super(*args) : false
-  end
-
-end
@@ -1,29 +0,0 @@
-class ProductCategory < Category
-  # FIXME: do not allow category with products or inputs to be destroyed
-  has_many :products
-  has_many :inputs
-
-  attr_accessible :name, :parent, :environment
-
-  scope :unique, -> { select 'DISTINCT ON (path) categories.*' }
-  scope :by_enterprise, -> enterprise {
-    distinct.joins(:products).
-    where('products.profile_id = ?', enterprise.id)
-  }
-  scope :by_environment, -> environment {
-    where 'environment_id = ?', environment.id
-  }
-
-  scope :unique_by_level, lambda { |level| {
-    :select => "DISTINCT ON (filtered_category) split_part(path, '/', #{level.to_i}) AS filtered_category, categories.*"
-  }}
-
-  def all_products
-    Product.where(product_category_id: (all_children << self).map(&:id))
-  end
-
-  def self.menu_categories(top_category, env)
-    top_category ? top_category.children : top_level_for(env).select{|c|c.kind_of?(ProductCategory)}
-  end
-
-end
@@ -1,8 +0,0 @@
-class ProductQualifier < ApplicationRecord
-
-  attr_accessible :qualifier, :product, :certifier
-
-  belongs_to :qualifier
-  belongs_to :product
-  belongs_to :certifier
-end
@@ -1,11 +0,0 @@
-class ProductionCost < ApplicationRecord
-
-  attr_accessible :name, :owner
-
-  belongs_to :owner, :polymorphic => true
-  validates_presence_of :owner
-  validates_presence_of :name
-  validates_length_of :name, :maximum => 30, :allow_blank => true
-  validates_uniqueness_of :name, :scope => [:owner_id, :owner_type]
-
-end
@@ -1,38 +0,0 @@
-class ProductsBlock < Block
-
-  attr_accessible :product_ids
-
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include ActionView::Helpers
-  include Rails.application.routes.url_helpers
-
-  def self.description
-    _('Products')
-  end
-
-  def default_title
-    _('Products')
-  end
-
-  def help
-    _('This block presents a list of your products.')
-  end
-
-  settings_items :product_ids, type: Array
-  def product_ids=(array)
-    self.settings[:product_ids] = array
-    if self.settings[:product_ids]
-      self.settings[:product_ids] = self.settings[:product_ids].map(&:to_i)
-    end
-  end
-
-  def products(reload = false)
-    if product_ids.blank?
-      owner.products.order('RANDOM()').limit([4,owner.products.count].min)
-    else
-      owner.products.where(:id => product_ids)
-    end.compact
-  end
-
-end
@@ -812,7 +812,7 @@ private :generate_url, :url_options
   end
  
   def accept_category?(cat)
-    forbidden = [ ProductCategory, Region ]
+    forbidden = [ Region ]
     !forbidden.include?(cat.class)
   end
  
@@ -1,30 +0,0 @@
-class Qualifier < ApplicationRecord
-
-  attr_accessible :name, :environment
-
-  SEARCHABLE_FIELDS = {
-    :name => {:label => _('Name'), :weight => 1},
-  }
-
-  belongs_to :environment
-
-  has_many :qualifier_certifiers, :dependent => :destroy
-  has_many :certifiers, :through => :qualifier_certifiers
-
-  def used_certs
-    Certifier.joins('INNER JOIN product_qualifiers' +
-                    ' ON certifiers.id = product_qualifiers.certifier_id')
-             .where(product_qualifiers: {qualifier_id: self.id})
-  end
-
-  has_many :product_qualifiers, :dependent => :destroy
-  has_many :products, :through => :product_qualifiers, :source => :product
-
-  validates_presence_of :environment_id
-  validates_presence_of :name
-
-  def <=>(b)
-    self.name.downcase.transliterate <=> b.name.downcase.transliterate
-  end
-
-end
@@ -1,6 +0,0 @@
-class QualifierCertifier < ApplicationRecord
-  belongs_to :qualifier
-  belongs_to :certifier
-
-  validates_presence_of :qualifier
-end
@@ -1,25 +0,0 @@
-class SellersSearchBlock < Block
-
-  attr_accessible :title
-
-  def self.description
-    _('Search for enterprises and products')
-  end
-
-  def self.short_description
-    _('Products/Enterprises search')
-  end
-
-  def self.pretty_name
-    _('Sellers Search')
-  end
-
-  def default_title
-    _('Search for sellers')
-  end
-
-  def help
-    _('This block presents a search engine for products.')
-  end
-
-end
@@ -1,23 +0,0 @@
-class Unit < ApplicationRecord
-
-  acts_as_list scope: -> unit { where environment_id: unit.environment_id }
-
-  attr_accessible :name, :singular, :plural, :environment
-
-  validates_presence_of :singular
-  validates_presence_of :plural
-
-  belongs_to :environment
-
-  validates_presence_of :environment_id
-  validates_presence_of :singular
-  validates_presence_of :plural
-
-  def name
-    self.singular
-  end
-  def name=(value)
-    self.singular = value
-  end
-
-end
@@ -1 +0,0 @@
-<%= link_to(_('View all products'), block.owner.public_profile_url.merge(:controller => 'catalog', :action => 'index')) %>
@@ -1,19 +0,0 @@
-<%
-  if @categories.nil? or @categories.length == 0
-    categories = ProductCategory.on_level(nil).order(:name)
-  else
-    categories = @categories
-  end
-%>
-
-<%= link_to _('Catalog start'), block.owner.catalog_url, :class=>'catalog-home-link' %>
-<ul class="catalog-categories-list">
-  <% categories.each do |category| %>
-    <%= category_with_sub_list(category) %>
-  <% end %>
-</ul>
-<% if @categories and @categories.length == 0 %>
-  <div class="catalog-categories-notice">
-    <%= _('There are no sub-categories for %s') % @category.name %>
-  </div>
-<% end %>
@@ -1,9 +0,0 @@
-<%= block_title(block.title, block.subtitle) %>
-
-<ul>
-  <% block.products.each do |product| %>
-    <li class='product'>
-      <%= link_to(product.name, product.url, :style => 'background-image:url(%s)' % product.default_image('minor')) %>
-    </li>
-  <% end %>
-</ul>
@@ -16,9 +16,6 @@
 <ul class="profile-info-data">
   <li><%= link_to _('Homepage'), block.owner.url, :class => 'url' %></li>
   <li><%= link_to _('View profile'), block.owner.public_profile_url %></li>
-  <% if block.owner.enterprise? && block.owner.environment.enabled?('products_for_enterprises') %>
-    <li><%= link_to(_('Products/Services'), :controller => 'catalog', :profile => block.owner.identifier) %></li>
-  <% end %>
   <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
     <li><%= link_to _('Control panel'), block.owner.admin_url %></li>
   <% end %>
@@ -1,24 +0,0 @@
-<h3><%= block.title %></h3>
-
-<%= form_tag({:controller => 'search', :action => 'assets'}, {:method => 'get'}) do %>
-
-  <div class="search-in-opt"><%= _('Search in:') %>
-    <dir>
-      <%= labelled_radio_button _('Enterprises'), 'asset', 'enterprises', true %><br />
-      <%= labelled_radio_button _('Products'), 'asset', 'products', false %>
-    </dir>
-  </div>
-
-  <div class="formfield search-from-opt">
-    <%= select_city(true) %>
-  </div>
-
-  <div class="formfield search-distance-opt">
-    <%= labelled_select(_('Distance:'), 'radius', :first, :last, nil, [15, 30, 50, 100, 150, 200, 300, 400, 500, 1000].map{|n|[n, n.to_s + 'km']}) %>
-  </div>
-
-  <div class="button-bar">
-    <%= submit_button :search, _('Search') %>
-  </div>
-
-<% end %>
@@ -1,8 +0,0 @@
-<strong><%= _('Featured Products') %></strong>
-<div id='edit-featured-products-block'>
-  <p><%= label_tag _('Choose some products') %></p>
-  <p><%= select_tag 'block[product_ids][]', options_for_select(@block.products_for_selection.map{|p| [p.name, p.id.to_s]}, @block.product_ids), :multiple => true %></p>
-  <p><%= labelled_form_field check_box(:block, :reflect) + _('Reflect products'), '' %></p>
-  <p><%= labelled_form_field(_('Transition speed (in seconds)'), select('block', 'speed', (1..10).to_a.collect{|i| [i, i*1000] })) %>
-  <p><%= labelled_form_field(_('In groups of'), select('block', 'groups_of', (1..10).to_a)) %>
-</div>
@@ -1,13 +0,0 @@
-<strong></strong>
-
-<p>
-<strong>
-<%= _('Select the products that must be shown.') %>
-</strong>
-</p>
-
-<% for product in @block.owner.products %>
-  <%= check_box_tag("block[product_ids][]", product.id, (!@block.product_ids.blank? && @block.product_ids.include?(product.id)), :id => "block_product_ids_#{product.id}" ) %>
-  <label for="block_product_ids_<%= product.id %>"><%= product.name %></label>
-  <br/>
-<% end %>
@@ -6,7 +6,7 @@
     <%= labelled_form_field(_('Custom title for this block: '), text_field(:block, :title, :maxlength => 20)) %>
     <%= labelled_form_field(_('Custom subtitle for this block: '), text_field(:block, :subtitle)) %>
  
-    <%= render :partial => partial_for_class(@block.class) %>
+    <%= render_partial_for_class @block.class %>
  
     <div class="display">
       <%= labelled_form_field _('Display this block:'),
@@ -1,130 +0,0 @@
-<% extra_content = [] %>
-<% extra_content_list = [] %>
-
-<div id="product-catalog">
-<% if !user.nil? && ( user.is_admin?(profile.environment) || user.is_admin?(profile) ) %>
-  <div class="product-catalog-ctrl">
-    <%= button :product, _('Manage Products/Services'), :controller => 'manage_products' %>
-  </div>
-<% end %>
-
-<h1><%= _('Products/Services') %></h1>
-
-<%= breadcrumb(@category) if params[:level] %>
-
-<ul id="product-list">
-  <% @products.each do |product| %>
-    <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_exec(&content) } %>
-    <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_exec(&content) } %>
-
-    <% status = [] %>
-    <% status << 'not-available' if !product.available %>
-    <% status << 'highlighted' if product.highlighted %>
-
-    <li id="product-<%= product.id %>" class="product <%= status.join(' ') %>">
-      <ul>
-        <li class="product-image-link">
-          <% if product.highlighted? %>
-            <%= link_to image_tag(themed_path('/images/star.png'), :class => 'star', :alt => _('Highlighted product')), product_path(product) %>
-          <% end %>
-          <% if product.image %>
-            <div class="zoomable-image">
-              <%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
-              <%= link_to content_tag(:span, _('Zoom in')), product.default_image(:big).gsub('_big',''), :class => 'zoomify-image' %>
-            </div>
-          <% else %>
-            <div class="no-image"><%= _('No image') %></div>
-          <% end %>
-          <div class="catalog-item-extras"><%= safe_join(extra_content, "\n") %></div>
-        </li>
-
-        <li class="product-link"><%= link_to_product product %></li>
-
-        <li class="product-price-line">
-          <% unless product.discount.blank? or product.discount == 0 %>
-            <span class="product-discount">
-              <span><%= _('from ') + price_span(product.price) %></span>
-              <span class="product-discount-by"><%= _('by ') %></span>
-            </span>
-          <% end %>
-          <% unless product.price.blank? or product.price == 0 %>
-            <span class="product-price">
-              <%= price_span product.price_with_discount, :class => "product-price #{'with-discount' unless product.discount}" %>
-              <span class="product-unit"><%= _(' / ') + (product.unit ? product.unit.singular : _('unit')) %></span>
-            </span>
-          <% end %>
-          <div style="clear: both"></div>
-        </li>
-
-        <% if product.description %>
-          <li class="product-description expand-box">
-            <span class="product-description-button"><%= _('description') %></span>
-            <div class="float-box">
-              <div class="arrow"></div>
-              <div class="content"><%= product.description %></div>
-            </div>
-          </li>
-        <% end %>
-
-        <% if product.price_described? %>
-          <li class="product-price-composition expand-box">
-            <span class="product-price-composition-button"><%= _('price composition') %></span>
-            <div class="float-box">
-              <div class="arrow"></div>
-              <div class="content">
-                <% product.inputs.relevant_to_price.each do |i| %>
-                  <div class="search-product-input-dots-to-price">
-                    <div class="search-product-input-name"><%= i.product_category.name %></div>
-                    <%= price_span i.cost, :class => 'search-product-input-price' %>
-                  </div>
-                <% end %>
-                <% product.price_details.each do |i| %>
-                  <div class="search-product-input-dots-to-price">
-                    <div class="search-product-input-name"><%= i.name %></div>
-                    <%= price_span i.price, :class => 'search-product-input-price' %>
-                  </div>
-                <% end %>
-              </div>
-            </div>
-          </li>
-        <% end %>
-
-        <% if product.inputs.count > 0 %>
-          <li class="product-inputs expand-box">
-            <span id="inputs-button"><%= _('inputs and raw materials') %></span>
-            <div class="float-box">
-              <div class="arrow"></div>
-              <div class="content">
-                <% product.inputs.each do |i| %>
-                  <div>
-                    <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
-                    <%= i.product_category.name %>
-                  </div>
-                <% end %>
-              </div>
-            </div>
-          </li>
-        <% end %>
-
-        <% unless product.qualifiers.blank? %>
-          <li class="product-qualifiers">
-            <span><%= _('qualifiers') if product.product_qualifiers.count > 0 %></span>
-            <div><%= render :partial => 'shared/product/qualifiers', :locals => {:product => product} %></div>
-        <% end %>
-
-        <% extra_content_list.map do |content| %>
-          <li class="catalog-list-item-extras"><%= content %></li>
-        <% end %>
-
-        <li class="product-unavailable"><%= _('product unavailable') unless product.available %></li>
-      </ul>
-    </li>
-  <% end %>
-</ul><!-- end id="product-list" -->
-
-<%= pagination_links @products, :params => {:controller => :catalog, :action => :index, :profile => profile.identifier} %>
-
-<%= add_zoom_to_images %>
-
-<br style="clear:both"/>
-</div><!-- end id="product-catalog" -->
@@ -7,15 +7,6 @@
   <%= link_to _('New category'), :action => 'new' %>
 </div>
  
-<h1><%= _('Product Categories') %></h1>
-<ul class='tree'>
-  <%= render :partial => 'category', :collection => @product_categories %>
-</ul>
-
-<div>
-  <%= link_to _('New category'), :action => 'new', :type => 'ProductCategory' %>
-</div>
-
 <h1><%= _('Regions') %></h1>
 <ul class='tree'>
   <%= render :partial => 'category', :collection => @regions %>
@@ -1,25 +0,0 @@
-<div id='request_result_message' style='display: none'></div>
-
-<%= form_for(:input,
-           :url => {:action => 'add_input', :id => @product},
-           :html => {:method => 'post', :id => 'input-category-form'}
-           ) do |f| %>
-
-  <h3><%= _('Choose an input or raw material to this product:') %><span class='loading-area'></span></h3>
-
-  <%= categories_container(select_for_new_category(@categories, @level)) %>
-
-  <div id='categories_selection_actionbar'>
-    <span id='save_and_continue_wrapper'>
-      <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-      <span class='tooltip' id='save_and_continue_disabled_tooltip'>
-         <%= ui_icon('ui-icon-alert') %>
-         <%= _('This category does not allow registration of products, select a more specific category') %>
-      </span>
-    </span>
-    <%= button :cancel, _('Cancel'), '#', :class => 'cancel-add-input' %>
-  </div>
-
-<% end %>
-
-<%= javascript_tag "add_input_stuff()" %>
@@ -1,8 +0,0 @@
-<%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
-
-<%= javascript_include_tag '/javascripts/product_categories.js' %>
-<%= javascript_tag do %>
-  product_categories.autocomplete.search_url = <%= url_for(:controller => :manage_products, :action => :search_categories).to_json %>
-  product_categories.autocomplete.select_url = <%= url_for(:controller => :manage_products, :action => :show_category_tree).to_json %>
-  product_categories.autocomplete.load('#product_category_id')
-<% end %>
@@ -1,10 +0,0 @@
-<%= select_for_categories(categories, level) %>
-
-<%= javascript_tag do %>
-  jQuery(document).ready(function() {
-    jQuery('#categories_container_wrapper').scrollTo('100%', 1000)
-    jQuery('#selected_category_id').val(<%= @category.id rescue nil %>)
-    jQuery('#hierarchy_navigation').html(<%= hierarchy_category_navigation(@category, :make_links => true).to_json %>)
-    toggleDisabled(<%= (!!(@category && @category.accept_products?)).to_json %>, jQuery('#save_and_continue'))
-  });
-<% end %>
@@ -1,4 +0,0 @@
-<%= select_certifiers(@qualifier) + remove_qualifier_button %>
-<%= javascript_tag do %>
-  jQuery('#product-qualifiers-list *').removeClass('small-loading')
-<% end %>
@@ -1,4 +0,0 @@
-<div id='display-product-category'>
-  <p class='hierarchy-category'></p>
-  <%= edit_link( _('Change category'), { :action => 'edit_category', :id => @product.id}, :id => 'link-edit-product-category') %>
-</div>
@@ -1,15 +0,0 @@
-<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
-<% if !@product.description.blank? %>
-  <%= @product.description %>
-  <%= edit_product_button_to_remote(@product, 'description', _('Edit description'), :title => _('Edit the description of your product and give consumers more information about what you are advertising')) %>
-<% else %>
-  <%= edit_product_ui_button_to_remote(
-    @product,
-    'description',
-    _('Add some description to your product'),
-    'data-primary-icon' => 'ui-icon-pencil',
-    'data-secondary-icon' => 'ui-icon-triangle-1-s',
-    :title => _('Add a description to your product and give consumers more information about what you are advertising')
-  ) %>
-  <%= javascript_tag("render_jquery_ui_buttons('edit-product-remote-button-ui-description')") %>
-<% end%>
@@ -1,11 +0,0 @@
-<div id='display-product-image'>
-  <%= image_tag (@product.reload.default_image('big')), :class => 'product-pic' %>
-</div>
-
-<% if @product.image %>
-  <%= link_to content_tag(:span, _('Zoom in')), @product.image.public_filename,
-    :class => 'zoomify-image' %>
-<% end %>
-<%= add_zoom_to_images %>
-
-<%= edit_product_link_to_remote(@product, 'image', _('Change image')) %>
@@ -1,17 +0,0 @@
-<div id='display-product-info'>
-  <%= display_value(@product) %>
-  <%= display_availability(@product) %>
-  <%= display_qualifiers(@product) %>
-
-  <% if @product.has_basic_info? %>
-    <%= edit_product_button_to_remote(@product, 'info', _('Edit basic information'), :title => _('Click here to edit price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers')) %>
-  <% else %>
-    <%= edit_product_ui_button_to_remote(@product, 'info', _('Add price and other basic information'),
-        :title => _('Click here to add price, discount and qualifiers/certifiers to make your product more attractive and detailed for the consumers'),
-        'data-primary-icon' => 'ui-icon-pencil',
-        'data-secondary-icon' => 'ui-icon-triangle-1-s')
-    %>
-    <%= javascript_tag("render_jquery_ui_buttons('edit-product-remote-button-ui-info')") %>
-  <% end%>
-
-</div>
@@ -1,21 +0,0 @@
-  <div class='input-informations input-form-closed'>
-    <div class='input-name'> <%= input.name %> <%= input_icon(input) %> </div>
-    <div class='input-details'>
-      <% button_bar do %>
-        <% if input.has_price_details? %>
-          <%= edit_button(:edit, _('Edit'), {:action => 'edit_input', :id => input}, :class => 'edit-input', :id => "edit-input-#{input.id}") %>
-        <% end %>
-        <%= edit_button(:remove, _('Remove'), {action: 'remove_input', id: input}, data: {confirm: _('Are you sure that you want to remove this input or raw material?')}, class: 'remove-input', id: "remove-input-#{input.id}") %>
-      <% end %>
-      <% if input.has_price_details? %>
-        <%= display_unit(input) %>
-      <% else %>
-        <%= edit_link(_('Click here to add price and the amount used'), {:action => 'edit_input', :id => input}, :class => 'add-input-details', :id => "add-input-#{input.id}-details") %>
-      <% end %>
-    </div>
-    <div id='input-<%= input.id %>-form' class='input-details-form'> </div>
-  </div>
-
-  <% if user && user.has_permission?('manage_products', profile) %>
-    <%= javascript_tag "input_javascript_stuff(#{input.id})" %>
-  <% end %>
@@ -1,33 +0,0 @@
-<div id='new-product-input'></div>
-
-<div id='display-add-input-button'>
-  <% if @product.inputs.empty? %>
-    <%= edit_ui_button(
-      _('Add the inputs or raw material used by this product'),
-      {:action => 'add_input', :id => @product.id},
-      :id => 'add-input-button',
-      'data-primary-icon' => 'ui-icon-pencil',
-      'data-secondary-icon' => 'ui-icon-triangle-1-s',
-      :title => _('Add inputs or raw materials used by this product and give more transparency to consumers about your enterprise')
-    ) %>
-    <%= javascript_tag("render_jquery_ui_buttons('add-input-button')") %>
-  <% else %>
-    <%= edit_button(:add, _('Add new input or raw material'), {:action => 'add_input', :id => @product.id}, :id => 'add-input-button', :title => _('Add new input or raw material used by this product and give more transparency to consumers about your enterprise')) %>
-    <%= content_tag('span', _('Drag the input with the mouse to change the order'), :class => 'hint', :style => 'display: none') %>
-  <% end %>
-  <span class='loading-area'></span>
-</div>
-
-<div id='display-product-inputs'>
-  <ul class='input-list'>
-    <%= render :partial => 'manage_products/input', :collection => @inputs %>
-  </ul>
-  <%= edit_link(_('Order inputs'), {:action => 'order_inputs', :id => @product.id}, :class => "order-inputs", :style => 'display:none') %>
-</div>
-
-<% if user && user.has_permission?('manage_products', profile) %>
-  <% if @product.inputs.size > 1 %>
-    <%= javascript_tag "input_javascript_ordering_stuff()" %>
-  <% end %>
-  <%= javascript_tag "display_input_stuff()" %>
-<% end %>
@@ -1,13 +0,0 @@
-<div id='display-product-name'>
-  <h2><%= @product.name_with_unit %></h2>
-  <%= edit_product_link_to_remote(@product, 'name', _('Edit name and unit'), :title => _('Click here to edit the name of your product and the unit')) %>
-</div>
-<%= javascript_tag do %>
-  jQuery('#display-product-category .hierarchy-category').first().html('<%=
-    escape_javascript(hierarchy_category_navigation(
-      @product.product_category,
-      :make_links => false,
-      :hide_current_category => @product.name_is_blank?)
-    )
-  %>')
-<% end %>
@@ -1,18 +0,0 @@
-<div id='display-manage-price-details'></div>
-
-<div id='display-price-details'>
-  <ul class='price-details-list'>
-    <li>
-      <div class='price-detail-name'><%= _('Inputs:') %></div>
-      <div class='price-detail-price inputs-cost'>
-        <span><%= float_to_currency(@product.inputs_cost) %></span>
-      </div>
-    </li>
-    <% @product.price_details.each do |price_detail| %>
-      <li>
-        <div class='price-detail-name'><%= "%s:" % price_detail.name %></div>
-        <div class='price-detail-price'><%= float_to_currency(price_detail.price) %></div>
-      </li>
-    <% end %>
-  </ul>
-</div>
@@ -1,14 +0,0 @@
-<%= render :file => 'shared/tiny_mce', :locals => {:mode => 'simple'} %>
-<%= remote_form_for(@product,
-                   :loading => "small_loading('product-description-form')",
-                   :update => 'product-description',
-                   :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'description'},
-                   :html => {:id => 'product-description-form', :method => 'post'}) do |f| %>
-
-  <%= labelled_form_field(_('Description:'), f.text_area(:description, :rows => 15, :style => 'width: 90%;', :class => 'mceEditor')) %>
-  <% button_bar do %>
-    <%= submit_button :save, _('Save') %>
-    <%= cancel_edit_product_link(@product, 'description') %>
-  <% end %>
-
-<% end %>
@@ -1,26 +0,0 @@
-<div id='display-product-image'>
-  <%= image_tag (@product.reload.default_image('thumb')), :class => 'product-pic' %>
-</div>
-
-<%= form_for(:product, :url => { :controller => 'manage_products', :action => 'edit', :id => @product, :field => 'image' }, :html => { :method => 'post', :id => 'uploadForm', :multipart => true}) do |f| %>
-  <%= f.fields_for :image_builder, @product.image do |i| %>
-    <%= i.file_field( :uploaded_data, { :size => 10 } ) %>
-    <p><%= _("Max size: %s (.jpg, .gif, .png)")% Image.max_size.to_humanreadable %></p>
-  <% end %>
-
-  <%= submit_button 'save', _('Save') %>
-  <%= cancel_edit_product_link(@product, 'image') %>
-<% end %>
-
-<script type="text/javascript">
-  jQuery("#uploadForm").ajaxForm({
-    beforeSubmit: function(a,f,o) {
-      o.loading = small_loading("uploadForm");
-    },
-    target: '#product-image'
-  });
-</script>
-
-<% if errors %>
-  <%= render_dialog_error_messages 'product' %>
-<% end %>
@@ -1,63 +0,0 @@
-<% if errors %>
-  <%= render_dialog_error_messages 'product' %>
-<% end %>
-
-<%= remote_form_for(@product,
-                   :loading => "small_loading('product-info-form')",
-                   :update => 'product-info',
-                   :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'info'},
-                   :html => {:id => 'product-info-form', :method => 'post'}) do |f| %>
-
-  <table>
-    <tr>
-      <td><%= f.label :price, _('Price (%s)') % environment.currency_unit, :class => 'formlabel' %></td>
-      <td class='formfield'><%= f.text_field(:price, :value => @product.formatted_value(:price), :class => 'numbers-only') %></td>
-    </tr>
-    <tr>
-      <td><%= f.label :discount, _('Discount (%s)') % environment.currency_unit, :class => 'formlabel' %></td>
-      <td class='formfield'><%= f.text_field(:discount, :value => @product.formatted_value(:discount), :class => 'numbers-only', :title => _('If your product is on sale, fill this field with the discount value')) %></td>
-    </tr>
-    <tr>
-      <td class='formlabel'><%= _('Available') %></td>
-      <td class='formfield'><%= labelled_radio_button( _('Yes'), 'product[available]', true, @product.available, :id => 'product_available') + labelled_radio_button( _('No'), 'product[available]', false, !@product.available) %></td>
-    </tr>
-    <tr>
-      <td><%= f.label :highlighted, _('Highlight this product?'), :class => 'formlabel' %></td>
-      <td class='formfield'><%= f.check_box(:highlighted) %></td>
-    </tr>
-  </table>
-
-  <% if !environment.qualifiers.empty? %>
-    <table id='product-qualifiers-list'>
-      <tr>
-        <th><%= _('Qualifier') %></th>
-        <th><%= _('Certifier') %></th>
-      </tr>
-      <% @product.qualifiers.each_with_index do |qualifier, index| %>
-      <tr>
-        <td>
-          <%= select_qualifiers(@product, qualifier.id) %>
-        </td>
-        <td id='certifier-area-<%= index %>'>
-          <%= select_certifiers(qualifier, @product) + remove_qualifier_button %>
-        </td>
-      </tr>
-      <% end %>
-    </table>
-    <%= button_to_function(
-      :add,
-      _('Add new qualifier'),
-      "new_qualifier_row('#product-qualifiers-list', '#{escape_javascript(CGI::escape_html(select_qualifiers(@product)))}', '#{escape_javascript(CGI::escape_html(remove_qualifier_button))}')"
-    ) %>
-    <%= hidden_field_tag "product[qualifiers_list][nil]" %>
-  <% end %>
-
-  <%= hidden_field_tag 'info-bar-update-url', @product.price_composition_bar_display_url, :class => 'bar-update-url' %>
-
-  <% button_bar do %>
-    <%= submit_button :save, _('Save') %>
-    <%= cancel_edit_product_link(@product, 'info') %>
-  <% end %>
-<% end %>
-
-<%= render :partial => 'shared/numbers_only_javascript' %>
@@ -1,43 +0,0 @@
-<%= form_for(:input, :url => {:controller => 'manage_products', :action => 'edit_input', :id => @input},
-            :html => {:method => 'post', :id => "edit-input-#{ @input.id }-form"}) do |f| %>
-
-  <%= hidden_field_tag 'input-bar-update-url', @input.product.price_composition_bar_display_url, :class => 'bar-update-url' %>
-  <%= hidden_field_tag 'inputs-cost-update-url', @input.product.inputs_cost_update_url %>
-
-  <table>
-    <tr>
-      <td><%= f.label :amount_used, label_amount_used(@input), :class => 'formlabel' %></td>
-      <td class='formfield'><%= f.text_field(:amount_used, :value => @input.formatted_amount, :class => 'numbers-only amount-used') + select_unit(@input) %></td>
-    </tr>
-    <tr>
-      <td><%= f.label :price_per_unit, _('Price %s (%s)') % [display_price_by(@input.unit), environment.currency_unit], :class => 'formlabel' %></td>
-      <td class='formfield'><%= f.text_field(:price_per_unit, :value => @input.formatted_value(:price_per_unit), :class => 'numbers-only price-per-unit') %></td>
-    </tr>
-    <tr>
-      <td class='formlabel'><%= _("This input or raw material inpact on the final price of the product?") %></td>
-      <td>
-        <%= radio_button :input, 'relevant_to_price', true %>
-        <label for="input_relevant_to_price"><%= _('Yes') %></label>
-        <%= radio_button :input, 'relevant_to_price', false %>
-        <label for="input_relevant_to_price"><%= _('No') %></label>
-      </td>
-    </tr>
-    <tr>
-      <td class='formlabel'><%= _('Is it from solidarity economy?') %></td>
-      <td>
-        <%= radio_button :input, 'is_from_solidarity_economy', true %>
-        <label for="input_is_from_solidarity_economy"><%= _('Yes') %></label>
-        <%= radio_button :input, 'is_from_solidarity_economy', false %>
-        <label for="input_is_from_solidarity_economy"><%= _('No') %></label>
-      </td>
-    </tr>
-    <tr>
-      <td colspan='2'>
-        <%= submit_button :save, _('Save'), :title => _('Save changes of this input or raw material') %>
-        <%= button :cancel, _('Cancel'), '#', :class => 'cancel-edit-input', :id => "cancel-edit-input-#{@input.id}", :title => _('Cancel changes of this input or raw material') %>
-      <td>
-    <tr>
-  </table>
-<% end %>
-
-<%= javascript_tag "edit_input_stuff(#{@input.id}, '#{environment.currency_separator}')" %>
@@ -1,21 +0,0 @@
-<%= remote_form_for(@product,
-                   :loading => "small_loading('product-name-form')",
-                   :update => 'product-name',
-                   :url => {:controller => 'manage_products', :action => 'edit', :id => @product, :field => 'name'},
-                   :html => {:method => 'post', :id => 'product-name-form'}) do |f| %>
-  <%= f.text_field(:name, :value => @product.name, :class => 'name_edition') %>
-  <%= select_unit(@product) %>
-
-  <% button_bar do %>
-    <%= submit_button :save, _('Save') %>
-    <%= cancel_edit_product_link(@product, 'name') %>
-  <% end %>
-<% end %>
-
-<script type="text/javascript">
-  jQuery('#product_name').focus().select();
-</script>
-
-<% if errors %>
-  <%= render_dialog_error_messages 'product' %>
-<% end %>
@@ -1,14 +0,0 @@
-<% price_details.each do |price_detail| %>
-  <tr id='<%= "price-detail-#{price_detail.id}" %>'>
-    <td><%= select_production_cost(@product, price_detail.production_cost_id) %></td>
-    <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', price_detail.formatted_value(:price), :class => 'numbers-only price-details-price', :size => 6)) %></td>
-    <td>
-      <%= link_to_remote(_('Remove'),
-                         :update => "price-detail-#{price_detail.id}",
-                         :complete => "calculateValuesForBar();",
-                         data: {confirm: _('Are you sure that you want to remove this cost?')},
-                         :url => { :action => 'remove_price_detail', :id => price_detail, :product => @product }) %>
-  </tr>
-<% end %>
-
-<%= render :partial => 'shared/numbers_only_javascript' %>
@@ -1,17 +0,0 @@
-<%= error_messages_for :product %> <br/>
-
-<%= form_for :product, :html => {:multipart => true }, :url => {:action => mode} do |f| %>
-  <%= required_fields_message %>
-
-  <%= display_form_field( _('Name:'), f.text_field(:name) ) %>
-  <%= display_form_field( _('Price:'), f.text_field(:price) ) %>
-  <%= display_form_field( _('Description:'), f.text_area(:description, :rows => 10, :class => 'mceEditor') ) %>
-  <%= labelled_form_field(f.check_box(:highlighted) + _('Highlight this product'),'') %>
-  <%= f.fields_for :image_builder, @product.image do |i| %>
-    <%= file_field_or_thumbnail(_('Image:'), @product.image, i) %>
-  <% end %>
-
-  <% button_bar do %>
-    <%= submit_button('save', (mode == 'new' ? _('Create product') : _('Save changes')), :cancel => {:action => 'index'} ) %>
-  <% end %>
-<% end %>
@@ -1,3 +0,0 @@
-<li class='input-item' id="input-<%= input.id %>">
-<%= render :partial => 'manage_products/display_input', :locals =>{:input  => input} %>
-</li>
@@ -1,43 +0,0 @@
-<div id='price-composition-bar'>
-  <%= render :partial => 'manage_products/price_composition_bar' %>
-</div>
-
-<%= form_tag({:action => 'manage_product_details'}, :method => 'post', :id => 'manage-product-details-form') do %>
-  <div>
-    <table id='display-product-price-details'>
-      <tr>
-        <td><%= _('Inputs') %></td>
-        <td class='inputs-cost'>
-          <span><%= float_to_currency(@product.inputs_cost) %></span>
-        </td>
-        <td>
-          <small><%= _('This value is composed by the total value of registered inputs') %></small>
-        </td>
-      </tr>
-      <%= render :partial => 'manage_products/edit_price_details', :locals => {:price_details => @product.price_details} %>
-    </table>
-  </div>
-
-  <%= hidden_field(:product, :inputs_cost) %>
-  <%= hidden_field(:product, :price) %>
-
-  <% button_bar do %>
-    <%= submit_button :save, _('Save'), :disabled => '', :class => 'disabled' %>
-    <%= button :cancel, _('Cancel'), '#', class: 'cancel-price-details', data: {confirm: _('If you leave, you will lose all unsaved information. Are you sure you want to quit?')} %>
-    <%= button(:add, _('New cost'), '#', :id => 'add-new-cost') %>
-    <span class='loading-area'></span>
-  <% end %>
-
-<% end %>
-
-<div style='display:none'>
-  <table id='new-cost-fields'>
-    <tr>
-      <td><%= select_production_cost(@product) %></td>
-      <td><%= labelled_form_field(environment.currency_unit, text_field_tag('price_details[][price]', nil, :class => 'numbers-only price-details-price', :size => 6)) %></td>
-      <td><%= link_to(_('Cancel'), '#', {:class => 'cancel-new-cost'}) %></td>
-    </tr>
-  </table>
-</div>
-
-<%= render :partial => 'shared/numbers_only_javascript' %>
@@ -1,22 +0,0 @@
-<%= javascript_tag do %>
-  var value = <%= @product.price_description_percentage %>;
-  var total_cost = <%= @product.total_production_cost %>;
-  var price = '<%= @product.formatted_value(:price) %>';
-  var described = false;
-  var currency_format = { separator : '<%= environment.currency_separator %>', delimiter : '<%= environment.currency_delimiter %>', unit : '<%= environment.currency_unit %>' };
-  if (<%= @product.price_described? %>) {
-    var described = true;
-  }
-  priceCompositionBar(value,described,total_cost,price);
-<% end %>
-
-<div id="price-details-info">
-  <div id="details-progressbar">
-    <div id='progressbar'></div>
-    <div id='progressbar-text'>
-      <%= price_composition_progressbar_text(@product) %>
-    </div>
-  </div>
-  <div id='progressbar-icon' class='ui-icon ui-icon-info' data-price-not-described-message='<%= _("The production cost of your product is not described yet. If you want to display the price composition, please add all the costs") %>' data-price-described-message='<%= _("The production cost of your product is fully described and will be displayed on your product's page") %>' data-price-described-notice='<%= _("Congratulations! Now the price is open to the public") %>'>
-</div>
-</div>
@@ -1,10 +0,0 @@
-<%= edit_ui_button(
-  _('Describe here the cost of production'),
-  {:action => 'manage_product_details', :id => @product.id},
-  :id => 'manage-product-details-button',
-  'data-primary-icon' => 'ui-icon-pencil',
-  'data-secondary-icon' => 'ui-icon-triangle-1-s',
-  :title => _('Describe details about how the price was defined')
-) %>
-<%= javascript_tag("render_jquery_ui_buttons('manage-product-details-button')") %>
-<span class='loading-area'></span>
@@ -1,2 +0,0 @@
-<%= categories_container selects_for_all_ancestors(@category), hierarchy_category_navigation(@category, :make_links => true) %>
-
@@ -1,3 +0,0 @@
-<h2> <%= _('Editing') %> <%= @product.name %> </h2>
-
-<%= render :partial => 'manage_products/form', :locals => {:mode => 'edit'}  %>
@@ -1,33 +0,0 @@
-<div class=product-category-hierarchy>
-  <%= hierarchy_category_navigation(@category, :make_links => false)%>
-</div>
-
-<div id="category-product-edition">
-
-  <h2><%= @product.name %></h2>
-
-  <div id='request_result_message' style='display: none'></div>
-
-  <%= remote_form_for(@product,
-                     :loading => "open_loading('#{ _('loading...') }')",
-                     :update => "request_result_message",
-                     :url => {:action => 'edit_category', :id => @product},
-                     :html => {:method => 'post', :id => 'category_form'}) do |f| %>
-
-    <h3><%= _('Edit category of this product:') %></h3>
-
-    <%= render 'manage_products/selected_category_tree' %>
-
-    <div id='categories_selection_actionbar'>
-      <%= button(:back, _('Back to product'), :action => 'show', :id => @product) %>
-      <span id='save_and_continue_wrapper'>
-        <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-        <span class='tooltip' id='save_and_continue_disabled_tooltip'>
-           <%= ui_icon('ui-icon-alert') %>
-           <%= _('This category does not allow registration of products, select a more specific category') %>
-        </span>
-      </span>
-    </div>
-
-  <% end %>
-</div>
@@ -1,30 +0,0 @@
-<h2> <%=_('Listing products and services') %> </h2>
-
-<table>
-  <tr>
-    <th><%= _('Product') %></th>
-    <th><%= _('Price') %></th>
-    <th><%= _('Actions') %></th>
-  </tr>
-  <% if @products.empty? %>
-    <tr>
-      <td colspan='3' style='text-align: center; padding: 10px'><em><%= _('(no product registered yet)') %></em></td>
-    </tr>
-  <% end %>
-  <% @products.each do |product| %>
-    <tr>
-      <td><strong><%= link_to product.name, :action => 'show', :id => product %></strong></td>
-      <td><%= product.price %></td>
-      <td>
-        <%= button :delete, _('Remove'), {action: 'destroy', id: product}, data: {confirm: _('Are you sure you want to remove this product?')} %>
-      </td>
-    </tr>
-  <% end %>
-</table>
-
-<%= pagination_links @products %>
-
-<% button_bar do %>
-  <%= button :add, _('New product or service'), :action => 'new' if @profile.create_product? %>
-  <%= button :back,  _('Back'), { :controller => 'profile_editor', :profile => @profile.identifier, :action => 'index' } %>
-<% end %>
@@ -1,30 +0,0 @@
-<h2 id='new_product_title'><%= _('New product or service') %></h2>
-
-<div id='request_result_message' style='display: none'></div>
-
-<%= remote_form_for @product,
-   :loading => "open_loading('#{ _('loading...') }')",
-   :update => "request_result_message",
-   :url => {:action => 'new'},
-   :html => {:method => 'post', :id => 'category_form'} do |f| %>
-
-  <h3><%= _('Select the category of the new product or service') %></h3>
-
-  <%= categories_container(select_for_new_category(@categories, @level)) %>
-
-  <div id='categories_selection_actionbar'>
-    <%= button :back, _('Back to the product listing'), :action => 'index' %>
-    <span id='save_and_continue_wrapper'>
-      <%= submit_button(:save, _('Save and continue'), :id => 'save_and_continue') %>
-      <span class='tooltip' id='save_and_continue_disabled_tooltip'>
-         <%= ui_icon('ui-icon-alert') %>
-         <%= _('This category does not allow registration of products, select a more specific category') %>
-      </span>
-    </span>
-  </div>
-
-<% end %>
-
-<%= javascript_tag do %>
-  toggleDisabled(<%= @category && @category.accept_products? ? 'true' : 'false' %>, jQuery('#save_and_continue')[0])
-<% end %>
@@ -1,74 +0,0 @@
-<div id="product-category">
-  <%= render :partial => 'manage_products/display_category' %>
-</div>
-
-<div id="show_product">
-
-  <div id='product-name'>
-    <%= render :partial => 'manage_products/display_name' %>
-  </div>
-
-  <div id='product-details'>
-    <div id='product-image' class="zoomable-image">
-      <%= render :partial => 'manage_products/display_image' %>
-    </div>
-    <div id='product-extra-content'>
-      <% extra_content = @plugins.dispatch(:product_info_extras, @product).collect { |content| instance_exec(&content) } %>
-      <%= safe_join(extra_content, "\n") %>
-    </div>
-    <div id='product-info'>
-      <%= render :partial => 'manage_products/display_info' %>
-    </div>
-  </div>
-
-  <br style='clear: both'/>
-
-  <% unless !@allowed_user && (@product.description.blank? && @product.inputs.empty? && !@product.price_described? ) %>
-    <% plugins_tabs = plugins_product_tabs %>
-
-    <div class='ui-tabs' id='product-<%= @product.id %>-tabs'>
-      <ul>
-        <% if !@product.description.blank? || @allowed_user %>
-          <li class='tab'><a href='#product-description'><%= _('Description') %></a></li>
-        <% end %>
-        <% if !@product.inputs.empty? || @allowed_user %>
-          <li class='tab'><a href='#product-inputs'><%= _('Inputs and raw material') %></a></li>
-        <% end %>
-        <% if @product.price_described? || @allowed_user %>
-          <li class='tab'><a href='#product-price-details'><%= _('Price composition') %></a></li>
-        <% end %>
-
-        <% plugins_tabs.each do |tab| %>
-          <li class='tab'><a href='#<%=tab[:id]%>'><%= tab[:title] %></a></li>
-        <% end %>
-
-      </ul>
-
-      <div id='product-description'>
-        <%= render :partial => 'manage_products/display_description' %>
-      </div>
-
-      <div id='product-inputs'>
-        <%= render :partial => 'manage_products/display_inputs' %>
-      </div>
-
-      <% if @product.price_described? || @allowed_user %>
-        <div id='product-price-details'>
-          <%= render :partial => 'manage_products/display_price_details' %>
-          <%= render :partial => 'manage_products/price_details_button' %>
-        </div>
-      <% end %>
-
-      <% plugins_tabs.each do |tab| %>
-        <div id='<%=tab[:id]%>'><%= raw tab[:content] %></div>
-      <% end %>
-
-    </div>
-  <% end %>
-
-</div>
-
-<% button_bar do %>
-  <%= button :back, _('Back to the product listing'), :controller => 'catalog', :action => 'index' %>
-  <%= button :delete, _('Remove product or service'), {:action => 'destroy', :id => @product}, :class => 'requires-permission-manage_products', :style => 'display:none;' %>
-<% end %>
@@ -17,7 +17,7 @@
           <strong><%= _('Address: ') + @profile.address %></strong><br/>
         <% end %>
         <% if @profile.respond_to?(:products) and !@profile.products.blank? %>
-          <strong><%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, :controller => 'manage_products', :profile => @profile.identifier, :action => 'show', :id => i.id)}.join(', ') %></strong><br/>
+          <strong><%= _('Products/Services: ') + @profile.products.map{|i| link_to(i.name, controller: 'products_plugin/page', profile: @profile.identifier, action: 'show', id: i.id)}.join(', ') %></strong><br/>
         <% end %>
         <% if @profile.respond_to?(:distance) and !@profile.distance.nil? %>
           <strong><%= _('Distance: ') + "%.2f%" % @profile.distance %></strong><br/>
@@ -1 +0,0 @@
-../../profile/_create_product.html.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-../../profile/_remove_product.html.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-../../profile/_update_product.html.erb
 \ No newline at end of file
@@ -1,13 +0,0 @@
-<div class='profile-activity-image'>
-  <%= link_to image_tag(activity.target.default_image :minor), activity.target.url, class: 'product-pic' if activity.target.present? %>
-</div>
-<div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_in_words activity.created_at %></p>
-
-  <div class='profile-wall-actions'>
-    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
-  </div>
-</div>
-
-<div style="clear: both"></div>
@@ -1,12 +0,0 @@
-<div class='profile-activity-image'>
-</div>
-<div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_in_words activity.created_at %></p>
-
-  <div class='profile-wall-actions'>
-    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
-  </div>
-</div>
-
-<div style="clear: both"></div>
@@ -1,13 +0,0 @@
-<div class='profile-activity-image'>
-  <%= link_to image_tag(activity.target.default_image :minor), activity.target.url, class: 'product-pic' if activity.target.present? %>
-</div>
-<div class='profile-activity-description'>
-  <p class='profile-activity-text'><%= link_to activity.user.short_name(nil), activity.user.url %> <%= describe activity %></p>
-  <p class='profile-activity-time'><%= time_ago_in_words activity.created_at %></p>
-
-  <div class='profile-wall-actions'>
-    <%= link_to_function(_('Remove'), 'remove_item_wall(this, \'%s\', \'%s\', \'%s\'); return false ;' % [".profile-activity-item", url_for(:profile => params[:profile], :action => :remove_activity, :activity_id => activity.id, :view => params[:view]), _('Are you sure you want to remove this activity and all its replies?')]) if logged_in? && current_person == @profile %>
-  </div>
-</div>
-
-<div style="clear: both"></div>
@@ -66,8 +66,3 @@
 <%= labelled_check_box(_('Enable "contact us"'), 'profile_data[enable_contact_us]', "1", @profile.enable_contact_us) if @profile.enterprise? %>
  
 <%= render :partial => 'moderation', :locals => { :profile => @profile } %>
-
-<% if profile.enterprise? && profile.environment.enabled?('products_for_enterprises') %>
-  <h2><%=_('Products/Services catalog')%></h2>
-  <%= labelled_form_field(_('Number of products/services displayed per page on catalog'), text_field(:profile_data, :products_per_catalog_page, :size => 3)) %>
-<% end %>
@@ -47,8 +47,6 @@
  
   <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
  
-  <%= control_panel_button(_('Manage Products/Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
-
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
       <%= control_panel_button(_('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
@@ -17,9 +17,10 @@
         <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
           <ul>
             <% search[:results].each do |hit| %>
-              <% partial = partial_for_class(hit.class, display) %>
-              <% variable_name = partial.gsub("#{display}_", '').to_sym %>
-              <%= render :partial => partial, :locals => {variable_name => hit} %>
+              <%= render_for_class hit.class do |klass| %>
+                <% name = klass.name.underscore %>
+                <%= render partial_name_for(name, display), name.split('/').last.to_sym => hit %>
+              <% end %>
             <% end %>
           </ul>
         </div>
@@ -1,85 +0,0 @@
-<% extra_content = @plugins.dispatch(:asset_product_extras, product).collect { |content| instance_exec(&content) } %>
-<% extra_properties = @plugins.dispatch(:asset_product_properties, product) %>
-
-<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
-
-  <div class="search-product-item-first-column">
-    <%= render :partial => 'search/image', :object => product %>
-
-    <% if product.available %>
-      <% if product.price && product.price > 0 %>
-        <% has_discount = product.discount && product.discount > 0 %>
-        <% if product.price %>
-          <span class="search-product-price-textid"><%=_("from") if has_discount %></span><%= price_span(product.price, :class => "search-product-price " + (has_discount ? 'with-discount' : '')) %>
-          <% if has_discount %>
-            <span class="search-product-price-textid"><%=_("by")%></span><%= price_span(product.price_with_discount, :class => "search-product-price") %>
-          <% end %>
-          <% if product.unit %>
-            <span class="search-product-unit">&nbsp;<%= _('/') %>&nbsp;<%= product.unit.name %></span>
-          <% end %>
-        <% end %>
-        <div class="search-product-inputs-info">
-          <% if p = product.percentage_from_solidarity_economy %>
-            <div class="search-product-percentage-from-solidarity-economy search-product-ecosol-percentage-icon-<%= p[0].to_s %>"
-              title="<%=_('Percentage of inputs from solidarity economy')%>">
-              <%= p[1] %>
-            </div>
-          <% end %>
-
-          <% if product.price_described? %>
-            <% title = (product.inputs.relevant_to_price + product.price_details).map{ |i|
-              '<div class="search-product-input-dots-to-price">' +
-                '<div class="search-product-input-name">' + i.name + '</div>' +
-                price_span(i.price, :class => 'search-product-input-price') +
-              '</div>' }.join('') %>
-            <%= link_to_function _("Open Price"), '', :title => title, :class => "search-product-price-details" %>
-          <% end %>
-        </div>
-      <% end %>
-    <% else %>
-      <span class="product-not-available"><%= _('Not available') %></div>
-    <% end %>
-
-  </div>
-  <div class="search-product-item-second-column">
-    <%= link_to_product product, :class => 'search-result-title' %>
-    <div class="search-product-supplier">
-      <span class="search-field-label"><%= _('Supplier') %>  </span><%= link_to_homepage product.enterprise.name, product.enterprise %>
-    </div>
-    <div class="search-product-description">
-      <% if product.description %>
-        <% desc_stripped = strip_tags(product.description) %>
-        <span class="search-field-label"><%= _('Description') %>  </span><%= excerpt desc_stripped, desc_stripped.first(3), radius: 300 %>
-      <% end %>
-    </div>
-  </div>
-  <div class="search-product-item-third-column">
-    <div class="search-product-region">
-      <% if product.enterprise.region %>
-        <span class="search-field-label"><%= _('City') %></span>
-        <br /><%= city_with_state(product.enterprise.region) %>
-      <% end %>
-    </div>
-    <div class="search-product-qualifiers">
-      <% if product.product_qualifiers.count > 0 %>
-        <span class="search-field-label"><%= _('Qualifiers') %></span>
-        <% product.product_qualifiers.each do |pq| %>
-          <% if pq.qualifier %>
-            <span class="search-product-qualifier"><%= pq.qualifier.name + (pq.certifier.nil? ?  _(";") : '') %></span>
-          <% end %>
-          <% if pq.certifier %>
-            <span class="search-product-certifier">&nbsp;<%= _('cert. ') + pq.certifier.name + _(";") %></span>
-          <% end %>
-        <% end %>
-      <% end %>
-    </div>
-  </div>
-
-  <div style="clear: both"></div>
-
-  <%= safe_join(extra_content, '\n') %>
-  <% extra_properties.each do |property| %>
-    <div><%= ''.html_safe + property[:name] + ': ' + instance_exec(&property[:content]) %></div>
-  <% end %>
-
-</li>
@@ -36,17 +36,6 @@
         <div class="search-no-image"><span><%= _('No image') %></span></div>
       <% end %>
     </div>
-  <% elsif image.is_a? Product %>
-    <% if image.image %>
-    <div class="zoomable-image">
-      <%= link_to '', product_path(image), :class => "search-image-pic",
-          :style => 'background-image: url(%s)'% image.default_image(:thumb) %>
-      <%= link_to content_tag(:span, _('Zoom in')), image.image.public_filename,
-          :class => 'zoomify-image' %>
-    </div>
-    <% else %>
-      <div class="search-no-image"><span><%= _('No image') %></span></div>
-    <% end %>
   <% else %>
     <div class="search-content-type-icon icon-content-<%=image.class.to_s.underscore.dasherize%>"></div>
   <% end %>
@@ -1 +0,0 @@
-search_page.html.erb
 \ No newline at end of file
@@ -1 +0,0 @@
-search.js.erb
 \ No newline at end of file
@@ -32,15 +32,6 @@ ActionTrackerConfig.verbs = {
   reply_scrap_on_self: {
   },
  
-  create_product: {
-  },
-
-  update_product: {
-  },
-
-  remove_product: {
-  },
-
   favorite_enterprise: {
   },
  
@@ -56,6 +56,13 @@ Noosfero::Application.routes.draw do
   # search
   match 'search(/:action(/*category_path))', controller: 'search', via: :all
  
+  ##
+  # Keep products URL compatibility
+  get 'catalog/:profile', to: redirect{ |params, request| "/profile/#{request.params[:profile]}/plugin/products/catalog" }
+  get 'myprofile/:profile/manage_products(/:action(/:id))', to: (redirect do |params, request|
+    "/profile/#{request.params[:profile]}/plugin/products/page/#{request.params[:action]}/#{request.params[:id]}"
+  end)
+
   # events
   match 'profile/:profile/events_by_day', controller: 'events', action: 'events_by_day', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   match 'profile/:profile/events_by_month', controller: 'events', action: 'events_by_month', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
@@ -63,9 +70,6 @@ Noosfero::Application.routes.draw do
   match 'profile/:profile/events/:year/:month', controller: 'events', action: 'events', year: /\d*/, month: /\d*/, profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   match 'profile/:profile/events', controller: 'events', action: 'events', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
  
-  # catalog
-  match 'catalog/:profile', controller: 'catalog', action: 'index', profile: /#{Noosfero.identifier_format_in_url}/i, as: :catalog, via: :all
-
   # invite
   match 'profile/:profile/invite/friends', controller: 'invite', action: 'invite_friends', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
   match 'profile/:profile/invite/:action', controller: 'invite', profile: /#{Noosfero.identifier_format_in_url}/i, via: :all
@@ -95,6 +99,7 @@ Noosfero::Application.routes.draw do
   # chat
   match 'chat(/:action(/:id))', controller: 'chat', via: :all
  
+
   ######################################################
   ## Controllers that are profile-specific (for profile admins )
   ######################################################
@@ -0,0 +1,33 @@
+class Product < ApplicationRecord
+end
+class Profile < ApplicationRecord
+  has_many :products
+end
+class Environment < ApplicationRecord
+  has_many :profiles
+  has_many :products, through: :profiles
+
+  acts_as_having_settings field: :settings
+  settings_items :enabled_plugins, type: Array
+end
+
+class EnableProductsPluginOnEnvironments < ActiveRecord::Migration
+
+  def up
+    environments  = Environment.all
+    products_used = environments.any?{ |e| e.products.count > 0 }
+    return unless products_used
+
+    Bundler.clean_system 'script/noosfero-plugins enable products'
+    environments.each do |e|
+      next unless e.products.count > 0
+      e.enabled_plugins << 'ProductsPlugin'
+      e.save!
+    end
+  end
+
+  def down
+    say "this migration can't be reverted"
+  end
+
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
  
-ActiveRecord::Schema.define(version: 20160408011720) do
+ActiveRecord::Schema.define(version: 20160422163123) do
  
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -1,317 +0,0 @@
-Feature: browse catalogs
-  As a noosfero visitor
-  I want to browse catalogs of products
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And the following enterprises
-      | identifier | owner     | name                               | enabled |
-      | artebonito | joaosilva | Associação de Artesanato de Bonito | true    |
-    And feature "products_for_enterprises" is enabled on environment
-    And the following product_categories
-      | name   |
-      | categ1 |
-      | food   |
-    And I am on /catalog/artebonito
-
-  Scenario: display titles
-    Then the page title should be "Associação de Artesanato de Bonito"
-    And I should see "Products/Services"
-
-  Scenario: display the simplest possible product
-    Given the following products
-      | owner      | category |
-      | artebonito | categ1   |
-    And I am on /catalog/artebonito
-    Then I should see "categ1" within "li.product-link"
-    And I should see "No image" within ".no-image"
-    And I should not see "unit" within "#product-list"
-    And I should not see "product unavailable"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: display a simple product without price
-    Given the following products
-      | owner      | category | name     |
-      | artebonito | categ1   | Produto1 |
-    And I am on /catalog/artebonito
-    Then I should see "Produto1" within "li.product-link"
-    And I should see "No image" within ".no-image"
-    And I should not see "unit" within "#product-list"
-    And I should not see "product unavailable"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: display a simple product without details
-    Given the following products
-      | owner      | category | name     | price |
-      | artebonito | categ1   | Produto1 | 50.00 |
-    And I am on /catalog/artebonito
-    Then I should see "Produto1" within "li.product-link"
-    And I should see "50.00" within "span.product-price"
-    And I should see "unit" within "span.product-unit"
-    And I should see "No image" within ".no-image"
-    And I should not see "product unavailable"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: don't display the price when it's $0.00
-    Given the following products
-      | owner      | category | name     | price |
-      | artebonito | categ1   | Produto1 | 0.00 |
-    And I am on /catalog/artebonito
-    Then I should see "Produto1" within "li.product-link"
-    And I should not see "0.00"
-
-  Scenario: don't display the price when it's not defined
-    Given the following products
-      | owner      | category | name     |
-      | artebonito | categ1   | Produto1 |
-    And I am on /catalog/artebonito
-    Then I should see "Produto1" within "li.product-link"
-    And I should not see "0.00"
-    And I should see "No image" within ".no-image"
-    And I should not see "product unavailable"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: product name links to product page
-    Given the following products
-      | owner      | category | name     | price |
-      | artebonito | categ1   | Produto1 | 50.00 |
-    And I am on /catalog/artebonito
-    When I follow "Produto1" within "li.product-link"
-    Then I should be taken to "Produto1" product page
-
-  Scenario: display product with custom image
-    Given the following products
-      | owner      | category | name    | price | img     |
-      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
-    And I am on /catalog/artebonito
-    Then I should see "Agrotox" within "li.product-link"
-    And I should see "12.34" within "span.product-price"
-    And I should see "unit" within "span.product-unit"
-    And I should not see "No image"
-    And I should not see "product unavailable"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: display "zoom in" button
-    Given the following products
-      | owner      | category | name    | price | img     |
-      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
-    And I am on /catalog/artebonito
-    And I should not see "No image"
-    And I should see "Zoom in" within ".zoomify-image"
-
-  Scenario: image links to product page
-    Given the following products
-      | owner      | category | name    | price | img     |
-      | artebonito | categ1   | Agrotox | 12.34 | agrotox |
-    And I am on /catalog/artebonito
-    When I follow "Agrotox" within ".product-image-link"
-    Then I should be taken to "Agrotox" product page
-
-  Scenario: display product with discount
-    Given the following products
-      | owner      | category | name        | price | discount | img         |
-      | artebonito | categ1   | Semterrinha | 99.99 | 12.34    | semterrinha |
-    And I am on /catalog/artebonito
-    Then I should see "Semterrinha" within "li.product-link"
-    And I should see "99.99" within "span.product-discount"
-    And I should see "87.65" within "span.product-price"
-    And I should not see "No image"
-    And I should not see "description"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  @selenium-fixme
-  Scenario: display description button when needed (but not the description)
-    Given the following products
-      | owner      | category | name     | price | description                                           |
-      | artebonito | categ1   | Produto2 | 12.34 | A small description for a product that doesn't exist. |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    Then I should see "Produto2" within "li.product-link"
-    And I should see "12.34" within "span.product-price"
-    And I should see "description" within "#product-description-button"
-    And "description" should not be visible within "product-description-button"
-    And I should see "A small description" within "#product-description"
-    And "A small description for a product that doesn't exist" should not be visible within "product-description"
-
-  @selenium-fixme
-  Scenario: display description when button is clicked
-    Given the following products
-      | owner      | category | name     | price | description                                           |
-      | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    When I follow "product-description-button"
-    Then I should see "A small description" within "#product-description"
-    And "A small description for a product that doesn't exist" should not be visible within "product-description"
-
-  @selenium-fixme
-  Scenario: hide description
-    Given the following products
-      | owner      | category | name     | price | description                                           |
-      | artebonito | categ1   | Produto3 | 12.34 | A small description for a product that doesn't exist. |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    When I click "product-description-button"
-    Then I should see "A small description" within "#product-description"
-    And the "product-description" should be visible
-    When I click "product-list"
-    Then the "product-description" should not be visible
-
-  Scenario: display unavailable product
-    Given the following products
-      | owner      | category | name  | price | available |
-      | artebonito | categ1   | Prod3 | 12.34 | false     |
-    And I am on /catalog/artebonito
-    Then I should see "Prod3" within "li.not-available"
-    And I should see "12.34" within "li.not-available"
-    And I should see "product unavailable" within "li.product-unavailable"
-    And I should not see "qualifiers"
-    And I should not see "price composition"
-
-  Scenario: display qualifiers
-    Given the following qualifiers
-      | name    |
-      | Organic |
-    And the following certifiers
-      | name    | qualifiers |
-      | Colivre | Organic    |
-    And the following products
-      | owner      | category | name   | price | qualifier |
-      | artebonito | categ1   | Banana | 0.99  | Organic   |
-    And I am on /catalog/artebonito
-    Then I should see "Banana" within "li.product-link"
-    And I should see "0.99" within "span.product-price"
-    And I should see "qualifiers" within "li.product-qualifiers"
-    And I should see "Organic" within "span.search-product-qualifier"
-    And I should not see "price composition"
-
-  @selenium-fixme
-  Scenario: not display price composition button if price is not described
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Bananada | 10.00 |
-    And the following input
-      | product  | category | price_per_unit | amount_used |
-      | Bananada | food     | 0.99           | 5           |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    Then I should see "Bananada" within "li.product-link"
-    And I should see "10.00" within "span.product-price"
-    And the "#product-price-composition-button" should not be visible
-
-  @selenium-fixme
-  Scenario: display price composition button (but not inputs)
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Bananada | 10.00 |
-    And the following input
-      | product  | category | price_per_unit | amount_used |
-      | Bananada | food     | 2.00           | 5           |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    Then I should see "Bananada" within "li.product-link"
-    And I should see "10.00" within "span.product-price"
-    And I should see "price composition" within "#product-price-composition-button"
-    And the "#product-price-composition-button" should be visible
-    And I should see "food" within "#product-price-composition"
-    And I should see "10.00" within "#product-price-composition"
-
-  @selenium-fixme
-  Scenario: display price composition when button is clicked
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Bananada | 10.88 |
-    And the following input
-      | product  | category | price_per_unit | amount_used |
-      | Bananada | food     | 2.72           | 4           |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    When I click "#product-price-composition-button"
-    Then the "#product-price-composition" should be visible
-    And I should see "food" within "#product-price-composition"
-    And I should see "10.88" within "#product-price-composition"
-
-  @selenium-fixme
-  Scenario: display inputs and raw materials button when not completely filled
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Vitamina | 17.99 |
-    And the following unit
-      | name  | plural |
-      | Liter | Liters |
-    And the following input
-      | product  | category |
-      | Vitamina | food     |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    Then the "#inputs-button" should be visible
-    And I should see "inputs and raw materials" within "#inputs-button"
-
-  @selenium-fixme
-  Scenario: display inputs and raw materials button
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Vitamina | 17.99 |
-    And the following unit
-      | name  | plural |
-      | Liter | Liters |
-    And the following input
-      | product  | category | price_per_unit | amount_used | unit  |
-      | Vitamina | food     | 1.45           | 7           | Liter |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    Then I should see "Vitamina" within "li.product-link"
-    And I should see "17.99" within "span.product-price"
-    And the "#inputs-button" should be visible
-    And I should see "inputs and raw materials" within "#inputs-button"
-    And the "#inputs-description" should not be visible
-    And I should see "7.0 Liter of food" within "#inputs-description"
-
-  @selenium-fixme
-  Scenario: display inputs and raw materials description
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Vitamina | 17.99 |
-    And the following unit
-      | name  | plural |
-      | Liter | Liters |
-    And the following input
-      | product  | category | price_per_unit | amount_used | unit  |
-      | Vitamina | food     | 1.45           | 7           | Liter |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    When I click "#inputs-button"
-    Then the "#inputs-description" should be visible
-    And I should see "7.0 Liter of food" within "#inputs-description"
-
-  @selenium-fixme
-  Scenario: hide inputs and raw materials
-    Given the following product
-      | owner      | category | name     | price |
-      | artebonito | food     | Vitamina | 17.99 |
-    And the following unit
-      | name  | plural |
-      | Liter | Liters |
-    And the following input
-      | product  | category | price_per_unit | amount_used | unit  |
-      | Vitamina | food     | 1.45           | 7           | Liter |
-    And I am on /catalog/artebonito
-    And I reload and wait for the page
-    When I click "#inputs-button"
-    Then the "#inputs-description" should be visible
-    And I should see "7.0 Liter of food" within "#inputs-description"
-    When I click "#product-list"
-    Then the "#inputs-description" should not be visible
@@ -4,16 +4,6 @@ Feature: categories_block
  
   Background:
     Given I am on the homepage
-    And the following product_categories
-      | name       | display_in_menu |
-      | Food       | true            |
-      | Book       | true            |
-    And the following product_categories
-      | parent  | name        | display_in_menu |
-      | Food    | Vegetarian  | true            |
-      | Food    | Steak       | true            |
-      | Book    | Fiction     | false           |
-      | Book    | Literature  | true            |
     And the following categories
       | name       | display_in_menu |
       | Wood       | true            |
@@ -27,49 +17,6 @@ Feature: categories_block
     And I go to /admin/environment_design
  
   @selenium
-  Scenario: List just product categories
-    Given display ".button-bar"
-    And I follow "Edit" within ".block-outer .categories-block"
-    And I check "Product"
-    When I press "Save"
-    Then I should see "Food"
-    And I should see "Book"
-    And "Vegetarian" should not be visible within "span#category-name"
-    And "Steak" should not be visible within "span#category-name"
-    And "Fiction" should not be visible within "span#category-name"
-
-  @selenium
-  Scenario: Show submenu if it exists
-    Given display ".button-bar"
-    And I follow "Edit" within ".block-outer .categories-block"
-    And I check "Product"
-    And I press "Save"
-    And I go to /
-    Then I should see "Food"
-    And I should see "Book"
-    And "Vegetarian" should not be visible within "span#category-name"
-    And "Steak" should not be visible within "span#category-name"
-    And "Literature" should not be visible within "span#category-name"
-    When I follow "block_2_category_2"
-    Then I should see "Literature"
-    When I follow "block_2_category_1"
-    Then I should see "Vegetarian"
-    And I should see "Steak"
-    And I should not see "Fiction"
-
-  @selenium
-  Scenario: Show only one submenu per time
-    Given display ".button-bar"
-    And I follow "Edit" within ".block-outer .categories-block"
-    And I check "Product"
-    And I press "Save"
-    And I go to /
-    Then I should see "Book"
-    And "Literature" should not be visible within "span#category-name"
-    When I follow "block_2_category_2"
-    Then I should see "Literature"
-
-  @selenium
   Scenario: List just general categories
     Given display ".button-bar"
     And I follow "Edit" within ".block-outer .categories-block"
@@ -1,39 +0,0 @@
-# These tests were originally unit tests, but they were moved here since they are view tests. The originals have been kept just in case somebody wants to review them, but should be removed shortly.
-
-Feature: enterprise homepage
-  As a noosfero visitor
-  I want to browse an enterprise's homepage
-  In order to know more information about the enterprise
-
-  Background:
-    Given the following users
-      | login       | name         |
-      | durdentyler | Tyler Durden |
-    And the following enterprises
-      | identifier | owner       | name                  | contact_email        | contact_phone  | enabled |
-      | mayhem     | durdentyler | Paper Street Soap Co. | queen@workerbees.org | (288) 555-0153 | true    |
-    And the following enterprise homepage
-      | enterprise | name             |
-      | mayhem     | article homepage |
-    And the following product_category
-      | name |
-      | soap |
-    And the following product
-      | name             | category | owner  |
-      | Natural Handmade | soap     | mayhem |
-    And feature "products_for_enterprises" is enabled on environment
-
-
-  Scenario: display profile info
-    When I go to /mayhem/homepage
-    Then I should see "queen@workerbees.org"
-    And I should see "(288) 555-0153"
-
-  Scenario: display products list
-    When I go to /mayhem/homepage
-    Then I should see "Natural Handmade"
-
-  Scenario: display link to product
-    When I go to /mayhem/homepage
-    And I follow "Natural Handmade"
-    Then I should be taken to "Natural Handmade" product page
@@ -1,47 +0,0 @@
-Feature: featured_products_block
-  As a profile owner
-  I want to edit the featured block
-
-  Background:
-    Given I am on the homepage
-    And the following users
-      | login       | name         |
-      | eddievedder | Eddie Vedder |
-    And the following enterprises
-      | identifier | owner | name | enabled |
-      | redemoinho | eddievedder | Rede Moinho | true |
-    And the following blocks
-      | owner       | type          |
-      | redemoinho | FeaturedProductsBlock |
-    And the following product_category
-      | name |
-      | automobile |
-    And the following products
-      | owner      | category | name | description | highlighted |
-      | redemoinho | automobile  | Car | Red Car | true |
-      | redemoinho | automobile  | Truck | Blue Truck | true |
-      | redemoinho | automobile  | Moto | Very long description of and auto-mobile moto to be truncated | true |
-    And I am logged in as "eddievedder"
-
-  @selenium-fixme
-  Scenario: select a product to be featured
-    And I follow "Manage my groups"
-    And I follow "Control panel of this group"
-    And I follow "Edit sideboxes"
-    Given I follow "Edit" within ".featured-products-block"
-    And I select "Car"
-    When I press "Save"
-    Then I should see "Car"
-    And I should not see "float_to_currency"
-    And I should not see "product_path"
-
-  @selenium-fixme
-  Scenario: display block with long description
-    Given I follow "Manage my groups"
-    And I follow "Control panel of this group"
-    And I follow "Edit sideboxes"
-    And I follow "Edit" within ".featured-products-block"
-    And I select "Moto"
-    And I press "Save"
-    When I am on redemoinho's homepage
-    Then I should see "Very long description of and auto-mobile moto to b..."
@@ -3,9 +3,6 @@ Feature: search
   I want to search
   In order to find stuff
  
-  Background:
-    Given feature "disable_asset_products" is disabled on environment
-
   Scenario: show empty results in all enabled assets
     Given I go to the search page
     And I fill in "search-input" with "Anything"
@@ -18,8 +15,6 @@ Feature: search
     And I should see "None" within ".search-results-enterprises"
     And I should see "Contents" within ".search-results-articles"
     And I should see "None" within ".search-results-articles"
-    And I should see "Products" within ".search-results-products"
-    And I should see "None" within ".search-results-products"
     And I should see "Events" within ".search-results-events"
     And I should see "None" within ".search-results-events"
  
@@ -92,23 +87,6 @@ Feature: search
     Then I should see "whales and dolphins" within "div.search-results-articles"
     And I should not see "bees and butterflies"
  
-  Scenario: simple search for product
-    Given the following enterprises
-      | identifier  | name    |
-      | colivre-ent | Colivre |
-    And the following product_categories
-      | name        |
-      | Development |
-    And the following products
-      | owner       | category    | name                        |
-      | colivre-ent | development | social networks consultancy |
-      | colivre-ent | development | wikis consultancy           |
-    When I go to the search page
-    And I fill in "search-input" with "wikis"
-    And I press "Search"
-    Then I should see "wikis consultancy" within "div.search-results-products"
-    And I should not see "social networks consultancy"
-
   Scenario: simple search for event
     Given the following communities
       | identifier | name |
@@ -130,15 +108,8 @@ Feature: search
     And the following communities
       | identifier     | name           |
       | noosfero-users | Noosfero users |
-    And the following product_categories
-      | name        |
-      | Development |
-    And the following products
-      | owner       | name              | category    |
-      | colivre_dev | Noosfero platform | Development |
     When I go to the search page
     And I fill in "search-input" with "noosfero"
     And I press "Search"
     Then I should see "Colivre - Noosfero dev." within "div.search-results-enterprises"
     And I should see "Noosfero users" within "div.search-results-communities"
-    And I should see "Noosfero platform" within "div.search-results-products"
@@ -1,105 +0,0 @@
-Feature: search products
-  As a noosfero user
-  I want to search products
-  In order to find ones that interest me
-
-  Background:
-    Given feature "disable_asset_products" is disabled on environment
-    And the following enterprises
-      | identifier  | name    |
-      | colivre-ent | Colivre |
-    And the following product_categories
-      | name        |
-      | Development |
-    And the following products
-      | owner       | category    | name                        | price | img    |
-      | colivre-ent | development | social networks consultancy | 1.00  | fruits |
-      | colivre-ent | development | wikis consultancy           | 2.00  | shoes  |
-
-  Scenario: show recent products on index
-    When I go to the search products page
-    Then I should see "wikis consultancy" within "#search-results"
-    And I should see "social networks consultancy" within "#search-results"
-
-  Scenario: show empty search results
-    When I search products for "something unrelated"
-    Then I should see "None" within ".search-results-type-empty"
-
-  Scenario: simple search for product
-    Given there are no pending jobs
-    When I search products for "wikis"
-    Then I should see "wikis consultancy" within "#search-results"
-    And I should see "wikis consultancy" within ".only-one-result-box"
-    And I should see wikis consultancy's product image
-    And I should not see "social networks consultancy"
-    And I should not see social networks consultancy's product image
-
-  Scenario: show percentage (100%) of solidary economy inputs in results
-    Given the following inputs
-      | product           | category    | solidary |
-      | wikis consultancy | development | true     |
-    When I go to the search products page
-    And I fill in "search-input" with "wikis"
-    And I press "Search"
-    Then I should see "100%" within "div.search-product-ecosol-percentage-icon-100"
-
-  Scenario: show percentage (50%) of solidary economy inputs in results
-    Given the following inputs
-      | product           | category    | solidary |
-      | wikis consultancy | development | true     |
-      | wikis consultancy | development | false    |
-    When I go to the search products page
-    And I fill in "search-input" with "wikis"
-    And I press "Search"
-    Then I should see "50%" within "div.search-product-ecosol-percentage-icon-50"
-
-  Scenario: show percentage (75%) of solidary economy inputs in results
-    Given the following inputs
-      | product           | category    | solidary |
-      | wikis consultancy | development | true     |
-      | wikis consultancy | development | true     |
-      | wikis consultancy | development | true     |
-      | wikis consultancy | development | false    |
-    When I go to the search products page
-    And I fill in "search-input" with "wikis"
-    And I press "Search"
-    Then I should see "75%" within "div.search-product-ecosol-percentage-icon-75"
-
-  Scenario: show percentage (25%) of solidary economy inputs in results
-    Given the following inputs
-      | product           | category    | solidary |
-      | wikis consultancy | development | true     |
-      | wikis consultancy | development | false    |
-      | wikis consultancy | development | false    |
-      | wikis consultancy | development | false    |
-    When I go to the search products page
-    And I fill in "search-input" with "wikis"
-    And I press "Search"
-    Then I should see "25%" within "div.search-product-ecosol-percentage-icon-25"
-
-  Scenario: display "zoom in" button on images on results
-    Given the following products
-      | owner       | category    | name     | price | img              |
-      | colivre-ent | development | noosfero | 12.34 | noosfero-network |
-    When I go to the search products page
-    And I fill in "search-input" with "noosfero"
-    And I press "Search"
-    Then I should not see "No image"
-    And I should see "Zoom in" within "a.zoomify-image"
-
-  Scenario: find products without exact query
-    Given the following product_category
-      | name           |
-      | Software Livre |
-    And the following products
-      | owner       | name                             | category       |
-      | colivre-ent | Noosfero Social Network Platform | software-livre |
-    When I go to the search products page
-    And I fill in "search-input" with "Noosfero Social"
-    And I press "Search"
-    Then I should see "Noosfero Social Network Platform" within "#search-results"
-
-  Scenario: don't search when products are disabled in environment
-    Given feature "disable_asset_products" is enabled on environment
-    When I go to the search products page
-    Then I should see "There is no such page" within "#not-found"
...	...	@@ -7,7 +7,6 @@ class CategoriesController < AdminController
7	7	def index
8	8	@categories = environment.categories.where("parent_id is null AND type is null")
9	9	@regions = environment.regions.where(:parent_id => nil)
10		- @product_categories = environment.product_categories.where(:parent_id => nil)
11	10	end
12	11
13	12	def get_children
...	...
1	1	class EditTemplateController < AdminController
2		-
	2	+
3	3	protect 'edit_environment_design', :environment
4		-
	4	+
5	5	#FIXME
6	6	#design_editor :holder => 'environment', :autosave => true, :block_types => :block_types
7	7
...	...	@@ -9,7 +9,6 @@ class EditTemplateController < AdminController
9	9	%w[
10	10	FavoriteLinks
11	11	ListBlock
12		- SellersSearchBlock
13	12	]
14	13	end
15	14
...	...
1	1	class EnvironmentDesignController < BoxOrganizerController
2		-
	2	+
3	3	protect 'edit_environment_design', :environment
4	4
5	5	def available_blocks
6		- @available_blocks \|\|= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, FeaturedProductsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
	6	+ @available_blocks \|\|= [ ArticleBlock, LoginBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock, HighlightsBlock, CategoriesBlock, RawHTMLBlock, TagsBlock ]
7	7	@available_blocks += plugins.dispatch(:extra_blocks, :type => Environment)
8	8	end
9	9
...	...
...	...	@@ -409,9 +409,6 @@ class CmsController < MyProfileController
409	409	]
410	410	articles += special_article_types if params && params[:cms]
411	411	parent_id = params ? params[:parent_id] : nil
412		- if profile.enterprise?
413		- articles << EnterpriseHomepage
414		- end
415	412	if @parent && @parent.blog?
416	413	articles -= Article.folder_types.map(&:constantize)
417	414	end
...	...
...	...	@@ -1,229 +0,0 @@
1		-class ManageProductsController < ApplicationController
2		- needs_profile
3		-
4		- protect 'manage_products', :profile, :except => [:show]
5		- before_filter :check_environment_feature
6		- before_filter :login_required, :except => [:show]
7		- before_filter :create_product?, :only => [:new]
8		-
9		- protected
10		-
11		- def check_environment_feature
12		- unless profile.environment.enabled?('products_for_enterprises')
13		- render_not_found
14		- return
15		- end
16		- end
17		-
18		- def create_product?
19		- if !profile.create_product?
20		- render_access_denied
21		- return
22		- end
23		- end
24		-
25		- public
26		-
27		- def index
28		- @products = @profile.products.paginate(:per_page => 10, :page => params[:page])
29		- end
30		-
31		- def show
32		- @product = @profile.products.find(params[:id])
33		- @inputs = @product.inputs
34		- @allowed_user = user && user.has_permission?('manage_products', profile)
35		- end
36		-
37		- def categories_for_selection
38		- @category = environment.categories.find_by id: params[:category_id]
39		- @object_name = params[:object_name]
40		- if @category
41		- @categories = @category.children
42		- @level = @category.leaf? ? @category.level : @categories.first.level
43		- else
44		- @categories = ProductCategory.top_level_for(environment)
45		- @level = 0
46		- end
47		- render :partial => 'categories_for_selection', :locals => { :categories => @categories, :level => @level }
48		- end
49		-
50		- def new
51		- @no_design_blocks = true
52		- @category = params[:selected_category_id] ? Category.find(params[:selected_category_id]) : nil
53		- @product = @profile.products.build(:product_category => @category)
54		- @categories = ProductCategory.top_level_for(environment)
55		- @level = 0
56		- if request.post?
57		- if @product.save
58		- session[:notice] = _('Product succesfully created')
59		- render :partial => 'shared/redirect_via_javascript',
60		- :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
61		- else
62		- render_dialog_error_messages 'product'
63		- end
64		- end
65		- end
66		-
67		- def edit
68		- @product = @profile.products.find(params[:id])
69		- field = params[:field]
70		- if request.post?
71		- begin
72		- @product.update!(params[:product])
73		- render :partial => "display_#{field}", :locals => {:product => @product}
74		- rescue Exception => e
75		- render :partial => "edit_#{field}", :locals => {:product => @product, :errors => true}
76		- end
77		- else
78		- render :partial => "edit_#{field}", :locals => {:product => @product, :errors => false}
79		- end
80		- end
81		-
82		- def edit_category
83		- @product = @profile.products.find(params[:id])
84		- @category = @product.product_category \|\| ProductCategory.first
85		- @categories = ProductCategory.top_level_for(environment)
86		- @edit = true
87		- @level = @category.level
88		- if request.post?
89		- if @product.update({:product_category_id => params[:selected_category_id]}, :without_protection => true)
90		- render :partial => 'shared/redirect_via_javascript',
91		- :locals => { :url => url_for(:controller => 'manage_products', :action => 'show', :id => @product) }
92		- else
93		- render_dialog_error_messages 'product'
94		- end
95		- end
96		- end
97		-
98		- def show_category_tree
99		- @category = environment.categories.find params[:category_id]
100		- render :partial => 'selected_category_tree'
101		- end
102		-
103		- def search_categories
104		- @term = params[:term].downcase
105		- conditions = ['LOWER(name) LIKE ? OR LOWER(name) LIKE ?', "#{@term}%", "% #{@term}%"]
106		- @categories = ProductCategory.where(conditions).limit(10)
107		- render :json => (@categories.map do \|category\|
108		- {:label => category.name, :value => category.id}
109		- end)
110		- end
111		-
112		- def add_input
113		- @product = @profile.products.find(params[:id])
114		- @input = @product.inputs.build
115		- @categories = ProductCategory.top_level_for(environment)
116		- @level = 0
117		- if request.post?
118		- if @input.update(:product_category_id => params[:selected_category_id])
119		- @inputs = @product.inputs
120		- render :partial => 'display_inputs'
121		- else
122		- render_dialog_error_messages 'product'
123		- end
124		- else
125		- render :partial => 'add_input'
126		- end
127		- end
128		-
129		- def manage_product_details
130		- @product = @profile.products.find(params[:id])
131		- if request.post?
132		- @product.update_price_details(params[:price_details]) if params[:price_details]
133		- render :partial => 'display_price_details'
134		- else
135		- render :partial => 'manage_product_details'
136		- end
137		- end
138		-
139		- def remove_price_detail
140		- @product = @profile.products.find(params[:product])
141		- @price_detail = @product.price_details.find(params[:id])
142		- @product = @price_detail.product
143		- if request.post?
144		- @price_detail.destroy
145		- render :nothing => true
146		- end
147		- end
148		-
149		- def display_price_composition_bar
150		- @product = @profile.products.find(params[:id])
151		- render :partial => 'price_composition_bar'
152		- end
153		-
154		- def display_inputs_cost
155		- @product = @profile.products.find(params[:id])
156		- render :inline => "<%= float_to_currency(@product.inputs_cost) %>"
157		- end
158		-
159		- def destroy
160		- @product = @profile.products.find(params[:id])
161		- if @product.destroy
162		- session[:notice] = _('Product succesfully removed')
163		- redirect_back_or_default :action => 'index'
164		- else
165		- session[:notice] = _('Could not remove the product')
166		- redirect_back_or_default :action => 'show', :id => @product
167		- end
168		- end
169		-
170		- def edit_input
171		- if request.xhr?
172		- @input = @profile.inputs.find_by id: params[:id]
173		- if @input
174		- if request.post?
175		- if @input.update(params[:input])
176		- render :partial => 'display_input', :locals => {:input => @input}
177		- else
178		- render :partial => 'edit_input'
179		- end
180		- else
181		- render :partial => 'edit_input'
182		- end
183		- else
184		- render :text => _('The input was not found')
185		- end
186		- end
187		- end
188		-
189		- def order_inputs
190		- @product = @profile.products.find(params[:id])
191		- @product.order_inputs!(params[:input]) if params[:input]
192		- render :nothing => true
193		- end
194		-
195		- def remove_input
196		- @input = @profile.inputs.find(params[:id])
197		- @product = @input.product
198		- if request.post?
199		- if @input.destroy
200		- @inputs = @product.inputs
201		- render :partial => 'display_inputs'
202		- else
203		- render_dialog_error_messages 'input'
204		- end
205		- end
206		- end
207		-
208		- def certifiers_for_selection
209		- @qualifier = Qualifier.exists?(:id => params[:id]) ? Qualifier.find(params[:id]) : nil
210		- render :update do \|page\|
211		- page.replace_html params[:certifier_area], :partial => 'certifiers_for_selection'
212		- end
213		- end
214		-
215		- def create_production_cost
216		- cost = @profile.production_costs.create(:name => params[:id])
217		- if cost.valid?
218		- cost.save
219		- render :text => {:name => cost.name,
220		- :id => cost.id,
221		- :ok => true
222		- }.to_json
223		- else
224		- render :text => {:ok => false,
225		- :error_msg => _(cost.errors['name'].join('\n')) % {:fn => _('Name')}
226		- }.to_json
227		- end
228		- end
229		-end
...	...	@@ -45,17 +45,10 @@ class ProfileDesignController < BoxOrganizerController
45	45	if profile.enterprise?
46	46	blocks << DisabledEnterpriseMessageBlock
47	47	blocks << HighlightsBlock
48		- blocks << ProductCategoriesBlock
49		- blocks << FeaturedProductsBlock
50	48	blocks << FansBlock
51	49	blocks += plugins.dispatch(:extra_blocks, :type => Enterprise)
52	50	end
53	51
54		- # product block exclusive for enterprises in environments that permits it
55		- if profile.enterprise? && profile.environment.enabled?('products_for_enterprises')
56		- blocks << ProductsBlock
57		- end
58		-
59	52	# block exclusive to profiles that have blog
60	53	if profile.has_blog?
61	54	blocks << BlogArchivesBlock
...	...
...	...	@@ -1,19 +0,0 @@
1		-class CatalogController < PublicController
2		- needs_profile
3		-
4		- before_filter :check_enterprise_and_environment
5		-
6		- def index
7		- extend CatalogHelper
8		- catalog_load_index
9		- end
10		-
11		- protected
12		-
13		- def check_enterprise_and_environment
14		- unless profile.enterprise? && @profile.environment.enabled?('products_for_enterprises')
15		- redirect_to :controller => 'profile', :profile => profile.identifier, :action => 'index'
16		- end
17		- end
18		-
19		-end
...	...	@@ -52,7 +52,6 @@ class SearchController < PublicController
52	52	[
53	53	[ :people, _('People'), :recent_people ],
54	54	[ :enterprises, _('Enterprises'), :recent_enterprises ],
55		- [ :products, _('Products'), :recent_products ],
56	55	[ :events, _('Upcoming events'), :upcoming_events ],
57	56	[ :communities, _('Communities'), :recent_communities ],
58	57	[ :articles, _('Contents'), :recent_articles ]
...	...	@@ -78,16 +77,17 @@ class SearchController < PublicController
78	77	full_text_search
79	78	end
80	79
81		- def products
82		- @scope = @environment.products
83		- full_text_search
84		- end
85		-
86	80	def enterprises
87	81	@scope = visible_profiles(Enterprise)
88	82	full_text_search
89	83	end
90	84
	85	+ # keep URL compatibility
	86	+ def products
	87	+ return render_not_found unless defined? ProductsPlugin
	88	+ redirect_to url_for(params.merge controller: 'products_plugin/search', action: :products)
	89	+ end
	90	+
91	91	def communities
92	92	@scope = visible_profiles(Community)
93	93	full_text_search
...	...	@@ -186,7 +186,6 @@ class SearchController < PublicController
186	186	people: _('People'),
187	187	communities: _('Communities'),
188	188	enterprises: _('Enterprises'),
189		- products: _('Products and Services'),
190	189	events: _('Events'),
191	190	}
192	191	end
...	...	@@ -260,12 +259,11 @@ class SearchController < PublicController
260	259	end
261	260
262	261	def available_assets
263		- assets = {
	262	+ {
264	263	articles: _('Contents'),
265	264	enterprises: _('Enterprises'),
266	265	people: _('People'),
267	266	communities: _('Communities'),
268		- products: _('Products and Services'),
269	267	}
270	268	end
271	269
...	...
...	...	@@ -67,24 +67,6 @@ module ActionTrackerHelper
67	67	}
68	68	end
69	69
70		- def create_product_description ta
71		- _('created the product %{title}') % {
72		- title: link_to(truncate(ta.get_name), ta.get_url),
73		- }
74		- end
75		-
76		- def update_product_description ta
77		- _('updated the product %{title}') % {
78		- title: link_to(truncate(ta.get_name), ta.get_url),
79		- }
80		- end
81		-
82		- def remove_product_description ta
83		- _('removed the product %{title}') % {
84		- title: truncate(ta.get_name),
85		- }
86		- end
87		-
88	70	def favorite_enterprise_description ta
89	71	_('favorited enterprise %{title}') % {
90	72	title: link_to(truncate(ta.get_enterprise_name), ta.get_enterprise_url),
...	...
...	...	@@ -44,8 +44,6 @@ module ApplicationHelper
44	44
45	45	include TokenHelper
46	46
47		- include CatalogHelper
48		-
49	47	include PluginsHelper
50	48
51	49	include ButtonsHelper
...	...	@@ -787,7 +785,7 @@ module ApplicationHelper
787	785	return "" if categories.blank?
788	786	content_tag(:ul) do
789	787	categories.map do \|category\|
790		- category_path = category.kind_of?(ProductCategory) ? {:controller => 'search', :action => 'assets', :asset => 'products', :product_category => category.id} : { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
	788	+ category_path = { :controller => 'search', :action => 'category_index', :category_path => category.explode_path }
791	789	if category.display_in_menu?
792	790	content_tag(:li) do
793	791	if !category.is_leaf_displayable_in_menu?
...	...