Merge branches 'stable' and 'ActionItem2526' into ActionItem2526

Leandro Nunes dos Santos
2 parents d711beb1 593da77e
Showing 35 changed files with 711 additions and 588 deletions Show diff stats
app/models/approve_article.rb
app/models/article.rb
app/models/comment.rb
app/models/environment.rb
app/models/profile.rb
app/models/task_mailer.rb
app/models/user.rb
etc/noosfero/varnish-noosfero.vcl
gitignore.example
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.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/cart.js
plugins/shopping_cart/public/style.css
plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb
plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb
plugins/shopping_cart/test/unit/shopping_cart_plugin_test.rb
plugins/shopping_cart/views/cart.html.erb
@@ -48,7 +48,7 @@ class ApproveArticle &lt; Task
   end
   def perform
-    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author.id)
+    article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
   end
   def title
@@ -562,6 +562,10 @@ class Article &lt; ActiveRecord::Base
     author ? author.url : nil
   end
+  def author_id
+    author ? author.id : nil
+  end
+
   alias :active_record_cache_key :cache_key
   def cache_key(params = {}, the_profile = nil, language = 'en')
     active_record_cache_key+'-'+language +
@@ -74,6 +74,10 @@ class Comment &lt; ActiveRecord::Base
     self.find(:all, :order => 'created_at desc, id desc', :limit => limit)
   end
+  def notification_emails
+    self.article.profile.notification_emails - [self.author_email || self.email]
+  end
+
   after_save :notify_article
   after_destroy :notify_article
   def notify_article
@@ -114,7 +118,7 @@ class Comment &lt; ActiveRecord::Base
   def notify_by_mail
     if source.kind_of?(Article) && article.notify_comments?
-      if !article.profile.notification_emails.empty?
+      if !notification_emails.empty?
         Comment::Notifier.deliver_mail(self)
       end
       emails = article.followers - [author_email]
@@ -174,7 +178,7 @@ class Comment &lt; ActiveRecord::Base
   class Notifier < ActionMailer::Base
     def mail(comment)
       profile = comment.article.profile
-      recipients profile.notification_emails
+      recipients comment.notification_emails
       from "#{profile.environment.name} <#{profile.environment.contact_email}>"
       subject _("[%s] you got a new comment!") % [profile.environment.name]
       body :recipient => profile.nickname || profile.name,
@@ -234,7 +234,8 @@ class Environment &lt; ActiveRecord::Base
   end
   settings_items :activation_blocked_text, :type => String
-  settings_items :message_for_disabled_enterprise, :type => String
+  settings_items :message_for_disabled_enterprise, :type => String,
+                 :default => _('This enterprise needs to be enabled.')
   settings_items :location, :type => String
   settings_items :layout_template, :type => String, :default => 'default'
   settings_items :homepage, :type => String
@@ -463,6 +463,10 @@ class Profile &lt; ActiveRecord::Base
     { :profile => identifier, :controller => 'profile_editor', :action => 'index' }
   end
+  def tasks_url
+    { :profile => identifier, :controller => 'tasks', :action => 'index', :host => default_hostname }
+  end
+
   def leave_url(reload = false)
     { :profile => identifier, :controller => 'profile', :action => 'leave', :reload => reload }
   end
@@ -14,7 +14,7 @@ class TaskMailer &lt; ActionMailer::Base
     recipients task.target.notification_emails
-    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))
+    url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
     from self.class.generate_from(task)
     subject '[%s] %s' % [task.environment.name, task.target_notification_description]
@@ -31,7 +31,7 @@ class User &lt; ActiveRecord::Base
   after_create do |user|
     user.person ||= Person.new
     user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
-    user.person.name ||= user.login
+    user.person.name ||= user.name
     user.person.visible = false unless user.activated?
     user.person.save!
     if user.environment.enabled?('skip_new_user_email_confirmation')
 sub vcl_recv {
   if (req.request == "GET" || req.request == "HEAD") {
     if (req.http.Cookie) {
-      # We only care about the "_noosfero_session.*" cookie, used for
-      # authentication.
-      if (req.http.Cookie !~ "_noosfero_session.*" ) {
+      # We only care about the "_noosfero_.*" cookies, used by Noosfero
+      if (req.http.Cookie !~ "_noosfero_.*" ) {
         # strip all cookies
         unset req.http.Cookie;
       }
@@ -21,8 +21,8 @@ public/user_themes
 public/designs/themes/default
 public/designs/themes/*
 public/designs/icons/default
-public/javascripts/cache*.js
-public/stylesheets/cache*.css
+public/javascripts/cache*
+public/stylesheets/cache*
 public/plugins
 db/development.db
 db/production.db
@@ -0,0 +1,296 @@
+require 'base64'
+
+class ShoppingCartPluginController < PublicController
+
+  include ShoppingCartPlugin::CartHelper
+  helper ShoppingCartPlugin::CartHelper
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../views')
+  before_filter :login_required, :only => []
+
+  before_filter :login_required, :only => []
+
+  def get
+    config =
+      if cart.nil?
+        { 'enterprise_id' => nil, 'hasProducts' => false }
+      else
+        { 'enterprise_id' => cart[:enterprise_id], 'hasProducts' => (cart[:items].keys.size > 0) }
+      end
+    render :text => config.to_json
+  end
+
+  def add
+    product = find_product(params[:id])
+    if product && enterprise = validate_same_enterprise(product)
+      self.cart = { :enterprise_id => enterprise.id, :items => {} } if self.cart.nil?
+      self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
+      self.cart[:items][product.id] += 1
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :products => [{
+          :id => product.id,
+          :name => product.name,
+          :price => get_price(product, enterprise.environment),
+          :description => product.description,
+          :picture => product.default_image(:minor),
+          :quantity => self.cart[:items][product.id]
+        }]
+      }.to_json
+    end
+  end
+
+  def remove
+    id = params[:id].to_i
+    if validate_cart_presence && validate_cart_has_product(id)
+      self.cart[:items].delete(id)
+      self.cart = nil if self.cart[:items].empty?
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :product_id => id
+      }.to_json
+    end
+  end
+
+  def list
+    if validate_cart_presence
+      products = self.cart[:items].collect do |id, quantity|
+        product = Product.find(id)
+        { :id => product.id,
+          :name => product.name,
+          :price => get_price(product, product.enterprise.environment),
+          :description => product.description,
+          :picture => product.default_image(:minor),
+          :quantity => quantity
+        }
+      end
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :products => products
+      }.to_json
+    end
+  end
+
+  def update_quantity
+    quantity = params[:quantity].to_i
+    id = params[:id].to_i
+    if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
+      product = Product.find(id)
+      self.cart[:items][product.id] = quantity
+      render :text => {
+        :ok => true,
+        :error => {:code => 0},
+        :product_id => id,
+        :quantity => quantity
+      }.to_json
+    end
+  end
+
+  def clean
+    self.cart = nil
+    render :text => {
+      :ok => true,
+      :error => {:code => 0}
+    }.to_json
+  end
+
+  def buy
+    @cart = cart
+    @enterprise = environment.enterprises.find(cart[:enterprise_id])
+    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])
+      self.cart = nil
+      render :text => {
+        :ok => true,
+        :message => _('Request sent successfully. Check your email.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue ActiveRecord::ActiveRecordError
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 6,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  def visibility
+    render :text => self.cart.has_key?(:visibility) ? self.cart[:visibility].to_json : true.to_json
+  end
+
+  def show
+    begin
+      self.cart[:visibility] = true
+      render :text => {
+        :ok => true,
+        :message => _('Basket displayed.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 7,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  def hide
+    begin
+      self.cart[:visibility] = false
+      render :text => {
+        :ok => true,
+        :message => _('Basket hidden.'),
+        :error => {:code => 0}
+      }.to_json
+    rescue Exception => exception
+      render :text => {
+        :ok => false,
+        :error => {
+          :code => 8,
+          :message => exception.message
+        }
+      }.to_json
+    end
+  end
+
+  private
+
+  def validate_same_enterprise(product)
+    if self.cart && self.cart[:enterprise_id] && product.enterprise_id != self.cart[:enterprise_id]
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 1,
+        :message => _("Can't join items from different enterprises.")
+      }
+      }.to_json
+      return nil
+    end
+    product.enterprise
+  end
+
+  def validate_cart_presence
+    if self.cart.nil?
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 2,
+        :message => _("There is no basket.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def find_product(id)
+    begin
+      product = Product.find(id)
+    rescue ActiveRecord::RecordNotFound
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 3,
+        :message => _("This enterprise doesn't have this product.")
+      }
+      }.to_json
+      return nil
+    end
+    product
+  end
+
+  def validate_cart_has_product(id)
+    if !self.cart[:items].has_key?(id)
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 4,
+        :message => _("The basket doesn't have this product.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def validate_item_quantity(quantity)
+    if quantity.to_i < 1
+      render :text => {
+        :ok => false,
+        :error => {
+        :code => 5,
+        :message => _("Invalid quantity.")
+      }
+      }.to_json
+      return false
+    end
+    true
+  end
+
+  def register_order(custumer, items)
+    new_items = {}
+    items.each do |id, quantity|
+      product = Product.find(id)
+      price = product.price || 0
+      new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
+    end
+    ShoppingCartPlugin::PurchaseOrder.create!(
+      :seller => Enterprise.find(cart[:enterprise_id]),
+      :customer => user,
+      :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
+      :products_list => new_items,
+      :customer_name => params[:customer][:name],
+      :customer_email => params[:customer][:email],
+      :customer_contact_phone => params[:customer][:contact_phone],
+      :customer_address => params[:customer][:address],
+      :customer_city => params[:customer][:city],
+      :customer_zip_code => params[:customer][:zip_code]
+    )
+  end
+
+  protected
+
+  def cart
+    @cart ||=
+      begin
+        cookies[cookie_key] && YAML.load(Base64.decode64(cookies[cookie_key])) || nil
+      end
+    @cart
+  end
+
+  def cart=(data)
+    @cart = data
+  end
+
+  after_filter :save_cookie
+  def save_cookie
+    if @cart.nil?
+      cookies.delete(cookie_key, :path => '/plugin/shopping_cart')
+    else
+      cookies[cookie_key] = {
+        :value => Base64.encode64(@cart.to_yaml),
+        :path => "/plugin/shopping_cart"
+      }
+    end
+  end
+
+  def cookie_key
+    :_noosfero_plugin_shopping_cart
+  end
+
+end
@@ -1,248 +0,0 @@
-include ShoppingCartPlugin::CartHelper
-
-class ShoppingCartPluginProfileController < ProfileController
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-  before_filter :login_required, :only => []
-
-  before_filter :login_required, :only => []
-
-  def add
-    session[:cart] = { :enterprise_id => profile.id, :items => {} } if session[:cart].nil?
-    if validate_same_enterprise && product = validate_enterprise_has_product(params[:id])
-      session[:cart][:items][product.id] = 0 if session[:cart][:items][product.id].nil?
-      session[:cart][:items][product.id] += 1
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :products => [{
-          :id => product.id,
-          :name => product.name,
-          :price => get_price(product, profile.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => session[:cart][:items][product.id]
-        }]
-      }.to_json
-    end
-  end
-
-  def remove
-    id = params[:id].to_i
-    if validate_cart_presence && validate_cart_has_product(id)
-      session[:cart][:items].delete(id)
-      session[:cart] = nil if session[:cart][:items].empty?
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :product_id => id
-      }.to_json
-    end
-  end
-
-  def list
-    if validate_cart_presence
-      products = session[:cart][:items].collect do |id, quantity|
-        product = Product.find(id)
-        { :id => product.id,
-          :name => product.name,
-          :price => get_price(product, profile.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => quantity
-        }
-      end
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :enterprise => Enterprise.find(session[:cart][:enterprise_id]).identifier,
-        :products => products
-      }.to_json
-    end
-  end
-
-  def update_quantity
-    quantity = params[:quantity].to_i
-    id = params[:id].to_i
-    if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
-      product = Product.find(id)
-      session[:cart][:items][product.id] = quantity
-      render :text => {
-        :ok => true,
-        :error => {:code => 0},
-        :product_id => id,
-        :quantity => quantity
-      }.to_json
-    end
-  end
-
-  def clean
-    session[:cart] = nil
-    render :text => {
-      :ok => true,
-      :error => {:code => 0}
-    }.to_json
-  end
-
-  def buy
-    @environment = profile.environment
-    render :layout => false
-  end
-
-  def send_request
-      register_order(params[:customer], session[:cart][:items])
-    begin
-      ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])
-      ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])
-      render :text => {
-        :ok => true,
-        :message => _('Request sent successfully. Check your email.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 6,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  def visibility
-    render :text => session[:cart].has_key?(:visibility) ? session[:cart][:visibility].to_json : true.to_json
-  end
-
-  def show
-    begin
-      session[:cart][:visibility] = true
-      render :text => {
-        :ok => true,
-        :message => _('Basket displayed.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 7,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  def hide
-    begin
-      session[:cart][:visibility] = false
-      render :text => {
-        :ok => true,
-        :message => _('Basket hidden.'),
-        :error => {:code => 0}
-      }.to_json
-    rescue Exception => exception
-      render :text => {
-        :ok => false,
-        :error => {
-          :code => 8,
-          :message => exception.message
-        }
-      }.to_json
-    end
-  end
-
-  private
-
-  def validate_same_enterprise
-    if profile.id != session[:cart][:enterprise_id]
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 1,
-        :message => _("Can't join items from different enterprises.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_cart_presence
-    if session[:cart].nil?
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 2,
-        :message => _("There is no basket.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_enterprise_has_product(id)
-    begin
-      product = profile.products.find(id)
-    rescue
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 3,
-        :message => _("This enterprise doesn't have this product.")
-      }
-      }.to_json
-      return nil
-    end
-    product
-  end
-
-  def validate_cart_has_product(id)
-    if !session[:cart][:items].has_key?(id)
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 4,
-        :message => _("The basket doesn't have this product.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def validate_item_quantity(quantity)
-    if quantity.to_i < 1
-      render :text => {
-        :ok => false,
-        :error => {
-        :code => 5,
-        :message => _("Invalid quantity.")
-      }
-      }.to_json
-      return false
-    end
-    true
-  end
-
-  def register_order(custumer, items)
-    new_items = {}
-    items.each do |id, quantity|
-      product = Product.find(id)
-      price = product.price || 0
-      new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
-    end
-    ShoppingCartPlugin::PurchaseOrder.create!(
-      :seller => profile,
-      :customer => user,
-      :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
-      :products_list => new_items,
-      :customer_name => params[:customer][:name],
-      :customer_email => params[:customer][:email],
-      :customer_contact_phone => params[:customer][:contact_phone],
-      :customer_address => params[:customer][:address],
-      :customer_city => params[:customer][:city],
-      :customer_zip_code => params[:customer][:zip_code]
-    )
-  end
-end
@@ -11,12 +11,13 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
     _("A shopping basket feature for enterprises")
   end
-  def add_to_cart_button(item, enterprise = context.profile)
+  def add_to_cart_button(item)
+    enterprise = item.enterprise
     if enterprise.shopping_cart && item.available
        lambda {
          link_to(_('Add to basket'), "add:#{item.name}",
            :class => 'cart-add-item',
-           :onclick => "Cart.addItem('#{enterprise.identifier}', #{item.id}, this); return false"
+           :onclick => "Cart.addItem(#{item.id}, this); return false"
          )
        }
     end
@@ -35,7 +36,7 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
   def body_beginning
-    expanded_template('cart.html.erb',{:cart => context.session[:cart]})
+    expanded_template('cart.html.erb')
   end
   def control_panel_buttons
 module ShoppingCartPlugin::CartHelper
   include ActionView::Helpers::NumberHelper
+  include ActionView::Helpers::TagHelper
   def sell_price(product)
     return 0 if product.price.nil?
 class ShoppingCartPlugin::Mailer < Noosfero::Plugin::MailerBase
+  include ShoppingCartPlugin::CartHelper
+
   def customer_notification(customer, supplier, items)
     domain = supplier.hostname || supplier.environment.default_hostname
     recipients    customer[:email]
@@ -10,7 +12,8 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
     body :customer => customer,
          :supplier => supplier,
          :items => items,
-         :environment => supplier.environment
+         :environment => supplier.environment,
+         :helper => self
   end
   def supplier_notification(customer, supplier, items)
@@ -23,6 +26,8 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
     body :customer => customer,
          :supplier => supplier,
          :items => items,
-         :environment => supplier.environment
+         :environment => supplier.environment,
+         :helper => self
+
   end
 end
@@ -11,10 +11,9 @@ function Cart(config) {
   $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} });
   if (!this.empty) {
     $(this.cartElem).show();
-    this.enterprise = config.enterprise;
     me = this;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/visibility',
+      url: '/plugin/shopping_cart/visibility',
       dataType: 'json',
       success: function(data, status, ajax){
         me.visible = /^true$/i.test(data);
@@ -25,7 +24,7 @@ function Cart(config) {
         alert('Visibility - HTTP '+status+': '+errorThrown);
       }
     });
-    $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugin/shopping_cart/buy'});
+    $(".cart-buy", this.cartElem).colorbox({ href: '/plugin/shopping_cart/buy' });
   }
 }
@@ -34,7 +33,7 @@ function Cart(config) {
   Cart.prototype.listProducts = function() {
     var me = this;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/list',
+      url: '/plugin/shopping_cart/list',
       dataType: 'json',
       success: function(data, ststus, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -61,7 +60,7 @@ function Cart(config) {
         '<span class="item-name">'+ item.name +'</span>' +
         '<div class="item-price">' +
         '<input size="1" value="'+item.quantity+'" />'+ (item.price ? '&times; '+ item.price : '') +'</div>' +
-        ' <a href="remove:'+item.name+'" onclick="Cart.removeItem(\''+this.enterprise+'\', '+item.id+'); return false"' +
+        ' <a href="remove:'+item.name+'" onclick="Cart.removeItem('+item.id+'); return false"' +
         ' class="button icon-remove"><span>remove</span></a>'
        ).appendTo(li);
       var input = $("input", li)[0];
@@ -100,7 +99,7 @@ function Cart(config) {
     var me = this;
     if( quantity == NaN ) return input.value = input.lastValue;
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity,
+      url: '/plugin/shopping_cart/update_quantity/'+ itemId +'?quantity='+ quantity,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) {
@@ -132,8 +131,7 @@ function Cart(config) {
     this.updateTotal();
   }
-  Cart.addItem = function(enterprise, itemId, link) {
-    // on the future, the instance may be found by the enterprise identifier.
+  Cart.addItem = function(itemId, link) {
     link.intervalId = setInterval(function() {
       steps = ['w', 'n', 'e', 's'];
       if( !link.step || link.step==3 ) link.step = 0;
@@ -144,18 +142,13 @@ function Cart(config) {
       clearInterval(link.intervalId);
       $(link).button({ icons: { primary: 'ui-icon-cart'}, disable: false });
     };
-    this.instance.addItem(enterprise, itemId, stopBtLoading);
+    this.instance.addItem(itemId, stopBtLoading);
   }
-  Cart.prototype.addItem = function(enterprise, itemId, callback) {
-    if(!this.enterprise) {
-      this.enterprise = enterprise;
-      $(".cart-buy", this.cartElem).colorbox({href: '/profile/' + this.enterprise + '/plugin/shopping_cart/buy'});
-//      $(this.cartElem).show();
-    }
+  Cart.prototype.addItem = function(itemId, callback) {
     var me = this;
     $.ajax({
-      url: '/profile/'+ enterprise +'/plugin/shopping_cart/add/'+ itemId,
+      url: '/plugin/shopping_cart/add/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -169,16 +162,16 @@ function Cart(config) {
     });
   }
-  Cart.removeItem = function(enterprise, itemId) {
+  Cart.removeItem = function(itemId) {
     var message = this.instance.cartElem.getAttribute('data-l10nRemoveItem');
-    if( confirm(message) ) this.instance.removeItem(enterprise, itemId);
+    if( confirm(message) ) this.instance.removeItem(itemId);
   }
-  Cart.prototype.removeItem = function(enterprise, itemId) {
+  Cart.prototype.removeItem = function(itemId) {
     if ($("li", this.itemsBox).size() < 2) return this.clean();
     var me = this;
     $.ajax({
-      url: '/profile/'+ enterprise +'/plugin/shopping_cart/remove/'+ itemId,
+      url: '/plugin/shopping_cart/remove/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -200,7 +193,7 @@ function Cart(config) {
   Cart.prototype.show = function() {
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/show',
+      url: '/plugin/shopping_cart/show',
       dataType: 'json',
       cache: false,
       error: function(ajax, status, errorThrown) {
@@ -215,7 +208,7 @@ function Cart(config) {
   }
   Cart.prototype.hide = function() {
     $.ajax({
-      url: '/profile/'+ this.enterprise +'/plugin/shopping_cart/hide',
+      url: '/plugin/shopping_cart/hide',
       dataType: 'json',
       cache: false,
       error: function(ajax, status, errorThrown) {
@@ -252,7 +245,7 @@ function Cart(config) {
   Cart.prototype.clean = function() {
     var me = this;
     $.ajax({
-      url: '/profile/'+ me.enterprise +'/plugin/shopping_cart/clean',
+      url: '/plugin/shopping_cart/clean',
       dataType: 'json',
       success: function(data, status, ajax){
         if ( !data.ok ) alert(data.error.message);
@@ -261,7 +254,6 @@ function Cart(config) {
           $(me.cartElem).slideUp(500, function() {
             $(me.itemsBox).empty();
             me.hide();
-            me.enterprise = null;
             me.updateTotal();
             me.empty = true;
           });
@@ -284,7 +276,7 @@ function Cart(config) {
     var me = this;
     $.ajax({
       type: 'POST',
-      url: '/profile/'+ me.enterprise +'/plugin/shopping_cart/send_request',
+      url: '/plugin/shopping_cart/send_request',
       data: params,
       dataType: 'json',
       success: function(data, status, ajax){
@@ -309,7 +301,19 @@ function Cart(config) {
   }
   $(function(){
-    $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} })
+
+    $.ajax({
+      url: "/plugin/shopping_cart/get",
+      dataType: 'json',
+      success: function(data) {
+        new Cart(data);
+        $('.cart-add-item').button({ icons: { primary: 'ui-icon-cart'} })
+      },
+      cache: false,
+      error: function(ajax, status, errorThrown) {
+        alert('Error getting shopping cart - HTTP '+status+': '+errorThrown);
+      }
+    });
   });
 })(jQuery);
-@import url(colorbox/colorbox.css);
-
 .cart-add-item .ui-icon-cart {
   background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
   width: 22px;
@@ -0,0 +1,225 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_controller'
+
+# Re-raise errors caught by the controller.
+class ShoppingCartPluginController; def rescue_action(e) raise e end; end
+
+class ShoppingCartPluginControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ShoppingCartPluginController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @enterprise = fast_create(Enterprise)
+    @product = fast_create(Product, :enterprise_id => @enterprise.id)
+  end
+  attr_reader :enterprise
+  attr_reader :product
+
+  should 'force cookie expiration with explicit path for an empty cart' do
+    get :get
+    assert @response.headers['Set-Cookie'].any? { |c| c =~ /_noosfero_plugin_shopping_cart=; path=\/plugin\/shopping_cart; expires=.*-1970/}
+  end
+
+  should 'add a new product to cart' do
+    get :add, :id => product.id
+
+    assert product_in_cart?(product)
+    assert_equal 1, product_quantity(product)
+  end
+
+  should 'grow quantity through add' do
+    get :add, :id => product.id
+    assert_equal 1, product_quantity(product)
+
+    get :add, :id => product.id
+    assert_equal 2, product_quantity(product)
+  end
+
+  should 'not add product to cart if it does not exists' do
+    assert_nothing_raised { get :add, :id => 9999 }
+
+    assert !product_in_cart?(product)
+    assert !response_ok?
+    assert 3, reponse_error_code
+  end
+
+  should 'remove cart if the product being removed is the last one' do
+    get :add, :id => product.id
+    assert cart?
+
+    get :remove, :id => product.id
+    assert !cart?
+  end
+
+  should 'not try to remove a product if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :remove, :id => 9999 }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'just remove product if there are other products on cart' do
+    another_product = fast_create(Product, :enterprise_id => enterprise.id)
+    get :add, :id => product.id
+    get :add, :id => another_product.id
+
+    get :remove, :id => product.id
+    assert cart?
+    assert !product_in_cart?(product)
+  end
+
+  should 'not try to remove a product that is not in the cart' do
+    get :add, :id => product.id
+    assert cart?
+    assert_nothing_raised { get :remove, :id => 9999 }
+
+    assert !response_ok?
+    assert_equal 4, reponse_error_code
+  end
+
+  should 'not try to list the cart if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :list  }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'list products without errors' do
+    get :add, :id => product.id
+
+    assert_nothing_raised { get :list  }
+    assert response_ok?
+  end
+
+  should 'update the quantity of a product' do
+    get :add, :id => product.id
+    assert 1, product_quantity(product)
+
+    get :update_quantity, :id => product.id, :quantity => 3
+    assert 3, product_quantity(product)
+  end
+
+  should 'not try to update quantity the quantity of a product if there is no cart' do
+    instantiate_cart
+    assert !cart?
+
+    assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
+    assert !response_ok?
+    assert_equal 2, reponse_error_code
+  end
+
+  should 'not try to update the quantity of a product that is not in the cart' do
+    get :add, :id => product.id
+    assert cart?
+    assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
+
+    assert !response_ok?
+    assert_equal 4, reponse_error_code
+  end
+
+  should 'not update the quantity of a product with a invalid value' do
+    get :add, :id => product.id
+
+    assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => -1}
+    assert !response_ok?
+    assert_equal 5, reponse_error_code
+
+    assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => 'asdf'}
+    assert !response_ok?
+    assert_equal 5, reponse_error_code
+  end
+
+  should 'clean the cart' do
+    another_product = fast_create(Product, :enterprise_id => enterprise.id)
+    get :add, :id => product.id
+    get :add, :id => another_product.id
+
+    assert_nothing_raised {  get :clean }
+    assert !cart?
+  end
+
+  should 'not crash if there is no cart' do
+    instantiate_cart
+    assert !cart?
+    assert_nothing_raised {  get :clean  }
+  end
+
+  should 'register order on send request' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
+    product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
+    @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1, product2.id => 2}})
+    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
+      post :send_request,
+        :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
+    end
+
+    order = ShoppingCartPlugin::PurchaseOrder.last
+
+    assert_equal 1.99, order.products_list[product1.id][:price]
+    assert_equal 1, order.products_list[product1.id][:quantity]
+    assert_equal 2.23, order.products_list[product2.id][:price]
+    assert_equal 2, order.products_list[product2.id][:quantity]
+    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
+  end
+
+  should 'register order on send request and not crash if product is not defined' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1}})
+    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
+      post :send_request,
+        :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
+    end
+
+    order = ShoppingCartPlugin::PurchaseOrder.last
+
+    assert_equal 0, order.products_list[product1.id][:price]
+  end
+
+  should 'clean the cart after placing the order' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id)
+    post :add, :id => product1.id
+    post :send_request, :customer => { :name => "Manuel", :email => "manuel@ceu.com" }
+    assert !cart?, "cart expected to be empty!"
+  end
+
+  private
+
+  def json_response
+    ActiveSupport::JSON.decode @response.body
+  end
+
+  def cart?
+    !@controller.send(:cart).nil?
+  end
+
+  def product_in_cart?(product)
+    @controller.send(:cart) &&
+      @controller.send(:cart)[:items] &&
+      @controller.send(:cart)[:items].has_key?(product.id)
+  end
+
+  def product_quantity(product)
+    @controller.send(:cart)[:items][product.id]
+  end
+
+  def response_ok?
+    json_response['ok']
+  end
+
+  def reponse_error_code
+    json_response['error']['code']
+  end
+
+  # temporary hack...if I don't do this the session stays as an Array instead
+  # of a TestSession
+  def instantiate_cart
+    get :add, :id => product.id
+    get :remove, :id => product.id
+  end
+
+end
@@ -1,213 +0,0 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_profile_controller'
-
-# Re-raise errors caught by the controller.
-class ShoppingCartPluginProfileController; def rescue_action(e) raise e end; end
-
-class ShoppingCartPluginProfileControllerTest < ActionController::TestCase
-
-  def setup
-    @controller = ShoppingCartPluginProfileController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @enterprise = fast_create(Enterprise)
-    @product = fast_create(Product, :enterprise_id => @enterprise.id)
-  end
-  attr_reader :enterprise
-  attr_reader :product
-
-  should 'add a new product to cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert product_in_cart?(product)
-    assert_equal 1, product_quantity(product)
-  end
-
-  should 'grow quantity through add' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert_equal 1, product_quantity(product)
-
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert_equal 2, product_quantity(product)
-  end
-
-  should 'not add product to cart if it does not exists' do
-    assert_nothing_raised { get :add, :profile => enterprise.identifier, :id => 9999 }
-
-    assert !product_in_cart?(product)
-    assert !response_ok?
-    assert 3, reponse_error_code
-  end
-
-  should 'remove cart if the product being removed is the last one' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-
-    get :remove, :profile => enterprise.identifier, :id => product.id
-    assert !cart?
-  end
-
-  should 'not try to remove a product if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'just remove product if there are other products on cart' do
-    another_product = fast_create(Product, :enterprise_id => enterprise.id)
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :add, :profile => enterprise.identifier, :id => another_product.id
-
-    get :remove, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert !product_in_cart?(product)
-  end
-
-  should 'not try to remove a product that is not in the cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
-
-    assert !response_ok?
-    assert_equal 4, reponse_error_code
-  end
-
-  should 'not try to list the cart if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :list, :profile => enterprise.identifier }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'list products without errors' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert_nothing_raised { get :list, :profile => enterprise.identifier }
-    assert response_ok?
-  end
-
-  should 'update the quantity of a product' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert 1, product_quantity(product)
-
-    get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 3
-    assert 3, product_quantity(product)
-  end
-
-  should 'not try to update quantity the quantity of a product if there is no cart' do
-    instantiate_session
-    assert !cart?
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
-    assert !response_ok?
-    assert_equal 2, reponse_error_code
-  end
-
-  should 'not try to update the quantity of a product that is not in the cart' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-    assert cart?
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
-
-    assert !response_ok?
-    assert_equal 4, reponse_error_code
-  end
-
-  should 'not update the quantity of a product with a invalid value' do
-    get :add, :profile => enterprise.identifier, :id => product.id
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => -1}
-    assert !response_ok?
-    assert_equal 5, reponse_error_code
-
-    assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 'asdf'}
-    assert !response_ok?
-    assert_equal 5, reponse_error_code
-  end
-
-  should 'clean the cart' do
-    another_product = fast_create(Product, :enterprise_id => enterprise.id)
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :add, :profile => enterprise.identifier, :id => another_product.id
-
-    assert_nothing_raised {  get :clean, :profile => enterprise.identifier }
-    assert !cart?
-  end
-
-  should 'not crash if there is no cart' do
-    instantiate_session
-    assert !cart?
-    assert_nothing_raised {  get :clean, :profile => enterprise.identifier }
-  end
-
-  should 'register order on send request' do
-    product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
-    product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
-    @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1, product2.id => 2}}})
-    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
-      post :send_request,
-        :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
-        :profile => enterprise.identifier
-    end
-
-    order = ShoppingCartPlugin::PurchaseOrder.last
-
-    assert_equal 1.99, order.products_list[product1.id][:price]
-    assert_equal 1, order.products_list[product1.id][:quantity]
-    assert_equal 2.23, order.products_list[product2.id][:price]
-    assert_equal 2, order.products_list[product2.id][:quantity]
-    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
-  end
-
-  should 'register order on send request and not crash if product is not defined' do
-    product1 = fast_create(Product, :enterprise_id => enterprise.id)
-    @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1}}})
-    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
-      post :send_request,
-        :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
-        :profile => enterprise.identifier
-    end
-
-    order = ShoppingCartPlugin::PurchaseOrder.last
-
-    assert_equal 0, order.products_list[product1.id][:price]
-  end
-
-  private
-
-  def json_response
-    ActiveSupport::JSON.decode @response.body
-  end
-
-  def cart?
-    !session[:cart].nil?
-  end
-
-  def product_in_cart?(product)
-    session[:cart][:items].has_key?(product.id)
-  end
-
-  def product_quantity(product)
-    session[:cart][:items][product.id]
-  end
-
-  def response_ok?
-    json_response['ok']
-  end
-
-  def reponse_error_code
-    json_response['error']['code']
-  end
-
-  # temporary hack...if I don't do this the session stays as an Array instead
-  # of a TestSession
-  def instantiate_session
-    get :add, :profile => enterprise.identifier, :id => product.id
-    get :remove, :profile => enterprise.identifier, :id => product.id
-  end
-
-end
@@ -7,7 +7,6 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
     @context = mock()
     @profile = mock()
     @profile.stubs(:identifier).returns('random-user')
-    @context.stubs(:profile).returns(@profile)
     @shopping_cart.context = @context
     @shopping_cart.stubs(:profile).returns(@profile)
   end
@@ -23,7 +22,8 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
     product = fast_create(Product, :available => false)
     enterprise = mock()
     enterprise.stubs(:shopping_cart).returns(true)
+    product.stubs(:enterprise).returns(enterprise)
-    assert_nil shopping_cart.add_to_cart_button(product, enterprise)
+    assert_nil shopping_cart.add_to_cart_button(product)
   end
 end
@@ -7,7 +7,7 @@
       <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
-      <a href="cart:buy" class="cart-buy"><%=_('Shopping checkout')%></a>
+      <a href="/plugin/shopping_cart/buy" class="cart-buy"><%=_('Shopping checkout')%></a>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
       <span class="str-show"><%=_('Show basket')%></span>
@@ -15,9 +15,3 @@
     </a>
   </div>
 </div>
-
-<script type="text/javascript">
-//<![CDATA[
-  new Cart({hasProducts:<%= !locals[:cart].nil? ? "true, enterprise:'#{Enterprise.find(locals[:cart][:enterprise_id]).identifier}'" : "false" %>});
-//]]>
-</script>
@@ -0,0 +1,35 @@
+<% person = user.nil? ? Person.new : user %>
+<div id='cart-request-box'>
+  <% form_for(:customer, person, :url => {:action => 'send_request'},
+              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
+    <div id="cart-form-main">
+      <%= 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') ) %>
+    </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>
+    <div id="cart-form-actions">
+      <%= submit_button(:send, _('Send buy request')) %>
+    </div>
+  <% end %>
+  <%= items_table(@cart[:items], @enterprise) %>
+  <%= 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>
@@ -35,7 +35,7 @@
     </ul>
     <p><%=_('Here are the products you bought:')%></p>
-    <%= items_table(@items, @supplier, true) %>
+    <%= @helper.items_table(@items, @supplier, true) %>
     <p>
       --<br/>
@@ -33,7 +33,7 @@
     </ul>
     <p><%=_('And here are the items bought by this customer:')%></p>
-    <%= items_table(@items, @supplier, true) %>
+    <%= @helper.items_table(@items, @supplier, true) %>
     <p>
       --<br/>
@@ -0,0 +1 @@
+<%= _("Request sent successfully check your email.")%>
@@ -1,35 +0,0 @@
-<% person = user.nil? ? Person.new : user %>
-<div id='cart-request-box'>
-  <% form_for(:customer, person, :url => {:action => 'send_request'},
-              :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do |f| %>
-    <div id="cart-form-main">
-      <%= 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') ) %>
-    </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>
-    <div id="cart-form-actions">
-      <%= submit_button(:send, _('Send buy request')) %>
-    </div>
-  <% end %>
-  <%= items_table(session[:cart][:items], profile) %>
-  <%= 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>
@@ -1 +0,0 @@
-<%= _("Request sent successfully check your email.")%>
@@ -234,7 +234,7 @@ class ProfileControllerTest &lt; ActionController::TestCase
     login_as(@profile.identifier)
     ent = fast_create(Enterprise, :name => 'my test enterprise', :identifier => 'my-test-enterprise', :enabled => false)
     get :index, :profile => ent.identifier
-    assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => Environment.default.message_for_disabled_enterprise
+    assert_tag :tag => 'div', :attributes => { :id => 'profile-disabled' }, :content => /#{Environment.default.message_for_disabled_enterprise}/
   end
   should 'not show message for disabled enterprise to non-enterprises' do
@@ -414,4 +414,20 @@ class ApproveArticleTest &lt; ActiveSupport::TestCase
     assert_match /My Article/, task.task_cancelled_message
   end
+  should 'not save 4 on the new article\'s last_changed_by_ud after approval if author is nil' do
+    article = fast_create(Article)
+    task = ApproveArticle.create!(:article => article, :target => community, :requestor => profile)
+    task.finish
+    new_article = Article.last
+    assert_nil new_article.last_changed_by_id
+  end
+
+  should 'not crash if target has its own domain' do
+    article = fast_create(Article)
+    profile.domains << Domain.create(:name => 'example.org')
+    assert_nothing_raised do
+      ApproveArticle.create!(:article => article, :target => profile, :requestor => community)
+    end
+  end
+
 end
@@ -1822,4 +1822,15 @@ class ArticleTest &lt; ActiveSupport::TestCase
     assert_equal author_name, article.author_name
   end
+  should "author_id return the author id of the article's author" do
+    author = fast_create(Person)
+    article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => author)
+    assert_equal author.id, article.author_id
+  end
+
+  should "author_id return nil if there is no article's author" do
+    article = Article.create!(:name => 'Test', :profile => profile, :last_changed_by => nil)
+    assert_nil article.author_id
+  end
+
 end
@@ -8,26 +8,27 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     ActionMailer::Base.delivery_method = :test
     ActionMailer::Base.perform_deliveries = true
     ActionMailer::Base.deliveries = []
-    @profile = create_user('user_comment_test').person
+    @profile = create_user('content_owner').person
+    @author = create_user('author').person
     @article = fast_create(Article, :name => 'Article test', :profile_id => @profile.id, :notify_comments => true)
   end
   should 'deliver mail after make an article comment' do
     assert_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article )
     end
   end
   should 'deliver mail to owner of article' do
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article )
+    create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article )
     sent = ActionMailer::Base.deliveries.first
     assert_equal [@profile.email], sent.to
   end
   should 'display author name in delivered mail' do
-    create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     sent = ActionMailer::Base.deliveries.first
-    assert_match /user_comment_test/, sent.body
+    assert_match /#{@author.name}/, sent.body
   end
   should 'display unauthenticated author name and email in delivered mail' do
@@ -40,18 +41,18 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
   should 'not deliver mail if notify comments is false' do
     @article.update_attribute(:notify_comments, false)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'you suck!', :source => @article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'you suck!', :source => @article)
     end
   end
   should 'include comment title in the e-mail' do
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment title/, sent.body
   end
   should 'include comment text in the e-mail' do
-    create_comment_and_notify(:author => @profile, :title => 'comment title', :body => 'comment body', :source => @article)
+    create_comment_and_notify(:author => @author, :title => 'comment title', :body => 'comment body', :source => @article)
     sent = ActionMailer::Base.deliveries.first
     assert_match /comment body/, sent.body
   end
@@ -61,7 +62,7 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_equal [], community.notification_emails
     article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
     assert_no_difference ActionMailer::Base.deliveries, :size do
-      create_comment_and_notify(:author => @profile, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
+      create_comment_and_notify(:author => @author, :title => 'test comment', :body => 'there is no addresses to send notification', :source => article)
     end
   end
@@ -80,6 +81,17 @@ class CommentNotifierTest &lt; ActiveSupport::TestCase
     assert_not_includes ActionMailer::Base.deliveries.map(&:bcc).flatten, follower.email
   end
+  should 'not deliver mail to comments author' do
+    community = fast_create(Community)
+    community.add_admin @profile
+    community.add_admin @author
+
+    article = fast_create(Article, :name => 'Article test', :profile_id => community.id, :notify_comments => true)
+    create_comment_and_notify(:source => @article, :author => @author, :title => 'comment title', :body => 'comment body')
+    sent = ActionMailer::Base.deliveries.first
+    assert_not_includes sent.to, @author.email
+  end
+
   private
   def create_comment_and_notify(args)
@@ -18,17 +18,6 @@ class DisabledEnterpriseMessageBlockTest &lt; ActiveSupport::TestCase
     instance_eval(&block.content)
   end
-  should 'display nothing if environment has no message' do
-    e = fast_create(Environment)
-    block = DisabledEnterpriseMessageBlock.new
-    p = Profile.new
-    block.expects(:owner).returns(p)
-    p.expects(:environment).returns(e)
-
-    expects(:render).with(:file => 'blocks/disabled_enterprise_message', :locals => { :message => ''})
-    instance_eval(&block.content)
-  end
-
   should 'not be editable' do
     assert !DisabledEnterpriseMessageBlock.new.editable?
   end
@@ -246,6 +246,13 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_equal({ :profile => 'testprofile', :controller => 'profile_editor', :action => 'index'}, profile.admin_url)
   end
+  should 'provide URL to tasks area' do
+    environment = create_environment('mycolivre.net')
+    profile = build(Profile, :identifier => 'testprofile', :environment_id => create_environment('mycolivre.net').id)
+
+    assert_equal({ :host => profile.default_hostname, :profile => 'testprofile', :controller => 'tasks', :action => 'index'}, profile.tasks_url)
+  end
+
   should 'provide URL to public profile' do
     environment = create_environment('mycolivre.net')
     profile = build(Profile, :identifier => 'testprofile', :environment_id => environment.id)
@@ -84,22 +84,9 @@ class TaskMailerTest &lt; ActiveSupport::TestCase
   end
   should 'be able to send a "target notification" message' do
-    task = Task.new
+    task = Task.new(:target => fast_create(Person))
     task.expects(:target_notification_description).returns('the task')
-    target = mock()
-    target.expects(:notification_emails).returns(['target@example.com'])
-    target.expects(:name).returns('Target')
-    target.expects(:url).returns({:host => 'my.domain.com', :profile => 'testprofile'})
-
-    environment = mock()
-    environment.expects(:contact_email).returns('sender@example.com')
-    environment.expects(:default_hostname).returns('example.com')
-    environment.expects(:name).returns('example').at_least_once
-
-    task.expects(:target).returns(target).at_least_once
-    task.expects(:environment).returns(environment).at_least_once
-
     TaskMailer.deliver_target_notification(task, 'the message')
     assert !ActionMailer::Base.deliveries.empty?
   end
@@ -617,6 +617,19 @@ class UserTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'create person with name equal to user name if a user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.name = "Some name"
+    user.save
+    assert_equal 'Some name', user.person.name
+  end
+
+  should 'create person with name equal to user login if no user name is defined' do
+    user = User.new( :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' )
+    user.save
+    assert_equal 'quire', user.person.name
+  end
+
   protected
     def new_user(options = {})
       user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))
@@ -38,11 +38,24 @@ module NoosferoHttpCaching
     def call(env)
       status, headers, body = @app.call(env)
       if headers['X-Noosfero-Auth'] == 'false'
-        headers.delete('Set-Cookie')
+        headers['Set-Cookie'] = remove_unwanted_cookies(headers['Set-Cookie'])
+        headers.delete('Set-Cookie') if headers['Set-Cookie'].blank?
       end
       headers.delete('X-Noosfero-Auth')
       [status, headers, body]
     end
+
+    protected
+
+    # filter off all cookies except for plugin-provided ones that are
+    # path-specific (i.e path != "/").
+    def remove_unwanted_cookies(cookie_list)
+      return nil if cookie_list.nil?
+      cookie_list.select do |c|
+        c =~ /^_noosfero_plugin_\w+=/ && c =~ /path=\/\w+/
+      end
+    end
+
   end
 end
	@@ -48,7 +48,7 @@ class ApproveArticle < Task		@@ -48,7 +48,7 @@ class ApproveArticle < Task
48	end	48	end
49		49
50	def perform	50	def perform
51	- article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author.id)	51	+ article.copy!(:name => name, :abstract => abstract, :body => body, :profile => target, :reference_article => article, :parent => article_parent, :highlighted => highlighted, :source => article.source, :last_changed_by_id => article.author_id)
52	end	52	end
53		53
54	def title	54	def title
	@@ -14,7 +14,7 @@ class TaskMailer < ActionMailer::Base		@@ -14,7 +14,7 @@ class TaskMailer < ActionMailer::Base
14		14
15	recipients task.target.notification_emails	15	recipients task.target.notification_emails
16		16
17	- url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.url.merge(:controller => 'tasks', :action => 'index'))	17	+ url_for_tasks_list = task.target.kind_of?(Environment) ? '' : url_for(task.target.tasks_url)
18		18
19	from self.class.generate_from(task)	19	from self.class.generate_from(task)
20	subject '[%s] %s' % [task.environment.name, task.target_notification_description]	20	subject '[%s] %s' % [task.environment.name, task.target_notification_description]
	@@ -31,7 +31,7 @@ class User < ActiveRecord::Base		@@ -31,7 +31,7 @@ class User < ActiveRecord::Base
31	after_create do \|user\|	31	after_create do \|user\|
32	user.person \|\|= Person.new	32	user.person \|\|= Person.new
33	user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)	33	user.person.attributes = user.person_data.merge(:identifier => user.login, :user => user, :environment_id => user.environment_id)
34	- user.person.name \|\|= user.login	34	+ user.person.name \|\|= user.name
35	user.person.visible = false unless user.activated?	35	user.person.visible = false unless user.activated?
36	user.person.save!	36	user.person.save!
37	if user.environment.enabled?('skip_new_user_email_confirmation')	37	if user.environment.enabled?('skip_new_user_email_confirmation')
@@ -0,0 +1,296 @@		@@ -0,0 +1,296 @@
	1	+require 'base64'
	2	+
	3	+class ShoppingCartPluginController < PublicController
	4	+
	5	+ include ShoppingCartPlugin::CartHelper
	6	+ helper ShoppingCartPlugin::CartHelper
	7	+
	8	+ append_view_path File.join(File.dirname(__FILE__) + '/../views')
	9	+ before_filter :login_required, :only => []
	10	+
	11	+ before_filter :login_required, :only => []
	12	+
	13	+ def get
	14	+ config =
	15	+ if cart.nil?
	16	+ { 'enterprise_id' => nil, 'hasProducts' => false }
	17	+ else
	18	+ { 'enterprise_id' => cart[:enterprise_id], 'hasProducts' => (cart[:items].keys.size > 0) }
	19	+ end
	20	+ render :text => config.to_json
	21	+ end
	22	+
	23	+ def add
	24	+ product = find_product(params[:id])
	25	+ if product && enterprise = validate_same_enterprise(product)
	26	+ self.cart = { :enterprise_id => enterprise.id, :items => {} } if self.cart.nil?
	27	+ self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
	28	+ self.cart[:items][product.id] += 1
	29	+ render :text => {
	30	+ :ok => true,
	31	+ :error => {:code => 0},
	32	+ :products => [{
	33	+ :id => product.id,
	34	+ :name => product.name,
	35	+ :price => get_price(product, enterprise.environment),
	36	+ :description => product.description,
	37	+ :picture => product.default_image(:minor),
	38	+ :quantity => self.cart[:items][product.id]
	39	+ }]
	40	+ }.to_json
	41	+ end
	42	+ end
	43	+
	44	+ def remove
	45	+ id = params[:id].to_i
	46	+ if validate_cart_presence && validate_cart_has_product(id)
	47	+ self.cart[:items].delete(id)
	48	+ self.cart = nil if self.cart[:items].empty?
	49	+ render :text => {
	50	+ :ok => true,
	51	+ :error => {:code => 0},
	52	+ :product_id => id
	53	+ }.to_json
	54	+ end
	55	+ end
	56	+
	57	+ def list
	58	+ if validate_cart_presence
	59	+ products = self.cart[:items].collect do \|id, quantity\|
	60	+ product = Product.find(id)
	61	+ { :id => product.id,
	62	+ :name => product.name,
	63	+ :price => get_price(product, product.enterprise.environment),
	64	+ :description => product.description,
	65	+ :picture => product.default_image(:minor),
	66	+ :quantity => quantity
	67	+ }
	68	+ end
	69	+ render :text => {
	70	+ :ok => true,
	71	+ :error => {:code => 0},
	72	+ :products => products
	73	+ }.to_json
	74	+ end
	75	+ end
	76	+
	77	+ def update_quantity
	78	+ quantity = params[:quantity].to_i
	79	+ id = params[:id].to_i
	80	+ if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
	81	+ product = Product.find(id)
	82	+ self.cart[:items][product.id] = quantity
	83	+ render :text => {
	84	+ :ok => true,
	85	+ :error => {:code => 0},
	86	+ :product_id => id,
	87	+ :quantity => quantity
	88	+ }.to_json
	89	+ end
	90	+ end
	91	+
	92	+ def clean
	93	+ self.cart = nil
	94	+ render :text => {
	95	+ :ok => true,
	96	+ :error => {:code => 0}
	97	+ }.to_json
	98	+ end
	99	+
	100	+ def buy
	101	+ @cart = cart
	102	+ @enterprise = environment.enterprises.find(cart[:enterprise_id])
	103	+ render :layout => false
	104	+ end
	105	+
	106	+ def send_request
	107	+ register_order(params[:customer], self.cart[:items])
	108	+ 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])
	112	+ self.cart = nil
	113	+ render :text => {
	114	+ :ok => true,
	115	+ :message => _('Request sent successfully. Check your email.'),
	116	+ :error => {:code => 0}
	117	+ }.to_json
	118	+ rescue ActiveRecord::ActiveRecordError
	119	+ render :text => {
	120	+ :ok => false,
	121	+ :error => {
	122	+ :code => 6,
	123	+ :message => exception.message
	124	+ }
	125	+ }.to_json
	126	+ end
	127	+ end
	128	+
	129	+ def visibility
	130	+ render :text => self.cart.has_key?(:visibility) ? self.cart[:visibility].to_json : true.to_json
	131	+ end
	132	+
	133	+ def show
	134	+ begin
	135	+ self.cart[:visibility] = true
	136	+ render :text => {
	137	+ :ok => true,
	138	+ :message => _('Basket displayed.'),
	139	+ :error => {:code => 0}
	140	+ }.to_json
	141	+ rescue Exception => exception
	142	+ render :text => {
	143	+ :ok => false,
	144	+ :error => {
	145	+ :code => 7,
	146	+ :message => exception.message
	147	+ }
	148	+ }.to_json
	149	+ end
	150	+ end
	151	+
	152	+ def hide
	153	+ begin
	154	+ self.cart[:visibility] = false
	155	+ render :text => {
	156	+ :ok => true,
	157	+ :message => _('Basket hidden.'),
	158	+ :error => {:code => 0}
	159	+ }.to_json
	160	+ rescue Exception => exception
	161	+ render :text => {
	162	+ :ok => false,
	163	+ :error => {
	164	+ :code => 8,
	165	+ :message => exception.message
	166	+ }
	167	+ }.to_json
	168	+ end
	169	+ end
	170	+
	171	+ private
	172	+
	173	+ def validate_same_enterprise(product)
	174	+ if self.cart && self.cart[:enterprise_id] && product.enterprise_id != self.cart[:enterprise_id]
	175	+ render :text => {
	176	+ :ok => false,
	177	+ :error => {
	178	+ :code => 1,
	179	+ :message => _("Can't join items from different enterprises.")
	180	+ }
	181	+ }.to_json
	182	+ return nil
	183	+ end
	184	+ product.enterprise
	185	+ end
	186	+
	187	+ def validate_cart_presence
	188	+ if self.cart.nil?
	189	+ render :text => {
	190	+ :ok => false,
	191	+ :error => {
	192	+ :code => 2,
	193	+ :message => _("There is no basket.")
	194	+ }
	195	+ }.to_json
	196	+ return false
	197	+ end
	198	+ true
	199	+ end
	200	+
	201	+ def find_product(id)
	202	+ begin
	203	+ product = Product.find(id)
	204	+ rescue ActiveRecord::RecordNotFound
	205	+ render :text => {
	206	+ :ok => false,
	207	+ :error => {
	208	+ :code => 3,
	209	+ :message => _("This enterprise doesn't have this product.")
	210	+ }
	211	+ }.to_json
	212	+ return nil
	213	+ end
	214	+ product
	215	+ end
	216	+
	217	+ def validate_cart_has_product(id)
	218	+ if !self.cart[:items].has_key?(id)
	219	+ render :text => {
	220	+ :ok => false,
	221	+ :error => {
	222	+ :code => 4,
	223	+ :message => _("The basket doesn't have this product.")
	224	+ }
	225	+ }.to_json
	226	+ return false
	227	+ end
	228	+ true
	229	+ end
	230	+
	231	+ def validate_item_quantity(quantity)
	232	+ if quantity.to_i < 1
	233	+ render :text => {
	234	+ :ok => false,
	235	+ :error => {
	236	+ :code => 5,
	237	+ :message => _("Invalid quantity.")
	238	+ }
	239	+ }.to_json
	240	+ return false
	241	+ end
	242	+ true
	243	+ end
	244	+
	245	+ def register_order(custumer, items)
	246	+ new_items = {}
	247	+ items.each do \|id, quantity\|
	248	+ product = Product.find(id)
	249	+ price = product.price \|\| 0
	250	+ new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
	251	+ end
	252	+ ShoppingCartPlugin::PurchaseOrder.create!(
	253	+ :seller => Enterprise.find(cart[:enterprise_id]),
	254	+ :customer => user,
	255	+ :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
	256	+ :products_list => new_items,
	257	+ :customer_name => params[:customer][:name],
	258	+ :customer_email => params[:customer][:email],
	259	+ :customer_contact_phone => params[:customer][:contact_phone],
	260	+ :customer_address => params[:customer][:address],
	261	+ :customer_city => params[:customer][:city],
	262	+ :customer_zip_code => params[:customer][:zip_code]
	263	+ )
	264	+ end
	265	+
	266	+ protected
	267	+
	268	+ def cart
	269	+ @cart \|\|=
	270	+ begin
	271	+ cookies[cookie_key] && YAML.load(Base64.decode64(cookies[cookie_key])) \|\| nil
	272	+ end
	273	+ @cart
	274	+ end
	275	+
	276	+ def cart=(data)
	277	+ @cart = data
	278	+ end
	279	+
	280	+ after_filter :save_cookie
	281	+ def save_cookie
	282	+ if @cart.nil?
	283	+ cookies.delete(cookie_key, :path => '/plugin/shopping_cart')
	284	+ else
	285	+ cookies[cookie_key] = {
	286	+ :value => Base64.encode64(@cart.to_yaml),
	287	+ :path => "/plugin/shopping_cart"
	288	+ }
	289	+ end
	290	+ end
	291	+
	292	+ def cookie_key
	293	+ :_noosfero_plugin_shopping_cart
	294	+ end
	295	+
	296	+end
	@@ -1,248 +0,0 @@	@@ -1,248 +0,0 @@
1	-include ShoppingCartPlugin::CartHelper
2	-
3	-class ShoppingCartPluginProfileController < ProfileController
4	- append_view_path File.join(File.dirname(__FILE__) + '/../views')
5	- before_filter :login_required, :only => []
6	-
7	- before_filter :login_required, :only => []
8	-
9	- def add
10	- session[:cart] = { :enterprise_id => profile.id, :items => {} } if session[:cart].nil?
11	- if validate_same_enterprise && product = validate_enterprise_has_product(params[:id])
12	- session[:cart][:items][product.id] = 0 if session[:cart][:items][product.id].nil?
13	- session[:cart][:items][product.id] += 1
14	- render :text => {
15	- :ok => true,
16	- :error => {:code => 0},
17	- :products => [{
18	- :id => product.id,
19	- :name => product.name,
20	- :price => get_price(product, profile.environment),
21	- :description => product.description,
22	- :picture => product.default_image(:minor),
23	- :quantity => session[:cart][:items][product.id]
24	- }]
25	- }.to_json
26	- end
27	- end
28	-
29	- def remove
30	- id = params[:id].to_i
31	- if validate_cart_presence && validate_cart_has_product(id)
32	- session[:cart][:items].delete(id)
33	- session[:cart] = nil if session[:cart][:items].empty?
34	- render :text => {
35	- :ok => true,
36	- :error => {:code => 0},
37	- :product_id => id
38	- }.to_json
39	- end
40	- end
41	-
42	- def list
43	- if validate_cart_presence
44	- products = session[:cart][:items].collect do \|id, quantity\|
45	- product = Product.find(id)
46	- { :id => product.id,
47	- :name => product.name,
48	- :price => get_price(product, profile.environment),
49	- :description => product.description,
50	- :picture => product.default_image(:minor),
51	- :quantity => quantity
52	- }
53	- end
54	- render :text => {
55	- :ok => true,
56	- :error => {:code => 0},
57	- :enterprise => Enterprise.find(session[:cart][:enterprise_id]).identifier,
58	- :products => products
59	- }.to_json
60	- end
61	- end
62	-
63	- def update_quantity
64	- quantity = params[:quantity].to_i
65	- id = params[:id].to_i
66	- if validate_cart_presence && validate_cart_has_product(id) && validate_item_quantity(quantity)
67	- product = Product.find(id)
68	- session[:cart][:items][product.id] = quantity
69	- render :text => {
70	- :ok => true,
71	- :error => {:code => 0},
72	- :product_id => id,
73	- :quantity => quantity
74	- }.to_json
75	- end
76	- end
77	-
78	- def clean
79	- session[:cart] = nil
80	- render :text => {
81	- :ok => true,
82	- :error => {:code => 0}
83	- }.to_json
84	- end
85	-
86	- def buy
87	- @environment = profile.environment
88	- render :layout => false
89	- end
90	-
91	- def send_request
92	- register_order(params[:customer], session[:cart][:items])
93	- begin
94	- ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])
95	- ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])
96	- render :text => {
97	- :ok => true,
98	- :message => _('Request sent successfully. Check your email.'),
99	- :error => {:code => 0}
100	- }.to_json
101	- rescue Exception => exception
102	- render :text => {
103	- :ok => false,
104	- :error => {
105	- :code => 6,
106	- :message => exception.message
107	- }
108	- }.to_json
109	- end
110	- end
111	-
112	- def visibility
113	- render :text => session[:cart].has_key?(:visibility) ? session[:cart][:visibility].to_json : true.to_json
114	- end
115	-
116	- def show
117	- begin
118	- session[:cart][:visibility] = true
119	- render :text => {
120	- :ok => true,
121	- :message => _('Basket displayed.'),
122	- :error => {:code => 0}
123	- }.to_json
124	- rescue Exception => exception
125	- render :text => {
126	- :ok => false,
127	- :error => {
128	- :code => 7,
129	- :message => exception.message
130	- }
131	- }.to_json
132	- end
133	- end
134	-
135	- def hide
136	- begin
137	- session[:cart][:visibility] = false
138	- render :text => {
139	- :ok => true,
140	- :message => _('Basket hidden.'),
141	- :error => {:code => 0}
142	- }.to_json
143	- rescue Exception => exception
144	- render :text => {
145	- :ok => false,
146	- :error => {
147	- :code => 8,
148	- :message => exception.message
149	- }
150	- }.to_json
151	- end
152	- end
153	-
154	- private
155	-
156	- def validate_same_enterprise
157	- if profile.id != session[:cart][:enterprise_id]
158	- render :text => {
159	- :ok => false,
160	- :error => {
161	- :code => 1,
162	- :message => _("Can't join items from different enterprises.")
163	- }
164	- }.to_json
165	- return false
166	- end
167	- true
168	- end
169	-
170	- def validate_cart_presence
171	- if session[:cart].nil?
172	- render :text => {
173	- :ok => false,
174	- :error => {
175	- :code => 2,
176	- :message => _("There is no basket.")
177	- }
178	- }.to_json
179	- return false
180	- end
181	- true
182	- end
183	-
184	- def validate_enterprise_has_product(id)
185	- begin
186	- product = profile.products.find(id)
187	- rescue
188	- render :text => {
189	- :ok => false,
190	- :error => {
191	- :code => 3,
192	- :message => _("This enterprise doesn't have this product.")
193	- }
194	- }.to_json
195	- return nil
196	- end
197	- product
198	- end
199	-
200	- def validate_cart_has_product(id)
201	- if !session[:cart][:items].has_key?(id)
202	- render :text => {
203	- :ok => false,
204	- :error => {
205	- :code => 4,
206	- :message => _("The basket doesn't have this product.")
207	- }
208	- }.to_json
209	- return false
210	- end
211	- true
212	- end
213	-
214	- def validate_item_quantity(quantity)
215	- if quantity.to_i < 1
216	- render :text => {
217	- :ok => false,
218	- :error => {
219	- :code => 5,
220	- :message => _("Invalid quantity.")
221	- }
222	- }.to_json
223	- return false
224	- end
225	- true
226	- end
227	-
228	- def register_order(custumer, items)
229	- new_items = {}
230	- items.each do \|id, quantity\|
231	- product = Product.find(id)
232	- price = product.price \|\| 0
233	- new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
234	- end
235	- ShoppingCartPlugin::PurchaseOrder.create!(
236	- :seller => profile,
237	- :customer => user,
238	- :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
239	- :products_list => new_items,
240	- :customer_name => params[:customer][:name],
241	- :customer_email => params[:customer][:email],
242	- :customer_contact_phone => params[:customer][:contact_phone],
243	- :customer_address => params[:customer][:address],
244	- :customer_city => params[:customer][:city],
245	- :customer_zip_code => params[:customer][:zip_code]
246	- )
247	- end
248	-end
1	module ShoppingCartPlugin::CartHelper	1	module ShoppingCartPlugin::CartHelper
2		2
3	include ActionView::Helpers::NumberHelper	3	include ActionView::Helpers::NumberHelper
		4	+ include ActionView::Helpers::TagHelper
4		5
5	def sell_price(product)	6	def sell_price(product)
6	return 0 if product.price.nil?	7	return 0 if product.price.nil?
1	-@import url(colorbox/colorbox.css);
2	-
3	.cart-add-item .ui-icon-cart {	1	.cart-add-item .ui-icon-cart {
4	background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;	2	background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
5	width: 22px;	3	width: 22px;
@@ -0,0 +1,225 @@		@@ -0,0 +1,225 @@
	1	+require File.dirname(__FILE__) + '/../../../../test/test_helper'
	2	+require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_controller'
	3	+
	4	+# Re-raise errors caught by the controller.
	5	+class ShoppingCartPluginController; def rescue_action(e) raise e end; end
	6	+
	7	+class ShoppingCartPluginControllerTest < ActionController::TestCase
	8	+
	9	+ def setup
	10	+ @controller = ShoppingCartPluginController.new
	11	+ @request = ActionController::TestRequest.new
	12	+ @response = ActionController::TestResponse.new
	13	+ @enterprise = fast_create(Enterprise)
	14	+ @product = fast_create(Product, :enterprise_id => @enterprise.id)
	15	+ end
	16	+ attr_reader :enterprise
	17	+ attr_reader :product
	18	+
	19	+ should 'force cookie expiration with explicit path for an empty cart' do
	20	+ get :get
	21	+ assert @response.headers['Set-Cookie'].any? { \|c\| c =~ /_noosfero_plugin_shopping_cart=; path=\/plugin\/shopping_cart; expires=.*-1970/}
	22	+ end
	23	+
	24	+ should 'add a new product to cart' do
	25	+ get :add, :id => product.id
	26	+
	27	+ assert product_in_cart?(product)
	28	+ assert_equal 1, product_quantity(product)
	29	+ end
	30	+
	31	+ should 'grow quantity through add' do
	32	+ get :add, :id => product.id
	33	+ assert_equal 1, product_quantity(product)
	34	+
	35	+ get :add, :id => product.id
	36	+ assert_equal 2, product_quantity(product)
	37	+ end
	38	+
	39	+ should 'not add product to cart if it does not exists' do
	40	+ assert_nothing_raised { get :add, :id => 9999 }
	41	+
	42	+ assert !product_in_cart?(product)
	43	+ assert !response_ok?
	44	+ assert 3, reponse_error_code
	45	+ end
	46	+
	47	+ should 'remove cart if the product being removed is the last one' do
	48	+ get :add, :id => product.id
	49	+ assert cart?
	50	+
	51	+ get :remove, :id => product.id
	52	+ assert !cart?
	53	+ end
	54	+
	55	+ should 'not try to remove a product if there is no cart' do
	56	+ instantiate_cart
	57	+ assert !cart?
	58	+
	59	+ assert_nothing_raised { get :remove, :id => 9999 }
	60	+ assert !response_ok?
	61	+ assert_equal 2, reponse_error_code
	62	+ end
	63	+
	64	+ should 'just remove product if there are other products on cart' do
	65	+ another_product = fast_create(Product, :enterprise_id => enterprise.id)
	66	+ get :add, :id => product.id
	67	+ get :add, :id => another_product.id
	68	+
	69	+ get :remove, :id => product.id
	70	+ assert cart?
	71	+ assert !product_in_cart?(product)
	72	+ end
	73	+
	74	+ should 'not try to remove a product that is not in the cart' do
	75	+ get :add, :id => product.id
	76	+ assert cart?
	77	+ assert_nothing_raised { get :remove, :id => 9999 }
	78	+
	79	+ assert !response_ok?
	80	+ assert_equal 4, reponse_error_code
	81	+ end
	82	+
	83	+ should 'not try to list the cart if there is no cart' do
	84	+ instantiate_cart
	85	+ assert !cart?
	86	+
	87	+ assert_nothing_raised { get :list }
	88	+ assert !response_ok?
	89	+ assert_equal 2, reponse_error_code
	90	+ end
	91	+
	92	+ should 'list products without errors' do
	93	+ get :add, :id => product.id
	94	+
	95	+ assert_nothing_raised { get :list }
	96	+ assert response_ok?
	97	+ end
	98	+
	99	+ should 'update the quantity of a product' do
	100	+ get :add, :id => product.id
	101	+ assert 1, product_quantity(product)
	102	+
	103	+ get :update_quantity, :id => product.id, :quantity => 3
	104	+ assert 3, product_quantity(product)
	105	+ end
	106	+
	107	+ should 'not try to update quantity the quantity of a product if there is no cart' do
	108	+ instantiate_cart
	109	+ assert !cart?
	110	+
	111	+ assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
	112	+ assert !response_ok?
	113	+ assert_equal 2, reponse_error_code
	114	+ end
	115	+
	116	+ should 'not try to update the quantity of a product that is not in the cart' do
	117	+ get :add, :id => product.id
	118	+ assert cart?
	119	+ assert_nothing_raised { get :update_quantity, :id => 9999, :quantity => 3 }
	120	+
	121	+ assert !response_ok?
	122	+ assert_equal 4, reponse_error_code
	123	+ end
	124	+
	125	+ should 'not update the quantity of a product with a invalid value' do
	126	+ get :add, :id => product.id
	127	+
	128	+ assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => -1}
	129	+ assert !response_ok?
	130	+ assert_equal 5, reponse_error_code
	131	+
	132	+ assert_nothing_raised { get :update_quantity, :id => product.id, :quantity => 'asdf'}
	133	+ assert !response_ok?
	134	+ assert_equal 5, reponse_error_code
	135	+ end
	136	+
	137	+ should 'clean the cart' do
	138	+ another_product = fast_create(Product, :enterprise_id => enterprise.id)
	139	+ get :add, :id => product.id
	140	+ get :add, :id => another_product.id
	141	+
	142	+ assert_nothing_raised { get :clean }
	143	+ assert !cart?
	144	+ end
	145	+
	146	+ should 'not crash if there is no cart' do
	147	+ instantiate_cart
	148	+ assert !cart?
	149	+ assert_nothing_raised { get :clean }
	150	+ end
	151	+
	152	+ should 'register order on send request' do
	153	+ product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
	154	+ product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
	155	+ @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1, product2.id => 2}})
	156	+ assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
	157	+ post :send_request,
	158	+ :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
	159	+ end
	160	+
	161	+ order = ShoppingCartPlugin::PurchaseOrder.last
	162	+
	163	+ assert_equal 1.99, order.products_list[product1.id][:price]
	164	+ assert_equal 1, order.products_list[product1.id][:quantity]
	165	+ assert_equal 2.23, order.products_list[product2.id][:price]
	166	+ assert_equal 2, order.products_list[product2.id][:quantity]
	167	+ assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
	168	+ end
	169	+
	170	+ should 'register order on send request and not crash if product is not defined' do
	171	+ product1 = fast_create(Product, :enterprise_id => enterprise.id)
	172	+ @controller.stubs(:cart).returns({ :enterprise_id => enterprise.id, :items => {product1.id => 1}})
	173	+ assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
	174	+ post :send_request,
	175	+ :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
	176	+ end
	177	+
	178	+ order = ShoppingCartPlugin::PurchaseOrder.last
	179	+
	180	+ assert_equal 0, order.products_list[product1.id][:price]
	181	+ end
	182	+
	183	+ should 'clean the cart after placing the order' do
	184	+ product1 = fast_create(Product, :enterprise_id => enterprise.id)
	185	+ post :add, :id => product1.id
	186	+ post :send_request, :customer => { :name => "Manuel", :email => "manuel@ceu.com" }
	187	+ assert !cart?, "cart expected to be empty!"
	188	+ end
	189	+
	190	+ private
	191	+
	192	+ def json_response
	193	+ ActiveSupport::JSON.decode @response.body
	194	+ end
	195	+
	196	+ def cart?
	197	+ !@controller.send(:cart).nil?
	198	+ end
	199	+
	200	+ def product_in_cart?(product)
	201	+ @controller.send(:cart) &&
	202	+ @controller.send(:cart)[:items] &&
	203	+ @controller.send(:cart)[:items].has_key?(product.id)
	204	+ end
	205	+
	206	+ def product_quantity(product)
	207	+ @controller.send(:cart)[:items][product.id]
	208	+ end
	209	+
	210	+ def response_ok?
	211	+ json_response['ok']
	212	+ end
	213	+
	214	+ def reponse_error_code
	215	+ json_response['error']['code']
	216	+ end
	217	+
	218	+ # temporary hack...if I don't do this the session stays as an Array instead
	219	+ # of a TestSession
	220	+ def instantiate_cart
	221	+ get :add, :id => product.id
	222	+ get :remove, :id => product.id
	223	+ end
	224	+
	225	+end
	@@ -1,213 +0,0 @@	@@ -1,213 +0,0 @@
1	-require File.dirname(__FILE__) + '/../../../../test/test_helper'
2	-require File.dirname(__FILE__) + '/../../controllers/shopping_cart_plugin_profile_controller'
3	-
4	-# Re-raise errors caught by the controller.
5	-class ShoppingCartPluginProfileController; def rescue_action(e) raise e end; end
6	-
7	-class ShoppingCartPluginProfileControllerTest < ActionController::TestCase
8	-
9	- def setup
10	- @controller = ShoppingCartPluginProfileController.new
11	- @request = ActionController::TestRequest.new
12	- @response = ActionController::TestResponse.new
13	- @enterprise = fast_create(Enterprise)
14	- @product = fast_create(Product, :enterprise_id => @enterprise.id)
15	- end
16	- attr_reader :enterprise
17	- attr_reader :product
18	-
19	- should 'add a new product to cart' do
20	- get :add, :profile => enterprise.identifier, :id => product.id
21	-
22	- assert product_in_cart?(product)
23	- assert_equal 1, product_quantity(product)
24	- end
25	-
26	- should 'grow quantity through add' do
27	- get :add, :profile => enterprise.identifier, :id => product.id
28	- assert_equal 1, product_quantity(product)
29	-
30	- get :add, :profile => enterprise.identifier, :id => product.id
31	- assert_equal 2, product_quantity(product)
32	- end
33	-
34	- should 'not add product to cart if it does not exists' do
35	- assert_nothing_raised { get :add, :profile => enterprise.identifier, :id => 9999 }
36	-
37	- assert !product_in_cart?(product)
38	- assert !response_ok?
39	- assert 3, reponse_error_code
40	- end
41	-
42	- should 'remove cart if the product being removed is the last one' do
43	- get :add, :profile => enterprise.identifier, :id => product.id
44	- assert cart?
45	-
46	- get :remove, :profile => enterprise.identifier, :id => product.id
47	- assert !cart?
48	- end
49	-
50	- should 'not try to remove a product if there is no cart' do
51	- instantiate_session
52	- assert !cart?
53	-
54	- assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
55	- assert !response_ok?
56	- assert_equal 2, reponse_error_code
57	- end
58	-
59	- should 'just remove product if there are other products on cart' do
60	- another_product = fast_create(Product, :enterprise_id => enterprise.id)
61	- get :add, :profile => enterprise.identifier, :id => product.id
62	- get :add, :profile => enterprise.identifier, :id => another_product.id
63	-
64	- get :remove, :profile => enterprise.identifier, :id => product.id
65	- assert cart?
66	- assert !product_in_cart?(product)
67	- end
68	-
69	- should 'not try to remove a product that is not in the cart' do
70	- get :add, :profile => enterprise.identifier, :id => product.id
71	- assert cart?
72	- assert_nothing_raised { get :remove, :profile => enterprise.identifier, :id => 9999 }
73	-
74	- assert !response_ok?
75	- assert_equal 4, reponse_error_code
76	- end
77	-
78	- should 'not try to list the cart if there is no cart' do
79	- instantiate_session
80	- assert !cart?
81	-
82	- assert_nothing_raised { get :list, :profile => enterprise.identifier }
83	- assert !response_ok?
84	- assert_equal 2, reponse_error_code
85	- end
86	-
87	- should 'list products without errors' do
88	- get :add, :profile => enterprise.identifier, :id => product.id
89	-
90	- assert_nothing_raised { get :list, :profile => enterprise.identifier }
91	- assert response_ok?
92	- end
93	-
94	- should 'update the quantity of a product' do
95	- get :add, :profile => enterprise.identifier, :id => product.id
96	- assert 1, product_quantity(product)
97	-
98	- get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 3
99	- assert 3, product_quantity(product)
100	- end
101	-
102	- should 'not try to update quantity the quantity of a product if there is no cart' do
103	- instantiate_session
104	- assert !cart?
105	-
106	- assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
107	- assert !response_ok?
108	- assert_equal 2, reponse_error_code
109	- end
110	-
111	- should 'not try to update the quantity of a product that is not in the cart' do
112	- get :add, :profile => enterprise.identifier, :id => product.id
113	- assert cart?
114	- assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => 9999, :quantity => 3 }
115	-
116	- assert !response_ok?
117	- assert_equal 4, reponse_error_code
118	- end
119	-
120	- should 'not update the quantity of a product with a invalid value' do
121	- get :add, :profile => enterprise.identifier, :id => product.id
122	-
123	- assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => -1}
124	- assert !response_ok?
125	- assert_equal 5, reponse_error_code
126	-
127	- assert_nothing_raised { get :update_quantity, :profile => enterprise.identifier, :id => product.id, :quantity => 'asdf'}
128	- assert !response_ok?
129	- assert_equal 5, reponse_error_code
130	- end
131	-
132	- should 'clean the cart' do
133	- another_product = fast_create(Product, :enterprise_id => enterprise.id)
134	- get :add, :profile => enterprise.identifier, :id => product.id
135	- get :add, :profile => enterprise.identifier, :id => another_product.id
136	-
137	- assert_nothing_raised { get :clean, :profile => enterprise.identifier }
138	- assert !cart?
139	- end
140	-
141	- should 'not crash if there is no cart' do
142	- instantiate_session
143	- assert !cart?
144	- assert_nothing_raised { get :clean, :profile => enterprise.identifier }
145	- end
146	-
147	- should 'register order on send request' do
148	- product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
149	- product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
150	- @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1, product2.id => 2}}})
151	- assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
152	- post :send_request,
153	- :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
154	- :profile => enterprise.identifier
155	- end
156	-
157	- order = ShoppingCartPlugin::PurchaseOrder.last
158	-
159	- assert_equal 1.99, order.products_list[product1.id][:price]
160	- assert_equal 1, order.products_list[product1.id][:quantity]
161	- assert_equal 2.23, order.products_list[product2.id][:price]
162	- assert_equal 2, order.products_list[product2.id][:quantity]
163	- assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
164	- end
165	-
166	- should 'register order on send request and not crash if product is not defined' do
167	- product1 = fast_create(Product, :enterprise_id => enterprise.id)
168	- @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1}}})
169	- assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
170	- post :send_request,
171	- :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
172	- :profile => enterprise.identifier
173	- end
174	-
175	- order = ShoppingCartPlugin::PurchaseOrder.last
176	-
177	- assert_equal 0, order.products_list[product1.id][:price]
178	- end
179	-
180	- private
181	-
182	- def json_response
183	- ActiveSupport::JSON.decode @response.body
184	- end
185	-
186	- def cart?
187	- !session[:cart].nil?
188	- end
189	-
190	- def product_in_cart?(product)
191	- session[:cart][:items].has_key?(product.id)
192	- end
193	-
194	- def product_quantity(product)
195	- session[:cart][:items][product.id]
196	- end
197	-
198	- def response_ok?
199	- json_response['ok']
200	- end
201	-
202	- def reponse_error_code
203	- json_response['error']['code']
204	- end
205	-
206	- # temporary hack...if I don't do this the session stays as an Array instead
207	- # of a TestSession
208	- def instantiate_session
209	- get :add, :profile => enterprise.identifier, :id => product.id
210	- get :remove, :profile => enterprise.identifier, :id => product.id
211	- end
212	-
213	-end
@@ -0,0 +1,35 @@		@@ -0,0 +1,35 @@
	1	+<% person = user.nil? ? Person.new : user %>
	2	+<div id='cart-request-box'>
	3	+ <% form_for(:customer, person, :url => {:action => 'send_request'},
	4	+ :html => {:onsubmit => "return Cart.send_request(this)", :id => 'cart-request-form' }) do \|f\| %>
	5	+ <div id="cart-form-main">
	6	+ <%= labelled_form_field('* ' + _("Name"), f.text_field(:name, :class => 'required') ) %>
	7	+ <%= labelled_form_field('* ' + _("Email"), f.text_field(:email, :class => 'required email') ) %>
	8	+ <%= labelled_form_field('* ' + _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
	9	+ </div>
	10	+ <fieldset><legend><%=_('Delivery Address')%></legend>
	11	+ <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
	12	+ <%= labelled_form_field( _("City"), f.text_field(:city)) %>
	13	+ <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
	14	+ </fieldset>
	15	+ <div id="cart-form-actions">
	16	+ <%= submit_button(:send, _('Send buy request')) %>
	17	+ </div>
	18	+ <% end %>
	19	+ <%= items_table(@cart[:items], @enterprise) %>
	20	+ <%= link_to '', '#', :onclick => "Cart.colorbox_close(this);", :class => 'cart-box-close icon-cancel' %>
	21	+</div>
	22	+
	23	+<script type="text/javascript">
	24	+//<![CDATA[
	25	+ jQuery(document).ready(function(){
	26	+ jQuery("#cart-request-form").validate({
	27	+ submitHandler: function(form) {
	28	+ jQuery(form).find('input.submit').attr('disabled', true);
	29	+ jQuery('#cboxLoadingOverlay').show().addClass('loading');
	30	+ jQuery('#cboxLoadingGraphic').show().addClass('loading');
	31	+ }
	32	+ });
	33	+ });
	34	+//]]>
	35	+</script>