Merge branch 'redemoinho-improvements'

Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb

Merge branch 'redemoinho-improvements'
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
Rodrigo Souto
2 parents ddb64469 9e203e4c
Showing 36 changed files with 726 additions and 111 deletions Show diff stats
app/controllers/public/catalog_controller.rb
app/helpers/catalog_helper.rb
app/helpers/display_helper.rb
app/models/category.rb
app/models/organization.rb
app/models/person.rb
app/models/product.rb
app/models/profile.rb
app/views/catalog/index.rhtml
app/views/profile_editor/_person_form.rhtml
app/views/search/_product.rhtml
app/views/shared/_organization_custom_fields.rhtml
lib/noosfero/plugin/settings.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb
plugins/shopping_cart/db/migrate/20121022190819_move_fields_included_on_profiles_table_to_settings.rb
plugins/shopping_cart/lib/shopping_cart_plugin.rb
plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb
plugins/shopping_cart/public/buy.js
 class CatalogController < PublicController
   needs_profile
+  no_design_blocks
   before_filter :check_enterprise_and_environment
   def index
-    @products = @profile.products.paginate(:order => 'name asc', :per_page => 9, :page => params[:page])
+    @category = params[:level] ? ProductCategory.find(params[:level]) : nil
+    @products = @profile.products.from_category(@category).paginate(:order => 'available desc, highlighted desc, name asc', :per_page => 9, :page => params[:page])
+    @categories = ProductCategory.on_level(params[:level])
   end
   protected
@@ -3,4 +3,28 @@ module CatalogHelper
   include DisplayHelper
   include ManageProductsHelper
+  def breadcrumb(category)
+    start = link_to(_('Start'), {:action => 'index'})
+    ancestors = category.ancestors.map { |c| link_to(c.name, {:action => 'index', :level => c.id}) }.reverse
+    current_level = content_tag('strong', category.name)
+    all_items = [start] + ancestors + [current_level]
+    content_tag('div', all_items.join(' &rarr; '), :id => 'breadcrumb')
+  end
+
+  def category_link(category, sub = false)
+    count = profile.products.from_category(category).count
+    name = truncate(category.name, :length => 22 - count.to_s.size)
+    link_name = sub ? name : content_tag('strong', name)
+    link = link_to(link_name, {:action => 'index', :level => category.id}, :title => category.name)
+    content_tag('li', "#{link} (#{count})") if count > 0
+  end
+
+  def category_sub_links(category)
+    sub_categories = []
+    category.children.each do |sub_category|
+      sub_categories << category_link(sub_category, true)
+    end
+    content_tag('ul', sub_categories) if sub_categories.size > 1
+  end
+
 end
@@ -8,6 +8,14 @@ module DisplayHelper
             opts
   end
+  def themed_path(file)
+    if File.exists?(File.join(Rails.root, 'public', theme_path, file))
+      File.join(theme_path, file)
+    else
+      file
+    end
+  end
+
   def image_link_to_product(product, opts={})
     return _('No product') unless product
     target = product_path(product)
@@ -13,6 +13,16 @@ class Category &lt; ActiveRecord::Base
     {:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
   }
+  named_scope :on_level, lambda { |parent| {:conditions => {:parent_id => parent}} }
+
+  named_scope :sub_categories, lambda { |category|
+    {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
+  }
+
+  named_scope :sub_tree, lambda { |category|
+    {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
+  }
+
   acts_as_filesystem
   has_many :article_categorizations, :dependent => :destroy
@@ -78,6 +78,8 @@ class Organization &lt; Profile
     country
     tag_list
     template_id
+    district
+    address_reference
   ]
   def self.fields
@@ -96,8 +98,8 @@ class Organization &lt; Profile
     []
   end
-  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information
+  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
   validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
@@ -147,6 +147,9 @@ class Person &lt; Profile
   contact_phone
   contact_information
   description
+  image
+  district
+  address_reference
   ]
   validates_multiparameter_assignments
@@ -201,8 +204,8 @@ class Person &lt; Profile
   N_('Education'); N_('Custom education'); N_('Custom area of study');
   settings_items :formation, :custom_formation, :custom_area_of_study
-  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code
+  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -23,6 +23,10 @@ class Product &lt; ActiveRecord::Base
   named_scope :more_recent, :order => "created_at DESC"
+  named_scope :from_category, lambda { |category|
+    {:joins => :product_category, :conditions => ['categories.path LIKE ?', "%#{category.slug}%"]} if category
+  }
+
   after_update :save_image
   def lat
@@ -141,6 +141,10 @@ class Profile &lt; ActiveRecord::Base
   acts_as_having_settings :field => :data
+  def settings
+    data
+  end
+
   settings_items :redirect_l10n, :type => :boolean, :default => false
   settings_items :public_content, :type => :boolean, :default => true
   settings_items :description
@@ -229,7 +233,7 @@ class Profile &lt; ActiveRecord::Base
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
     else
-      %w[address city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
+      %w[address district city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
     end
   end
@@ -698,7 +702,7 @@ private :generate_url, :url_options
   def custom_footer_expanded
     footer = custom_footer
     if footer
-      %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do |att|
+      %w[contact_person contact_email contact_phone location address district address_reference economic_activity city state country zip_code].each do |att|
         if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
           if !self.send(att).nil? && !self.send(att).blank?
             footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))
 <% extra_content = [] %>
 <% extra_content_list = [] %>
-<ul id="product-list">
-  <li><h1><%= _('Products/Services') %></h1></li>
+<h1><%= _('Products/Services') %></h1>
+<%= breadcrumb(@category) if params[:level] %>
+
+<div class='l-sidebar-left-bar'>
+  <ul>
+    <% if @categories.size > 0 %>
+      <% @categories.each do |category| %>
+        <%= category_link(category) %>
+        <%= category_sub_links(category) %>
+      <% end %>
+    <% else %>
+      <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
+    <% end %>
+  </ul>
+</div>
+
+<ul id="product-list" class="l-sidebar-left-content">
   <% @products.each do |product| %>
     <% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { |content| instance_eval(&content) } %>
     <% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { |content| instance_eval(&content) } %>
-    <li class="product <%= "not-available" unless product.available %>">
+    <% 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)})" %>
@@ -21,6 +21,8 @@
 <%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
+<%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference, :rel => _('Address reference')))) %>
+<%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
 <% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { |content| instance_eval(&content) } %>
 <% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
-<li class="search-product-item">
+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
   <div class="search-product-item-first-column">
     <%= render :partial => 'search/image', :object => product %>
@@ -10,6 +10,8 @@
 <%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
 <%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
 <%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference))) %>
+<%= optional_field(profile, 'district', labelled_form_field(_('District'), text_field(object_name, :district))) %>
 <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
 <%= optional_field(profile, 'city', f.text_field(:city)) %>
 <%= optional_field(profile, 'state', f.text_field(:state)) %>
 class Noosfero::Plugin::Settings
-  def initialize(environment, plugin, attributes = nil)
-    @environment = environment
+  def initialize(base, plugin, attributes = nil)
+    @base = base
     @plugin = plugin
     attributes ||= {}
     attributes.each do |k,v|
@@ -10,7 +10,7 @@ class Noosfero::Plugin::Settings
   end
   def settings
-    @environment.settings["#{@plugin.public_name}_plugin".to_sym] ||= {}
+    @base.settings["#{@plugin.public_name}_plugin".to_sym] ||= {}
   end
   def method_missing(method, *args, &block)
@@ -38,7 +38,7 @@ class Noosfero::Plugin::Settings
   end
   def save!
-    @environment.save!
+    @base.save!
   end
 end
@@ -100,15 +100,16 @@ class ShoppingCartPluginController &lt; PublicController
   def buy
     @cart = cart
     @enterprise = environment.enterprises.find(cart[:enterprise_id])
+    @settings = Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
     render :layout => false
   end
   def send_request
     register_order(params[:customer], self.cart[:items])
     begin
-      enterprise = Enterprise.find(cart[:enterprise_id])
-      ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items])
-      ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items])
+      enterprise = environment.enterprises.find(cart[:enterprise_id])
+      ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option])
+      ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option])
       self.cart = nil
       render :text => {
         :ok => true,
@@ -168,6 +169,25 @@ class ShoppingCartPluginController &lt; PublicController
     end
   end
+  def update_delivery_option
+    enterprise = environment.enterprises.find(cart[:enterprise_id])
+    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    delivery_price = settings.delivery_options[params[:delivery_option]]
+    delivery = Product.new(:name => params[:delivery_option], :price => delivery_price)
+    delivery.save(false)
+    items = self.cart[:items].clone
+    items[delivery.id] = 1
+    total_price = get_total_on_currency(items, environment)
+    delivery.destroy
+    render :text => {
+      :ok => true,
+      :delivery_price => float_to_currency_cart(delivery_price, environment),
+      :total_price => total_price,
+      :message => _('Delivery option updated.'),
+      :error => {:code => 0}
+    }.to_json
+  end
+
   private
   def validate_same_enterprise(product)
@@ -4,9 +4,12 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
   def edit
+    params[:settings] = treat_cart_options(params[:settings])
+
+    @settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin, params[:settings])
     if request.post?
       begin
-        profile.update_attributes!(params[:profile_attr])
+        @settings.save!
         session[:notice] = _('Option updated successfully.')
       rescue Exception => exception
         session[:notice] = _('Option wasn\'t updated successfully.')
@@ -46,4 +49,25 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
     order.save!
     redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
   end
+
+  private
+
+  def treat_cart_options(settings)
+    return if settings.blank?
+    settings[:enabled] = settings[:enabled] == '1'
+    settings[:delivery] = settings[:delivery] == '1'
+    settings[:free_delivery_price] = settings[:free_delivery_price].blank? ? nil : settings[:free_delivery_price].to_d
+    settings[:delivery_options] = treat_delivery_options(settings[:delivery_options])
+    settings
+  end
+
+  def treat_delivery_options(params)
+    result = {}
+    params[:options].size.times do |counter|
+      if params[:options][counter].present? && params[:prices][counter].present?
+        result[params[:options][counter]] = params[:prices][counter]
+      end
+    end
+    result
+  end
 end
@@ -0,0 +1,19 @@
+class MoveFieldsIncludedOnProfilesTableToSettings < ActiveRecord::Migration
+  def self.up
+    Profile.find_each do |profile|
+      settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
+      settings.enabled = profile.shopping_cart
+      settings.delivery = profile.shopping_cart_delivery
+      settings.delivery_price = profile.shopping_cart_delivery_price
+      settings.save!
+    end
+
+    remove_column :profiles, :shopping_cart
+    remove_column :profiles, :shopping_cart_delivery
+    remove_column :profiles, :shopping_cart_delivery_price
+  end
+
+  def self.down
+    say "This migration can not be reverted!"
+  end
+end
@@ -3,17 +3,36 @@ require_dependency &#39;shopping_cart_plugin/ext/person&#39;
 class ShoppingCartPlugin < Noosfero::Plugin
-  def self.plugin_name
+  class << self
+    def plugin_name
     "Shopping Basket"
-  end
+    end
+
+    def plugin_description
+      _("A shopping basket feature for enterprises")
+    end
+
+    def enabled_default_setting
+      true
+    end
-  def self.plugin_description
-    _("A shopping basket feature for enterprises")
+    def delivery_default_setting
+      false
+    end
+
+    def delivery_price_default_setting
+      0
+    end
+
+    def delivery_options_default_setting
+      {}
+    end
   end
   def add_to_cart_button(item)
     enterprise = item.enterprise
-    if enterprise.shopping_cart && item.available
+    settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    if settings.enabled && item.available
        lambda {
          link_to(_('Add to basket'), "add:#{item.name}",
            :class => 'cart-add-item',
@@ -40,11 +59,12 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
   def control_panel_buttons
+    settings = Noosfero::Plugin::Settings.new(context.profile, ShoppingCartPlugin)
     buttons = []
     if context.profile.enterprise?
       buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
     end
-    if context.profile.enterprise? && context.profile.shopping_cart
+    if context.profile.enterprise? && settings.enabled
       buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
     end
@@ -8,46 +8,69 @@ module ShoppingCartPlugin::CartHelper
     product.discount ? product.price_with_discount : product.price
   end
-  def get_price(product, environment)
-    float_to_currency_cart(sell_price(product), environment)
+  def get_price(product, environment, quantity=1)
+    float_to_currency_cart(price_with_quantity(product,quantity), environment)
   end
-  def get_total(items, environment)
-    float_to_currency_cart(items.map { |id, quantity| sell_price(Product.find(id)) * quantity}.sum, environment)
+  def price_with_quantity(product, quantity=1)
+    quantity = 1 if !quantity.kind_of?(Numeric)
+    sell_price(product)*quantity
   end
-  def items_table(items, profile, by_mail = false)
+  def get_total(items)
+    items.map { |id, quantity| price_with_quantity(Product.find(id),quantity)}.sum
+  end
+
+  def get_total_on_currency(items, environment)
+    float_to_currency_cart(get_total(items), environment)
+  end
+
+  def items_table(items, profile, delivery_option = nil, by_mail = false)
     environment = profile.environment
+    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
     items = items.to_a
-    if profile.shopping_cart_delivery
-      delivery = Product.create!(:name => _('Delivery'), :price => profile.shopping_cart_delivery_price, :product_category => ProductCategory.last)
-      items << [delivery.id, 1]
-    end
     quantity_opts = { :class => 'cart-table-quantity' }
     quantity_opts.merge!({:align => 'center'}) if by_mail
     price_opts = {:class => 'cart-table-price'}
     price_opts.merge!({:align => 'right'}) if by_mail
+    items.sort! {|a, b| Product.find(a.first).name <=> Product.find(b.first).name}
+
+    if settings.delivery
+      if settings.free_delivery_price && get_total(items) >= settings.free_delivery_price
+        delivery = Product.new(:name => _('Free delivery'), :price => 0)
+      else
+        delivery = Product.new(:name => delivery_option || _('Delivery'), :price => settings.delivery_options[delivery_option])
+      end
+      delivery.save(false)
+      items << [delivery.id, '']
+    end
     table = '<table id="cart-items-table" cellpadding="2" cellspacing="0"
     border="'+(by_mail ? '1' : '0')+'"
     style="'+(by_mail ? 'border-collapse:collapse' : '')+'">' +
     content_tag('tr',
-                content_tag('th', _('Item name')) +
-                content_tag('th', by_mail ? '&nbsp;#&nbsp;' : '#') +
-                content_tag('th', _('Price'))
+      content_tag('th', _('Item name')) +
+      content_tag('th', by_mail ? '&nbsp;#&nbsp;' : '#') +
+      content_tag('th', _('Price'))
     ) +
     items.map do |id, quantity|
       product = Product.find(id)
+      name_opts = {}
+      is_delivery = quantity.kind_of?(String)
+      if is_delivery
+        price_opts.merge!({:id => 'delivery-price'})
+        name_opts.merge!({:id => 'delivery-name'})
+      end
       content_tag('tr',
-                  content_tag('td', product.name) +
-                  content_tag('td', quantity, quantity_opts ) +
-                  content_tag('td', get_price(product, environment), price_opts )
-                 )
+        content_tag('td', product.name, name_opts) +
+        content_tag('td', quantity, quantity_opts ) +
+        content_tag('td', get_price(product, environment, quantity), price_opts)
+      )
     end.join("\n")
-    total = get_total(items, environment)
-    delivery.destroy if profile.shopping_cart_delivery
+    total = get_total_on_currency(items, environment)
+    delivery.destroy if settings.delivery
     table +
     content_tag('th', _('Total:'), :colspan => 2, :class => 'cart-table-total-label') +
@@ -56,6 +79,14 @@ module ShoppingCartPlugin::CartHelper
   end
   def float_to_currency_cart(value, environment)
-    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u %n")
+    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u%n")
+  end
+
+  def select_delivery_options(options, environment)
+    result = options.map do |option, price|
+      ["#{option} (#{float_to_currency_cart(price, environment)})", option]
+    end
+    result << ["#{_('Delivery')} (#{float_to_currency_cart(0, environment)})", 'delivery'] if result.empty?
+    result
   end
 end
@@ -2,7 +2,7 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
   include ShoppingCartPlugin::CartHelper
-  def customer_notification(customer, supplier, items)
+  def customer_notification(customer, supplier, items, delivery_option)
     domain = supplier.hostname || supplier.environment.default_hostname
     recipients    customer[:email]
     from          'no-reply@' + domain
@@ -13,10 +13,11 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
          :supplier => supplier,
          :items => items,
          :environment => supplier.environment,
-         :helper => self
+         :helper => self,
+         :delivery_option => delivery_option
   end
-  def supplier_notification(customer, supplier, items)
+  def supplier_notification(customer, supplier, items, delivery_option)
     domain = supplier.environment.default_hostname
     recipients    supplier.contact_email
     from          'no-reply@' + domain
@@ -27,7 +28,7 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
          :supplier => supplier,
          :items => items,
          :environment => supplier.environment,
-         :helper => self
-
+         :helper => self,
+         :delivery_option => delivery_option
   end
 end
@@ -0,0 +1,34 @@
+jQuery(document).ready(function(){
+  jQuery("#cart-request-form").validate({
+    submitHandler: function(form) {
+      jQuery(form).find('input.submit').attr('disabled', true);
+      jQuery('#cboxLoadingOverlay').show().addClass('loading');
+      jQuery('#cboxLoadingGraphic').show().addClass('loading');
+    }
+  });
+});
+
+jQuery('#delivery_option').change(function(){
+  jQuery('#cboxLoadingGraphic').show();
+  me = this;
+  enterprise = jQuery(me).attr('data-profile-identifier');
+  option = jQuery(me).val();
+  jQuery.ajax({
+    url: '/plugin/shopping_cart/update_delivery_option',
+    dataType: "json",
+    data: 'delivery_option='+option,
+    success: function(data, st, ajax) {
+      jQuery('#delivery-price').text(data.delivery_price);
+      jQuery('.cart-table-total-value').text(data.total_price);
+      jQuery('#delivery-name').text(option);
+      jQuery('#cboxLoadingGraphic').hide();
+    },
+    error: function(ajax, st, errorThrown) {
+      alert('Update delivery option - HTTP '+st+': '+errorThrown);
+    },
+  });
+});
+
+jQuery('#customer_payment').change(function(){
+  jQuery(this).closest('.formfieldline').next().slideToggle('fast');
+});
@@ -0,0 +1,16 @@
+jQuery('#settings_delivery').click(function(){
+  jQuery('#delivery_settings').toggle('fast');
+});
+
+jQuery('#add-new-option').click(function(){
+  new_option = jQuery('#empty-option').clone();
+  new_option.removeAttr('id');
+  jQuery('#add-new-option-row').before(new_option);
+  new_option.show();
+  return false;
+});
+
+jQuery('.remove-option').live('click', function(){
+  jQuery(this).closest('tr').remove();
+  return false;
+});
@@ -13,46 +13,42 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   attr_reader :enterprise
   should 'be able to enable shopping cart' do
-    enterprise.shopping_cart = false
-    enterprise.save
-    post :edit, :profile => enterprise.identifier, :profile_attr => {:shopping_cart => '1'}
-    enterprise.reload
+    settings.enabled = false
+    settings.save!
+    post :edit, :profile => enterprise.identifier, :settings => {:enabled => '1'}
-    assert enterprise.shopping_cart
+    assert settings.enabled
   end
   should 'be able to disable shopping cart' do
-    enterprise.shopping_cart = true
-    enterprise.save
-    post :edit, :profile => enterprise.identifier, :profile_attr => {:shopping_cart => '0'}
-    enterprise.reload
+    settings.enabled = true
+    settings.save!
+    post :edit, :profile => enterprise.identifier, :settings => {:enabled => '0'}
-    assert !enterprise.shopping_cart
+    assert !settings.enabled
   end
   should 'be able to enable shopping cart delivery' do
-    enterprise.shopping_cart_delivery = false
-    enterprise.save
-    post :edit, :profile => enterprise.identifier, :profile_attr => {:shopping_cart_delivery => '1'}
-    enterprise.reload
+    settings.delivery = false
+    settings.save!
+    post :edit, :profile => enterprise.identifier, :settings => {:delivery => '1'}
-    assert enterprise.shopping_cart_delivery
+    assert settings.delivery
   end
   should 'be able to disable shopping cart delivery' do
-    enterprise.shopping_cart_delivery = true
-    enterprise.save
-    post :edit, :profile => enterprise.identifier, :profile_attr => {:shopping_cart_delivery => '0'}
-    enterprise.reload
+    settings.delivery = true
+    settings.save!
+    post :edit, :profile => enterprise.identifier, :settings => {:delivery => '0'}
-    assert !enterprise.shopping_cart_delivery
+    assert !settings.delivery
   end
   should 'be able to choose the delivery price' do
     price = 4.35
-    post :edit, :profile => enterprise.identifier, :profile_attr => {:shopping_cart_delivery_price => price}
-    enterprise.reload
-    assert enterprise.shopping_cart_delivery_price == price
+    post :edit, :profile => enterprise.identifier, :settings => {:delivery_price => price}
+
+    assert settings.delivery_price == price
   end
   should 'filter the reports correctly' do
@@ -112,4 +108,11 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
     po.reload
     assert_equal ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED, po.status
   end
+
+  private
+
+  def settings
+    @enterprise.reload
+    Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
+  end
 end
@@ -6,30 +6,26 @@
       <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
       <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
       <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
+      <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @enterprise.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
+      <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('Check'), :check]]))) %>
+      <%= labelled_form_field(_('Change'), text_field_tag('customer[change]')) %>
     </div>
-    <fieldset><legend><%=_('Delivery Address')%></legend>
-      <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
-      <%= labelled_form_field( _("City"), f.text_field(:city)) %>
-      <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
-    </fieldset>
+    <% if @settings.delivery %>
+      <fieldset><legend><%=_('Delivery Address')%></legend>
+        <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
+        <%= labelled_form_field(_('Address reference'), f.text_field(:address_reference)) %>
+        <%= labelled_form_field(_('District'), f.text_field(:district)) %>
+        <%= labelled_form_field( _("City"), f.text_field(:city)) %>
+        <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
+      </fieldset>
+    <% end %>
     <div id="cart-form-actions">
       <%= submit_button(:send, _('Send buy request')) %>
     </div>
   <% end %>
-  <%= items_table(@cart[:items], @enterprise) %>
+  <% delivery_option = @settings.delivery_options.first && @settings.delivery_options.first.first %>
+  <%= items_table(@cart[:items], @enterprise, delivery_option) %>
   <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
 </div>
-<script type="text/javascript">
-//<![CDATA[
-  jQuery(document).ready(function(){
-    jQuery("#cart-request-form").validate({
-      submitHandler: function(form) {
-        jQuery(form).find('input.submit').attr('disabled', true);
-        jQuery('#cboxLoadingOverlay').show().addClass('loading');
-        jQuery('#cboxLoadingGraphic').show().addClass('loading');
-      }
-    });
-  });
-//]]>
-</script>
+<%= javascript_include_tag '../plugins/shopping_cart/buy' %>
@@ -17,26 +17,35 @@
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
       <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li>
+      <% if @customer[:payment] == 'money' %>
+        <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         <li><b><%= _('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
       <% end %>
+      <% if !@customer[:district].blank? %>
+        <%= @customer[:district] %><br \>
+      <% end %>
       <% if !@customer[:city].blank? %>
         <%= @customer[:city] %><br \>
       <% end %>
       <% if !@customer[:zip_code].blank? %>
         <%= @customer[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <% if !@customer[:address_reference].blank? %>
+        <%= @customer[:address_reference] %><br \>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
     <p><%=_('Here are the products you bought:')%></p>
-    <%= @helper.items_table(@items, @supplier, true) %>
-
+    <%= @helper.items_table(@items, @supplier, @delivery_option, true) %>
     <p>
       --<br/>
       <%=_('Thanks for buying with us!')%><br/>
@@ -15,26 +15,35 @@
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
       <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li>
+      <% if @customer[:payment] == 'money' %>
+        <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         <li><b><%= _('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
       <% end %>
+      <% if !@customer[:district].blank? %>
+        <%= @customer[:district] %><br \>
+      <% end %>
       <% if !@customer[:city].blank? %>
         <%= @customer[:city] %><br \>
       <% end %>
       <% if !@customer[:zip_code].blank? %>
         <%= @customer[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <% if !@customer[:address_reference].blank? %>
+        <%= @customer[:address_reference] %><br \>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
     <p><%=_('And here are the items bought by this customer:')%></p>
-    <%= @helper.items_table(@items, @supplier, true) %>
-
+    <%= @helper.items_table(@items, @supplier, @delivery_option, true) %>
     <p>
       --<br/>
       <%=_('If there are any problems with this email contact the admin of %s.') % @environment.name %>
 <h1> <%= _('Basket options') %> </h1>
-<% form_for(:profile_attr, profile, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Enabled?'), f.check_box(:shopping_cart)) %>
-  <%= labelled_form_field(_('Delivery?'), f.check_box(:shopping_cart_delivery)) %>
-  <%= labelled_form_field(_('Delivery price:'), f.text_field(:shopping_cart_delivery_price)) %>
+<% form_for(:settings, @settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
+  <%= labelled_form_field(_('Enabled?'), f.check_box(:enabled)) %>
+  <%= labelled_form_field(_('Delivery?'), f.check_box(:delivery)) %>
+  <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
+  <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
+    <table>
+      <tr>
+        <th><%= _('Option') %></th>
+        <th><%= _('Price') %></th>
+        <th>&nbsp;</th>
+      </tr>
+      <% @settings.delivery_options.each do |option, price| %>
+        <tr>
+          <td><%= text_field_tag('settings[delivery_options][options][]', option, :style => 'width: 100%') %></td>
+          <td><%= text_field_tag('settings[delivery_options][prices][]', price, :style => 'width: 100%') %></td>
+          <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
+        </tr>
+      <% end %>
+      <tr>
+        <td><%= text_field_tag('settings[delivery_options][options][]', nil, :style => 'width: 100%') %></td>
+        <td><%= text_field_tag('settings[delivery_options][prices][]', nil, :style => 'width: 100%') %></td>
+        <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
+      </tr>
+      <tr id='add-new-option-row'>
+        <td colspan='3' style='background-color: #EEE; text-align: center'><%= link_to(_('ADD NEW OPTION'), '', :id => 'add-new-option') %></td>
+      </tr>
+      <tr id="empty-option" style='display: none'>
+        <td><%= text_field_tag('settings[delivery_options][options][]', nil, :style => 'width: 100%') %></td>
+        <td><%= text_field_tag('settings[delivery_options][prices][]', nil, :style => 'width: 100%') %></td>
+        <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
+      </tr>
+    </table>
+
+    <%= labelled_form_field(_('Free delivery price:'), f.text_field(:free_delivery_price)) %>
+    <%= content_tag('small', _('Empty stands for no free delivery price.')) %>
+  </fieldset>
   <br style='clear: both'/>
   <br style='clear: both'/>
   <div>
@@ -11,3 +43,5 @@
     <%= button :back, _('Back to control panel'), :controller => 'profile_editor' %>
   </div>
 <% end%>
+
+<%= javascript_include_tag '../plugins/shopping_cart/edit' %>
@@ -2681,6 +2681,40 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 .msie #product-list h3 {
   margin-top: -15px;
 }
+
+.l-sidebar-left-bar ul,
+.l-sidebar-right-bar ul {
+  list-style-type: none;
+  margin-left: 0;
+  padding: 1em 1em 0.5em 1em;
+}
+
+.l-sidebar-left-bar ul ul,
+.l-sidebar-right-bar ul ul {
+  padding-top: 0;
+}
+
+.l-sidebar-left-bar ul{
+  background-color: #eeeeec;
+  border-radius: 5px;
+}
+
+.l-sidebar-left-bar a,
+.l-sidebar-right-bar a {
+  text-decoration: none;
+}
+
+.l-sidebar-left-bar a:hover,
+.l-sidebar-right-bar a:hover {
+  text-decoration: underline;
+}
+
+.l-sidebar-left-bar li,
+.l-sidebar-right-bar li {
+  margin: 0;
+  padding: 0;
+}
+
 /* * * Show Product * * * * * * * * * * * * */
 .controller-catalog #show_product .product-pic {
@@ -6070,6 +6104,35 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
      line-height: 1.5;
 }
+/* Sidebar Layout */
+
+.l-sidebar-left-bar {
+  float: left;
+  width: 20%;
+}
+
+.l-sidebar-left-content {
+  float: right;
+  width: 78%;
+}
+
+.l-sidebar-right-bar {
+  float: right;
+  width: 20%;
+}
+
+.l-sidebar-right-content {
+  float: left;
+  width: 78%;
+}
+
+/* Breadcrumb */
+
+#breadcrumb {
+  font-size: 16px;
+  margin: 15px 0;
+}
+
 .controller-profile_editor #profile-data {
   display: table;
   width: auto;
@@ -6118,3 +6181,10 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
   width: 100px;
   text-align: center;
 }
+
+#product-list .highlighted img.star {
+  position: absolute;
+  top: 2px;
+  right: 2px;
+  z-index: 10;
+}
@@ -109,4 +109,119 @@ class CatalogControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'span', :content => 'This is Plugin2 speaking!', :attributes => {:id => 'plugin2'}
   end
+  should 'get categories of the right level' do
+    pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
+    pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc3 = ProductCategory.create!(:name => "PC3", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc4 = ProductCategory.create!(:name => "PC4", :environment => @enterprise.environment, :parent_id => pc2.id)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier, :level => pc1.id
+
+    assert_not_includes assigns(:categories), pc1
+    assert_includes assigns(:categories), pc2
+    assert_includes assigns(:categories), pc3
+    assert_not_includes assigns(:categories), pc4
+  end
+
+  should 'filter products based on level selected' do
+    pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
+    pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc3 = ProductCategory.create!(:name => "PC3", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc4 = ProductCategory.create!(:name => "PC4", :environment => @enterprise.environment, :parent_id => pc2.id)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier, :level => pc2.id
+
+    assert_not_includes assigns(:products), p1
+    assert_includes assigns(:products), p2
+    assert_not_includes assigns(:products), p3
+    assert_includes assigns(:products), p4
+  end
+
+  should 'get products ordered by availability, highlighted and then name' do
+    p1 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Zebra', :available => true, :highlighted => true)
+    p2 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Car', :available => true)
+    p3 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Panda', :available => true)
+    p4 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Pen', :available => false, :highlighted => true)
+    p5 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Ball', :available => false)
+    p6 = fast_create(Product, :enterprise_id => @enterprise.id, :name => 'Medal', :available => false)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_equal [p1,p2,p3,p4,p5,p6], assigns(:products)
+  end
+
+  should 'add highlighted CSS class around a highlighted product' do
+    prod = @enterprise.products.create!(:name => 'Highlighted Product', :product_category => @product_category, :highlighted => true)
+    get :index, :profile => @enterprise.identifier
+    assert_tag :tag => 'li', :attributes => { :class => 'product highlighted' }, :content => /Highlighted Product/
+  end
+
+  should 'do not add highlighted CSS class around an ordinary product' do
+    prod = @enterprise.products.create!(:name => 'Ordinary Product', :product_category => @product_category, :highlighted => false)
+    get :index, :profile => @enterprise.identifier
+    assert_no_tag :tag => 'li', :attributes => { :class => 'product highlighted' }, :content => /Ordinary Product/
+  end
+
+  should 'display star image in highlighted product' do
+    prod = @enterprise.products.create!(:name => 'The Eyes Are The Light', :product_category => @product_category, :highlighted => true)
+    get :index, :profile => @enterprise.identifier
+    assert_tag :tag => 'img', :attributes => { :class => 'star', :src => /star.png/ }
+  end
+
+  should 'display categories and sub-categories link' do
+    pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
+    pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc3 = ProductCategory.create!(:name => "PC3", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc4 = ProductCategory.create!(:name => "PC4", :environment => @enterprise.environment, :parent_id => pc2.id)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'a', :attributes => {:href => /level=#{pc1.id}/}
+    assert_tag :tag => 'a', :attributes => {:href => /level=#{pc2.id}/}
+    assert_tag :tag => 'a', :attributes => {:href => /level=#{pc3.id}/}
+    assert_no_tag :tag => 'a', :attributes => {:href => /level=#{pc4.id}/}
+  end
+
+
+  should 'display categories on breadcrumb' do
+    pc1 = ProductCategory.create!(:name => "PC1", :environment => @enterprise.environment)
+    pc2 = ProductCategory.create!(:name => "PC2", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc3 = ProductCategory.create!(:name => "PC3", :environment => @enterprise.environment, :parent_id => pc1.id)
+    pc4 = ProductCategory.create!(:name => "PC4", :environment => @enterprise.environment, :parent_id => pc2.id)
+    p1 = fast_create(Product, :product_category_id => pc1.id, :enterprise_id => @enterprise.id)
+    p2 = fast_create(Product, :product_category_id => pc2.id, :enterprise_id => @enterprise.id)
+    p3 = fast_create(Product, :product_category_id => pc3.id, :enterprise_id => @enterprise.id)
+    p4 = fast_create(Product, :product_category_id => pc4.id, :enterprise_id => @enterprise.id)
+
+    get :index, :profile => @enterprise.identifier, :level => pc4.id
+
+    assert_tag :tag => 'div', :attributes => {:id => 'breadcrumb'}, :descendant => {:tag => 'a', :attributes => {:href => /level=#{pc1.id}/}}
+    assert_tag :tag => 'div', :attributes => {:id => 'breadcrumb'}, :descendant => {:tag => 'a', :attributes => {:href => /level=#{pc2.id}/}}
+    assert_tag :tag => 'div', :attributes => {:id => 'breadcrumb'}, :descendant => {:tag => 'strong', :content => pc4.name}
+    assert_no_tag :tag => 'div', :attributes => {:id => 'breadcrumb'}, :descendant => {:tag => 'a', :attributes => {:href => /level=#{pc3.id}/}}
+  end
+
+  should 'add product status on the class css' do
+    category = ProductCategory.create!(:name => "Cateogry", :environment => @enterprise.environment)
+    p1 = fast_create(Product, :product_category_id => category.id, :enterprise_id => @enterprise.id, :highlighted => true)
+    p2 = fast_create(Product, :product_category_id => category.id, :enterprise_id => @enterprise.id, :available => false)
+
+    get :index, :profile => @enterprise.identifier
+
+    assert_tag :tag => 'li', :attributes => {:id => "product-#{p1.id}", :class => /highlighted/}
+    assert_tag :tag => 'li', :attributes => {:id => "product-#{p2.id}", :class => /not-available/}
+  end
+
 end
@@ -926,6 +926,20 @@ class SearchControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'add highlighted CSS class around a highlighted product' do
+    enterprise = fast_create(Enterprise)
+    product = Product.create!(:name => 'Enter Sandman', :enterprise_id => enterprise.id, :product_category_id => @product_category.id, :highlighted => true)
+    get :products
+    assert_tag :tag => 'li', :attributes => { :class => 'search-product-item highlighted' }, :content => /Enter Sandman/
+  end
+
+  should 'do not add highlighted CSS class around an ordinary product' do
+    enterprise = fast_create(Enterprise)
+    product = Product.create!(:name => 'Holier Than Thou', :enterprise_id => enterprise.id, :product_category_id => @product_category.id, :highlighted => false)
+    get :products
+    assert_no_tag :tag => 'li', :attributes => { :class => 'search-product-item highlighted' }, :content => /Holier Than Thou/
+  end
+
   ##################################################################
   ##################################################################
@@ -552,4 +552,62 @@ class CategoryTest &lt; ActiveSupport::TestCase
     cat.save!
   end
+  should 'return categories of a level' do
+    c1 = fast_create(Category)
+    c2 = fast_create(Category)
+    c3 = fast_create(Category, :parent_id => c1)
+    c4 = fast_create(Category, :parent_id => c1)
+    c5 = fast_create(Category, :parent_id => c2)
+    c6 = fast_create(Category, :parent_id => c3)
+
+    assert_includes Category.on_level(nil), c1
+    assert_includes Category.on_level(nil), c2
+    assert_includes Category.on_level(c1), c3
+    assert_includes Category.on_level(c1), c4
+    assert_includes Category.on_level(c2), c5
+    assert_includes Category.on_level(c3), c6
+  end
+
+  should 'on level named_scope must be able to receive parent or parent_id' do
+    parent = fast_create(Category)
+    category = fast_create(Category, :parent_id => parent)
+
+    assert_includes Category.on_level(parent), category
+    assert_includes Category.on_level(parent.id), category
+  end
+
+  should 'list category sub-categories' do
+    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
+    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
+    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
+    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
+    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
+
+    sub_categories = Category.sub_categories(c1)
+
+    assert ActiveRecord::NamedScope::Scope, sub_categories.class
+    assert_not_includes sub_categories, c1
+    assert_not_includes sub_categories, c2
+    assert_includes sub_categories, c3
+    assert_includes sub_categories, c4
+    assert_includes sub_categories, c5
+  end
+
+  should 'list category sub-tree' do
+    c1 = Category.create!(:name => 'Category 1', :environment => Environment.default)
+    c2 = Category.create!(:name => 'Category 2', :environment => Environment.default)
+    c3 = Category.create!(:name => 'Category 3', :environment => Environment.default, :parent_id => c1)
+    c4 = Category.create!(:name => 'Category 4', :environment => Environment.default, :parent_id => c1)
+    c5 = Category.create!(:name => 'Category 5', :environment => Environment.default, :parent_id => c3)
+
+    sub_tree = Category.sub_tree(c1)
+
+    assert ActiveRecord::NamedScope::Scope, sub_tree.class
+    assert_includes sub_tree, c1
+    assert_not_includes sub_tree, c2
+    assert_includes sub_tree, c3
+    assert_includes sub_tree, c4
+    assert_includes sub_tree, c5
+  end
+
 end
@@ -44,4 +44,14 @@ class DisplayHelperTest &lt; ActiveSupport::TestCase
     assert_equal 'go to <a href="http://www.noosfero.org" onclick="return confirm(\'Are you sure you want to visit this web site?\')" rel="nofolow" target="_blank">www.&#x200B;noos&#x200B;fero&#x200B;.org</a> yeah!', html
   end
+  should 'return path to file under theme dir if theme has that file' do
+    stubs(:theme_path).returns('/designs/themes/noosfero')
+    assert_equal '/designs/themes/noosfero/images/rails.png', themed_path('/images/rails.png')
+  end
+
+  should 'return path to file under public dir if theme hasnt that file' do
+    stubs(:theme_path).returns('/designs/themes/noosfero')
+    assert_equal '/images/invalid-file.png', themed_path('/images/invalid-file.png')
+  end
+
 end
@@ -64,7 +64,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should "have person info fields" do
     p = Person.new(:environment => Environment.default)
-    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image ].each do |i|
+    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image, :district, :address_reference ].each do |i|
       assert_respond_to p, i
     end
   end
@@ -10,29 +10,41 @@ class PluginSettingsTest &lt; ActiveSupport::TestCase
   def setup
     @environment = Environment.new
+    @profile = Profile.new
     @plugin = SolarSystemPlugin
-    @settings = Noosfero::Plugin::Settings.new(@environment, @plugin)
   end
-  attr_accessor :environment, :plugin, :settings
+  attr_accessor :environment, :profile, :plugin, :settings
-  should 'store setttings in environment' do
+  should 'store setttings on any model that offers settings' do
+    base = environment
+    settings = Noosfero::Plugin::Settings.new(base, plugin)
     settings.star = 'sun'
     settings.planets = 8
-    assert_equal 'sun', environment.settings[:solar_system_plugin][:star]
-    assert_equal 8, environment.settings[:solar_system_plugin][:planets]
+    assert_equal 'sun', base.settings[:solar_system_plugin][:star]
+    assert_equal 8, base.settings[:solar_system_plugin][:planets]
+    assert_equal 'sun', settings.star
+    assert_equal 8, settings.planets
+
+    base = profile
+    settings = Noosfero::Plugin::Settings.new(base, plugin)
+    settings.star = 'sun'
+    settings.planets = 8
+    assert_equal 'sun', base.settings[:solar_system_plugin][:star]
+    assert_equal 8, base.settings[:solar_system_plugin][:planets]
     assert_equal 'sun', settings.star
     assert_equal 8, settings.planets
   end
-  should 'save environment on save' do
+  should 'save base on save' do
     environment.expects(:save!)
+    settings = Noosfero::Plugin::Settings.new(environment, plugin)
     settings.save!
   end
   should 'use default value defined on the plugin class' do
+    settings = Noosfero::Plugin::Settings.new(profile, plugin)
     assert_equal 42, settings.secret
   end
 end
-
@@ -772,4 +772,40 @@ class ProductTest &lt; ActiveSupport::TestCase
     assert_equal [prod3, prod2, prod1], Product.more_recent
   end
+  should 'return products from a category' do
+    pc1 = ProductCategory.create!(:name => 'PC1', :environment => Environment.default)
+    pc2 = ProductCategory.create!(:name => 'PC2', :environment => Environment.default)
+    pc3 = ProductCategory.create!(:name => 'PC3', :environment => Environment.default, :parent => pc1)
+    p1 = fast_create(Product, :product_category_id => pc1)
+    p2 = fast_create(Product, :product_category_id => pc1)
+    p3 = fast_create(Product, :product_category_id => pc2)
+    p4 = fast_create(Product, :product_category_id => pc3)
+
+    products = Product.from_category(pc1)
+
+    assert_includes products, p1
+    assert_includes products, p2
+    assert_not_includes products, p3
+    assert_includes products, p4
+  end
+
+  should 'not crash if nil is passed to from_category' do
+    assert_nothing_raised do
+      Product.from_category(nil)
+    end
+  end
+
+  should 'return from_category scope untouched if passed nil' do
+    enterprise = fast_create(Enterprise)
+    p1 = fast_create(Product, :enterprise_id => enterprise.id)
+    p2 = fast_create(Product, :enterprise_id => enterprise.id)
+    p3 = fast_create(Product, :enterprise_id => enterprise.id)
+
+    products = enterprise.products.from_category(nil)
+
+    assert_includes products, p1
+    assert_includes products, p2
+    assert_includes products, p3
+  end
+
 end
	@@ -3,4 +3,28 @@ module CatalogHelper		@@ -3,4 +3,28 @@ module CatalogHelper
3	include DisplayHelper	3	include DisplayHelper
4	include ManageProductsHelper	4	include ManageProductsHelper
5		5
		6	+ def breadcrumb(category)
		7	+ start = link_to(_('Start'), {:action => 'index'})
		8	+ ancestors = category.ancestors.map { \|c\| link_to(c.name, {:action => 'index', :level => c.id}) }.reverse
		9	+ current_level = content_tag('strong', category.name)
		10	+ all_items = [start] + ancestors + [current_level]
		11	+ content_tag('div', all_items.join(' → '), :id => 'breadcrumb')
		12	+ end
		13	+
		14	+ def category_link(category, sub = false)
		15	+ count = profile.products.from_category(category).count
		16	+ name = truncate(category.name, :length => 22 - count.to_s.size)
		17	+ link_name = sub ? name : content_tag('strong', name)
		18	+ link = link_to(link_name, {:action => 'index', :level => category.id}, :title => category.name)
		19	+ content_tag('li', "#{link} (#{count})") if count > 0
		20	+ end
		21	+
		22	+ def category_sub_links(category)
		23	+ sub_categories = []
		24	+ category.children.each do \|sub_category\|
		25	+ sub_categories << category_link(sub_category, true)
		26	+ end
		27	+ content_tag('ul', sub_categories) if sub_categories.size > 1
		28	+ end
		29	+
6	end	30	end
	@@ -8,6 +8,14 @@ module DisplayHelper		@@ -8,6 +8,14 @@ module DisplayHelper
8	opts	8	opts
9	end	9	end
10		10
		11	+ def themed_path(file)
		12	+ if File.exists?(File.join(Rails.root, 'public', theme_path, file))
		13	+ File.join(theme_path, file)
		14	+ else
		15	+ file
		16	+ end
		17	+ end
		18	+
11	def image_link_to_product(product, opts={})	19	def image_link_to_product(product, opts={})
12	return _('No product') unless product	20	return _('No product') unless product
13	target = product_path(product)	21	target = product_path(product)
	@@ -13,6 +13,16 @@ class Category < ActiveRecord::Base		@@ -13,6 +13,16 @@ class Category < ActiveRecord::Base
13	{:conditions => ['parent_id is null and environment_id = ?', environment.id ]}	13	{:conditions => ['parent_id is null and environment_id = ?', environment.id ]}
14	}	14	}
15		15
		16	+ named_scope :on_level, lambda { \|parent\| {:conditions => {:parent_id => parent}} }
		17	+
		18	+ named_scope :sub_categories, lambda { \|category\|
		19	+ {:conditions => ['categories.path LIKE ? AND categories.id != ?', "%#{category.slug}%", category.id]}
		20	+ }
		21	+
		22	+ named_scope :sub_tree, lambda { \|category\|
		23	+ {:conditions => ['categories.path LIKE ?', "%#{category.slug}%"]}
		24	+ }
		25	+
16	acts_as_filesystem	26	acts_as_filesystem
17		27
18	has_many :article_categorizations, :dependent => :destroy	28	has_many :article_categorizations, :dependent => :destroy
1	<% extra_content = [] %>	1	<% extra_content = [] %>
2	<% extra_content_list = [] %>	2	<% extra_content_list = [] %>
3		3
4	-<ul id="product-list">
5	- <li><h1><%= _('Products/Services') %></h1></li>	4	+<h1><%= _('Products/Services') %></h1>
6		5
		6	+<%= breadcrumb(@category) if params[:level] %>
		7	+
		8	+<div class='l-sidebar-left-bar'>
		9	+ <ul>
		10	+ <% if @categories.size > 0 %>
		11	+ <% @categories.each do \|category\| %>
		12	+ <%= category_link(category) %>
		13	+ <%= category_sub_links(category) %>
		14	+ <% end %>
		15	+ <% else %>
		16	+ <%= content_tag('li', _('There are no sub-categories for %s') % @category.name, :style => 'color: #555753; padding-bottom: 0.5em;') %>
		17	+ <% end %>
		18	+ </ul>
		19	+</div>
		20	+
		21	+<ul id="product-list" class="l-sidebar-left-content">
7	<% @products.each do \|product\| %>	22	<% @products.each do \|product\| %>
8	<% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { \|content\| instance_eval(&content) } %>	23	<% extra_content = @plugins.dispatch(:catalog_item_extras, product).collect { \|content\| instance_eval(&content) } %>
9	<% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { \|content\| instance_eval(&content) } %>	24	<% extra_content_list = @plugins.dispatch(:catalog_list_item_extras, product).collect { \|content\| instance_eval(&content) } %>
10		25
11	- <li class="product <%= "not-available" unless product.available %>">	26	+ <% status = [] %>
		27	+ <% status << 'not-available' if !product.available %>
		28	+ <% status << 'highlighted' if product.highlighted %>
		29	+
		30	+ <li id="product-<%= product.id %>" class="product <%= status.join(' ') %>">
12	<ul>	31	<ul>
13	<li class="product-image-link">	32	<li class="product-image-link">
		33	+ <% if product.highlighted? %>
		34	+ <%= link_to image_tag(themed_path('/images/star.png'), :class => 'star', :alt => _('Highlighted product')), product_path(product) %>
		35	+ <% end %>
14	<% if product.image %>	36	<% if product.image %>
15	<div class="zoomable-image">	37	<div class="zoomable-image">
16	<%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>	38	<%= link_to_product product, :class => 'product-big', :style => "background-image: url(#{product.default_image(:big)})" %>
1	<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { \|content\| instance_eval(&content) } %>	1	<% extra_content = @plugins.dispatch(:asset_product_extras, product, product.enterprise).collect { \|content\| instance_eval(&content) } %>
2	<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>	2	<% extra_properties = @plugins.dispatch(:asset_product_properties, product)%>
3		3
4	-<li class="search-product-item">	4	+<li class="search-product-item <%= 'highlighted' if product.highlighted? %>">
5		5
6	<div class="search-product-item-first-column">	6	<div class="search-product-item-first-column">
7	<%= render :partial => 'search/image', :object => product %>	7	<%= render :partial => 'search/image', :object => product %>
	@@ -100,15 +100,16 @@ class ShoppingCartPluginController < PublicController		@@ -100,15 +100,16 @@ class ShoppingCartPluginController < PublicController
100	def buy	100	def buy
101	@cart = cart	101	@cart = cart
102	@enterprise = environment.enterprises.find(cart[:enterprise_id])	102	@enterprise = environment.enterprises.find(cart[:enterprise_id])
		103	+ @settings = Noosfero::Plugin::Settings.new(@enterprise, ShoppingCartPlugin)
103	render :layout => false	104	render :layout => false
104	end	105	end
105		106
106	def send_request	107	def send_request
107	register_order(params[:customer], self.cart[:items])	108	register_order(params[:customer], self.cart[:items])
108	begin	109	begin
109	- enterprise = Enterprise.find(cart[:enterprise_id])
110	- ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items])
111	- ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items])	110	+ enterprise = environment.enterprises.find(cart[:enterprise_id])
		111	+ ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option])
		112	+ ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], enterprise, self.cart[:items], params[:delivery_option])
112	self.cart = nil	113	self.cart = nil
113	render :text => {	114	render :text => {
114	:ok => true,	115	:ok => true,
	@@ -168,6 +169,25 @@ class ShoppingCartPluginController < PublicController		@@ -168,6 +169,25 @@ class ShoppingCartPluginController < PublicController
168	end	169	end
169	end	170	end
170		171
		172	+ def update_delivery_option
		173	+ enterprise = environment.enterprises.find(cart[:enterprise_id])
		174	+ settings = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
		175	+ delivery_price = settings.delivery_options[params[:delivery_option]]
		176	+ delivery = Product.new(:name => params[:delivery_option], :price => delivery_price)
		177	+ delivery.save(false)
		178	+ items = self.cart[:items].clone
		179	+ items[delivery.id] = 1
		180	+ total_price = get_total_on_currency(items, environment)
		181	+ delivery.destroy
		182	+ render :text => {
		183	+ :ok => true,
		184	+ :delivery_price => float_to_currency_cart(delivery_price, environment),
		185	+ :total_price => total_price,
		186	+ :message => _('Delivery option updated.'),
		187	+ :error => {:code => 0}
		188	+ }.to_json
		189	+ end
		190	+
171	private	191	private
172		192
173	def validate_same_enterprise(product)	193	def validate_same_enterprise(product)
	@@ -4,9 +4,12 @@ class ShoppingCartPluginMyprofileController < MyProfileController		@@ -4,9 +4,12 @@ class ShoppingCartPluginMyprofileController < MyProfileController
4	append_view_path File.join(File.dirname(__FILE__) + '/../views')	4	append_view_path File.join(File.dirname(__FILE__) + '/../views')
5		5
6	def edit	6	def edit
		7	+ params[:settings] = treat_cart_options(params[:settings])
		8	+
		9	+ @settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin, params[:settings])
7	if request.post?	10	if request.post?
8	begin	11	begin
9	- profile.update_attributes!(params[:profile_attr])	12	+ @settings.save!
10	session[:notice] = _('Option updated successfully.')	13	session[:notice] = _('Option updated successfully.')
11	rescue Exception => exception	14	rescue Exception => exception
12	session[:notice] = _('Option wasn\'t updated successfully.')	15	session[:notice] = _('Option wasn\'t updated successfully.')
	@@ -46,4 +49,25 @@ class ShoppingCartPluginMyprofileController < MyProfileController		@@ -46,4 +49,25 @@ class ShoppingCartPluginMyprofileController < MyProfileController
46	order.save!	49	order.save!
47	redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]	50	redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
48	end	51	end
		52	+
		53	+ private
		54	+
		55	+ def treat_cart_options(settings)
		56	+ return if settings.blank?
		57	+ settings[:enabled] = settings[:enabled] == '1'
		58	+ settings[:delivery] = settings[:delivery] == '1'
		59	+ settings[:free_delivery_price] = settings[:free_delivery_price].blank? ? nil : settings[:free_delivery_price].to_d
		60	+ settings[:delivery_options] = treat_delivery_options(settings[:delivery_options])
		61	+ settings
		62	+ end
		63	+
		64	+ def treat_delivery_options(params)
		65	+ result = {}
		66	+ params[:options].size.times do \|counter\|
		67	+ if params[:options][counter].present? && params[:prices][counter].present?
		68	+ result[params[:options][counter]] = params[:prices][counter]
		69	+ end
		70	+ end
		71	+ result
		72	+ end
49	end	73	end
@@ -0,0 +1,19 @@		@@ -0,0 +1,19 @@
	1	+class MoveFieldsIncludedOnProfilesTableToSettings < ActiveRecord::Migration
	2	+ def self.up
	3	+ Profile.find_each do \|profile\|
	4	+ settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
	5	+ settings.enabled = profile.shopping_cart
	6	+ settings.delivery = profile.shopping_cart_delivery
	7	+ settings.delivery_price = profile.shopping_cart_delivery_price
	8	+ settings.save!
	9	+ end
	10	+
	11	+ remove_column :profiles, :shopping_cart
	12	+ remove_column :profiles, :shopping_cart_delivery
	13	+ remove_column :profiles, :shopping_cart_delivery_price
	14	+ end
	15	+
	16	+ def self.down
	17	+ say "This migration can not be reverted!"
	18	+ end
	19	+end
@@ -0,0 +1,34 @@		@@ -0,0 +1,34 @@
	1	+jQuery(document).ready(function(){
	2	+ jQuery("#cart-request-form").validate({
	3	+ submitHandler: function(form) {
	4	+ jQuery(form).find('input.submit').attr('disabled', true);
	5	+ jQuery('#cboxLoadingOverlay').show().addClass('loading');
	6	+ jQuery('#cboxLoadingGraphic').show().addClass('loading');
	7	+ }
	8	+ });
	9	+});
	10	+
	11	+jQuery('#delivery_option').change(function(){
	12	+ jQuery('#cboxLoadingGraphic').show();
	13	+ me = this;
	14	+ enterprise = jQuery(me).attr('data-profile-identifier');
	15	+ option = jQuery(me).val();
	16	+ jQuery.ajax({
	17	+ url: '/plugin/shopping_cart/update_delivery_option',
	18	+ dataType: "json",
	19	+ data: 'delivery_option='+option,
	20	+ success: function(data, st, ajax) {
	21	+ jQuery('#delivery-price').text(data.delivery_price);
	22	+ jQuery('.cart-table-total-value').text(data.total_price);
	23	+ jQuery('#delivery-name').text(option);
	24	+ jQuery('#cboxLoadingGraphic').hide();
	25	+ },
	26	+ error: function(ajax, st, errorThrown) {
	27	+ alert('Update delivery option - HTTP '+st+': '+errorThrown);
	28	+ },
	29	+ });
	30	+});
	31	+
	32	+jQuery('#customer_payment').change(function(){
	33	+ jQuery(this).closest('.formfieldline').next().slideToggle('fast');
	34	+});
@@ -0,0 +1,16 @@		@@ -0,0 +1,16 @@
	1	+jQuery('#settings_delivery').click(function(){
	2	+ jQuery('#delivery_settings').toggle('fast');
	3	+});
	4	+
	5	+jQuery('#add-new-option').click(function(){
	6	+ new_option = jQuery('#empty-option').clone();
	7	+ new_option.removeAttr('id');
	8	+ jQuery('#add-new-option-row').before(new_option);
	9	+ new_option.show();
	10	+ return false;
	11	+});
	12	+
	13	+jQuery('.remove-option').live('click', function(){
	14	+ jQuery(this).closest('tr').remove();
	15	+ return false;
	16	+});