shopping_cart: refactor to use orders and delivery plugins

Braulio Bhavamitra
1 parent 5faa5da5
Showing 45 changed files with 1173 additions and 1787 deletions Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb
plugins/shopping_cart/db/migrate/20121022190819_move_fields_included_on_profiles_table_to_settings.rb
plugins/shopping_cart/db/migrate/20131226125124_move_shopping_cart_purchase_order_to_orders_plugin_order.rb
plugins/shopping_cart/db/migrate/20150202122535_move_shopping_delivery_options_to_delivery_plugin.rb
plugins/shopping_cart/lib/ext/enterprise.rb
plugins/shopping_cart/lib/ext/person.rb
plugins/shopping_cart/lib/ext/profile.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/lib/shopping_cart_plugin/purchase_order.rb
plugins/shopping_cart/plugin.yml
plugins/shopping_cart/po/de/shopping_cart.po
plugins/shopping_cart/po/es/shopping_cart.po
plugins/shopping_cart/po/fr/shopping_cart.po
plugins/shopping_cart/po/hy/shopping_cart.po
plugins/shopping_cart/po/pt/shopping_cart.po
plugins/shopping_cart/po/ru/shopping_cart.po
plugins/shopping_cart/public/buy.js
 require 'base64'
  
-class ShoppingCartPluginController < PublicController
+class ShoppingCartPluginController < OrdersPluginController
  
   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?
-        { :profile_id => nil,
+        { :profile_id => params[:profile_id],
           :has_products => false,
           :visible => false,
           :products => []}
       else
-        { :profile_id => cart[:profile_id],
+        {
+        	:profile_id => cart[:profile_id],
+          :profile_short_name => cart_profile.short_name,
           :has_products => (cart[:items].keys.size > 0),
           :visible => visible?,
-          :products => products}
+          :products => products,
+        }
       end
+    config[:has_previous_orders] = if cart_profile then previous_orders.first.present? else false end
     render :text => config.to_json
   end
  
   def add
     product = find_product(params[:id])
-    if product && profile = validate_same_profile(product)
-      self.cart = { :profile_id => profile.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, profile.environment),
-          :description => product.description,
-          :picture => product.default_image(:minor),
-          :quantity => self.cart[:items][product.id]
-        }]
-      }.to_json
+    if product && (profile = validate_same_profile(product))
+        self.cart = { :profile_id => profile.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, profile.environment),
+            :description => product.description,
+            :picture => product.default_image(:minor),
+            :quantity => self.cart[:items][product.id]
+          }]
+        }.to_json
     end
   end
  
@@ -93,36 +92,56 @@ class ShoppingCartPluginController &lt; PublicController
     }.to_json
   end
  
+  # override from OrdersPluginController
+  def repeat
+    unless params[:id].present?
+      @orders = previous_orders.last(5).reverse
+      @orders.each{ |o| o.enable_product_diff }
+    else
+      @order = cart_profile.orders.find params[:id]
+      self.cart = { profile_id: cart_profile.id, items: {} }
+      @order.items.each do |item|
+        next unless item.repeat_product and item.repeat_product.available
+        self.cart[:items][item.repeat_product.id] = item.quantity_consumer_ordered.to_i
+      end
+      self.cart[:repeat_order_id] = @order.id
+
+      render json: {
+        products: products,
+      }
+    end
+  end
+
   def buy
+    @no_design_blocks = true
     @customer = user || Person.new
-    if validate_cart_presence
-      @cart = cart
-      @profile = environment.profiles.find(cart[:profile_id])
-      @settings = Noosfero::Plugin::Settings.new(@profile, ShoppingCartPlugin)
-      render :layout => false
+    return redirect_to request.referer || environment.top_url if self.cart.nil?
+    @settings = cart_profile.shopping_cart_settings
+    @cart = cart
+    @profile = cart_profile
+    @order = profile.sales.build consumer: user
+
+    @order.supplier_delivery = profile.delivery_methods.find session[:cart][:last_delivery_option_id] rescue nil
+    if repeat_order_id = self.cart[:repeat_order_id]
+      repeat_order = cart_profile.orders.where(id: repeat_order_id).first
+      @order.consumer_delivery_data = repeat_order.consumer_delivery_data if repeat_order
     end
   end
  
   def send_request
-    register_order(params[:customer], self.cart[:items])
+    order = register_order(params[:customer], self.cart[:items])
     begin
-      profile = environment.profiles.find(cart[:profile_id])
-      ShoppingCartPlugin::Mailer.customer_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
-      ShoppingCartPlugin::Mailer.supplier_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
+      ShoppingCartPlugin::Mailer.customer_notification(order, self.cart[:items]).deliver
+      ShoppingCartPlugin::Mailer.supplier_notification(order, self.cart[:items]).deliver
+      session[:notice] = _('Your order has been sent successfully! You will receive a confirmation e-mail shortly.')
+      @success = true
+      @profile = cart_profile
+      session[:cart] ||= {}
+      session[:cart][:last_delivery_option_id] = order.supplier_delivery_id
       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
+    rescue ActiveRecord::ActiveRecordError => exception
+      @success = false
+      @error = exception.message
     end
   end
  
@@ -168,35 +187,35 @@ class ShoppingCartPluginController &lt; PublicController
     end
   end
  
-  def update_delivery_option
-    profile = environment.profiles.find(cart[:profile_id])
-    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
-    delivery_price = settings.delivery_options[params[:delivery_option]]
-    delivery = Product.new(:name => params[:delivery_option], :price => delivery_price)
-    delivery.save(false)
-    items = self.cart[:items].clone
-    items[delivery.id] = 1
-    total_price = get_total_on_currency(items, environment)
-    delivery.destroy
-    render :text => {
-      :ok => true,
-      :delivery_price => float_to_currency_cart(delivery_price, environment),
-      :total_price => total_price,
-      :message => _('Delivery option updated.'),
-      :error => {:code => 0}
-    }.to_json
+  def update_supplier_delivery
+    @profile = cart_profile
+    supplier_delivery = @profile.delivery_methods.find params[:order][:supplier_delivery_id]
+    order = build_order self.cart[:items], supplier_delivery
+    total_price = order.total_price
+    render json: {
+      ok: true,
+      delivery_price: float_to_currency_cart(supplier_delivery.cost(total_price), environment, unit: ''),
+      total_price: float_to_currency_cart(total_price, environment, unit: ''),
+      message: _('Delivery option updated.'),
+      error: {code: 0}
+    }
   end
  
-  private
+  # must be public
+  def profile
+    cart_profile
+  end
+
+  protected
  
   def validate_same_profile(product)
     if self.cart && self.cart[:profile_id] && product.profile_id != self.cart[:profile_id]
       render :text => {
         :ok => false,
         :error => {
-        :code => 1,
-        :message => _("Can't join items from different enterprises.")
-      }
+          :code => 1,
+          :message => _("Your basket contains items from '%{profile_name}'. Please empty the basket or checkout before adding items from here.") % {profile_name: cart_profile.short_name}
+        }
       }.to_json
       return nil
     end
@@ -262,40 +281,48 @@ class ShoppingCartPluginController &lt; PublicController
   end
  
   def register_order(custumer, items)
-    new_items = {}
-    items.each do |id, quantity|
+    products_list = {}; items.each do |id, quantity|
       product = Product.find(id)
       price = product.price || 0
-      new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
+      products_list[id] = {:quantity => quantity, :price => price, :name => product.name}
     end
-    purchase_order = ShoppingCartPlugin::PurchaseOrder.new
-    purchase_order.seller = environment.profiles.find(cart[:profile_id])
-    purchase_order.customer = user
-    purchase_order.status = ShoppingCartPlugin::PurchaseOrder::Status::OPENED
-    purchase_order.products_list = new_items
-    purchase_order.customer_delivery_option = params[:delivery_option]
-    purchase_order.customer_payment = params[:customer][:payment]
-    purchase_order.customer_change = params[:customer][:change]
-    purchase_order.customer_name = params[:customer][:name]
-    purchase_order.customer_email = params[:customer][:email]
-    purchase_order.customer_contact_phone = params[:customer][:contact_phone]
-    purchase_order.customer_address = params[:customer][:address]
-    purchase_order.customer_district = params[:customer][:district]
-    purchase_order.customer_city = params[:customer][:city]
-    purchase_order.customer_zip_code = params[:customer][:zip_code]
-    purchase_order.save!
-  end
  
-  protected
+    order = OrdersPlugin::Sale.new
+    order.profile = environment.profiles.find(cart[:profile_id])
+    order.supplier_delivery = profile.delivery_methods.find params[:order][:supplier_delivery_id]
+    order.session_id = session_id unless user
+    order.consumer = user
+    order.source = 'shopping_cart_plugin'
+    order.status = 'ordered'
+    order.products_list = products_list
+    order.consumer_data = params[:order][:consumer_data]
+    order.payment_data = params[:order][:payment_data]
+    order.consumer_delivery_data = params[:order][:consumer_delivery_data]
+    order.save!
+
+    order
+  end
  
   def cart
     @cart ||=
       begin
         cookies[cookie_key] && YAML.load(Base64.decode64(cookies[cookie_key])) || nil
       end
+    # migrate from old attribute
+    @cart[:profile_id] ||= @cart.delete(:enterprise_id) if @cart and @cart[:enterprise_id].present?
     @cart
   end
  
+  def cart_profile
+    profile_id = if params[:profile_id].present? then params[:profile_id] elsif cart then cart[:profile_id] end
+    @cart_profile ||= environment.profiles.find profile_id rescue nil
+  end
+
+  # from OrdersPluginController
+  def supplier
+    cart_profile
+  end
+
   def cart=(data)
     @cart = data
   end
 class ShoppingCartPluginMyprofileController < MyProfileController
-  def edit
-    params[:settings] = treat_cart_options(params[:settings])
-
-    @settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin, params[:settings])
-    if request.post?
-      begin
-        @settings.save!
-        session[:notice] = _('Option updated successfully.')
-      rescue Exception => exception
-        session[:notice] = _('Option wasn\'t updated successfully.')
-      end
-      redirect_to :action => 'edit'
-    end
-  end
-
-  def reports
-    utc_string = ' 00:00:00 UTC'
-    @from = params[:from] ? Time.parse(params[:from] + utc_string) : Time.now.utc.at_beginning_of_month
-    @to = params[:to] ? Time.parse(params[:to] + utc_string) : Time.now.utc
-    @status = !params[:filter_status].blank? ? params[:filter_status].to_i : nil
-
-    condition = 'created_at >= ? AND created_at <= ?'
-    condition_parameters = [@from, @to+1.day]
-    if @status
-      condition += ' AND status = ?'
-      condition_parameters << @status
-    end
  
-    conditions = [condition] + condition_parameters
-    @orders = profile.orders.find(:all, :conditions => conditions)
+  helper DeliveryPlugin::DisplayHelper
  
-    @products = {}
-    @orders.each do |order|
-      order.products_list.each do |id, qp|
-        @products[id] ||= ShoppingCartPlugin::LineItem.new(id, qp[:name])
-        @products[id].quantity += qp[:quantity]
+  def edit
+    params[:settings] = treat_cart_options(params[:settings])
+    @settings = profile.shopping_cart_settings params[:settings] || {}
+    respond_to do |format|
+      format.js do
+        if request.post?
+          @success = @settings.save!
+        end
       end
+      format.html
     end
   end
  
-  def update_order_status
-    order = ShoppingCartPlugin::PurchaseOrder.find(params[:order_id].to_i)
-    order.status = params[:order_status].to_i
-    order.save!
-    redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
-  end
-
-  private
+  protected
  
   def treat_cart_options(settings)
     return if settings.blank?
     settings[:enabled] = settings[:enabled] == '1'
-    settings[:delivery] = settings[:delivery] == '1'
-    settings[:free_delivery_price] = settings[:free_delivery_price].blank? ? nil : settings[:free_delivery_price].to_d
-    settings[:delivery_options] = treat_delivery_options(settings[:delivery_options])
     settings
   end
  
-  def treat_delivery_options(params)
-    result = {}
-    return result if params.nil? || params[:options].nil?
-    params[:options].size.times do |counter|
-      if params[:options][counter].present? && params[:prices][counter].present?
-        result[params[:options][counter]] = params[:prices][counter]
-      end
-    end
-    result
-  end
 end
 class MoveFieldsIncludedOnProfilesTableToSettings < ActiveRecord::Migration
   def self.up
     Profile.find_each do |profile|
-      settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
+      settings = profile.shopping_cart_settings
       settings.enabled = profile.shopping_cart
       settings.delivery = profile.shopping_cart_delivery
       settings.delivery_price = profile.shopping_cart_delivery_price
@@ -0,0 +1,86 @@
+OrdersPlugin.send :remove_const, :Item if defined? OrdersPlugin::Item
+OrdersPlugin.send :remove_const, :Order if defined? OrdersPlugin::Order
+
+class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
+  acts_as_having_settings :field => :data
+
+  module Status
+    OPENED = 0
+    CANCELED = 1
+    CONFIRMED = 2
+    SHIPPED = 3
+  end
+end
+
+class Profile
+  has_many :orders, :class_name => 'OrdersPlugin::Order'
+end
+
+class OrdersPlugin::Item < Noosfero::Plugin::ActiveRecord
+  belongs_to :order, :class_name => 'OrdersPlugin::Order'
+end
+class OrdersPlugin::Order < Noosfero::Plugin::ActiveRecord
+  has_many :items, :class_name => 'OrdersPlugin::Item', :foreign_key => :order_id
+
+  extend CodeNumbering::ClassMethods
+  code_numbering :code, :scope => proc{ self.profile.orders }
+end
+
+StatusTransform = {
+  ShoppingCartPlugin::PurchaseOrder::Status::OPENED => 'ordered',
+  ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED => 'accepted',
+  ShoppingCartPlugin::PurchaseOrder::Status::CANCELED => 'cancelled',
+  ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED => 'delivered',
+}
+
+class MoveShoppingCartPurchaseOrderToOrdersPluginOrder < ActiveRecord::Migration
+  def self.up
+    OrdersPlugin::Order.record_timestamps = false
+
+    ShoppingCartPlugin::PurchaseOrder.all(:order => 'created_at ASC').each do |purchase_order|
+      data = purchase_order.data
+
+      order = OrdersPlugin::Order.new :profile_id => purchase_order.seller_id, :consumer_id => purchase_order.customer_id
+
+      order.consumer_data = {}
+      ['contact_phone','name','email'].each do |prop|
+        order.consumer_data[prop.to_sym] = data[('customer_'+prop).to_sym]
+      end
+
+      order.consumer_delivery_data = {
+        :name           => data[:customer_delivery_option],
+        :address_line1  => data[:customer_address],
+        :address_line2  => data[:customer_district],
+        :postal_code    => data[:customer_zip_code],
+        :state          => data[:customer_state],
+        :country        => 'Brasil'
+      }
+      order.supplier_delivery_data = {}
+
+      data[:products_list].each do |id, data|
+        item = order.items.build :product_id => id, :name => data[:name], :quantity_consumer_ordered => data[:quantity], :price => data[:price]
+        item.order = order
+      end
+
+      order.payment_data = {
+        :method         => data[:customer_payment],
+        :change         => data[:customer_change]
+      }
+
+      order.status = StatusTransform[purchase_order.status]
+
+      order.updated_at = purchase_order.updated_at
+      order.created_at = purchase_order.created_at
+
+      order.save!
+    end
+
+    # Leave table for registry
+    #drop_table :shopping_cart_plugin_purchase_orders
+
+    OrdersPlugin::Order.record_timestamps = true
+  end
+
+  def self.down
+  end
+end
@@ -0,0 +1,21 @@
+class MoveShoppingDeliveryOptionsToDeliveryPlugin < ActiveRecord::Migration
+  def up
+    Enterprise.find_each batch_size: 20 do |enterprise|
+      settings = enterprise.shopping_cart_settings
+      next if settings.delivery_options.blank?
+
+      free_over_price = settings.free_delivery_price
+      settings.delivery_options.each do |name, price|
+        enterprise.delivery_methods.create! name: name, fixed_cost: price.to_f, delivery_type: 'deliver', free_over_price: free_over_price
+      end
+
+      settings.free_delivery_price = nil
+      settings.delivery_options = nil
+      enterprise.save!
+    end
+  end
+
+  def down
+    say "this migration can't be reverted"
+  end
+end
@@ -1,5 +0,0 @@
-require_dependency 'enterprise'
-
-class Enterprise
-  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
-end
@@ -1,5 +0,0 @@
-require_dependency 'person'
-
-class Person
-  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
-end
@@ -0,0 +1,24 @@
+require_dependency 'profile'
+
+class Profile
+
+  def shopping_cart_settings attrs = {}
+    @shopping_cart_settings ||= Noosfero::Plugin::Settings.new self, ShoppingCartPlugin, attrs
+    attrs.each{ |a, v| @shopping_cart_settings.send "#{a}=", v }
+    @shopping_cart_settings
+  end
+
+  def shopping_cart_enabled
+    self.shopping_cart_settings.enabled
+  end
+
+  # may be customized by other profiles
+  def cart_order_supplier_notification_recipients
+    if self.contact_email.present?
+      [self.contact_email]
+    else
+      self.admins.collect(&:contact_email).select{ |email| email.present? }
+    end
+  end
+
+end
 class ShoppingCartPlugin < Noosfero::Plugin
  
-  class << self
-    def plugin_name
+  def self.plugin_name
     "Shopping Basket"
-    end
-
-    def plugin_description
-      _("A shopping basket feature for enterprises")
-    end
-
-    def delivery_default_setting
-      false
-    end
-
-    def delivery_price_default_setting
-      0
-    end
-
-    def delivery_options_default_setting
-      {}
-    end
   end
  
-  def add_to_cart_button(item)
-    profile = item.profile
-    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
-    if settings.enabled && item.available
-       lambda {
-         link_to(_('Add to basket'), "add:#{item.name}",
-           :class => 'cart-add-item',
-           :onclick => "Cart.addItem(#{item.id}, this); return false"
-         )
-       }
-    end
+  def self.plugin_description
+    _("A shopping basket feature for enterprises")
   end
  
-  alias :product_info_extras :add_to_cart_button
-  alias :catalog_item_extras :add_to_cart_button
-  alias :asset_product_extras :add_to_cart_button
-
   def stylesheet?
     true
   end
@@ -48,19 +17,45 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
  
   def body_beginning
-    expanded_template('cart.html.erb')
+    lambda do
+    	extend ShoppingCartPlugin::CartHelper
+      render 'public/cart' unless cart_minimized
+    end
   end
  
   def control_panel_buttons
-    settings = Noosfero::Plugin::Settings.new(context.profile, ShoppingCartPlugin)
     buttons = []
     if context.profile.enterprise?
       buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
     end
-    if context.profile.enterprise? && settings.enabled
-      buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
-    end
  
     buttons
   end
+
+  def add_to_cart_button item, options = {}
+    profile = item.profile
+    return unless profile.shopping_cart_enabled and item.available
+    lambda do
+      extend ShoppingCartPlugin::CartHelper
+      add_to_cart_button item, options
+    end
+  end
+
+  alias :product_info_extras :add_to_cart_button
+  alias :catalog_item_extras :add_to_cart_button
+  alias :asset_product_extras :add_to_cart_button
+
+  # We now think that it's not a good idea to have the basket in the same time.
+  #def catalog_autocomplete_item_extras product
+  #  add_to_cart_button product, with_text: false
+  #end
+
+  def catalog_search_extras_begin
+    return unless profile.shopping_cart_enabled
+    lambda do
+      extend ShoppingCartPlugin::CartHelper
+      content_tag 'li', render('public/cart'), :class => 'catalog-cart'
+    end
+  end
+
 end
+require_dependency 'delivery_plugin/display_helper'
+
 module ShoppingCartPlugin::CartHelper
  
   include ActionView::Helpers::NumberHelper
   include ActionView::Helpers::TagHelper
  
+  include DeliveryPlugin::DisplayHelper
+
+  def add_to_cart_button item, options = {}
+  	label = if options[:with_text].nil? or options[:with_text] then _('Add to basket') else '' end
+  	button_to_function 'cart', label, "Cart.addItem(#{item.id}, this)", class: 'cart-add-item', type: 'primary'
+  end
+
+  def cart_applet
+    button_to_function 'cart', '&nbsp;<span class="cart-qtty"></span>', "cart.toggle()", class: 'cart-applet-indicator', type: 'primary'
+  end
+
+  def cart_minimized
+    @catalog_bar
+  end
+
+  def repeat_checkout_order_button order
+    button_to_function :check, t('views.public.repeat.checkout'), 'cart.repeatCheckout(event, this)', 'data-order-id' => order.id, class: 'repeat-checkout-order'
+  end
+
+  def repeat_choose_order_button order
+    button_to_function :edit, t('views.public.repeat.choose'), 'cart.repeatChoose(event, this)', 'data-order-id' => order.id, class: 'repeat-choose-order'
+  end
+
   def sell_price(product)
     return 0 if product.price.nil?
     product.discount ? product.price_with_discount : product.price
   end
  
-  def get_price(product, environment, quantity=1)
-    float_to_currency_cart(price_with_quantity(product,quantity), environment)
+  def get_price product, environment, quantity=1, options = {}
+    float_to_currency_cart price_with_quantity(product,quantity), environment, options
   end
  
   def price_with_quantity(product, quantity=1)
@@ -25,68 +50,28 @@ module ShoppingCartPlugin::CartHelper
     float_to_currency_cart(get_total(items), environment)
   end
  
-  def items_table(items, profile, delivery_option = nil, by_mail = false)
-    environment = profile.environment
-    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
-    items = items.to_a
-
-    quantity_opts = { :class => 'cart-table-quantity' }
-    quantity_opts.merge!({:align => 'center'}) if by_mail
-    price_opts = {:class => 'cart-table-price'}
-    price_opts.merge!({:align => 'right'}) if by_mail
-    items.sort! {|a, b| Product.find(a.first).name <=> Product.find(b.first).name}
-
-    if settings.delivery
-      if settings.free_delivery_price && get_total(items) >= settings.free_delivery_price
-        delivery = Product.new(:name => _('Free delivery'), :price => 0)
-      else
-        delivery = Product.new(:name => delivery_option || _('Delivery'), :price => settings.delivery_options[delivery_option])
-      end
-      delivery.save(false)
-      items << [delivery.id, '']
+  def build_order items, delivery_method = nil
+    @order = @profile.sales.build
+    items.each do |product_id, quantity|
+      @order.items.build product_id: product_id, quantity_consumer_ordered: quantity
     end
+    @order.supplier_delivery = delivery_method
+    @order
+  end
  
-    table = '<table id="cart-items-table" cellpadding="2" cellspacing="0"
-    border="'+(by_mail ? '1' : '0')+'"
-    style="'+(by_mail ? 'border-collapse:collapse' : '')+'">' +
-    content_tag('tr',
-      content_tag('th', _('Item name')) +
-      content_tag('th', by_mail ? '&nbsp;#&nbsp;' : '#') +
-      content_tag('th', c_('Price'))
-    ) +
-    items.map do |id, quantity|
-      product = Product.find(id)
-      name_opts = {}
-      is_delivery = quantity.kind_of?(String)
-      if is_delivery
-        price_opts.merge!({:id => 'delivery-price'})
-        name_opts.merge!({:id => 'delivery-name'})
-      end
-      content_tag('tr',
-        content_tag('td', product.name, name_opts) +
-        content_tag('td', quantity, quantity_opts ) +
-        content_tag('td', get_price(product, environment, quantity), price_opts)
-      )
-    end.join("\n")
-
-    total = get_total_on_currency(items, environment)
-    delivery.destroy if settings.delivery
-
-    table +
-    content_tag('th', _('Total:'), :colspan => 2, :class => 'cart-table-total-label') +
-    content_tag('th', total, :class => 'cart-table-total-value') +
-    '</table>'
+  def items_table(items, profile, delivery_method = nil, by_mail = false)
+    # partial key needed in mailer context
+    render partial: 'shopping_cart_plugin/items', locals: {order: build_order(items, delivery_method), by_mail: by_mail}
   end
  
-  def float_to_currency_cart(value, environment)
-    number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u%n")
+  def float_to_currency_cart value, environment, _options = {}
+    options = {:unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u%n"}
+    options.merge! _options
+    number_to_currency value, options
   end
  
-  def select_delivery_options(options, environment)
-    result = options.map do |option, price|
-      ["#{option} (#{float_to_currency_cart(price, environment)})", option]
-    end
-    result << ["#{_('Delivery')} (#{float_to_currency_cart(0, environment)})", 'delivery'] if result.empty?
-    result
+  def options_for_payment
+    options_for_select OrdersPlugin::Order::PaymentMethods.map{ |key, text| [text.call, key] }
   end
+
 end
@@ -2,38 +2,38 @@ class ShoppingCartPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
  
   include ShoppingCartPlugin::CartHelper
  
-  def customer_notification(customer, supplier, items, delivery_option)
-    domain = supplier.hostname || supplier.environment.default_hostname
-    @customer = customer
-    @supplier = supplier
+  helper ShoppingCartPlugin::CartHelper
+
+  attr_accessor :environment, :profile
+
+  def customer_notification order, items
+    domain = order.profile.hostname || order.profile.environment.default_hostname
+    self.profile = order.profile
+    self.environment = order.profile.environment
+    @order = order
     @items = items
-    @environment = supplier.environment
-    @helper = self
-    @delivery_option = delivery_option
  
     mail(
-      to:           customer[:email],
+      to:           @order.consumer_data[:email],
       from:         'no-reply@' + domain,
-      reply_to:     supplier.contact_email,
-      subject:      _("[%s] Your buy request was performed successfully.") % supplier[:name],
+      reply_to:     @order.profile.cart_order_supplier_notification_recipients,
+      subject:      _("[%s] Your buy request was performed successfully.") % @order.profile.short_name(nil),
       content_type: 'text/html'
     )
   end
  
-  def supplier_notification(customer, supplier, items, delivery_option)
-    domain = supplier.environment.default_hostname
-    @customer = customer
-    @supplier = supplier
+  def supplier_notification order, items
+    domain = order.profile.environment.default_hostname
+    self.profile = order.profile
+    self.environment = order.profile.environment
+    @order = order
     @items = items
-    @environment = supplier.environment
-    @helper = self
-    @delivery_option = delivery_option
  
     mail(
-      to:    supplier.contact_email,
+      to:            @order.profile.cart_order_supplier_notification_recipients,
       from:          'no-reply@' + domain,
-      reply_to:      customer[:email],
-      subject:       _("[%s] You have a new buy request from %s.") % [supplier.environment.name, customer[:name]],
+      reply_to:      @order.consumer_data[:email],
+      subject:       _("[%s] You have a new buy request from %s.") % [order.profile.environment.name, @order.consumer_data[:name]],
       content_type:  'text/html'
     )
   end
@@ -1,43 +0,0 @@
-class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
-
-  belongs_to :customer, :class_name => "Profile"
-  belongs_to :seller, :class_name => "Profile"
-
-  validates_presence_of :status, :seller
-
-  attr_accessible :seller, :status, :products_list
-
-  acts_as_having_settings :field => :data
-
-  settings_items :products_list, :type => Array, :default => {}
-  settings_items :customer_name, :type => String
-  settings_items :customer_email, :type => String
-  settings_items :customer_contact_phone, :type => String
-  settings_items :customer_address, :type => String
-  settings_items :customer_district, :type => String
-  settings_items :customer_city, :type => String
-  settings_items :customer_zip_code, :type => String
-  settings_items :customer_delivery_option, :type => String
-  settings_items :customer_payment, :type => String
-  settings_items :customer_change, :type => String
-
-  before_create do |order|
-    order.created_at = Time.now.utc
-    order.updated_at = Time.now.utc
-  end
-
-  before_update do |order|
-    order.updated_at = Time.now.utc
-  end
-
-  module Status
-    OPENED = 0
-    CANCELED = 1
-    CONFIRMED = 2
-    SHIPPED = 3
-
-    def self.name
-      [_('Opened'), _('Canceled'), _('Confirmed'), _('Shipped')]
-    end
-  end
-end
@@ -0,0 +1,3 @@
+name: shopping_cart
+dependencies:
+  - orders
@@ -6,8 +6,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2015-02-23 11:36+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2015-02-23 11:35+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Spanish <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -4,9 +4,9 @@
 # , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2015-03-07 10:49+0200\n"
 "Last-Translator: Tuux <tuxa@galaxie.eu.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2015-02-23 11:37+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Armenian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -11,12 +11,12 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-02-23 11:36+0200\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
+"PO-Revision-Date: 2015-06-12 11:29-0300\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
-"plugin-shopping-cart/pt/>\n"
+"Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero"
+"/plugin-shopping-cart/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -65,6 +65,18 @@ msgstr &quot;Frete grátis&quot;
 msgid "Delivery"
 msgstr "Entrega"
  
+#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7
+msgid "Delivery or pickup"
+msgstr "Forma de retirada ou entrega"
+
+#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7
+msgid "Deliveries or pickups"
+msgstr "Formas de retirada ou entrega"
+
+#: plugins/delivery/views/delivery_plugin/_order_select.html.slim
+msgid "Instructions"
+msgstr "Instruções"
+
 #: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:53
 msgid "Item name"
 msgstr "Nome do item"
@@ -86,6 +98,10 @@ msgstr &quot;[%s] Você tem um novo pedido de compra de %s.&quot;
 msgid "Request sent successfully. Check your email."
 msgstr "Requisição enviada com sucesso. Cheque seu email."
  
+#: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:115
+msgid "Your order has been sent successfully! You will receive a confirmation e-mail shortly."
+msgstr "Seu pedido foi enviado com sucesso! Você receberá uma confirmação em breve."
+
 #: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb:138
 msgid "Basket displayed."
 msgstr "Cesto exibido."
@@ -134,18 +150,15 @@ msgstr &quot;Opção foi atualizada com sucesso.&quot;
 msgid "Option wasn't updated successfully."
 msgstr "Opção não foi atualizada com sucesso."
  
-#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:6
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:5
 msgid "Name"
 msgstr "Nome"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:10
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:13
-msgid "Delivery Address"
-msgstr "Endereço de Entrega"
+msgid "Delivery or pickup method"
+msgstr "Forma de entrega ou retirada"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb:16
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:22
 msgid "Send buy request"
 msgstr "Enviar pedido de compra"
@@ -176,10 +189,9 @@ msgstr &quot;Estado&quot;
 msgid "E-mail"
 msgstr "E-mail"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
-#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:8
-msgid "Delivery option"
-msgstr "Opção de entrega"
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9
+msgid "Personal identification"
+msgstr "Identificação pessoal"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20
@@ -188,12 +200,20 @@ msgstr &quot;Opção de entrega&quot;
 msgid "Payment"
 msgstr "Pagamento"
  
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9
+msgid "Payment's method"
+msgstr "Forma de pagamento"
+
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb:35
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:22
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10
 msgid "shopping_cart|Change"
-msgstr "Troco"
+msgstr "Troco para"
+
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:10
+msgid "Your Order"
+msgstr "Seu Pedido"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb:7
 msgid "Quantity"
@@ -303,42 +323,30 @@ msgid &quot;Hi %s!&quot;
 msgstr "Olá %s!"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10
-msgid "This is a notification e-mail about your buy request on %s."
-msgstr "Esse é um email de notificação sobre o seu pedido de compra em %s."
+msgid "This is a notification e-mail about your buy request on the enterprise %s."
+msgstr "Esse é um email de notificação sobre o seu pedido de compra no empreendimento %s."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:11
 msgid ""
-"The supplier already received your buy request and may contact you for "
+"The enterprise already received your buy request and will contact you for "
 "confirmation."
 msgstr ""
-"O fornecedor já recebeu o seu pedido de compra e deve te contactar para "
+"O empreendimento já recebeu o seu pedido de compra e entrará em contato para "
 "confirmação."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:12
-msgid "If you have any doubts, contact us at: %s"
-msgstr "Se você tem alguma dúvida, nos contacte em: %s"
+msgid "If you have any doubts about your order, write to us at: %s."
+msgstr "Se você tem alguma dúvida sobre o seu pedido, nos escreva: %s."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:13
-msgid "Please check if your information below is correct:"
-msgstr "Por favor cheque se suas informações abaixo estão corretas:"
+msgid "Review below the informations of your order:"
+msgstr "Abaixo, revise as informações do seu pedido:"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:19
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:17
 msgid "Phone number"
 msgstr "Telefone"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18
-#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9
-msgid "Money"
-msgstr "Dinheiro"
-
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:20
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:18
-#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9
-msgid "shopping_cart|Check"
-msgstr "Cheque"
-
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47
 msgid "Here are the products you bought:"
 msgstr "Aqui estão os produtos que você pediu:"
@@ -368,3 +376,17 @@ msgstr &quot;E aqui estão os itens pedidos por esse consumidor:&quot;
 msgid "If there are any problems with this email contact the admin of %s."
 msgstr ""
 "Se houver algum problema com esse email contacte o administrador de %s."
+
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15
+msgid "Address completion"
+msgstr "Complemento (p.ex. apto)"
+
+#:
+msgid "repeat order"
+msgstr "repetir pedido"
+
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb
+msgid "haven't finished yet: back to shopping"
+msgstr "ainda não concluí: voltar às compras"
+
+
@@ -5,8 +5,8 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: 1.1-166-gaf47713\n"
-"POT-Creation-Date: 2015-06-01 17:26-0300\n"
+"Project-Id-Version: 1.0-690-gcb6e853\n"
+"POT-Creation-Date: 2015-03-05 12:09-0300\n"
 "PO-Revision-Date: 2015-02-23 11:36+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/noosfero/plugin-"
@@ -15,8 +15,8 @@ msgstr &quot;&quot;
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
+"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Generator: Weblate 2.3-dev\n"
  
 #: plugins/shopping_cart/lib/shopping_cart_plugin.rb:9
-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');
-    }
-  });
-});
+shopping_cart.buy = {
  
-jQuery('#delivery_option').change(function(){
-  jQuery('#cboxLoadingGraphic').show();
-  me = this;
-  profile = jQuery(me).attr('data-profile-identifier');
-  option = jQuery(me).val();
-  jQuery.ajax({
-    url: '/plugin/shopping_cart/update_delivery_option',
-    dataType: "json",
-    data: 'delivery_option='+option,
-    success: function(data, st, ajax) {
-      jQuery('#delivery-price').text(data.delivery_price);
-      jQuery('.cart-table-total-value').text(data.total_price);
-      jQuery('#delivery-name').text(option);
-      jQuery('#cboxLoadingGraphic').hide();
-    },
-    error: function(ajax, st, errorThrown) {
-      alert('Update delivery option - HTTP '+st+': '+errorThrown);
-    },
-  });
-});
+  validate: function() {
+    $("#cart-request-form").validate({
+      submitHandler: function(form) {
+        $(form).find('input.submit').attr('disabled', true);
+        $('#cboxLoadingOverlay').show().addClass('loading');
+        $('#cboxLoadingGraphic').show().addClass('loading');
+      }
+    });
+  },
+
+  update_delivery: function () {
+    $('#cboxLoadingGraphic').show();
+    var me = $(this);
+    var profile = me.attr('data-profile-identifier');
+    var id = me.val();
+    var name = me.find('option:selected').attr('data-label');
+    $.ajax({
+      url: '/plugin/shopping_cart/update_supplier_delivery',
+      dataType: "json",
+      data: 'order[supplier_delivery_id]='+id,
+      success: function(data, st, ajax) {
+        $('#delivery-price').text(data.delivery_price);
+        $('.cart-table-total-value').text(data.total_price);
+        $('#delivery-name').text(name);
+        $('#cboxLoadingGraphic').hide();
+        display_notice(data.message)
+      },
+      error: function(ajax, st, errorThrown) {
+        alert('Update delivery option - HTTP '+st+': '+errorThrown);
+      },
+    });
+  },
+
+  update_payment: function() {
+    var payment = $(this)
+    var form = $(payment.get(0).form)
+    var changeField = form.find('#order_payment_data_change').parents('.form-group');
+    var method = payment.val() == 'money' ? 'slideDown' : 'slideUp';
+    changeField[method]('fast');
+  },
+}
+
+$(document).ready(shopping_cart.buy.validate)
+$('#order_supplier_delivery_id').on('change keyup', shopping_cart.buy.update_delivery)
+$('#order_payment_data_method').on('change keyup', shopping_cart.buy.update_payment)
  
-jQuery('#customer_payment').change(function(){
-  jQuery(this).closest('.formfieldline').next().slideToggle('fast');
-});
+shopping_cart = {
+}
+
 function Cart(config) {
   var $ = jQuery;
+  config.minimized = Cart.minimized;
   Cart.instance = this; // this may be a list on the future;
-  this.cartElem = $("#cart1")[0];
+  this.cartElem = $("#cart1");
   this.cartElem.cartObj = this;
-  this.contentBox = $("#cart1 .cart-content");
+  this.contentBox = (config.minimized) ? $("#cart1 .cart-inner") : $("#cart1 .cart-inner .cart-content");
   this.itemsBox = $("#cart1 .cart-items");
+  this.profileId = config.profile_id;
   this.items = {};
+  this.products = config.products;
   this.empty = !config.has_products;
+  this.minimized = config.minimized;
+  this.hasPreviousOrders = config.has_previous_orders;
   this.visible = false;
+  this.itemTemplate = _.template(jQuery('#cart-item-template').html());
+  $("#cart-profile-name").text(config.profile_short_name);
   $(".cart-buy", this.cartElem).button({ icons: { primary: 'ui-icon-cart'} });
-  if (!this.empty) {
-    $(this.cartElem).show();
-    this.visible = config.visible;
-    this.addToList(config.products, true)
-  }
+  this.load()
 }
  
 (function($){
-
   // Forbidding the user to request more the one action on the cart
-  // simultaneously because the cart in the cookie doesn't supports it.
+  // simultaneously because the cart in the cookie doesn't support it.
   Cart.prototype.ajax = function(config){
     var me = this;
     this.disabled = true;
@@ -31,6 +36,17 @@ function Cart(config) {
     $.ajax(config);
   }
  
+  Cart.prototype.load = function(){
+    if (!this.empty) {
+      if (!this.minimized) {
+        $(this.cartElem).show();
+      }
+      this.addToList(this.products, true)
+    } else if (this.minimized) {
+      this.setQuantity(0)
+    }
+  }
+
   Cart.prototype.addToList = function(products, clear) {
     if( clear ) this.itemsBox.empty();
     var me = this;
@@ -38,17 +54,12 @@ function Cart(config) {
     for( var item,i=0; item=products[i]; i++ ) {
       this.items[item.id] = { price:item.price, quantity:item.quantity };
       this.updateTotal();
-      var liId = "cart-item-"+item.id;
-      var li = $("#"+liId);
-      if( !li[0] ) li = $('<li id="'+liId+'"></li>\n').appendTo(this.itemsBox);
-      li.empty();
-      $('<div class="picture" style="background-image:url('+item.picture+')"></div>' +
-        '<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('+item.id+'); return false"' +
-        ' class="button icon-remove"><span>remove</span></a>'
-       ).appendTo(li);
+      item.priceTxt = (item.price) ? '&times;' + item.price : '';
+
+      jQuery('#cart-item-'+item.id).remove()
+      var li = jQuery(this.itemTemplate({item: item}))
+      li.appendTo(this.itemsBox);
+
       var input = $("input", li)[0];
       input.lastValue = input.value;
       input.productId = item.id;
@@ -67,16 +78,24 @@ function Cart(config) {
       li.animate({ backgroundColor: liBg }, 1000);
     }
  
-    if (!clear && this.empty) $(this.cartElem).show();
-    if((!clear && this.empty) || (this.visible && clear)) {
-      this.contentBox.hide();
-      this.show(!clear);
+    if (!Cart.minimized) {
+      if (!clear && this.empty) $(this.cartElem).show();
+      if((!clear && this.empty) || (this.visible && clear)) {
+        this.contentBox.hide();
+      }
+    } else {
+      if (!clear) {
+        $( ".cart-applet .cart-applet-indicator" ).addClass( 'cart-highlight' );
+        $( ".cart-applet" ).effect('bounce', 300, function(){
+          $( ".cart-applet .cart-applet-indicator" ).removeClass( 'cart-highlight' );
+        });
+      }
     }
     this.empty = false;
   }
  
   Cart.prototype.updateQuantity = function(input, itemId, quantity) {
-    if(this.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if(this.disabled) return alert(Cart.l10n.waitLastRequest);
     quantity = parseInt(quantity);
     input.disabled = true;
     var originalBg = input.style.backgroundImage;
@@ -117,24 +136,16 @@ function Cart(config) {
   }
  
   Cart.addItem = function(itemId, link) {
-    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if(this.instance.disabled) return alert(Cart.l10n.waitLastRequest);
     if ( this.productsLength > 100 ) {
       // This limit protect the user from losing data on cookie limit.
       // This is NOT limiting to 100 products, is limiting to 100 kinds of products.
-      alert(shoppingCartPluginL10n.maxNumberOfItens);
+      alert(Cart.l10n.maxNumberOfItens);
       return false;
     }
-    link.intervalId = setInterval(function() {
-      $(link).addClass('loading');
-      steps = ['w', 'n', 'e', 's'];
-      if( !link.step || link.step==3 ) link.step = 0;
-      link.step++;
-      $(link).button({ icons: { primary: 'ui-icon-arrowrefresh-1-'+steps[link.step]}})
-    }, 100);
+    $(link).addClass('small-loading');
     var stopBtLoading = function() {
-      clearInterval(link.intervalId);
-      $(link).removeClass('loading');
-      $(link).button({ icons: { primary: 'ui-icon-cart'}});
+      $(link).removeClass('small-loading');
     };
     this.instance.addItem(itemId, stopBtLoading);
   }
@@ -145,7 +156,12 @@ function Cart(config) {
       url: '/plugin/shopping_cart/add/'+ itemId,
       dataType: 'json',
       success: function(data, status, ajax){
-        if ( !data.ok ) log.error('Shopping cart data failure', data.error);
+        if ( !data.ok ) {
+          if (typeof data.error.message != "undefined")
+            alert(data.error.message)
+          else
+            log.error('Shopping cart data failure', data.error);
+        }
         else me.addToList(data.products);
       },
       cache: false,
@@ -157,8 +173,8 @@ function Cart(config) {
   }
  
   Cart.removeItem = function(itemId) {
-    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
-    if( confirm(shoppingCartPluginL10n.removeItem) ) this.instance.removeItem(itemId);
+    if(this.instance.disabled) return alert(Cart.l10n.waitLastRequest);
+    if( confirm(Cart.l10n.removeItem) ) this.instance.removeItem(itemId);
   }
  
   Cart.prototype.removeItem = function(itemId) {
@@ -179,11 +195,51 @@ function Cart(config) {
   }
  
   Cart.toggle = function(link) {
-    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
+    if(this.instance.disabled) return alert(Cart.l10n.waitLastRequest);
     link.parentNode.parentNode.cartObj.toggle();
   }
   Cart.prototype.toggle = function() {
-    this.visible ? this.hide(true) : this.show(true);
+    if (this.empty && this.hasPreviousOrders)
+      noosfero.modal.url('/plugin/shopping_cart/repeat?profile_id='+cart.profileId)
+    else
+      this.visible ? this.hide(true) : this.show(true)
+  }
+
+  Cart.prototype.repeat = function(order_id, callback) {
+    this.ajax({
+      url: '/plugin/shopping_cart/repeat/'+order_id+'?profile_id='+cart.profileId,
+      success: function(data) {
+        cart.addToList(data.products, true)
+        callback(data)
+      },
+      // can't do POST because of firefox cookie reset bug
+      type: 'GET', dataType: 'json', cache: false
+    })
+  }
+
+  Cart.prototype.repeatCheckout = function(event, button) {
+    var order_id = jQuery(button).attr('data-order-id')
+    this.repeat(order_id, function(data) {
+      window.location.href = '/plugin/shopping_cart/buy'
+    })
+    event.stopPropagation()
+    return false;
+  }
+
+  Cart.prototype.repeatChoose = function(event, button) {
+    var order_id = jQuery(button).attr('data-order-id')
+    this.repeat(order_id, function(data) {
+      noosfero.modal.close()
+      cart.show(true);
+    })
+    event.stopPropagation()
+    return false;
+  }
+
+  Cart.prototype.clearOrdersSession = function() {
+    noosfero.modal.close()
+    cart.hasPreviousOrders = false;
+    cart.setQuantity(0)
   }
  
   Cart.prototype.show = function(register) {
@@ -221,7 +277,7 @@ function Cart(config) {
   }
  
   Cart.prototype.updateTotal = function() {
-    var total = 0;
+    var total = qtty = 0;
     var currency, sep = "";
     for( var itemId in this.items ) {
       var item = this.items[itemId];
@@ -230,15 +286,27 @@ function Cart(config) {
         sep = item.price.charAt(item.price.length-3);
         var price = item.price.replace(/[^0-9]/g,"");
         total += item.quantity * parseFloat(price);
+        qtty += item.quantity;
       }
     }
     total = Math.round(total).toString().replace(/(..)$/, sep+"$1")
     $(".cart-total b", this.cartElem).text( ( (total!=0) ? currency+" "+total : "---" ) );
+    this.setQuantity(qtty)
+  }
+
+  Cart.prototype.setQuantity = function(qtty) {
+    this.cartElem.find('.cart-applet-checkout').toggle(qtty > 0)
+    this.cartElem.find('.cart-applet-checkout-disabled').toggle(qtty === 0)
+
+    if (qtty === 0 && this.hasPreviousOrders)
+      $(".cart-qtty", this.cartElem).text( Cart.l10n.repeatOrder )
+    else
+      $(".cart-qtty", this.cartElem).text( qtty )
   }
  
   Cart.clean = function(link) {
-    if(this.instance.disabled) return alert(shoppingCartPluginL10n.waitLastRequest);
-    if( confirm(shoppingCartPluginL10n.cleanCart) ) link.parentNode.parentNode.parentNode.cartObj.clean();
+    if(this.instance.disabled) return alert(Cart.l10n.waitLastRequest);
+    if( confirm(Cart.l10n.cleanCart) ) link.parentNode.parentNode.parentNode.cartObj.clean();
   }
  
   Cart.prototype.clean = function() {
@@ -250,9 +318,9 @@ function Cart(config) {
         if ( !data.ok ) log.error(data.error);
         else{
           me.items = {};
-          $(me.cartElem).slideUp(500, function() {
+          $(me.contentBox).slideUp(500, function() {
             $(me.itemsBox).empty();
-            me.hide();
+            //me.hide();
             me.updateTotal();
             me.empty = true;
           });
@@ -277,21 +345,8 @@ function Cart(config) {
       type: 'POST',
       url: '/plugin/shopping_cart/send_request',
       data: params,
-      dataType: 'json',
-      success: function(data, status, ajax){
-        if ( !data.ok ) display_notice(data.error.message);
-        else {
-          me.clean();
-          display_notice(data.message);
-        }
-      },
+      dataType: 'script',
       cache: false,
-      error: function(ajax, status, errorThrown) {
-        log.error('Send request - HTTP '+status, errorThrown);
-      },
-      complete: function() {
-        noosfero.modal.close();
-      }
     });
   }
  
@@ -301,31 +356,4 @@ function Cart(config) {
     Cart.unloadingPage = true;
   });
  
-  $(function(){
-
-    $.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) {
-        // Give some time to register page unload.
-        setTimeout(function() {
-          // page unload is not our problem.
-          if (Cart.unloadingPage) {
-            log('Page unload before cart load.');
-          } else {
-            log.error('Error getting shopping cart - HTTP '+status, errorThrown);
-            if ( confirm(shoppingCartPluginL10n.getProblemConfirmReload) ) {
-              document.location.reload();
-            }
-          }
-        }, 100);
-      }
-    });
-  });
-
 })(jQuery);
-jQuery('#settings_delivery').click(function(){
-  jQuery('#delivery_settings').toggle('fast');
+$('#settings_enabled').click(function(){
+  $('#delivery-settings').toggle('fast');
 });
+$('#delivery-settings').toggle($('#settings_enabled').prop('checked'))
  
-jQuery('#add-new-option').click(function(){
-  new_option = jQuery('#empty-option').clone();
+$('#add-new-option').click(function(){
+  new_option = $('#empty-option').clone();
   new_option.removeAttr('id');
-  jQuery('#add-new-option-row').before(new_option);
+  $('#add-new-option-row').before(new_option);
   new_option.show();
   return false;
 });
  
-jQuery('.remove-option').live('click', function(){
-  jQuery(this).closest('tr').remove();
+$('.remove-option').live('click', function(){
+  $(this).closest('tr').remove();
   return false;
 });
+
@@ -1,742 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="purchase-report.svg"
-   inkscape:export-filename="/home/aurium/purchase-report.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4980">
-      <stop
-         style="stop-color:#2e3436;stop-opacity:1;"
-         offset="0"
-         id="stop4982" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:0"
-         offset="1"
-         id="stop4984" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4962"
-       inkscape:collect="always">
-      <stop
-         id="stop4964"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:0" />
-      <stop
-         id="stop4966"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4952">
-      <stop
-         style="stop-color:#555753;stop-opacity:1;"
-         offset="0"
-         id="stop4954" />
-      <stop
-         style="stop-color:#888a85;stop-opacity:1"
-         offset="1"
-         id="stop4956" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4944">
-      <stop
-         style="stop-color:#888a85;stop-opacity:1;"
-         offset="0"
-         id="stop4946" />
-      <stop
-         style="stop-color:#555753;stop-opacity:1"
-         offset="1"
-         id="stop4948" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4914">
-      <stop
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="0"
-         id="stop4916" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1"
-         offset="1"
-         id="stop4918" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4853">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4855" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4857" />
-    </linearGradient>
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective10" />
-    <inkscape:perspective
-       id="perspective3634"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective3659"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <inkscape:perspective
-       id="perspective4618"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       id="linearGradient2251">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2253" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2255" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="linearGradient4602"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(3.2628514,1006.5776)"
-       x1="36.237148"
-       y1="41.284599"
-       x2="33.664921"
-       y2="37.770721" />
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#7c7c7c;stop-opacity:1;"
-         offset="0"
-         id="stop2226" />
-      <stop
-         style="stop-color:#b8b8b8;stop-opacity:1;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2259"
-       id="linearGradient4605"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.999421,0,0,1,-5.0089689,998.39565)"
-       x1="26.076092"
-       y1="26.696676"
-       x2="30.811172"
-       y2="42.007351" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2259">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2261" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2263" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15218"
-       id="linearGradient4608"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.067236,0,0,0.989276,4.391684,4.035227)"
-       x1="22.308331"
-       y1="18.99214"
-       x2="35.785294"
-       y2="39.498238" />
-    <linearGradient
-       id="linearGradient15218">
-      <stop
-         style="stop-color:#f0f0ef;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15220" />
-      <stop
-         id="stop2269"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         id="stop2267"
-         offset="0.82758623"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d8d3;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15222" />
-    </linearGradient>
-    <inkscape:perspective
-       id="perspective4722"
-       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
-       inkscape:vp_z="1 : 0.5 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_x="0 : 0.5 : 1"
-       sodipodi:type="inkscape:persp3d" />
-    <linearGradient
-       y2="-968.28137"
-       x2="46.01725"
-       y1="-987.48724"
-       x1="31.962252"
-       gradientTransform="matrix(1.067236,0,0,0.989276,-9.611267,2002.7597)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4644-0"
-       xlink:href="#linearGradient15218-5"
-       inkscape:collect="always" />
-    <linearGradient
-       id="linearGradient15218-5">
-      <stop
-         style="stop-color:#f0f0ef;stop-opacity:1.0000000;"
-         offset="0.0000000"
-         id="stop15220-1" />
-      <stop
-         id="stop2269-8"
-         offset="0.59928656"
-         style="stop-color:#e8e8e8;stop-opacity:1;" />
-      <stop
-         id="stop2267-9"
-         offset="0.82758623"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#d8d8d3;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop15222-1" />
-    </linearGradient>
-    <linearGradient
-       y2="39.498238"
-       x2="35.785294"
-       y1="18.99214"
-       x1="22.308331"
-       gradientTransform="matrix(1.067236,0,0,0.989276,-11.611266,-5.9647499)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4733"
-       xlink:href="#linearGradient15218-5"
-       inkscape:collect="always" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4853"
-       id="linearGradient4870"
-       gradientUnits="userSpaceOnUse"
-       x1="32.5"
-       y1="1026.8622"
-       x2="36.5"
-       y2="1026.8622"
-       gradientTransform="translate(0,15)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4914"
-       id="linearGradient4926"
-       gradientUnits="userSpaceOnUse"
-       x1="21.5"
-       y1="16.5"
-       x2="32.5"
-       y2="38.5"
-       gradientTransform="translate(0,1004.3622)" />
-    <mask
-       maskUnits="userSpaceOnUse"
-       id="mask4922">
-      <rect
-         style="color:#000000;fill:url(#linearGradient4926);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="rect4924"
-         width="34"
-         height="41"
-         x="7.5"
-         y="1006.8622" />
-    </mask>
-    <filter
-       inkscape:collect="always"
-       id="filter4938"
-       x="-0.063571429"
-       width="1.1271429"
-       y="-1.0679999"
-       height="3.1359998">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="1.1124999"
-         id="feGaussianBlur4940" />
-    </filter>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4944"
-       id="linearGradient4950"
-       x1="5.5"
-       y1="1015.8622"
-       x2="11.5"
-       y2="1049.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4962"
-       id="linearGradient4958"
-       x1="36.5"
-       y1="1047.8622"
-       x2="31.5"
-       y2="1038.8622"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4952"
-       id="linearGradient4960"
-       gradientUnits="userSpaceOnUse"
-       x1="34.5"
-       y1="1046.8622"
-       x2="29.5"
-       y2="1039.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4962"
-       id="linearGradient4968"
-       gradientUnits="userSpaceOnUse"
-       x1="37.420265"
-       y1="1044.8622"
-       x2="36.5"
-       y2="1043.8622" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4980"
-       id="linearGradient4986"
-       x1="38.5"
-       y1="41.5"
-       x2="41.5"
-       y2="44.5"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="12.541667"
-     inkscape:cx="24"
-     inkscape:cy="24"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1366"
-     inkscape:window-height="721"
-     inkscape:window-x="-3"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2816"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       originx="0.5px"
-       originy="0.5px" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Camada 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <rect
-       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter4938);opacity:0.7"
-       id="rect4928"
-       width="41.999996"
-       height="2.5"
-       x="3.5"
-       y="43.5"
-       transform="translate(0,1004.3622)"
-       ry="1" />
-    <rect
-       style="color:#000000;fill:url(#linearGradient4644-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4950);stroke-width:1.00000024000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="rect4699"
-       width="38"
-       height="45"
-       x="5.5"
-       y="1004.8622"
-       ry="1" />
-    <path
-       style="fill:url(#linearGradient4986);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.59999999999999998"
-       d="M 33.5,45 43,36.5 43,45 33.5,45 z"
-       id="path4970"
-       transform="translate(0,1004.3622)"
-       sodipodi:nodetypes="cccc" />
-    <rect
-       style="fill:none;stroke:url(#linearGradient4605);stroke-width:1.00000083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
-       id="rect15244"
-       width="35.997337"
-       height="43.000019"
-       x="6.5026627"
-       y="1005.8622"
-       rx="0"
-       ry="0" />
-    <g
-       id="g4873"
-       mask="url(#mask4922)"
-       transform="translate(0,1.7382813e-5)">
-      <path
-         sodipodi:nodetypes="cccccc"
-         d="m 29.5,1015.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         id="path4802"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="translate(0,1004.3622)"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="5.5"
-         sodipodi:cx="26.5"
-         id="path4804"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4806"
-         sodipodi:cx="26.5"
-         sodipodi:cy="5.5"
-         sodipodi:rx="1"
-         sodipodi:ry="1"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         transform="translate(0,1007.3622)" />
-      <path
-         transform="translate(0,1010.3622)"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="5.5"
-         sodipodi:cx="26.5"
-         id="path4808"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         id="path4811"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 29.5,1029.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
-         sodipodi:nodetypes="cccccc"
-         inkscape:connector-curvature="0" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4813"
-         sodipodi:cx="26.5"
-         sodipodi:cy="5.5"
-         sodipodi:rx="1"
-         sodipodi:ry="1"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         transform="translate(0,1018.3622)" />
-      <path
-         transform="translate(0,1021.3622)"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="5.5"
-         sodipodi:cx="26.5"
-         id="path4815"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4817"
-         sodipodi:cx="26.5"
-         sodipodi:cy="5.5"
-         sodipodi:rx="1"
-         sodipodi:ry="1"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         transform="translate(0,1024.3622)" />
-      <path
-         id="path4827"
-         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0"
-         inkscape:connector-curvature="0" />
-      <path
-         transform="translate(0,1033.3622)"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="5.5"
-         sodipodi:cx="26.5"
-         id="path4829"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <path
-         sodipodi:type="arc"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         id="path4831"
-         sodipodi:cx="26.5"
-         sodipodi:cy="5.5"
-         sodipodi:rx="1"
-         sodipodi:ry="1"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         transform="translate(0,1036.3622)" />
-      <path
-         transform="translate(0,1039.3622)"
-         d="m 27.5,5.5 c 0,0.5522847 -0.447715,1 -1,1 -0.552285,0 -1,-0.4477153 -1,-1 0,-0.5522847 0.447715,-1 1,-1 0.552285,0 1,0.4477153 1,1 z"
-         sodipodi:ry="1"
-         sodipodi:rx="1"
-         sodipodi:cy="5.5"
-         sodipodi:cx="26.5"
-         id="path4833"
-         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-         sodipodi:type="arc" />
-      <g
-         id="g5575-7"
-         transform="matrix(0.01545762,0,0,0.01545762,-84.564216,932.96399)"
-         style="fill:#d38d5f">
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-9-6"
-           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-3-6-2"
-           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-8-6-2"
-           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-7-4-7"
-           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-2-8"
-           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-1-9"
-           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-4-4-1"
-           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-7-7"
-           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-6-5"
-           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-3-0"
-           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-2-3-8"
-           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-5-8-2"
-           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-      </g>
-      <g
-         id="g5575-7-8"
-         transform="matrix(0.01545762,0,0,0.01545762,-84.486184,947.26528)"
-         style="fill:#d38d5f">
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-9-6-5"
-           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-3-6-2-0"
-           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-8-6-2-9"
-           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-7-4-7-6"
-           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-2-8-3"
-           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-1-9-8"
-           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-4-4-1-5"
-           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-7-7-6"
-           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-6-5-1"
-           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-3-0-1"
-           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-2-3-8-5"
-           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-5-8-2-9"
-           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-      </g>
-      <g
-         id="g5575-7-8-8"
-         transform="matrix(0.01545762,0,0,0.01545762,-84.564216,961.96398)"
-         style="fill:#d38d5f">
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-9-6-5-4"
-           d="m 6408.0436,5064.9271 c -11.726,-11.2912 -32.3679,-9.6218 -42.4594,3.1418 -19.6123,19.9856 -39.9641,39.4417 -59.1428,59.74 -9.518,12.5005 -6.3676,31.3823 5.826,40.9329 19.6892,19.3981 38.735,39.51 58.8119,58.4787 12.3484,9.5947 31.3846,6.505 40.8262,-5.7528 19.4803,-19.979 39.9713,-39.2016 58.856,-59.6292 9.0558,-12.4283 5.7503,-30.9531 -6.2232,-40.3134 -18.839,-18.8581 -37.6197,-37.7778 -56.4947,-56.598 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-3-6-2-0-8"
-           d="m 6271.4191,5203.1033 c -11.659,-11.815 -32.7156,-10.3098 -42.9669,2.6329 -19.7244,20.2091 -40.4303,39.6819 -59.5621,60.3374 -9.0337,12.4807 -5.8043,30.8944 6.2011,40.2912 19.927,19.5313 39.0995,40.0758 59.474,59.0098 12.4653,9.0761 30.8739,5.764 40.2082,-6.2396 19.3801,-19.7478 39.4876,-38.9701 58.4368,-59.0318 9.4652,-12.3353 6.4045,-31.4347 -5.8482,-40.9551 -18.655,-18.6738 -37.2518,-37.4088 -55.9429,-56.0448 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-8-6-2-9-1"
-           d="m 6545.5287,5202.6829 c -11.7363,-11.3217 -32.3801,-9.5656 -42.4593,3.1418 -19.5937,19.9946 -39.9139,39.3349 -59.0767,59.7178 -9.5513,12.3449 -6.4556,31.438 5.7819,40.9772 19.6941,19.3922 38.7293,39.519 58.8119,58.4788 12.4118,9.6084 31.3584,6.4621 40.8704,-5.797 19.3229,-19.7402 39.4821,-38.8781 58.3264,-58.9655 9.5617,-12.3467 6.4938,-31.475 -5.7378,-40.933 -18.8464,-18.8655 -37.6344,-37.7925 -56.5168,-56.6201 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-7-4-7-6-0"
-           d="m 6683.1903,5065.7678 c -11.6727,-11.8214 -32.6711,-10.2704 -42.9667,2.6331 -19.5831,19.9842 -39.9685,39.3886 -59.0767,59.7177 -9.5608,12.3477 -6.4907,31.4696 5.7376,40.9329 19.6964,19.4311 38.8692,39.5905 58.8782,58.5894 12.4019,9.5309 31.358,6.4013 40.8042,-5.8192 19.3581,-19.7586 39.4434,-38.8626 58.3704,-59.0098 9.5628,-12.3863 6.44,-31.439 -5.7818,-40.977 -18.6625,-18.6812 -37.2665,-37.4235 -55.9652,-56.0671 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-2-8-3-3"
-           d="m 6820.3665,5203.4794 c -11.6211,-11.8358 -32.7205,-10.3463 -42.9888,2.6109 -19.6161,19.9836 -39.9579,39.4428 -59.1429,59.7399 -9.5091,12.4948 -6.4432,31.3232 5.7819,40.8887 19.7364,19.4377 38.8215,39.6072 58.9443,58.6115 12.2819,9.5014 31.2571,6.4201 40.7379,-5.8413 19.38,-19.7479 39.4876,-38.9702 58.4367,-59.0319 9.212,-12.1115 6.6473,-30.6982 -5.1419,-40.247 -18.8831,-18.9025 -37.708,-37.8662 -56.6272,-56.7308 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-1-9-8-0"
-           d="m 6662,5332.625 c -15.2378,0.1612 -24.0529,14.157 -34.1146,23.4276 -15.476,15.9413 -31.8697,31.086 -46.7916,47.5099 -2.9405,4.2478 -4.8192,9.3664 -5.1563,14.4687 58.2812,-0.042 116.7292,0.083 174.9063,-0.062 -0.7632,-15.4178 -15.3649,-24.1142 -24.7148,-34.6559 -15.4837,-15.0104 -30.156,-31.1956 -46.0978,-45.5317 -5.23,-3.6558 -11.6538,-5.4746 -18.0312,-5.1562 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-4-4-1-5-4"
-           d="m 6387.75,5331.1875 c -12.8167,-0.2843 -21.9125,9.8823 -29.9201,18.4726 -16.9981,17.3803 -34.8059,34.2122 -51.3299,51.9024 -3.1649,4.3908 -5.2116,9.685 -5.5625,15.0313 58.2812,-0.042 116.7292,0.083 174.9063,-0.063 -0.723,-15.0722 -14.844,-23.7682 -24.0397,-33.9792 -15.7089,-15.2187 -30.5296,-31.6073 -46.7416,-46.1458 -5.0231,-3.5423 -11.1737,-5.3579 -17.3125,-5.2187 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-7-7-6-4"
-           d="m 6438.0625,5011.4375 c 0.8844,15.3847 15.3961,24.0874 24.746,34.5934 15.4791,14.996 30.0891,31.1552 46.0665,45.4691 12.3222,9.0732 30.8351,5.8023 40.1691,-6.1752 19.3539,-19.7366 39.5157,-38.9385 58.3934,-58.981 3.1742,-4.3805 5.1726,-9.6672 5.5625,-15.0313 -58.2707,0.083 -116.8752,-0.1665 -174.9375,0.125 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-6-5-1-4"
-           d="m 6701.375,5008.75 c 27.4204,26.9864 54.2733,54.7791 81.9688,81.3438 12.312,9.5662 31.425,6.3692 40.8246,-5.801 59.1737,-59.3365 118.4716,-118.5488 177.7691,-177.7616 -100.1875,34.073 -200.375,68.1459 -300.5625,102.2188 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-3-0-1-4"
-           d="m 6998.8438,4984.5938 c -47.3943,47.7404 -95.4006,94.9567 -142.5626,142.875 -10.1297,12.3088 -7.0115,31.8296 5.3324,41.3869 25.2451,25.1714 50.3907,50.4424 75.5426,75.7068 34.073,-100.1875 68.1459,-200.375 102.2188,-300.5625 -13.5104,13.5313 -27.0208,27.0625 -40.5312,40.5938 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-2-3-8-5-7"
-           d="m 6114.2812,5244.9062 c 26.8771,-27.2005 54.2641,-54.0149 80.875,-81.4062 10.0644,-12.3049 7.0844,-31.7597 -5.3634,-41.3871 -59.3365,-59.1737 -118.5488,-118.4717 -177.7616,-177.7691 34.0834,100.1874 68.1667,200.375 102.25,300.5624 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-        <path
-           inkscape:connector-curvature="0"
-           id="rect5245-5-4-7-4-3-5-8-2-9-6"
-           d="m 6090.125,4947.4375 c 47.677,47.4093 94.9671,95.3478 142.7812,142.5313 12.3096,10.0651 31.7648,7.1628 41.4222,-5.2972 25.2023,-25.2247 50.4579,-50.3961 75.7341,-75.5466 -100.1875,-34.0729 -200.375,-68.1458 -300.5625,-102.2188 13.5417,13.5105 27.0833,27.0209 40.625,40.5313 z"
-           style="fill:#d38d5f;fill-opacity:1;stroke:none" />
-      </g>
-    </g>
-    <g
-       id="g4835"
-       style="stroke:url(#linearGradient4958)">
-      <path
-         sodipodi:nodetypes="csccc"
-         id="path2210"
-         d="m 30.5,1049.8622 c 3,0 4.031657,-1.3115 7,-4 2.357963,-2.1356 6,-4 6,-8 0,5 -5,4 -10,4 0,4 1,8 -3,8 z"
-         style="color:#000000;fill:url(#linearGradient4602);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4960);stroke-width:1.00000024000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
-      <path
-         style="opacity:0.50000000000000000;color:#000000;fill:none;stroke:url(#linearGradient4968);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
-         d="m 39.5,1042.8622 -5,0 0,4"
-         id="path2247"
-         sodipodi:nodetypes="ccc" />
-    </g>
-  </g>
-</svg>
@@ -1,226 +0,0 @@
-.cart-add-item .ui-icon-cart {
-  background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
-  width: 22px;
-}
-.cart-buy .ui-icon-cart {
-  background: url("/plugins/shopping_cart/images/button-icon.png") no-repeat scroll left center transparent;
-  width: 22px;
-}
-.cart-add-item .ui-button-text {
-  padding-left: 2.6em;
-}
-
-.product-item .cart-add-item {
-   top: 0px;
-}
-
-.cart {
-  position: fixed;
-  right: 20px;
-  top: 0px;
-  width: 200px;
-  z-index: 1000;
-  border: 1px solid #777;
-  background: rgba(100,100,100,0.8);
-}
-
-.cart h3 {
-  color: #000;
-  margin: 0px 0px 0px 5px;
-}
-
-.cart-clean {
-  color: #AAA;
-  position: absolute;
-  top: 1px;
-  right: 5px;
-  text-decoration: none;
-}
-.cart-clean:hover {
-  color: #888;
-}
-
-.cart-content {
-  display: none;
-}
-
-.cart-items {
-  margin: 0px;
-  padding: 0px;
-  max-height: 328px;
-  overflow: auto;
-}
-
-.cart-items li {
-  height: 50px;
-  padding: 5px;
-  margin: 3px;
-  border: 1px solid #999;
-  list-style: none;
-  background: #FFF;
-  position: relative;
-}
-
-.cart-items .picture {
-  float: left;
-  width: 50px;
-  height: 50px;
-  margin-right: 10px;
-  background-repeat: no-repeat;
-  background-position: 50% 50%;
-}
-
-.cart .item-name {
-  margin-right: 20px;
-}
-
-.cart .button {
-  position: absolute;
-  top: 2px;
-  right: 2px;
-}
-
-.cart input {
-  border: 1px solid transparent;
-  background: transparent 50% 50% no-repeat;
-  text-align: center;
-  padding: 0px;
-  font-family: monospace;
-  width: 2em;
-}
-.cart:hover input, .cart input:focus {
-  border: 1px solid #CCC;
-}
-
-.cart-buy {
-  display: block;
-  margin: 2px 4px;
-}
-
-.cart-total {
-  position: absolute;
-  left: 5px;
-  bottom: 0px;
-}
-
-.cart-toggle {
-  display: block;
-  color: #AAA;
-  text-decoration: none;
-  float: right;
-  padding: 0px 5px;
-}
-.cart-toggle:hover {
-  color: #fff;
-}
-
-#cart-request-box {
-  width: 690px;
-}
-
-#cart-request-form {
-  width: 274px;
-  float: left;
-}
-
-#cart-request-box .cart-box-close {
-  position: absolute;
-  right: 10px;
-  bottom: 10px;
-  width: 16px;
-  height: 16px;
-  background-repeat: no-repeat;
-}
-
-#cart-form-main {
-  border: 2px solid #FFF;
-  padding: 0px 10px;
-}
-
-#cart-request-form fieldset {
-  clear: left;
-  color: #999;
-  border: 1px solid #BBB;
-  margin-top: 5px;
-}
-
-#cart-request-form input,
-#cart-request-form select {
-  width: 250px;
-}
-
-#cart-form-actions {
-  clear: both;
-  padding-top: 15px;
-  text-align: center;
-}
-
-#cart-form-actions .submit {
-  cursor: pointer;
-}
-
-#cart-items-table {
-  margin-left: 285px;
-  width: 400px
-}
-
-.cart-table-quantity {
-  text-align: center;
-}
-
-.cart-table-price,
-.cart-table-total-label,
-.cart-table-total-value {
-  text-align: right;
-}
-
-label.error {
-  float: none;
-  color: red;
-  padding-left: .5em;
-  vertical-align: top;
-}
-
-.controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url("/plugins/shopping_cart/images/control-panel/purchase-report.png")}
-.controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url("/plugins/shopping_cart/images/control-panel/purchase-report.gif")}
-.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.png")}
-.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.gif")}
-
-.action-shopping_cart_plugin_myprofile-reports td.order-info {
-  padding: 0px;
-  height: auto;
-}
-
-.action-shopping_cart_plugin_myprofile-reports .customer-details,
-.action-shopping_cart_plugin_myprofile-reports .order-products {
-  list-style-position: inside;
-  float: left;
-  width: 49%;
-  margin: 0px;
-  padding: 10px 0px;
-}
-
-.action-shopping_cart_plugin_myprofile-reports .order-products {
-  float: right;
-}
-
-.action-shopping_cart_plugin_myprofile-reports .customer-details li,
-.action-shopping_cart_plugin_myprofile-reports .order-products li {
-  padding-left: 5px;
-}
-
-#cart-order-filter {
-  background-color: #ccc;
-  border: 1px solid #aaa;
-  border-radius: 5px;
-  padding: 3px 8px;
-  margin-bottom: 10px;
-}
-
-th {
-  text-align: center;
-}
-
-td {
-  text-align: left;
-}
@@ -0,0 +1,289 @@
+.cart-add-item .ui-icon-cart,
+.cart-buy .ui-icon-cart,
+.icon-cart, .btn.icon-cart {
+  background-image: url("/plugins/shopping_cart/images/button-icon.png");
+  background-repeat: no-repeat;
+  background-position: 5px center;
+}
+.cart-add-item.small-loading {
+  background-image: url(/images/loading-small.gif);
+}
+
+a.button.with-text.icon-cart,
+a.button.with-text.icon-cart:visited,
+body.noosfero a.button.with-text.icon-cart,
+body.noosfero a.button.with-text.icon-cart:visited,
+input.button.with-text.icon-cart,
+.icon-cart, .btn.icon-cart {
+  padding-left: 30px;
+}
+.catalog-autocomplete .cart-add-item {
+  display: block;
+  float: right;
+}
+.cart-add-item .ui-button-text {
+  padding-left: 2.6em;
+}
+.product-item .cart-add-item {
+  top: 0px;
+}
+
+
+.action-shopping_cart_plugin-buy .cart {
+  display: none !important;
+}
+.cart {
+  display: none;
+  position: fixed;
+  right: 20px;
+  top: 0px;
+  z-index: 100;
+}
+.cart-minimized {
+  float: right;
+  position: relative;
+}
+#catalog-options ul .catalog-cart {
+  float: right;
+  margin: 0;
+}
+#cart1 .cart-inner {
+  width: 200px;
+  z-index: 1000;
+  border: 1px solid #777;
+  border-radius: 10px;
+  box-shadow: #000 2px 2px 8px;
+  background: rgba(130,130,130,0.9);
+}
+.cart .cart-inner {
+  position: relative;
+  top: 2px;
+  padding-bottom: 20px;
+}
+.cart .cart-inner .cart-content {
+  display: none;
+}
+.cart-minimized .cart-inner {
+  display: none;
+  position: absolute;
+  top: 24px;
+  left: -150px;
+}
+.cart-minimized .cart-applet {
+  float: right;
+  text-align: center;
+}
+#content .cart-minimized .cart-applet .cart-highlight {
+  background-color: yellow;
+}
+.cart-minimized .cart-applet-checkout, .cart-minimized .cart-applet-checkout-disabled {
+  display: block;
+  font-size: 80%;
+  margin-top: 3px;
+}
+.cart-minimized .cart-applet-checkout-disabled {
+  pointer-events: none;
+  cursor: default;
+  color: #CCC;
+  text-decoration: none;
+}
+.cart-qtty {
+  font-weight: bold;
+}
+#cart1 h3 {
+  color: #036276;
+  margin: 0px 0px 0px 5px;
+  font-weight: lighter;
+}
+#cart-profile-name {
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  margin: 0px 5px;
+  color: #000;
+}
+.cart-clean {
+  color: #AAA;
+  position: absolute;
+  top: 1px;
+  right: 5px;
+  text-decoration: none;
+}
+.cart-clean:hover {
+  color: #888;
+}
+.cart-items {
+  margin: 0px;
+  padding: 0px;
+  max-height: 328px;
+  overflow-y: auto;
+  overflow-x: hidden;
+}
+#catalog-options .cart-items {
+  padding: 0;
+  margin: 0;
+}
+#catalog-options .cart-items li {
+  margin-right: 0;
+}
+.cart-items li {
+  padding: 0;
+  border: 2px solid #999;
+  width: 98%;
+  list-style: none;
+  background: #FFF;
+  position: relative;
+  border-radius: 5px;
+  font-size: 85%;
+  min-height: 50px;
+}
+.cart-items .picture {
+  float: left;
+  width: 50px;
+  height: 50px;
+  margin-right: 10px;
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+#cart1 .item-name {
+  margin-right: 0;
+}
+.cart-items .cart-remove-item {
+  float: right;
+}
+
+#cart1 input {
+  border: 1px solid transparent;
+  background: transparent 50% 50% no-repeat;
+  text-align: center;
+  padding: 0px;
+  font-family: monospace;
+  width: 2em;
+}
+#cart1:hover input, #cart1 input:focus {
+  border: 1px solid #CCC;
+}
+.cart-buy {
+  display: block;
+  margin: 2px 4px;
+}
+.cart-total {
+  float: left;
+}
+.cart-toggle, .cart-toggle:visited {
+  display: block;
+  color: #036276;
+  text-decoration: none;
+  float: right;
+  padding: 0px 5px;
+}
+.cart-toggle:hover {
+  color: #fff;
+}
+.str-hide {
+  display: none;
+}
+
+#cart-request-box {
+  overflow: hidden;
+}
+#cart-request-box a {
+  font-size: smaller;
+}
+#cart-request-form {
+}
+#cart-request-box .cart-box-close {
+  position: absolute;
+  right: 10px;
+  bottom: 10px;
+  width: 16px;
+  height: 16px;
+  background-repeat: no-repeat;
+}
+#cart-request-box .cart-go-back {
+  float: right;
+  text-transform: none;
+  font-variant: normal;
+}
+
+#cart-request-form fieldset {
+  clear: left;
+  color: #999;
+  margin-top: 5px;
+}
+
+#cart-request-form input,
+#cart-request-form select {
+}
+
+#cart-form-actions {
+  clear: both;
+  padding-top: 15px;
+  text-align: center;
+}
+
+#cart-form-actions .submit {
+  cursor: pointer;
+}
+
+#cart-items-table {
+}
+
+.cart-table-quantity {
+  text-align: center;
+}
+
+.cart-table-price,
+.cart-table-total-label,
+.cart-table-total-value {
+  text-align: right;
+}
+label.error {
+  float: none;
+  color: red;
+  padding-left: .5em;
+  vertical-align: top;
+}
+
+.controller-profile_editor a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.png")}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart-icon {background-image: url("/plugins/shopping_cart/images/control-panel/icon.gif")}
+
+.action-shopping_cart_plugin_myprofile-reports td.order-info {
+  padding: 0px;
+  height: auto;
+}
+.action-shopping_cart_plugin_myprofile-reports .customer-details,
+.action-shopping_cart_plugin_myprofile-reports .order-products {
+  list-style-position: inside;
+  float: left;
+  width: 49%;
+  margin: 0px;
+  padding: 10px 0px;
+}
+.action-shopping_cart_plugin_myprofile-reports .order-products {
+  float: right;
+}
+.action-shopping_cart_plugin_myprofile-reports .customer-details li,
+.action-shopping_cart_plugin_myprofile-reports .order-products li {
+  padding-left: 5px;
+}
+#cart-order-filter {
+  background-color: #ccc;
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  padding: 3px 8px;
+  margin-bottom: 10px;
+}
+th {
+  text-align: center;
+}
+td {
+  text-align: left;
+}
+/* Repeat orders */
+a.button.repeat-checkout-order, a.button.repeat-choose-order {
+  display: block;
+  margin: 0 5px 5px 40px;
+  font-size: 80%;
+  background-color: #ffc64c;
+}
@@ -154,29 +154,29 @@ class ShoppingCartPluginControllerTest &lt; ActionController::TestCase
     product1 = fast_create(Product, :profile_id => profile.id, :price => 1.99)
     product2 = fast_create(Product, :profile_id => profile.id, :price => 2.23)
     @controller.stubs(:cart).returns({ :profile_id => profile.id, :items => {product1.id => 1, product2.id => 2}})
-    assert_difference 'ShoppingCartPlugin::PurchaseOrder.count', 1 do
+    assert_difference 'OrdersPlugin::Order.count', 1 do
       post :send_request,
         :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
     end
  
-    order = ShoppingCartPlugin::PurchaseOrder.last
+    order = OrdersPlugin::Order.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
+    assert_equal 'confirmed', order.status
   end
  
   should 'register order on send request and not crash if product is not defined' do
     product1 = fast_create(Product, :profile_id => profile.id)
     @controller.stubs(:cart).returns({ :profile_id => profile.id, :items => {product1.id => 1}})
-    assert_difference 'ShoppingCartPlugin::PurchaseOrder.count', 1 do
+    assert_difference 'OrdersPlugin::Order.count', 1 do
       post :send_request,
         :customer => {:name => "Manuel", :email => "manuel@ceu.com"}
     end
  
-    order = ShoppingCartPlugin::PurchaseOrder.last
+    order = OrdersPlugin::Order.last
  
     assert_equal 0, order.products_list[product1.id][:price]
   end
@@ -51,6 +51,7 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
     assert settings.delivery_price == price.to_s
   end
  
+  # FIXME
   should 'be able to choose delivery_options' do
     delivery_options = {:options => ['car', 'bike'], :prices => ['20', '5']}
     post :edit, :profile => profile.identifier, :settings => {:delivery_options => delivery_options}
@@ -61,18 +62,18 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
  
   should 'filter the reports correctly' do
     another_profile = fast_create(Enterprise)
-    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
-    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED)
-    po3 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po1 = OrdersPlugin::Sale.create! :profile => profile, :status => 'confirmed'
+    po2 = OrdersPlugin::Sale.create! :profile => profile, :status => 'shipped'
+    po3 = OrdersPlugin::Sale.create! :profile => profile, :status => 'confirmed'
     po3.created_at = 1.year.ago
     po3.save!
-    po4 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => another_profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po4 = OrdersPlugin::Sale.create! :profile => another_profile, :status => 'confirmed'
  
     post :reports,
       :profile => profile.identifier,
       :from => (Time.now - 1.day).strftime(TIME_FORMAT),
       :to => (Time.now + 1.day).strftime(TIME_FORMAT),
-      :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
+      :filter_status => 'confirmed'
  
     assert_includes assigns(:orders), po1
     assert_not_includes assigns(:orders), po2
@@ -86,14 +87,14 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
     p3 = fast_create(Product, :profile_id => profile.id, :price => 3)
     po1_products = {p1.id => {:quantity => 1, :price => p1.price, :name => p1.name}, p2.id => {:quantity => 2, :price => p2.price, :name => p2.name }}
     po2_products = {p2.id => {:quantity => 1, :price => p2.price, :name => p2.name }, p3.id => {:quantity => 2, :price => p3.price, :name => p3.name}}
-    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :products_list => po1_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
-    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :products_list => po2_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po1 = OrdersPlugin::Sale.create! :profile => profile, :products_list => po1_products, :status => 'confirmed'
+    po2 = OrdersPlugin::Sale.create! :profile => profile, :products_list => po2_products, :status => 'confirmed'
  
     post :reports,
       :profile => profile.identifier,
       :from => (Time.now - 1.day).strftime(TIME_FORMAT),
       :to => (Time.now + 1.day).strftime(TIME_FORMAT),
-      :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
+      :filter_status => 'confirmed'
  
     lineitem1 = ShoppingCartPlugin::LineItem.new(p1.id, p1.name)
     lineitem1.quantity = 1
@@ -107,20 +108,20 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   end
  
   should 'be able to update the order status' do
-    po = ShoppingCartPlugin::PurchaseOrder.create!(:seller => profile, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po = OrdersPlugin::Sale.create!(:profile => profile, :status => 'confirmed')
  
     post :update_order_status,
       :profile => profile.identifier,
       :order_id => po.id,
-      :order_status => ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED
+      :order_status => 'confirmed'
     po.reload
-    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED, po.status
+    assert_equal 'confirmed', po.status
   end
  
   private
  
   def settings
     @profile.reload
-    Noosfero::Plugin::Settings.new(@profile, ShoppingCartPlugin)
+    profile.shopping_cart_settings
   end
 end
@@ -28,7 +28,7 @@ class ShoppingCartPluginTest &lt; ActiveSupport::TestCase
  
   should 'be disabled by default on the enterprise' do
     profile = fast_create(Enterprise)
-    settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
+    settings = profile.shopping_cart_settings
     assert !settings.enabled
   end
 end
@@ -1,30 +0,0 @@
-<div id="cart1" class="cart" style="display:none">
-  <div class="cart-inner">
-    <div class="cart-content">
-      <h3><%= _("Basket") %></h3>
-      <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="/plugin/shopping_cart/buy" class="cart-buy modal"><%=_('Shopping checkout')%></a>
-    </div>
-    <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
-      <span class="str-show"><%=_('Show basket')%></span>
-      <span class="str-hide" style="display:none"><%=_('Hide basket')%></span>
-    </a>
-  </div>
-</div>
-<script>
-  var shoppingCartPluginL10n = {
-    getProblemConfirmReload: <%= (
-      _('Ups... I had a problem to load the basket list.') +
-      "\n" +
-      _('Did you want to reload this page?')
-    ).to_json %>,
-    maxNumberOfItens: <%= (
-      _('Sorry, you can\'t have more then 100 kinds of items on this basket.')
-    ).to_json %>,
-    waitLastRequest: <%= _('Oops, you must wait your last request to finish first!').to_json %>,
-    removeItem: <%= _('Are you sure you want to remove this item?').to_json %>,
-    cleanCart: <%= _('Are you sure you want to clean your basket?').to_json %>
-  }
-</script>
@@ -0,0 +1,82 @@
+<div id="cart1" class="cart<%= '-minimized' if cart_minimized %>">
+  <% if cart_minimized %>
+    <div class="cart-applet">
+      <%= cart_applet %>
+
+      <%= link_to _('Shopping checkout'), "/plugin/shopping_cart/buy", class: 'cart-applet-checkout' %>
+      <span class="cart-applet-checkout-disabled">
+        <%= _('Basket is empty') %>
+      </span>
+    </div>
+  <% end %>
+  <div class="cart-inner">
+    <div class="cart-content">
+      <h3><%= _("Basket") %></h3>
+      <div id="cart-profile-name"></div>
+      <a href="cart:clean" onclick="cart.clean(); return false" class="cart-clean"><%=_('Clean basket')%></a>
+      <ul class="cart-items">
+      </ul>
+      <%= button 'cart',  _('Shopping checkout'), "/plugin/shopping_cart/buy", :class => 'cart-buy modal-toggle' %>
+      <div class="cart-total"><%=_('Total:')%> <b></b></div>
+    </div>
+      <a href="#" onclick="cart.toggle(); return false" class="cart-toggle">
+        <span class="str-show"><%=_('Show basket')%></span>
+        <span class="str-hide"><%=_('Hide basket')%></span>
+      </a>
+  </div>
+
+    <script id="cart-item-template" type="text/template">
+      <li id="cart-item-{{item.id}}">
+        <%= button_to_function_without_text 'remove', '', "Cart.removeItem({{item.id}}); return false", :class => 'cart-remove-item' %>
+	      <div class="picture" style="background-image:url({{item.picture}})"></div>
+	      <span class="item-name">{{item.name}}</span>
+	      <div class="item-price">
+	        <input size="1" value="{{item.quantity}}" />{{item.priceTxt}}
+	      </div>
+      </li>
+  </script>
+</div>
+
+<script type="text/javascript">
+jQuery(function($) {
+  Cart.l10n = {
+    getProblemConfirmReload: <%= (
+      _('Ups... I had a problem to load the basket list.') +
+      "\n" +
+      _('Did you want to reload this page?')
+    ).to_json %>,
+    maxNumberOfItens: <%= (
+      _('Sorry, you can\'t have more then 100 kinds of items on this basket.')
+    ).to_json %>,
+    waitLastRequest: <%= _('Oops, you must wait your last request to finish first!').to_json %>,
+    removeItem: <%= _('Are you sure you want to remove this item?').to_json %>,
+    cleanCart: <%= _('Are you sure you want to clean your basket?').to_json %>,
+    repeatOrder: <%= _('repeat order').to_json %>,
+  }
+  // boolean configuration that defines if the behaviour of the cart is "minimized" or "full"
+  Cart.minimized = <%= cart_minimized.to_json %>
+
+  $.ajax({
+    url: "/plugin/shopping_cart/get?profile_id="+<%= profile.id.to_json rescue ''.to_json %>,
+    dataType: 'json',
+    success: function(data) {
+      cart = new Cart(data);
+    },
+    cache: false,
+    error: function(ajax, status, errorThrown) {
+      // Give some time to register page unload.
+      setTimeout(function() {
+        // page unload is not our problem.
+        if (Cart.unloadingPage) {
+          log('Page unload before cart load.');
+        } else {
+          log.error('Error getting shopping cart - HTTP '+status, errorThrown);
+          if ( confirm(Cart.l10n.getProblemConfirmReload) ) {
+            document.location.reload();
+          }
+        }
+      }, 100);
+    }
+  });
+});
+</script>
@@ -0,0 +1,47 @@
+<table id="cart-items-table" cellpadding="2" cellspacing="0"
+  border="<%= if by_mail then 1 else 0 end %>"
+  style="<%= 'border-collapse: collapse' if by_mail %>">
+
+  <tr>
+    <th>
+      <%= _('Item name') %>
+    </th>
+    <th>
+      <%= if by_mail then '&nbsp;#&nbsp;' else '#' end %>
+    </th>
+    <th>
+      <%= _('Price') + " (#{@environment.currency_unit})" %>
+    </th>
+  </tr>
+
+  <% order.items.each do |item| %>
+    <tr>
+      <td>
+        <%= item.name %>
+      </td>
+      <td class='cart-table-quantity' align="<%= 'center' if by_mail %>">
+        <%= item.quantity_consumer_ordered %>
+      </td>
+      <td class='cart-table-price' align="<%= 'right' if by_mail %>">
+        <%= get_price item.product, @environment, item.quantity_consumer_ordered, unit: '' %>
+      </td>
+
+    </tr>
+  <% end %>
+
+  <tr>
+    <td colspan=2 id='delivery-name'>
+      <%= order.supplier_delivery.name if order.supplier_delivery %>
+    </td>
+    <td id='delivery-price' class="cart-table-price">
+      <%= float_to_currency_cart order.supplier_delivery.cost(order.total_price), @environment, unit: '' if order.supplier_delivery %>
+    </td>
+  </tr>
+
+  <th colspan=2 class="cart-table-total-label">
+    <%= _('Total:') %>
+  </th>
+  <th class="cart-table-total-value">
+    <%= float_to_currency_cart order.total, @environment %>
+  </th>
+</table>
-<div id='cart-request-box'>
-  <%= form_for(:customer, :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('* ' +  c_("Email"), f.text_field(:email, :class => 'required email') ) %>
-      <%= labelled_form_field('* ' +  c_("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
-      <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => @profile.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(@cart[:items]) >= @settings.free_delivery_price) %>
-      <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('shopping_cart|Check'), :check]]))) %>
-      <%= labelled_form_field(s_('shopping_cart|Change'), text_field_tag('customer[change]')) %>
+<div id='cart-request-box' class="row">
+  <h1>
+    <%= _('Shopping checkout') %>
+    <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()', class: 'cart-go-back' %>
+  </h1>
+
+  <%= form_for :order, url: {action: :send_request},
+    html: {onsubmit: "return Cart.send_request(this)", id: 'cart-request-form'} do |f| %>
+
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <fieldset>
+        <legend><%=_('Personal identification')%></legend>
+
+        <%= f.fields_for :consumer_data, @order.consumer do |ff| %>
+          <%= labelled_form_field('* ' + _("Name"), ff.text_field(:name, value: (user.name if user), class: 'required') ) %>
+          <%= labelled_form_field('* ' +  _("Email"), ff.text_field(:email, value: (user.email if user), class: 'required email') ) %>
+          <%= labelled_form_field('* ' +  _("Contact phone"), ff.text_field(:contact_phone, value: (user.contact_phone if user), class: 'required') ) %>
+        <% end %>
+      </fieldset>
+
+      <fieldset>
+        <legend><%=_("Payment's method")%></legend>
+
+        <%= f.fields_for :payment_data do |ff| %>
+          <%= labelled_form_field _('Payment'), ff.select(:method, options_for_payment) %>
+          <%= labelled_form_field(s_('shopping_cart|Change'), ff.text_field(:change)) %>
+        <% end %>
+      </fieldset>
+
+      <% if profile.delivery_methods.size > 0 %>
+        <fieldset>
+          <legend><%=_('Delivery or pickup method')%></legend>
+          <%= render 'delivery_plugin/order_select', f: f, order: @order %>
+        </fieldset>
+      <% end %>
     </div>
-    <% if @settings.delivery %>
-      <fieldset><legend><%=_('Delivery Address')%></legend>
-        <%= labelled_form_field(c_('Address (street and number)'), f.text_field(:address)) %>
-        <%= labelled_form_field(c_('Address reference'), f.text_field(:address_reference)) %>
-        <%= labelled_form_field(c_('District'), f.text_field(:district)) %>
-        <%= labelled_form_field( c_("City"), f.text_field(:city)) %>
-        <%= labelled_form_field(c_('ZIP code'), f.text_field(:zip_code)) %>
+
+    <div class="col-lg-6 col-md-6 col-sm-6">
+      <fieldset>
+        <legend><%=s_('Your Order')%></legend>
+        <% supplier_delivery = @order.supplier_delivery || profile.delivery_methods.first %>
+        <%= items_table @cart[:items], @profile, supplier_delivery %>
       </fieldset>
-    <% end %>
-    <div id="cart-form-actions">
+    </div>
+
+    <div id="cart-form-actions" class="row">
       <%= submit_button(:send, _('Send buy request')) %>
     </div>
   <% end %>
-  <% delivery_option = @settings.delivery_options.first && @settings.delivery_options.first.first %>
-  <%= items_table(@cart[:items], @profile, delivery_option) %>
-  <%= link_to_function '', "noosfero.modal.close();", :class => 'cart-box-close icon-cancel' %>
 </div>
  
 <%= javascript_include_tag '../plugins/shopping_cart/buy' %>
+
@@ -0,0 +1 @@
+cart.clearOrdersSession();
@@ -4,52 +4,66 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   </head>
   <body>
-    <h4><%= _('Hi %s!') % @customer[:name] %></h4>
+    <h4><%= _('Hi %s!') % @order.consumer_data[:name] %></h4>
  
     <p>
-      <%= _('This is a notification e-mail about your buy request on %s.') % link_to(@supplier.name, @supplier.url) %>
-      <%= _('The supplier already received your buy request and may contact you for confirmation.') %>
-      <%= _('If you have any doubts, contact us at: %s') % @supplier.contact_email %>
-      <%= _('Please check if your information below is correct:') %>
+      <%= _('This is a notification e-mail about your buy request on the enterprise %s.') % link_to(@order.profile.name, @order.profile.url) %>
+      <%= _('The enterprise already received your buy request and will contact you for confirmation.') %>
+      <%= _('If you have any doubts about your order, write to us at: %s.') % @order.profile.contact_email %>
+      <%= _('Review below the informations of your order:') %>
     </p>
  
     <ul>
-      <li><b><%= c_('Full name') %>: </b><%= @customer[:name] %></li>
-      <li><b><%= c_('Email') %>: </b><%= @customer[:email] %></li>
-      <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
-      <% if @customer[:payment] == 'money' %>
-        <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
+      <li><b><%= c_('Full name') %>: </b><%= @order.consumer_data[:name] %></li>
+      <li><b><%= c_('Email') %>: </b><%= @order.consumer_data[:email] %></li>
+      <li><b><%= _('Phone number') %>: </b><%= @order.consumer_data[:contact_phone] %></li>
+
+      <li><b><%= _("Payment's method") %>: </b><%= _ OrdersPlugin::Order::PaymentMethods[@order.payment_data[:method].to_sym].call %></li>
+      <% if @order.payment_data[:method] == 'money' %>
+        <li><b><%= s_('shopping_cart|Change') %>: </b><%= @order.payment_data[:change] %></li>
+      <% end %>
+
+      <li><b><%= _('Delivery or pickup') %>:</b></li>
+      <%= @order.supplier_delivery_data[:name] %><br/>
+      <p>
+        <i><%= @order.supplier_delivery_data[:description] %></i>
+      </p>
+
+      <% if !@order.consumer_delivery_data[:address].blank? || !@order.consumer_delivery_data[:city].blank? || !@order.consumer_delivery_data[:zip_code].blank? || !@order.consumer_delivery_data[:district].blank? || !@order.consumer_delivery_data[:address_reference].blank? %>
+        <li><b><%= c_('Address') %>:</b></li>
+      <% end %>
+      <% if !@order.consumer_delivery_data[:address].blank? %>
+        <%= @order.consumer_delivery_data[:address] %><br \>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
-        <li><b><%= c_('Address') %>:</b>
+      <% if !@order.consumer_delivery_data[:address_line2].blank? %>
+        <%= @order.consumer_delivery_data[:address_line2] %><br \>
       <% end %>
-      <% if !@customer[:address].blank? %>
-        <%= @customer[:address] %><br \>
+      <% if !@order.consumer_delivery_data[:address_reference].blank? %>
+        <%= @order.consumer_delivery_data[:address_reference] %><br \>
       <% end %>
-      <% if !@customer[:district].blank? %>
-        <%= @customer[:district] %><br \>
+      <% if !@order.consumer_delivery_data[:district].blank? %>
+        <%= @order.consumer_delivery_data[:district] %><br \>
       <% end %>
-      <% if !@customer[:city].blank? %>
-        <%= @customer[:city] %><br \>
+      <% if !@order.consumer_delivery_data[:city].blank? %>
+        <%= @order.consumer_delivery_data[:city] %><br \>
       <% end %>
-      <% if !@customer[:zip_code].blank? %>
-        <%= @customer[:zip_code] %>
+      <% if !@order.consumer_delivery_data[:state].blank? %>
+        <%= @order.consumer_delivery_data[:state] %><br \>
       <% end %>
-      <% if !@customer[:address_reference].blank? %>
-        <%= @customer[:address_reference] %><br \>
+      <% if !@order.consumer_delivery_data[:zip_code].blank? %>
+        <%= @order.consumer_delivery_data[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
+      <% if !@order.consumer_delivery_data[:address].blank? || !@order.consumer_delivery_data[:city].blank? || !@order.consumer_delivery_data[:zip_code].blank? || !@order.consumer_delivery_data[:district].blank? || !@order.consumer_delivery_data[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
  
     <p><%=_('Here are the products you bought:')%></p>
-    <%= @helper.items_table(@items, @supplier, @delivery_option, true) %>
+    <%= items_table(@items, @order.profile, @order.supplier_delivery, true) %>
     <p>
       --<br/>
       <%=_('Thanks for buying with us!')%><br/>
-      <%= link_to @supplier.name, @supplier.url %>
+      <%= link_to @order.profile.name, @order.profile.url %>
     </p>
     <small style="color: #888"><%= _('A service of %s.') % @environment.name %></small>
   </body>
@@ -4,46 +4,54 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
   </head>
   <body>
-    <h4><%= _('Hi %s!') % @supplier.name %></h4>
+    <h4><%= _('Hi %s!') % @order.profile.name %></h4>
  
     <p>
-      <%= _('This is a buy request made by %s.') % @customer[:name] %>
+      <%= _('This is a buy request made by %s.') % @order.consumer_data[:name] %>
       <%= _('Below follows the customer informations:') %>
     </p>
  
     <ul>
-      <li><b><%= c_('Full name') %>: </b><%= @customer[:name] %></li>
-      <li><b><%= c_('Email') %>: </b><%= @customer[:email] %></li>
-      <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('shopping_cart|Check') %></li>
-      <% if @customer[:payment] == 'money' %>
-        <li><b><%= _('shopping_cart|Change') %>: </b><%= @customer[:change] %></li>
-      <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
+      <li><b><%= c_('Full name') %>: </b><%= @order.consumer_data[:name] %></li>
+      <li><b><%= c_('Email') %>: </b><%= @order.consumer_data[:email] %></li>
+      <li><b><%= _('Phone number') %>: </b><%= @order.consumer_data[:contact_phone] %></li>
+
+      <li><b><%= _('Payment') %>: </b><%= OrdersPlugin::Order::PaymentMethods[@order.payment_data[:method].to_sym].call %></li>
+      <% if @order.payment_data[:method] == 'money' %>
+        <li><b><%= s_('shopping_cart|Change') %>: </b><%= @order.payment_data[:change] %></li>
+      <% end %>
+
+      <% if !@order.consumer_delivery_data[:address].blank? || !@order.consumer_delivery_data[:city].blank? || !@order.consumer_delivery_data[:zip_code].blank? || !@order.consumer_delivery_data[:district].blank? || !@order.consumer_delivery_data[:address_reference].blank? %>
         <li><b><%= c_('Address') %>:</b>
       <% end %>
-      <% if !@customer[:address].blank? %>
-        <%= @customer[:address] %><br \>
+      <% if !@order.consumer_delivery_data[:address].blank? %>
+        <%= @order.consumer_delivery_data[:address] %><br \>
+      <% end %>
+      <% if !@order.consumer_delivery_data[:address_line2].blank? %>
+        <%= @order.consumer_delivery_data[:address_line2] %><br \>
+      <% end %>
+      <% if !@order.consumer_delivery_data[:address_reference].blank? %>
+        <%= @order.consumer_delivery_data[:address_reference] %><br \>
       <% end %>
-      <% if !@customer[:district].blank? %>
-        <%= @customer[:district] %><br \>
+      <% if !@order.consumer_delivery_data[:district].blank? %>
+        <%= @order.consumer_delivery_data[:district] %><br \>
       <% end %>
-      <% if !@customer[:city].blank? %>
-        <%= @customer[:city] %><br \>
+      <% if !@order.consumer_delivery_data[:city].blank? %>
+        <%= @order.consumer_delivery_data[:city] %><br \>
       <% end %>
-      <% if !@customer[:zip_code].blank? %>
-        <%= @customer[:zip_code] %>
+      <% if !@order.consumer_delivery_data[:state].blank? %>
+        <%= @order.consumer_delivery_data[:state] %><br \>
       <% end %>
-      <% if !@customer[:address_reference].blank? %>
-        <%= @customer[:address_reference] %><br \>
+      <% if !@order.consumer_delivery_data[:zip_code].blank? %>
+        <%= @order.consumer_delivery_data[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
+      <% if !@order.consumer_delivery_data[:address].blank? || !@order.consumer_delivery_data[:city].blank? || !@order.consumer_delivery_data[:zip_code].blank? || !@order.consumer_delivery_data[:district].blank? || !@order.consumer_delivery_data[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
  
     <p><%=_('And here are the items bought by this customer:')%></p>
-    <%= @helper.items_table(@items, @supplier, @delivery_option, true) %>
+    <%= items_table(@items, @order.profile, @order.supplier_delivery, true) %>
     <p>
       --<br/>
       <%=_('If there are any problems with this email contact the admin of %s.') % @environment.name %>
@@ -1 +0,0 @@
-<%= _("Request sent successfully check your email.")%>
@@ -0,0 +1,5 @@
+<% if @success %>
+  window.location.href = <%= url_for(controller: :catalog, profile: @profile.identifier).to_json %>
+<% else %>
+  display_notice(<%= "#{_ 'Error'}: #{@error}".to_json %>)
+<% end %>
@@ -1,61 +0,0 @@
-<% if @orders.empty? %>
-  <p><i><%= _("No results.") %></i></p>
-<% else %>
-  <table>
-    <tr>
-      <th><%= _('Date') %></th>
-      <th><%= _('Customer') %></th>
-      <th><%= _('Purchase value') %></th>
-      <th><%= _('Status')%></th>
-      <th>&nbsp;</th>
-    </tr>
-    <% status_collection.delete_at(0) %>
-    <% @orders.each do |order|%>
-      <tr>
-        <td><%= order.created_at.strftime("%Y-%m-%d")%></td>
-        <td><%= order.customer_name %></td>
-        <td style="text-align: right"><%= float_to_currency_cart(order.products_list.sum {|id, qp| qp[:price]*qp[:quantity]}, environment) %></td>
-        <td>
-          <% form_tag :action => 'update_order_status' do %>
-            <%= hidden_field_tag(:order_id, order.id) +
-              hidden_field_tag(:context_from, @from) +
-              hidden_field_tag(:context_to, @to) +
-              hidden_field_tag(:context_status, @status) +
-              select_tag( :order_status, options_from_collection_for_select(status_collection, :first, :last, order.status),
-                         :onchange => "this.form.submit()" )
-            %>
-          <% end %>
-        </td>
-        <td><button class="view-order-details" data-order="<%=order.id%>"><%=c_('View details')%></button></td>
-      </tr>
-      <tr id="order-details-<%=order.id%>" style="display:none">
-        <td class="order-info" colspan="5">
-          <div style="display:none">
-            <ul class="customer-details">
-              <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', c_('Contact phone')], ['address', c_('Address')], ['district', c_('District')], ['city', c_('City')], ['zip_code', c_('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('shopping_cart|Change')]].each do |field| %>
-                <% attribute = field.first %>
-                <% name = field.last %>
-                <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
-              <% end %>
-            </ul>
-            <ul class="order-products">
-              <% order.products_list.each do |id, qp| %>
-                <%
-                  begin
-                    product = Product.find(id)
-                  rescue
-                    product = nil
-                  end
-                %>
-                <li><%= product ? link_to(product.name, product.url) : qp[:name]%>
-                &times; <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>
-              <% end %>
-            </ul>
-            <br style="clear:both"/>
-          </div>
-        </td>
-      </tr>
-    <% end %>
-  </table>
-<% end %>
-
@@ -1,17 +0,0 @@
-<% if @products.empty? %>
-  <p><i><%= _("No results.") %></i></p>
-<% else %>
-  <table>
-    <tr>
-      <th><%= c_('Product') %></th>
-      <th><%= _('Quantity') %></th>
-    </tr>
-    <% @products.each do |id, item|%>
-      <tr>
-        <td><%= item.product ? link_to(item.name, item.product.url) : item.name %></td>
-        <td style="text-align: center"><%= item.quantity %></td>
-      </tr>
-    <% end %>
-  </table>
-<% end %>
-
 <h1> <%= _('Basket options') %> </h1>
  
-<%= form_for(:settings, :url => {:action => 'edit'}, :html => {:method => 'post'}) do |f| %>
-  <%= labelled_form_field(_('Enable shopping basket'), f.check_box(:enabled)) %>
-  <%= labelled_form_field(_('Enable delivery fields on orders'), f.check_box(:delivery)) %>
-  <% display_delivery_settings = @settings.delivery ? 'auto' : 'none' %>
-  <fieldset id='delivery_settings' style="display: <%= display_delivery_settings %>"><legend><%=_('Delivery')%></legend>
-    <table>
-      <tr>
-        <th><%= _('Option') %></th>
-        <th><%= c_('Price') %></th>
-        <th>&nbsp;</th>
-      </tr>
-      <% @settings.delivery_options.each do |option, price| %>
-        <tr>
-          <td><%= text_field_tag('settings[delivery_options][options][]', option, :style => 'width: 100%') %></td>
-          <td><%= text_field_tag('settings[delivery_options][prices][]', price, :style => 'width: 100%') %></td>
-          <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
-        </tr>
-      <% end %>
-      <tr>
-        <td><%= text_field_tag('settings[delivery_options][options][]', nil, :style => 'width: 100%') %></td>
-        <td><%= text_field_tag('settings[delivery_options][prices][]', nil, :style => 'width: 100%') %></td>
-        <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
-      </tr>
-      <tr id='add-new-option-row'>
-        <td colspan='3' style='background-color: #EEE; text-align: center'><%= link_to(_('ADD NEW OPTION'), '', :id => 'add-new-option') %></td>
-      </tr>
-      <tr id="empty-option" style='display: none'>
-        <td><%= text_field_tag('settings[delivery_options][options][]', nil, :style => 'width: 100%') %></td>
-        <td><%= text_field_tag('settings[delivery_options][prices][]', nil, :style => 'width: 100%') %></td>
-        <td><%= button_without_text(:close, _('Remove option'), '', :class => 'remove-option') %></td>
-      </tr>
-    </table>
+<%= form_for :settings, url: {action: 'edit'}, html: {onsubmit: '$(this).ajaxSubmit()'} do |f| %>
  
-    <%= labelled_form_field(_("Order's minimum price for free delivery:"), f.text_field(:free_delivery_price)) %>
-    <%= content_tag('small', _('Leave empty to always charge the delivery.')) %>
-  </fieldset>
-  <br style='clear: both'/>
-  <br style='clear: both'/>
   <div>
-    <%= submit_button(:save, c_('Save')) %>
-    <%= button :back, c_('Back to control panel'), :controller => 'profile_editor' %>
+    <%= f.check_box :enabled, onchange: 'this.form.onsubmit()' %>
+    <%= f.label :enabled, _('Enable shopping basket')  %>
   </div>
-<% end%>
+
+<% end %>
+
+<fieldset id='delivery-settings'>
+  <label><%=_('Deliveries or pickups')%></label>
+  <%= render 'delivery_plugin/admin_method/index' %>
+</fieldset>
  
 <%= javascript_include_tag '../plugins/shopping_cart/edit' %>
@@ -0,0 +1,5 @@
+<% if @success %>
+  display_notice(<%= _('Option updated successfully.').to_json %>)
+<% else %>
+  display_notice(<%= _('Option wasn\'t updated successfully.').to_json %>)
+<% end %>
@@ -1,57 +0,0 @@
-<h1> <%= _('Purchase Reports') %> </h1>
-
-<% extend ProfileHelper %>
-<% extend ShoppingCartPlugin::CartHelper %>
-
-<% status = ShoppingCartPlugin::PurchaseOrder::Status.name; pos=-1 %>
-<% status_collection = [[nil, c_('All')]] %>
-<% status_collection += status.map{|s| [pos+=1, s] } %>
-
-<% form_tag({}, {:id => 'cart-order-filter'}) do %>
-  <%= labelled_text_field(c_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
-  <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
-  <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status,  status_collection)%></span>
-  &nbsp;
-  <%= submit_button('save',  c_('Filter')) %>
-<% end %>
-
-<% tabs = [] %>
-<% tabs << {:title => _('Products list'), :id => 'products_list', :content => (render :partial => 'products_list')} %>
-<% tabs << {:title => _('Orders list'), :id => 'orders_list', :content => (render :partial => 'orders_list', :locals => {:status_collection => status_collection})} %>
-<%= render_tabs(tabs) %>
-
-<script>
-	var dates = jQuery( "#from, #to" ).datepicker({
-		defaultDate: "+1w",
-		changeMonth: true,
-    dateFormat: 'yy-mm-dd',
-		onSelect: function( selectedDate ) {
-			var option = this.id == "from" ? "minDate" : "maxDate",
-				instance = jQuery( this ).data( "datepicker" ),
-				date = jQuery.datepicker.parseDate(
-					instance.settings.dateFormat ||
-					jQuery.datepicker._defaults.dateFormat,
-					selectedDate, instance.settings );
-			dates.not( this ).datepicker( "option", option, date );
-		}
-	});
-  jQuery(".view-order-details").each(function(index, bt){
-    jQuery(bt).button({
-      icons: {
-        primary: "ui-icon-info"
-      },
-      text: false
-    });
-    bt.onclick = function(){
-      var orderId = this.getAttribute("data-order");
-      var tr = jQuery("#order-details-"+orderId);
-      var div = jQuery("#order-details-"+orderId+" div");
-      if ( tr[0].style.display == "none" ) {
-        tr.show();
-        div.slideDown('fast');
-      } else {
-        div.slideUp("fast", function(){tr.hide()});
-      }
-    }
-  });
-</script>
@@ -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('* ' +  c_("Email"), f.text_field(:email, :class => 'required email') ) %>
-      <%= labelled_form_field('* ' +  c_("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
-    </div>
-    <fieldset><legend><%=_('Delivery Address')%></legend>
-      <%= labelled_form_field(c_('Address (street and number)'), f.text_field(:address)) %>
-      <%= labelled_form_field( c_("City"), f.text_field(:city)) %>
-      <%= labelled_form_field(c_('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_function '', "noosfero.modal.close();", :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	1	require 'base64'
2	2
3		-class ShoppingCartPluginController < PublicController
	3	+class ShoppingCartPluginController < OrdersPluginController
4	4
5	5	include ShoppingCartPlugin::CartHelper
6	6	helper ShoppingCartPlugin::CartHelper
7	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	8	def get
14	9	config =
15	10	if cart.nil?
16		- { :profile_id => nil,
	11	+ { :profile_id => params[:profile_id],
17	12	:has_products => false,
18	13	:visible => false,
19	14	:products => []}
20	15	else
21		- { :profile_id => cart[:profile_id],
	16	+ {
	17	+ :profile_id => cart[:profile_id],
	18	+ :profile_short_name => cart_profile.short_name,
22	19	:has_products => (cart[:items].keys.size > 0),
23	20	:visible => visible?,
24		- :products => products}
	21	+ :products => products,
	22	+ }
25	23	end
	24	+ config[:has_previous_orders] = if cart_profile then previous_orders.first.present? else false end
26	25	render :text => config.to_json
27	26	end
28	27
29	28	def add
30	29	product = find_product(params[:id])
31		- if product && profile = validate_same_profile(product)
32		- self.cart = { :profile_id => profile.id, :items => {} } if self.cart.nil?
33		- self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
34		- self.cart[:items][product.id] += 1
35		- render :text => {
36		- :ok => true,
37		- :error => {:code => 0},
38		- :products => [{
39		- :id => product.id,
40		- :name => product.name,
41		- :price => get_price(product, profile.environment),
42		- :description => product.description,
43		- :picture => product.default_image(:minor),
44		- :quantity => self.cart[:items][product.id]
45		- }]
46		- }.to_json
	30	+ if product && (profile = validate_same_profile(product))
	31	+ self.cart = { :profile_id => profile.id, :items => {} } if self.cart.nil?
	32	+ self.cart[:items][product.id] = 0 if self.cart[:items][product.id].nil?
	33	+ self.cart[:items][product.id] += 1
	34	+ render :text => {
	35	+ :ok => true,
	36	+ :error => {:code => 0},
	37	+ :products => [{
	38	+ :id => product.id,
	39	+ :name => product.name,
	40	+ :price => get_price(product, profile.environment),
	41	+ :description => product.description,
	42	+ :picture => product.default_image(:minor),
	43	+ :quantity => self.cart[:items][product.id]
	44	+ }]
	45	+ }.to_json
47	46	end
48	47	end
49	48
...	...	@@ -93,36 +92,56 @@ class ShoppingCartPluginController < PublicController
93	92	}.to_json
94	93	end
95	94
	95	+ # override from OrdersPluginController
	96	+ def repeat
	97	+ unless params[:id].present?
	98	+ @orders = previous_orders.last(5).reverse
	99	+ @orders.each{ \|o\| o.enable_product_diff }
	100	+ else
	101	+ @order = cart_profile.orders.find params[:id]
	102	+ self.cart = { profile_id: cart_profile.id, items: {} }
	103	+ @order.items.each do \|item\|
	104	+ next unless item.repeat_product and item.repeat_product.available
	105	+ self.cart[:items][item.repeat_product.id] = item.quantity_consumer_ordered.to_i
	106	+ end
	107	+ self.cart[:repeat_order_id] = @order.id
	108	+
	109	+ render json: {
	110	+ products: products,
	111	+ }
	112	+ end
	113	+ end
	114	+
96	115	def buy
	116	+ @no_design_blocks = true
97	117	@customer = user \|\| Person.new
98		- if validate_cart_presence
99		- @cart = cart
100		- @profile = environment.profiles.find(cart[:profile_id])
101		- @settings = Noosfero::Plugin::Settings.new(@profile, ShoppingCartPlugin)
102		- render :layout => false
	118	+ return redirect_to request.referer \|\| environment.top_url if self.cart.nil?
	119	+ @settings = cart_profile.shopping_cart_settings
	120	+ @cart = cart
	121	+ @profile = cart_profile
	122	+ @order = profile.sales.build consumer: user
	123	+
	124	+ @order.supplier_delivery = profile.delivery_methods.find session[:cart][:last_delivery_option_id] rescue nil
	125	+ if repeat_order_id = self.cart[:repeat_order_id]
	126	+ repeat_order = cart_profile.orders.where(id: repeat_order_id).first
	127	+ @order.consumer_delivery_data = repeat_order.consumer_delivery_data if repeat_order
103	128	end
104	129	end
105	130
106	131	def send_request
107		- register_order(params[:customer], self.cart[:items])
	132	+ order = register_order(params[:customer], self.cart[:items])
108	133	begin
109		- profile = environment.profiles.find(cart[:profile_id])
110		- ShoppingCartPlugin::Mailer.customer_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
111		- ShoppingCartPlugin::Mailer.supplier_notification(params[:customer], profile, self.cart[:items], params[:delivery_option]).deliver
	134	+ ShoppingCartPlugin::Mailer.customer_notification(order, self.cart[:items]).deliver
	135	+ ShoppingCartPlugin::Mailer.supplier_notification(order, self.cart[:items]).deliver
	136	+ session[:notice] = _('Your order has been sent successfully! You will receive a confirmation e-mail shortly.')
	137	+ @success = true
	138	+ @profile = cart_profile
	139	+ session[:cart] \|\|= {}
	140	+ session[:cart][:last_delivery_option_id] = order.supplier_delivery_id
112	141	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
	142	+ rescue ActiveRecord::ActiveRecordError => exception
	143	+ @success = false
	144	+ @error = exception.message
126	145	end
127	146	end
128	147
...	...	@@ -168,35 +187,35 @@ class ShoppingCartPluginController < PublicController
168	187	end
169	188	end
170	189
171		- def update_delivery_option
172		- profile = environment.profiles.find(cart[:profile_id])
173		- settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
174		- delivery_price = settings.delivery_options[params[:delivery_option]]
175		- delivery = Product.new(:name => params[:delivery_option], :price => delivery_price)
176		- delivery.save(false)
177		- items = self.cart[:items].clone
178		- items[delivery.id] = 1
179		- total_price = get_total_on_currency(items, environment)
180		- delivery.destroy
181		- render :text => {
182		- :ok => true,
183		- :delivery_price => float_to_currency_cart(delivery_price, environment),
184		- :total_price => total_price,
185		- :message => _('Delivery option updated.'),
186		- :error => {:code => 0}
187		- }.to_json
	190	+ def update_supplier_delivery
	191	+ @profile = cart_profile
	192	+ supplier_delivery = @profile.delivery_methods.find params[:order][:supplier_delivery_id]
	193	+ order = build_order self.cart[:items], supplier_delivery
	194	+ total_price = order.total_price
	195	+ render json: {
	196	+ ok: true,
	197	+ delivery_price: float_to_currency_cart(supplier_delivery.cost(total_price), environment, unit: ''),
	198	+ total_price: float_to_currency_cart(total_price, environment, unit: ''),
	199	+ message: _('Delivery option updated.'),
	200	+ error: {code: 0}
	201	+ }
188	202	end
189	203
190		- private
	204	+ # must be public
	205	+ def profile
	206	+ cart_profile
	207	+ end
	208	+
	209	+ protected
191	210
192	211	def validate_same_profile(product)
193	212	if self.cart && self.cart[:profile_id] && product.profile_id != self.cart[:profile_id]
194	213	render :text => {
195	214	:ok => false,
196	215	:error => {
197		- :code => 1,
198		- :message => _("Can't join items from different enterprises.")
199		- }
	216	+ :code => 1,
	217	+ :message => _("Your basket contains items from '%{profile_name}'. Please empty the basket or checkout before adding items from here.") % {profile_name: cart_profile.short_name}
	218	+ }
200	219	}.to_json
201	220	return nil
202	221	end
...	...	@@ -262,40 +281,48 @@ class ShoppingCartPluginController < PublicController
262	281	end
263	282
264	283	def register_order(custumer, items)
265		- new_items = {}
266		- items.each do \|id, quantity\|
	284	+ products_list = {}; items.each do \|id, quantity\|
267	285	product = Product.find(id)
268	286	price = product.price \|\| 0
269		- new_items[id] = {:quantity => quantity, :price => price, :name => product.name}
	287	+ products_list[id] = {:quantity => quantity, :price => price, :name => product.name}
270	288	end
271		- purchase_order = ShoppingCartPlugin::PurchaseOrder.new
272		- purchase_order.seller = environment.profiles.find(cart[:profile_id])
273		- purchase_order.customer = user
274		- purchase_order.status = ShoppingCartPlugin::PurchaseOrder::Status::OPENED
275		- purchase_order.products_list = new_items
276		- purchase_order.customer_delivery_option = params[:delivery_option]
277		- purchase_order.customer_payment = params[:customer][:payment]
278		- purchase_order.customer_change = params[:customer][:change]
279		- purchase_order.customer_name = params[:customer][:name]
280		- purchase_order.customer_email = params[:customer][:email]
281		- purchase_order.customer_contact_phone = params[:customer][:contact_phone]
282		- purchase_order.customer_address = params[:customer][:address]
283		- purchase_order.customer_district = params[:customer][:district]
284		- purchase_order.customer_city = params[:customer][:city]
285		- purchase_order.customer_zip_code = params[:customer][:zip_code]
286		- purchase_order.save!
287		- end
288	289
289		- protected
	290	+ order = OrdersPlugin::Sale.new
	291	+ order.profile = environment.profiles.find(cart[:profile_id])
	292	+ order.supplier_delivery = profile.delivery_methods.find params[:order][:supplier_delivery_id]
	293	+ order.session_id = session_id unless user
	294	+ order.consumer = user
	295	+ order.source = 'shopping_cart_plugin'
	296	+ order.status = 'ordered'
	297	+ order.products_list = products_list
	298	+ order.consumer_data = params[:order][:consumer_data]
	299	+ order.payment_data = params[:order][:payment_data]
	300	+ order.consumer_delivery_data = params[:order][:consumer_delivery_data]
	301	+ order.save!
	302	+
	303	+ order
	304	+ end
290	305
291	306	def cart
292	307	@cart \|\|=
293	308	begin
294	309	cookies[cookie_key] && YAML.load(Base64.decode64(cookies[cookie_key])) \|\| nil
295	310	end
	311	+ # migrate from old attribute
	312	+ @cart[:profile_id] \|\|= @cart.delete(:enterprise_id) if @cart and @cart[:enterprise_id].present?
296	313	@cart
297	314	end
298	315
	316	+ def cart_profile
	317	+ profile_id = if params[:profile_id].present? then params[:profile_id] elsif cart then cart[:profile_id] end
	318	+ @cart_profile \|\|= environment.profiles.find profile_id rescue nil
	319	+ end
	320	+
	321	+ # from OrdersPluginController
	322	+ def supplier
	323	+ cart_profile
	324	+ end
	325	+
299	326	def cart=(data)
300	327	@cart = data
301	328	end
...	...
1	1	class ShoppingCartPluginMyprofileController < MyProfileController
2		- def edit
3		- params[:settings] = treat_cart_options(params[:settings])
4		-
5		- @settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin, params[:settings])
6		- if request.post?
7		- begin
8		- @settings.save!
9		- session[:notice] = _('Option updated successfully.')
10		- rescue Exception => exception
11		- session[:notice] = _('Option wasn\'t updated successfully.')
12		- end
13		- redirect_to :action => 'edit'
14		- end
15		- end
16		-
17		- def reports
18		- utc_string = ' 00:00:00 UTC'
19		- @from = params[:from] ? Time.parse(params[:from] + utc_string) : Time.now.utc.at_beginning_of_month
20		- @to = params[:to] ? Time.parse(params[:to] + utc_string) : Time.now.utc
21		- @status = !params[:filter_status].blank? ? params[:filter_status].to_i : nil
22		-
23		- condition = 'created_at >= ? AND created_at <= ?'
24		- condition_parameters = [@from, @to+1.day]
25		- if @status
26		- condition += ' AND status = ?'
27		- condition_parameters << @status
28		- end
29	2
30		- conditions = [condition] + condition_parameters
31		- @orders = profile.orders.find(:all, :conditions => conditions)
	3	+ helper DeliveryPlugin::DisplayHelper
32	4
33		- @products = {}
34		- @orders.each do \|order\|
35		- order.products_list.each do \|id, qp\|
36		- @products[id] \|\|= ShoppingCartPlugin::LineItem.new(id, qp[:name])
37		- @products[id].quantity += qp[:quantity]
	5	+ def edit
	6	+ params[:settings] = treat_cart_options(params[:settings])
	7	+ @settings = profile.shopping_cart_settings params[:settings] \|\| {}
	8	+ respond_to do \|format\|
	9	+ format.js do
	10	+ if request.post?
	11	+ @success = @settings.save!
	12	+ end
38	13	end
	14	+ format.html
39	15	end
40	16	end
41	17
42		- def update_order_status
43		- order = ShoppingCartPlugin::PurchaseOrder.find(params[:order_id].to_i)
44		- order.status = params[:order_status].to_i
45		- order.save!
46		- redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
47		- end
48		-
49		- private
	18	+ protected
50	19
51	20	def treat_cart_options(settings)
52	21	return if settings.blank?
53	22	settings[:enabled] = settings[:enabled] == '1'
54		- settings[:delivery] = settings[:delivery] == '1'
55		- settings[:free_delivery_price] = settings[:free_delivery_price].blank? ? nil : settings[:free_delivery_price].to_d
56		- settings[:delivery_options] = treat_delivery_options(settings[:delivery_options])
57	23	settings
58	24	end
59	25
60		- def treat_delivery_options(params)
61		- result = {}
62		- return result if params.nil? \|\| params[:options].nil?
63		- params[:options].size.times do \|counter\|
64		- if params[:options][counter].present? && params[:prices][counter].present?
65		- result[params[:options][counter]] = params[:prices][counter]
66		- end
67		- end
68		- result
69		- end
70	26	end
...	...
1	1	class MoveFieldsIncludedOnProfilesTableToSettings < ActiveRecord::Migration
2	2	def self.up
3	3	Profile.find_each do \|profile\|
4		- settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
	4	+ settings = profile.shopping_cart_settings
5	5	settings.enabled = profile.shopping_cart
6	6	settings.delivery = profile.shopping_cart_delivery
7	7	settings.delivery_price = profile.shopping_cart_delivery_price
...	...
...	...	@@ -0,0 +1,86 @@
	1	+OrdersPlugin.send :remove_const, :Item if defined? OrdersPlugin::Item
	2	+OrdersPlugin.send :remove_const, :Order if defined? OrdersPlugin::Order
	3	+
	4	+class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
	5	+ acts_as_having_settings :field => :data
	6	+
	7	+ module Status
	8	+ OPENED = 0
	9	+ CANCELED = 1
	10	+ CONFIRMED = 2
	11	+ SHIPPED = 3
	12	+ end
	13	+end
	14	+
	15	+class Profile
	16	+ has_many :orders, :class_name => 'OrdersPlugin::Order'
	17	+end
	18	+
	19	+class OrdersPlugin::Item < Noosfero::Plugin::ActiveRecord
	20	+ belongs_to :order, :class_name => 'OrdersPlugin::Order'
	21	+end
	22	+class OrdersPlugin::Order < Noosfero::Plugin::ActiveRecord
	23	+ has_many :items, :class_name => 'OrdersPlugin::Item', :foreign_key => :order_id
	24	+
	25	+ extend CodeNumbering::ClassMethods
	26	+ code_numbering :code, :scope => proc{ self.profile.orders }
	27	+end
	28	+
	29	+StatusTransform = {
	30	+ ShoppingCartPlugin::PurchaseOrder::Status::OPENED => 'ordered',
	31	+ ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED => 'accepted',
	32	+ ShoppingCartPlugin::PurchaseOrder::Status::CANCELED => 'cancelled',
	33	+ ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED => 'delivered',
	34	+}
	35	+
	36	+class MoveShoppingCartPurchaseOrderToOrdersPluginOrder < ActiveRecord::Migration
	37	+ def self.up
	38	+ OrdersPlugin::Order.record_timestamps = false
	39	+
	40	+ ShoppingCartPlugin::PurchaseOrder.all(:order => 'created_at ASC').each do \|purchase_order\|
	41	+ data = purchase_order.data
	42	+
	43	+ order = OrdersPlugin::Order.new :profile_id => purchase_order.seller_id, :consumer_id => purchase_order.customer_id
	44	+
	45	+ order.consumer_data = {}
	46	+ ['contact_phone','name','email'].each do \|prop\|
	47	+ order.consumer_data[prop.to_sym] = data[('customer_'+prop).to_sym]
	48	+ end
	49	+
	50	+ order.consumer_delivery_data = {
	51	+ :name => data[:customer_delivery_option],
	52	+ :address_line1 => data[:customer_address],
	53	+ :address_line2 => data[:customer_district],
	54	+ :postal_code => data[:customer_zip_code],
	55	+ :state => data[:customer_state],
	56	+ :country => 'Brasil'
	57	+ }
	58	+ order.supplier_delivery_data = {}
	59	+
	60	+ data[:products_list].each do \|id, data\|
	61	+ item = order.items.build :product_id => id, :name => data[:name], :quantity_consumer_ordered => data[:quantity], :price => data[:price]
	62	+ item.order = order
	63	+ end
	64	+
	65	+ order.payment_data = {
	66	+ :method => data[:customer_payment],
	67	+ :change => data[:customer_change]
	68	+ }
	69	+
	70	+ order.status = StatusTransform[purchase_order.status]
	71	+
	72	+ order.updated_at = purchase_order.updated_at
	73	+ order.created_at = purchase_order.created_at
	74	+
	75	+ order.save!
	76	+ end
	77	+
	78	+ # Leave table for registry
	79	+ #drop_table :shopping_cart_plugin_purchase_orders
	80	+
	81	+ OrdersPlugin::Order.record_timestamps = true
	82	+ end
	83	+
	84	+ def self.down
	85	+ end
	86	+end
...	...
...	...	@@ -0,0 +1,21 @@
	1	+class MoveShoppingDeliveryOptionsToDeliveryPlugin < ActiveRecord::Migration
	2	+ def up
	3	+ Enterprise.find_each batch_size: 20 do \|enterprise\|
	4	+ settings = enterprise.shopping_cart_settings
	5	+ next if settings.delivery_options.blank?
	6	+
	7	+ free_over_price = settings.free_delivery_price
	8	+ settings.delivery_options.each do \|name, price\|
	9	+ enterprise.delivery_methods.create! name: name, fixed_cost: price.to_f, delivery_type: 'deliver', free_over_price: free_over_price
	10	+ end
	11	+
	12	+ settings.free_delivery_price = nil
	13	+ settings.delivery_options = nil
	14	+ enterprise.save!
	15	+ end
	16	+ end
	17	+
	18	+ def down
	19	+ say "this migration can't be reverted"
	20	+ end
	21	+end
...	...
...	...	@@ -1,5 +0,0 @@
1		-require_dependency 'enterprise'
2		-
3		-class Enterprise
4		- has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
5		-end
...	...	@@ -1,5 +0,0 @@
1		-require_dependency 'person'
2		-
3		-class Person
4		- has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
5		-end
...	...	@@ -0,0 +1,24 @@
	1	+require_dependency 'profile'
	2	+
	3	+class Profile
	4	+
	5	+ def shopping_cart_settings attrs = {}
	6	+ @shopping_cart_settings \|\|= Noosfero::Plugin::Settings.new self, ShoppingCartPlugin, attrs
	7	+ attrs.each{ \|a, v\| @shopping_cart_settings.send "#{a}=", v }
	8	+ @shopping_cart_settings
	9	+ end
	10	+
	11	+ def shopping_cart_enabled
	12	+ self.shopping_cart_settings.enabled
	13	+ end
	14	+
	15	+ # may be customized by other profiles
	16	+ def cart_order_supplier_notification_recipients
	17	+ if self.contact_email.present?
	18	+ [self.contact_email]
	19	+ else
	20	+ self.admins.collect(&:contact_email).select{ \|email\| email.present? }
	21	+ end
	22	+ end
	23	+
	24	+end
...	...
1	1	class ShoppingCartPlugin < Noosfero::Plugin
2	2
3		- class << self
4		- def plugin_name
	3	+ def self.plugin_name
5	4	"Shopping Basket"
6		- end
7		-
8		- def plugin_description
9		- _("A shopping basket feature for enterprises")
10		- end
11		-
12		- def delivery_default_setting
13		- false
14		- end
15		-
16		- def delivery_price_default_setting
17		- 0
18		- end
19		-
20		- def delivery_options_default_setting
21		- {}
22		- end
23	5	end
24	6
25		- def add_to_cart_button(item)
26		- profile = item.profile
27		- settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
28		- if settings.enabled && item.available
29		- lambda {
30		- link_to(_('Add to basket'), "add:#{item.name}",
31		- :class => 'cart-add-item',
32		- :onclick => "Cart.addItem(#{item.id}, this); return false"
33		- )
34		- }
35		- end
	7	+ def self.plugin_description
	8	+ _("A shopping basket feature for enterprises")
36	9	end
37	10
38		- alias :product_info_extras :add_to_cart_button
39		- alias :catalog_item_extras :add_to_cart_button
40		- alias :asset_product_extras :add_to_cart_button
41		-
42	11	def stylesheet?
43	12	true
44	13	end
...	...	@@ -48,19 +17,45 @@ class ShoppingCartPlugin < Noosfero::Plugin
48	17	end
49	18
50	19	def body_beginning
51		- expanded_template('cart.html.erb')
	20	+ lambda do
	21	+ extend ShoppingCartPlugin::CartHelper
	22	+ render 'public/cart' unless cart_minimized
	23	+ end
52	24	end
53	25
54	26	def control_panel_buttons
55		- settings = Noosfero::Plugin::Settings.new(context.profile, ShoppingCartPlugin)
56	27	buttons = []
57	28	if context.profile.enterprise?
58	29	buttons << { :title => _('Shopping basket'), :icon => 'shopping-cart-icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
59	30	end
60		- if context.profile.enterprise? && settings.enabled
61		- buttons << { :title => _('Purchase reports'), :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
62		- end
63	31
64	32	buttons
65	33	end
	34	+
	35	+ def add_to_cart_button item, options = {}
	36	+ profile = item.profile
	37	+ return unless profile.shopping_cart_enabled and item.available
	38	+ lambda do
	39	+ extend ShoppingCartPlugin::CartHelper
	40	+ add_to_cart_button item, options
	41	+ end
	42	+ end
	43	+
	44	+ alias :product_info_extras :add_to_cart_button
	45	+ alias :catalog_item_extras :add_to_cart_button
	46	+ alias :asset_product_extras :add_to_cart_button
	47	+
	48	+ # We now think that it's not a good idea to have the basket in the same time.
	49	+ #def catalog_autocomplete_item_extras product
	50	+ # add_to_cart_button product, with_text: false
	51	+ #end
	52	+
	53	+ def catalog_search_extras_begin
	54	+ return unless profile.shopping_cart_enabled
	55	+ lambda do
	56	+ extend ShoppingCartPlugin::CartHelper
	57	+ content_tag 'li', render('public/cart'), :class => 'catalog-cart'
	58	+ end
	59	+ end
	60	+
66	61	end
...	...
	1	+require_dependency 'delivery_plugin/display_helper'
	2	+
1	3	module ShoppingCartPlugin::CartHelper
2	4
3	5	include ActionView::Helpers::NumberHelper
4	6	include ActionView::Helpers::TagHelper
5	7
	8	+ include DeliveryPlugin::DisplayHelper
	9	+
	10	+ def add_to_cart_button item, options = {}
	11	+ label = if options[:with_text].nil? or options[:with_text] then _('Add to basket') else '' end
	12	+ button_to_function 'cart', label, "Cart.addItem(#{item.id}, this)", class: 'cart-add-item', type: 'primary'
	13	+ end
	14	+
	15	+ def cart_applet
	16	+ button_to_function 'cart', ' <span class="cart-qtty"></span>', "cart.toggle()", class: 'cart-applet-indicator', type: 'primary'
	17	+ end
	18	+
	19	+ def cart_minimized
	20	+ @catalog_bar
	21	+ end
	22	+
	23	+ def repeat_checkout_order_button order
	24	+ button_to_function :check, t('views.public.repeat.checkout'), 'cart.repeatCheckout(event, this)', 'data-order-id' => order.id, class: 'repeat-checkout-order'
	25	+ end
	26	+
	27	+ def repeat_choose_order_button order
	28	+ button_to_function :edit, t('views.public.repeat.choose'), 'cart.repeatChoose(event, this)', 'data-order-id' => order.id, class: 'repeat-choose-order'
	29	+ end
	30	+
6	31	def sell_price(product)
7	32	return 0 if product.price.nil?
8	33	product.discount ? product.price_with_discount : product.price
9	34	end
10	35
11		- def get_price(product, environment, quantity=1)
12		- float_to_currency_cart(price_with_quantity(product,quantity), environment)
	36	+ def get_price product, environment, quantity=1, options = {}
	37	+ float_to_currency_cart price_with_quantity(product,quantity), environment, options
13	38	end
14	39
15	40	def price_with_quantity(product, quantity=1)
...	...	@@ -25,68 +50,28 @@ module ShoppingCartPlugin::CartHelper
25	50	float_to_currency_cart(get_total(items), environment)
26	51	end
27	52
28		- def items_table(items, profile, delivery_option = nil, by_mail = false)
29		- environment = profile.environment
30		- settings = Noosfero::Plugin::Settings.new(profile, ShoppingCartPlugin)
31		- items = items.to_a
32		-
33		- quantity_opts = { :class => 'cart-table-quantity' }
34		- quantity_opts.merge!({:align => 'center'}) if by_mail
35		- price_opts = {:class => 'cart-table-price'}
36		- price_opts.merge!({:align => 'right'}) if by_mail
37		- items.sort! {\|a, b\| Product.find(a.first).name <=> Product.find(b.first).name}
38		-
39		- if settings.delivery
40		- if settings.free_delivery_price && get_total(items) >= settings.free_delivery_price
41		- delivery = Product.new(:name => _('Free delivery'), :price => 0)
42		- else
43		- delivery = Product.new(:name => delivery_option \|\| _('Delivery'), :price => settings.delivery_options[delivery_option])
44		- end
45		- delivery.save(false)
46		- items << [delivery.id, '']
	53	+ def build_order items, delivery_method = nil
	54	+ @order = @profile.sales.build
	55	+ items.each do \|product_id, quantity\|
	56	+ @order.items.build product_id: product_id, quantity_consumer_ordered: quantity
47	57	end
	58	+ @order.supplier_delivery = delivery_method
	59	+ @order
	60	+ end
48	61
49		- table = '<table id="cart-items-table" cellpadding="2" cellspacing="0"
50		- border="'+(by_mail ? '1' : '0')+'"
51		- style="'+(by_mail ? 'border-collapse:collapse' : '')+'">' +
52		- content_tag('tr',
53		- content_tag('th', _('Item name')) +
54		- content_tag('th', by_mail ? ' # ' : '#') +
55		- content_tag('th', c_('Price'))
56		- ) +
57		- items.map do \|id, quantity\|
58		- product = Product.find(id)
59		- name_opts = {}
60		- is_delivery = quantity.kind_of?(String)
61		- if is_delivery
62		- price_opts.merge!({:id => 'delivery-price'})
63		- name_opts.merge!({:id => 'delivery-name'})
64		- end
65		- content_tag('tr',
66		- content_tag('td', product.name, name_opts) +
67		- content_tag('td', quantity, quantity_opts ) +
68		- content_tag('td', get_price(product, environment, quantity), price_opts)
69		- )
70		- end.join("\n")
71		-
72		- total = get_total_on_currency(items, environment)
73		- delivery.destroy if settings.delivery
74		-
75		- table +
76		- content_tag('th', _('Total:'), :colspan => 2, :class => 'cart-table-total-label') +
77		- content_tag('th', total, :class => 'cart-table-total-value') +
78		- '</table>'
	62	+ def items_table(items, profile, delivery_method = nil, by_mail = false)
	63	+ # partial key needed in mailer context
	64	+ render partial: 'shopping_cart_plugin/items', locals: {order: build_order(items, delivery_method), by_mail: by_mail}
79	65	end
80	66
81		- def float_to_currency_cart(value, environment)
82		- number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u%n")
	67	+ def float_to_currency_cart value, environment, _options = {}
	68	+ options = {:unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :precision => 2, :format => "%u%n"}
	69	+ options.merge! _options
	70	+ number_to_currency value, options
83	71	end
84	72
85		- def select_delivery_options(options, environment)
86		- result = options.map do \|option, price\|
87		- ["#{option} (#{float_to_currency_cart(price, environment)})", option]
88		- end
89		- result << ["#{_('Delivery')} (#{float_to_currency_cart(0, environment)})", 'delivery'] if result.empty?
90		- result
	73	+ def options_for_payment
	74	+ options_for_select OrdersPlugin::Order::PaymentMethods.map{ \|key, text\| [text.call, key] }
91	75	end
	76	+
92	77	end
...	...