Update delivery, orders, orders_cycle, suppliers and shopping_cart to rails4

Braulio Bhavamitra
1 parent 0f263193
Showing 113 changed files with 1592 additions and 560 deletions Show diff stats
plugins/delivery/controllers/myprofile/delivery_plugin/admin_method_controller.rb
plugins/delivery/controllers/myprofile/delivery_plugin/admin_options_controller.rb
plugins/delivery/db/migrate/20150623125525_add_distribution_margin_to_delivery_plugin_method.rb
plugins/delivery/lib/delivery_plugin/display_helper.rb
plugins/delivery/lib/ext/profile.rb
plugins/delivery/locales/en-US.yml
plugins/delivery/locales/pt-BR.yml
plugins/delivery/models/delivery_plugin/method.rb
plugins/delivery/public/stylesheets/delivery.scss
plugins/delivery/test/test_helper.rb
plugins/delivery/test/unit/delivery_plugin/method_test.rb
plugins/delivery/test/unit/delivery_plugin/option_test.rb
plugins/delivery/views/delivery_plugin/_order_select.html.slim
plugins/delivery/views/delivery_plugin/admin_method/_edit.html.slim
plugins/delivery/views/delivery_plugin/admin_method/_show.html.slim
plugins/delivery/views/delivery_plugin/admin_options/_new.js.erb
plugins/delivery/views/delivery_plugin/admin_options/select_all.js.erb
plugins/orders/controllers/myprofile/orders_plugin_admin_controller.rb
plugins/orders/controllers/myprofile/orders_plugin_admin_item_controller.rb
plugins/orders/controllers/myprofile/orders_plugin_item_controller.rb
@@ -14,7 +14,7 @@ class DeliveryPlugin::AdminMethodController &lt; MyProfileController
  
   def edit
     @delivery_method ||= profile.delivery_methods.find_by_id params[:id]
-    if params[:delivery_method].present? and @delivery_method.update_attributes params[:delivery_method]
+    if params[:delivery_method].present? and @delivery_method.update params[:delivery_method]
       render partial: 'list'
     else
       render partial: 'edit', locals: {delivery_method: @delivery_method}
@@ -8,7 +8,13 @@ class DeliveryPlugin::AdminOptionsController &lt; DeliveryPlugin::AdminMethodContro
   before_filter :load_owner
  
   def select
+  end
  
+  def select_all
+    missing_methods = profile.delivery_methods - @owner.delivery_methods
+    missing_methods.each do |dm|
+      DeliveryPlugin::Option.create! owner_id: @owner.id, owner_type: @owner.class.name, delivery_method: dm
+    end
   end
  
   def new
@@ -0,0 +1,8 @@
+class AddDistributionMarginToDeliveryPluginMethod < ActiveRecord::Migration
+
+  def change
+    add_column :delivery_plugin_methods, :distribution_margin_fixed, :decimal
+    add_column :delivery_plugin_methods, :distribution_margin_percentage, :decimal
+  end
+
+end
@@ -9,15 +9,24 @@ module DeliveryPlugin::DisplayHelper
     methods = options[:methods] || profile.delivery_methods
  
     options = methods.map do |method|
-      cost = if method.fixed_cost.present? and method.fixed_cost > 0 then float_to_currency_cart(method.fixed_cost, environment) else nil end
+      cost = if method.fixed_cost.present? and method.fixed_cost > 0 then method.fixed_cost_as_currency else nil end
       text = if cost.present? then "#{method.name} (#{cost})" else method.name end
  
       content_tag :option, text, value: method.id,
-        data: {label: method.name, type: method.delivery_type, instructions: method.description.to_s},
-        selected: if method == selected then 'selected' else nil end
+        data: {label: method.name, type: method.delivery_type, instructions: CGI::escapeHTML(method.description.to_s)},
+        selected: if method.id == selected then 'selected' else nil end
     end.join
   end
  
+  def consumer_delivery_field_value order, field
+    # BLACK OR WHITE: do not mix existing delivery data with user's location
+    if order.consumer_delivery_data.present?
+      order.consumer_delivery_data[field]
+    elsif user
+      user.send field
+    end
+  end
+
   def delivery_context
     @delivery_context || 'delivery_plugin/admin_method'
   end
 require_dependency 'profile'
  
-class Profile
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
  
-  has_many :delivery_methods, class_name: 'DeliveryPlugin::Method', foreign_key: :profile_id, dependent: :destroy, order: 'id ASC'
+  has_many :delivery_methods, -> { order 'id ASC' }, class_name: 'DeliveryPlugin::Method', foreign_key: :profile_id, dependent: :destroy
  
 end
+end
@@ -12,16 +12,23 @@
         delivery_type: 'Type'
         delivery_type_help: 'Pickup: the products will be delivered in the consumption place.<br>Delivery: the products will be delivered in the address asked by the consumer.'
         name: Name
-        name_help: Write the name of the Consumption Place or the 
-        fixed_cost: Fixed cost
-        free_over_price: Order's minimum price for free delivery
+        name_help: Write the name of the Consumption Place or the
+
+        costs_legend: Delivery's costs
+        fixed_cost: Fixed cost of delivery
+        free_over_price: Order's minimum value for free delivery
+
+        distribution_legend: Distribution's costs
+        distribution_margin_percentage: Distribution's margin
+        distribution_margin_fixed: Distribution's margin (fixed)
+
         instructions: Description
         instructions_help: "Write the address and other important informations about the place of this consumption place.<br> This text will be available"
     views:
-      delivery_option: 
-        select: 
+      delivery_option:
+        select:
           add: Add selected
-        _select_content: 
+        _select_content:
           add: Add option
           add_new: "add new"
           are_you_sure_you_want: "Are you sure you want to remove?"
@@ -29,14 +36,14 @@
           choose_a_delivery_met: "Choose a delivery method from the list"
           edit_this: "Edit"
           remove_method: "Remove"
-        _show: 
+        _show:
           x: X
-        select: 
+        select:
           add_a_delivery_method: "Add a delivery method to the Orders' Cycle"
       method:
         index:
           new: "New delivery or pickup"
-        edit: 
+        edit:
           add: Add
           back: back
           save: Save
@@ -13,15 +13,21 @@
         delivery_type_help: "Retirada: os produtos serão buscados pela(o) consumidor(a), por exemplo, no empreendimento, numa feira ou num Núcleo de Consumo.<br>Entrega: os produtos serão entregues no endereço solicitado pelo(a) consumidor(a)."
         name: Nome
         name_help: "Para opção Retirada: escreva o nome do local onde os produtos deverão ser retirados pela(o) consumidor(a), por exemplo o nome do Núcleo de Consumo, da feira ou do próprio empreendimento.<br>Para a opção Entrega: escreva o nome do local, (uma cidade ou região) ou a forma de entrega (Correios, transportadora)"
-        fixed_cost: Custo
-        free_over_price: "Preço mínimo do pedido para Entrega Grátis"
+
+        costs_legend: Custos de entrega
+        fixed_cost: Custo de entrega
+        free_over_price: "Valor mínimo do pedido para Entrega Grátis"
+        distribution_legend: Custos de distribuição
+        distribution_margin_percentage: Margem de distribuição
+        distribution_margin_fixed: Margem de distribuição (valor fixo)
+
         instructions: Descrição
         instructions_help: "Escreva informações importantes sobre esta opção de Retirada ou Entrega.<br>Por exemplo, o endereço completo do Núcleo de Consumo, a abrangência da região de entrega.<br> Este texto estará disponível no \"Finalizar pedido\" e, ao confirmar a compra, o(a) consumidor(a) receberá um email com o pedido realizado e as informações deste campo."
     views:
-      delivery_option: 
-        select: 
+      delivery_option:
+        select:
           add: "Adicionar selecionados"
-        _select_content: 
+        _select_content:
           add: Adicionar opção
           add_new: "adicionar novo"
           are_you_sure_you_want: "Tem certeza de que quer remover?"
@@ -29,14 +35,14 @@
           choose_a_delivery_met: "Escolha um método de entrega da lista"
           edit_this: Editar
           remove_method: "Remover"
-        _show: 
+        _show:
           x: X
-        select: 
+        select:
           add_a_delivery_method: "Adicionar um método de entrega ao ciclo de pedidos"
       method:
         index:
           new: "Nova forma de entrega ou retirada"
-        edit: 
+        edit:
           add: Adicionar
           back: voltar
           save: Salvar
 class DeliveryPlugin::Method < ActiveRecord::Base
  
-  extend CurrencyHelper::ClassMethods
-
   Types = ['pickup', 'deliver']
  
   # see also: Profile::LOCATION_FIELDS
@@ -10,7 +8,7 @@ class DeliveryPlugin::Method &lt; ActiveRecord::Base
   ].map(&:to_sym)
  
   attr_accessible :profile, :delivery_type, :name, :description,
-    :fixed_cost, :free_over_price
+    :fixed_cost, :free_over_price, :distribution_margin_percentage, :distribution_margin_fixed
  
   belongs_to :profile
  
@@ -20,8 +18,14 @@ class DeliveryPlugin::Method &lt; ActiveRecord::Base
   validates_presence_of :name
   validates_inclusion_of :delivery_type, in: Types
  
-  scope :pickup, conditions: {delivery_type: 'pickup'}
-  scope :delivery, conditions: {delivery_type: 'deliver'}
+  scope :pickup, -> { where delivery_type: 'pickup' }
+  scope :delivery, -> { where delivery_type: 'deliver'}
+
+  extend CurrencyHelper::ClassMethods
+  has_currency :fixed_cost
+  has_currency :free_over_price
+  has_currency :distribution_margin_percentage
+  has_currency :distribution_margin_fixed
  
   def pickup?
     self.delivery_type == 'pickup'
@@ -30,22 +34,40 @@ class DeliveryPlugin::Method &lt; ActiveRecord::Base
     self.delivery_type == 'deliver'
   end
  
-  def has_cost? order_price=nil
+  def has_distribution_margin?
+    (self.distribution_margin_percentage.present? and self.distribution_margin_percentage.nonzero?) or
+      (self.distribution_margin_fixed.present? and self.distribution_margin_fixed.nonzero?)
+  end
+
+  def has_fixed_cost? order_price=nil
     if order_price.present? and order_price.nonzero? and self.free_over_price.present? and self.free_over_price.nonzero?
       order_price <= self.free_over_price
     else
       self.fixed_cost.present? and self.fixed_cost.nonzero?
     end
   end
+
+  def distribution_margin order_price
+    value = 0
+    value += self.distribution_margin_fixed if self.distribution_margin_fixed.present?
+    value += order_price * (self.distribution_margin_percentage/100) if self.distribution_margin_percentage.present?
+    value
+  end
+
+  def has_cost? order_price=nil
+    has_cost = self.has_distribution_margin?
+    has_cost ||= self.has_fixed_cost? order_price
+  end
   def free? order_price=nil
     !self.has_cost?
   end
  
   def cost order_price=nil
-    if self.has_cost?(order_price) then self.fixed_cost.to_f else 0 end
+    value = 0
+    value += self.fixed_cost if self.has_fixed_cost? order_price
+    value += self.distribution_margin order_price if self.has_distribution_margin?
+    value
   end
-  has_currency :fixed_cost
-  has_currency :free_over_price
   has_currency :cost
  
   protected
@@ -3,7 +3,7 @@
 #delivery-method-edition {
   @extend .container-clean;
  
-  .field-help {
+  .help-block {
     font-size: 10px;
   }
 }
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,42 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class DeliveryPlugin::MethodTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = build(Profile)
+  end
+
+  attr_accessor :profile
+
+  should 'have a name and a delivery type' do
+    dm = DeliveryPlugin::Method.new :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile
+    assert dm.valid?
+    dm = DeliveryPlugin::Method.new :profile => profile
+    assert !dm.valid?
+  end
+
+  should 'accept only pickup and deliver as delivery types' do
+    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'unkown', :profile => profile)
+    assert !dm.valid?
+    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'pickup', :profile => profile)
+    assert dm.valid?
+    dm = build(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
+    assert dm.valid?
+  end
+
+  should 'filter by delivery types' do
+    dm_deliver = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
+    dm_pickup = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'pickup', :profile => profile)
+    assert_equal [dm_deliver], DeliveryPlugin::Method.delivery
+    assert_equal [dm_pickup], DeliveryPlugin::Method.pickup
+  end
+
+  should 'have many delivery options' do
+    dm = create(DeliveryPlugin::Method, :name => 'Delivery Deluxe', :delivery_type => 'deliver', :profile => profile)
+    cycle = build(OrdersCyclePlugin::Cycle, :name => 'cycle name', :profile => profile)
+    option = create(DeliveryPlugin::Option, :cycle => cycle, :delivery_method => dm)
+
+    assert_equal [option], dm.reload.delivery_options
+  end
+
+end
@@ -0,0 +1,24 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class DeliveryPlugin::OptionTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = build(Profile)
+    @cycle = build(OrdersCyclePluginCycle, :profile => @profile)
+    @delivery_method = build(OrdersCyclePluginMethod, :profile => @profile)
+  end
+
+  attr_accessor :profile
+  attr_accessor :cycle
+  attr_accessor :delivery_method
+
+  should 'be associated with a cycle and a delivery method' do
+    option = OrdersCyclePluginOption.new :cycle => @cycle, :delivery_method => @delivery_method
+    assert option.valid?
+    option = OrdersCyclePluginOption.new
+    :wa
+
+    assert !option.valid?
+  end
+
+end
@@ -2,30 +2,37 @@
 - edition = true if edition.nil?
 - readonly = !edition
  
-div.order-delivery-select
+div.order-delivery-select id='order-#{order.id}'
  
   div.supplier-delivery-data
-    = labelled_form_field _('Option'),
-      f.select(:supplier_delivery_id, supplier_delivery_options(methods: methods), {}, disabled: readonly,
-        onchange: 'delivery.order.select.onChange(this)', onkeyup: 'delivery.order.select.onChange(this)')
-    p.instructions
+    - if order.delivery_methods.size > 0
+      = labelled_form_field _('Option'),
+        f.select(:supplier_delivery_id, supplier_delivery_options(methods: methods, selected: order.supplier_delivery_id), {}, disabled: readonly,
+          onchange: 'delivery.order.select.onChange(this)', onkeyup: 'delivery.order.select.onChange(this)') + content_tag('div', '', class: 'help-block instructions')
+    - elsif (name = consumer_delivery_field_value order, :name).present?
+      = labelled_form_field _('Option'),
+        f.text_field(:address, value: name, readonly: true)
+      div class='help-block instructions' = h(consumer_delivery_field_value order, :description)
  
-  div.consumer-delivery-data
-    = f.fields_for :consumer_delivery_data, order.consumer_delivery_data do |ff|
-      = labelled_form_field _('Address (street and number)'),
-        ff.text_field(:address, value: order.consumer_delivery_data[:address], readonly: readonly)
-      = labelled_form_field _('Address completion'),
-        ff.text_field(:address_line2, value: order.consumer_delivery_data[:address_line2], readonly: readonly)
-      = labelled_form_field _('Address reference'),
-        ff.text_field(:address_reference, value: order.consumer_delivery_data[:address_reference], readonly: readonly)
-      = labelled_form_field _('District'),
-        ff.text_field(:district, value: order.consumer_delivery_data[:district], readonly: readonly)
-      = labelled_form_field _('City'),
-        ff.text_field(:city, value: order.consumer_delivery_data[:city], readonly: readonly)
-      = labelled_form_field _('State'),
-        ff.text_field(:state, value: order.consumer_delivery_data[:state], readonly: readonly)
-      = labelled_form_field _('ZIP code'),
-        ff.text_field(:zip_code, value: order.consumer_delivery_data[:zip_code], readonly: readonly)
+  / do not render on confirmation email (@view) if supplier_delivery is pickup
+  - unless (@view and order.supplier_delivery_data[:delivery_type] == 'pickup') or order.delivery_methods.size == 0
+    div.consumer-delivery-data
+      = f.fields_for :consumer_delivery_data do |ff|
+        = labelled_form_field _('Address (street and number)'),
+          ff.text_field(:address, value: consumer_delivery_field_value(order, :address), readonly: readonly)
+        = labelled_form_field _('Address completion'),
+          ff.text_field(:address_line2, value: consumer_delivery_field_value(order, :address_line2), readonly: readonly)
+        = labelled_form_field _('Address reference'),
+          ff.text_field(:address_reference, value: consumer_delivery_field_value(order, :address_reference), readonly: readonly)
+        = labelled_form_field _('District'),
+          ff.text_field(:district, value: consumer_delivery_field_value(order, :district), readonly: readonly)
+        = labelled_form_field _('City'),
+          ff.text_field(:city, value: consumer_delivery_field_value(order, :city), readonly: readonly)
+        = labelled_form_field _('State'),
+          ff.text_field(:state, value: consumer_delivery_field_value(order, :state), readonly: readonly)
+        = labelled_form_field _('ZIP code'),
+          ff.text_field(:zip_code, value: consumer_delivery_field_value(order, :zip_code), readonly: readonly)
+
+javascript:
+  delivery.order.select.onChange($('.order-delivery-select#order-#{order.id} #order_supplier_delivery_id'))
  
-  javascript:
-    delivery.order.select.onChange($('#order_supplier_delivery_id'))
@@ -12,15 +12,27 @@
   = labelled_field f, :name, t('delivery_plugin.models.method.name'), f.text_field(:name),
     help: t('delivery_plugin.models.method.name_help')
   = labelled_field f, :description, t('delivery_plugin.models.method.instructions'),
-    f.text_area(:description, rows: 5), help: t('delivery_plugin.models.method.instructions_help')
+    f.text_area(:description, rows: 5, class: 'mceEditor'), help: t('delivery_plugin.models.method.instructions_help')
  
-  = labelled_field f, :fixed_cost, t('delivery_plugin.models.method.fixed_cost'),
-    input_group_addon(environment.currency_unit){ f.text_field :fixed_cost, type: :number, step: '0.01', value: number_with_precision(delivery_method.fixed_cost, precision: 2, locale: :en)}
+  fieldset
+    legend= t'delivery_plugin.models.method.costs_legend'
+    = labelled_field f, :fixed_cost, t('delivery_plugin.models.method.fixed_cost'),
+      input_group_addon(environment.currency_unit){ f.text_field :fixed_cost, type: :number, step: 'any', value: number_with_precision(delivery_method.fixed_cost, precision: 2, locale: :en)}
  
-  = labelled_field f, :free_over_price, t('delivery_plugin.models.method.free_over_price'),
-    input_group_addon(environment.currency_unit){ f.text_field :free_over_price, type: :number, step: '0.01', value: number_with_precision(delivery_method.free_over_price, precision: 2, locale: :en)}
+    = labelled_field f, :free_over_price, t('delivery_plugin.models.method.free_over_price'),
+      input_group_addon(environment.currency_unit){ f.text_field :free_over_price, type: :number, step: 'any', value: number_with_precision(delivery_method.free_over_price, precision: 2, locale: :en)}
+
+  fieldset
+    legend= t'delivery_plugin.models.method.distribution_legend'
+    = labelled_field f, :distribution_margin_percentage, t('delivery_plugin.models.method.distribution_margin_percentage'),
+      input_group_addon('%'){ f.text_field :distribution_margin_percentage, type: :number, step: 'any', value: number_with_precision(delivery_method.distribution_margin_percentage, precision: 2, locale: :en)}
+
+    = labelled_field f, :distribution_margin_fixed, t('delivery_plugin.models.method.distribution_margin_fixed'),
+      input_group_addon(environment.currency_unit){ f.text_field :distribution_margin_fixed, type: :number, step: 'any', value: number_with_precision(delivery_method.distribution_margin_fixed, precision: 2, locale: :en)}
  
   div
     = submit_button :save, if delivery_method.new_record? then t('delivery_plugin.views.method.edit.add') else t('delivery_plugin.views.method.edit.save') end
     = link_to_function t('delivery_plugin.views.method.edit.back'), "delivery.method.view.toggle()"
  
+= render file: 'shared/tiny_mce', locals: {mode: 'simple'}
+
-td.name title="#{method.description}"
+td.name title="#{strip_tags method.description}"
   = method.name
 td.actions
   - if request.GET[:select_ids].present? and not method.id.to_s.in? Array(request.GET[:selected_ids])
-// FIXME: move to orders_cycle plugin
-jQuery('#cycle-delivery-options').html('<%= j render('index', owner: @owner) %>');
+// FIXME: use generic class
+$('#cycle-delivery-options').html('<%= j render('index', owner: @owner) %>');
 noosfero.modal.close()
  
@@ -0,0 +1,3 @@
+// FIXME: use generic class
+$('#cycle-delivery-options').html('<%= j render('index', owner: @owner) %>');
+
@@ -43,8 +43,8 @@ class OrdersPluginAdminController &lt; MyProfileController
     @orders_method = if @actor_name == :supplier then :sales else :purchases end
  
     @order = profile.send(@orders_method).find params[:id]
-    return render_access_denied unless @order.verify_actor? profile, @actor_name
-    @order.update_attributes params[:order]
+    return render_access_denied unless @user_is_admin or @order.verify_actor? profile, @actor_name
+    @order.update params[:order]
  
     respond_to do |format|
       format.js{ render 'orders_plugin_admin/edit' }
@@ -15,7 +15,7 @@ class OrdersPluginAdminItemController &lt; MyProfileController
     @actor_name = params[:actor_name].to_sym
     @order = if @actor_name == :consumer then @item.purchase else @item.sale end
  
-    @item.update_attributes! params[:item]
+    @item.update! params[:item]
   end
  
   def add_search
@@ -23,7 +23,7 @@ class OrdersPluginItemController &lt; MyProfileController
  
     if params[:item].present? and set_quantity_consumer_ordered params[:item][:quantity_consumer_ordered]
       params[:item][:quantity_consumer_ordered] = @quantity_consumer_ordered
-      @item.update_attributes! params[:item]
+      @item.update! params[:item]
     end
   end
  
@@ -8,6 +8,7 @@ class OrdersPluginOrderController &lt; ProfileController
   before_filter :load_order, except: [:new]
   before_filter :check_access, only: [:confirm, :remove, :cancel]
   before_filter :set_actor_name
+  before_filter :disable_purechat
  
   helper OrdersPlugin::TranslationHelper
   helper OrdersPlugin::DisplayHelper
@@ -19,7 +20,7 @@ class OrdersPluginOrderController &lt; ProfileController
  
   def load_order
     @order = hmvc_orders_context::Sale.find_by_id params[:id]
-    render_access_denied if @order.present? and not @order.may_view? user
+    render_access_denied if @order.present? and (not @user_is_admin or not @order.may_view? user)
   end
  
   def check_access access = 'view'
@@ -40,4 +41,8 @@ class OrdersPluginOrderController &lt; ProfileController
   extend HMVC::ClassMethods
   hmvc OrdersPlugin, orders_context: OrdersPlugin
  
+  def disable_purechat
+    @disable_purechat = true
+  end
+
 end
@@ -0,0 +1,15 @@
+class AddStatusToOrdersPluginItem < ActiveRecord::Migration
+
+  def change
+    add_column :orders_plugin_items, :status, :string
+    add_column :orders_plugin_orders, :building_next_status, :boolean
+
+    say_with_time "filling items' statuses..." do
+      OrdersPlugin::Item.includes(:order).find_each batch_size: 50 do |item|
+        next item.destroy if item.order.nil?
+        item.fill_status
+      end
+    end
+  end
+
+end
@@ -0,0 +1,58 @@
+module CodeNumbering
+  module ClassMethods
+    def code_numbering field, options = {}
+      class_attribute :code_numbering_field
+      class_attribute :code_numbering_options
+
+      self.code_numbering_field = field
+      self.code_numbering_options = options
+
+      before_create :create_code_numbering
+
+      include CodeNumbering::InstanceMethods
+    end
+  end
+
+  module InstanceMethods
+
+    def code
+      self.attributes[self.code_numbering_field.to_s]
+    end
+
+    def code_scope
+      scope = self.code_numbering_options[:scope]
+      case scope
+      when Symbol
+        self.send scope
+      when Proc
+        instance_exec &scope
+      else
+        self.class
+      end
+    end
+
+    def code_maximum
+      self.code_scope.maximum(self.code_numbering_field) || 0
+    end
+
+    def create_code_numbering
+      max = self.code_numbering_options[:start].to_i - 1 if self.code_numbering_options[:start]
+      max = self.code_maximum
+      self.send "#{self.code_numbering_field}=", max+1
+    end
+
+    def reset_scope_code_numbering
+      max = self.code_numbering_options[:start].to_i - 1 if self.code_numbering_options[:start]
+      max ||= 1
+
+      self.code_scope.order(:created_at).each do |record|
+        record.update_column self.code_numbering_field, max
+        max += 1
+      end
+      self.reload
+    end
+
+  end
+end
+
+ActiveRecord::Base.extend CodeNumbering::ClassMethods
 require_dependency 'profile'
+require_dependency 'community'
  
-# FIXME move to core
-class Profile
-
-  def has_admin? person
-    return unless person
-    person.has_permission? 'edit_profile', self
-  end
-
-end
-
-class Profile
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
  
   # cannot use :order because of months/years named_scope
   has_many :orders, class_name: 'OrdersPlugin::Sale', foreign_key: :profile_id
   has_many :sales, class_name: 'OrdersPlugin::Sale', foreign_key: :profile_id
   has_many :purchases, class_name: 'OrdersPlugin::Purchase', foreign_key: :consumer_id
  
-  has_many :ordered_items, through: :orders, source: :items, order: 'name ASC'
+  has_many :ordered_items, -> { order 'name ASC' }, through: :orders, source: :items
  
   has_many :sales_consumers, through: :sales, source: :consumer
-  has_many :purchases_consumers, through: :purchases, source: :consumer
+  has_many :purchases_consumers, through: :sales, source: :consumer
  
   has_many :sales_profiles, through: :sales, source: :profile
-  has_many :purchases_profiles, through: :purchases, source: :profile
+  has_many :purchases_profiles, through: :sales, source: :profile
+
+end
+end
+
+class Profile
+
+  # FIXME move to core
+  def has_admin? person
+    return unless person
+    person.has_permission? 'edit_profile', self
+  end
  
   def sales_all_consumers
     consumers = self.sales_consumers.order 'name ASC'
-    consumers.concat self.consumers.except_self.order('name ASC') if self.respond_to? :consumers
+    consumers.concat self.suppliers.except_self.order('name ASC') if self.respond_to? :suppliers
     consumers.uniq
   end
-  def purchases_all_suppliers
-    suppliers = self.purchases_profiles.order 'name ASC'
-    suppliers.concat self.suppliers.except_self.order('name ASC') if self.respond_to? :suppliers
-    suppliers.uniq
+  def purchases_all_consumers
+    consumers = self.purchases_consumers.order 'name ASC'
+    consumers.concat self.consumers.except_self.order('name ASC') if self.respond_to? :consumers
+    consumers.uniq
   end
  
   def self.create_orders_manager_role env_id
-require 'active_record/session_store'
+require_dependency 'session'
  
-class ActiveRecord::SessionStore::Session
+class Session
  
   has_many :orders, primary_key: :session_id, foreign_key: :session_id, class_name: 'OrdersPlugin::Order'
  
@@ -2,6 +2,8 @@ module OrdersPlugin::DisplayHelper
  
   protected
  
+  include HelpHelper
+
   include OrdersPlugin::TranslationHelper
   include OrdersPlugin::PriceHelper
   include OrdersPlugin::DateHelper
@@ -9,7 +11,8 @@ module OrdersPlugin::DisplayHelper
   include OrdersPlugin::TableHelper
   include OrdersPlugin::AdminHelper
   include OrdersPlugin::JavascriptHelper
-  include HelpHelper
+
+  include DeliveryPlugin::DisplayHelper
  
   # come on, you can't replace a rails api method (button_to_function was)!
   def submit_to_function name, function, html_options={}
@@ -6,7 +6,7 @@ module OrdersPlugin::FieldHelper
     help = options.delete(:help)
     content_tag :div,
       if form then form.label field, label, class: 'control-label' else label_tag field, label, class: 'control-label' end +
-      content_tag('div', help, class: 'field-help') +
+      content_tag('div', help, class: 'help-block') +
       content_tag('div', field_html, class: 'field-box') +
       content_tag('div', '', style: 'clear: both'),
       options.merge(class: options[:class].to_s + ' field form-group')
@@ -4,8 +4,6 @@ class OrdersPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
  
   helper ApplicationHelper
   helper OrdersPlugin::DisplayHelper
-  helper OrdersPlugin::DateHelper
-  helper OrdersPlugin::TranslationHelper
  
   attr_accessor :environment
   attr_accessor :profile
@@ -82,4 +80,10 @@ class OrdersPlugin::Mailer &lt; Noosfero::Plugin::MailerBase
     end
   end
  
+  # for order/show_simple form
+  def protect_against_forgery?
+    false
+  end
+  helper_method :protect_against_forgery?
+
 end
@@ -142,6 +142,7 @@ module OrdersPlugin::Report
       productsStart = sbs+5
       productsEnd = 0
       selled_sum = 0
+      total_price_without_margin = 0
       orders.each do |order|
  
         sheet.add_row [t('lib.report.order_code'), t('lib.report.member_name'), '', t('lib.report.phone'), '', t('lib.report.mail'), ''], style: bluecell_b_top
@@ -188,6 +189,7 @@ module OrdersPlugin::Report
           style: [default,default,default,default,default,currency,currency],
           formula_values: [nil,nil,nil,nil,nil,nil,formula_value_s]
           selled_sum += item.status_quantity * item.price rescue 0
+          total_price_without_margin += item.price_without_margins * item.status_quantity
  
           sbe += 1
           sum += formula_value
@@ -200,12 +202,11 @@ module OrdersPlugin::Report
         sbs = sbe + 2
       end
  
-      sheet.add_row [t('lib.report.selled_total'), '', "=SUM(G#{productsStart}:G#{productsEnd})"],
-        formula_values: [nil,nil, selled_sum],
-        style: [redcell,redcell,currency]
-
-      ["A#{sbs}:B#{sbs}"].each{ |c| sheet.merge_cells c }
+      sheet.add_row [t('lib.report.selled_total'), '', "=SUM(G#{productsStart}:G#{productsEnd})", t('lib.report.total_price_without_margin'),"","", total_price_without_margin],
+        formula_values: [nil, nil, selled_sum, nil, nil, nil, nil],
+        style: [redcell, redcell, currency, redcell, redcell, redcell, currency]
  
+      ["A#{sbs}:B#{sbs}", "D#{sbs}:F{sbs}"].each{ |c| sheet.merge_cells c }
  
       sheet.column_widths 15,30,30,9,8,10,11
     end # closes spreadsheet
-"en-US": &en-US
+en-US: &en-US
+
+  number:
+    currency:
+      format:
+        xlsx_currency: "[$$-409]* #.##0,00;[RED]-[$$-409]* #.##0,00"
  
   orders_plugin:
     terms:
@@ -77,6 +82,7 @@
         supplier: "%{terms.supplier.singular.capitalize}"
         total_parcel_value: "Total value using stock"
         total_selled_value: "Total selled value"
+        total_price_without_margin: "Total price without margin"
         total_value: "Total Value"
         un: un.
         value: value
@@ -299,8 +305,8 @@
           supplier_product: "%{terms.supplier.singular.capitalize}/Product"
           total: "TOTAL:"
  
-'en_US':
+en_US:
   <<: *en-US
-'en':
+en:
   <<: *en-US
  
-"pt-BR": &pt-BR
+pt-BR: &pt-BR
+
+  number:
+    currency:
+      format:
+        xlsx_currency: "[$R$-416]* #,##0.00;[RED]-[$R$-416]* #,##0.00"
  
   orders_plugin:
     terms:
@@ -78,6 +83,7 @@
         supplier: "%{terms.supplier.singular.capitalize}"
         total_parcel_value: "Valor total usando estoque"
         total_selled_value: "Valor total vendido"
+        total_price_without_margin: "Valor total sem a margem"
         total_value: "total pago"
         un: un.
         value: Valor
@@ -299,8 +305,8 @@
           supplier_product: "%{terms.supplier.singular.capitalize}/Produto"
           total: "TOTAL:"
  
-'pt_BR':
+pt_BR:
   <<: *pt-BR
-'pt':
+pt:
   <<: *pt-BR
  
@@ -7,6 +7,13 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
   # flag used by items to compare them with products
   attr_accessor :product_diff
  
+  Statuses = %w[ordered accepted separated delivered received]
+  DbStatuses = %w[draft planned cancelled] + Statuses
+  UserStatuses = %w[open forgotten planned cancelled] + Statuses
+  StatusText = {}; UserStatuses.map do |status|
+    StatusText[status] = "orders_plugin.models.order.statuses.#{status}"
+  end
+
   # should be Order, but can't reference it here so it would create a cyclic reference
   StatusAccessMap = {
     'ordered' => :consumer,
@@ -28,9 +35,9 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
  
   serialize :data
  
-  belongs_to :order, class_name: 'OrdersPlugin::Order', foreign_key: :order_id, touch: true
-  belongs_to :sale, class_name: 'OrdersPlugin::Sale', foreign_key: :order_id, touch: true
-  belongs_to :purchase, class_name: 'OrdersPlugin::Purchase', foreign_key: :order_id, touch: true
+  belongs_to :order, class_name: '::OrdersPlugin::Order', foreign_key: :order_id, touch: true
+  belongs_to :sale, class_name: '::OrdersPlugin::Sale', foreign_key: :order_id, touch: true
+  belongs_to :purchase, class_name: '::OrdersPlugin::Purchase', foreign_key: :order_id, touch: true
  
   belongs_to :product
   has_one :supplier, through: :product
@@ -40,28 +47,30 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
  
   # FIXME: don't work because of load order
   #if defined? SuppliersPlugin
-    has_many :from_products, through: :product, source: :orders
+    has_many :from_products, through: :product
+    has_one :from_product, through: :product
     has_many :to_products, through: :product
-    has_many :sources_supplier_products, through: :product, source: :items
-    has_many :supplier_products, through: :product, source: :enterprise
+    has_one :to_product, through: :product
+    has_many :sources_supplier_products, through: :product
+    has_one :sources_supplier_product, through: :product
+    has_many :supplier_products, through: :product
+    has_one :supplier_product, through: :product
     has_many :suppliers, through: :product
+    has_one :supplier, through: :product
   #end
-  def from_product
-    self.from_products.first
-  end
-  def supplier_product
-    self.supplier_products.first
-  end
  
-  scope :ordered, conditions: ['orders_plugin_orders.status = ?', 'ordered'], joins: [:order]
-  scope :for_product, lambda{ |product| {conditions: {product_id: product.id}} }
+  scope :ordered, -> { joins(:order).where 'orders_plugin_orders.status = ?', 'ordered' }
+  scope :for_product, -> (product) { where product_id: product.id }
  
   default_scope include: [:product]
  
   validate :has_order
   validates_presence_of :product
+  validates_inclusion_of :status, in: DbStatuses
  
+  before_validation :set_defaults
   before_save :save_calculated_prices
+  before_save :step_status
   before_create :sync_fields
  
   # utility for other classes
@@ -104,6 +113,9 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
   def price
     self[:price] || (self.product.price_with_discount || 0 rescue nil)
   end
+  def price_without_margins
+    self.product.price_without_margins rescue self.price
+  end
   def unit
     self.product.unit
   end
@@ -121,8 +133,15 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
     end
   end
  
-  def status
-    self.order.status
+  def calculated_status
+    status = self.order.status
+    index = Statuses.index status
+    next_status = Statuses[index+1] if index
+    next_quantity = "quantity_#{StatusDataMap[next_status]}" if next_status
+    if next_status and self.send next_quantity then next_status else status end
+  end
+  def on_next_status?
+    self.order.status != self.calculated_status
   end
  
   # product used for comparizon when repeating an order
@@ -144,13 +163,13 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
  
   def status_quantity_field
     @status_quantity_field ||= begin
-      status = StatusDataMap[self.order.status] || 'consumer_ordered'
+      status = StatusDataMap[self.status] || 'consumer_ordered'
       "quantity_#{status}"
     end
   end
   def status_price_field
     @status_price_field ||= begin
-      status = StatusDataMap[self.order.status] || 'consumer_ordered'
+      status = StatusDataMap[self.status] || 'consumer_ordered'
       "price_#{status}"
     end
   end
@@ -184,10 +203,10 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
  
   def quantity_price_data actor_name
     data = {flags: {}}
-    statuses = OrdersPlugin::Order::Statuses
+    statuses = ::OrdersPlugin::Order::Statuses
     statuses_data = data[:statuses] = {}
  
-    current = statuses.index(self.order.status) || 0
+    current = statuses.index(self.status) || 0
     next_status = self.order.next_status actor_name
     next_index = statuses.index(next_status) || current + 1
     goto_next = actor_name == StatusAccessMap[next_status]
@@ -266,8 +285,11 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
  
     # Set access
     statuses_data.each.with_index do |(status, status_data), i|
-      status_data[:flags][:editable] = true if StatusAccessMap[status] == actor_name
-      # code to only allow last status
+      #consumer_may_edit = actor_name == :consumer and status == 'ordered' and self.order.open?
+      if StatusAccessMap[status] == actor_name
+        status_data[:flags][:editable] = true
+      end
+      # only allow last status
       #status_data[:flags][:editable] = true if status_data[:access] == actor_name and (status_data[:flags][:admin] or self.order.open?)
     end
  
@@ -279,6 +301,14 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
     self.save_calculated_prices
   end
  
+  # used by db/migrate/20150627232432_add_status_to_orders_plugin_item.rb
+  def fill_status
+    status = self.calculated_status
+    return if self.status == status
+    self.update_column :status, status
+    self.order.update_column :building_next_status, true if self.order.status != status and not self.order.building_next_status
+  end
+
   protected
  
   def save_calculated_prices
@@ -288,6 +318,17 @@ class OrdersPlugin::Item &lt; ActiveRecord::Base
     end
   end
  
+  def set_defaults
+    self.status ||= Statuses.first
+  end
+
+  def step_status
+    status = self.calculated_status
+    return if self.status == status
+    self.status = status
+    self.order.update_column :building_next_status, true if self.order.status != status and not self.order.building_next_status
+  end
+
   def has_order
     self.order or self.sale or self.purchase
   end
 class OrdersPlugin::Order < ActiveRecord::Base
  
-  Statuses = %w[ordered accepted separated delivered received]
-  DbStatuses = %w[draft planned cancelled] + Statuses
-  UserStatuses = %w[open forgotten planned cancelled] + Statuses
-  StatusText = {}; UserStatuses.map do |status|
-    StatusText[status] = "orders_plugin.models.order.statuses.#{status}"
-  end
+  # if abstract_class is true then it will trigger https://github.com/rails/rails/issues/20871
+  #self.abstract_class = true
+
+  Statuses = ::OrdersPlugin::Item::Statuses
+  DbStatuses = ::OrdersPlugin::Item::DbStatuses
+  UserStatuses = ::OrdersPlugin::Item::UserStatuses
+  StatusText = ::OrdersPlugin::Item::StatusText
  
   # oh, we need a payments plugin!
   PaymentMethods = {
@@ -31,18 +32,14 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
   ]
  
   # copy, for easiness. can't be declared to here to avoid cyclic reference
-  StatusDataMap = OrdersPlugin::Item::StatusDataMap
-  StatusAccessMap = OrdersPlugin::Item::StatusAccessMap
+  StatusDataMap = ::OrdersPlugin::Item::StatusDataMap
+  StatusAccessMap = ::OrdersPlugin::Item::StatusAccessMap
  
   StatusesByActor = {
     consumer: StatusAccessMap.map{ |s, a| s if a == :consumer }.compact,
     supplier: StatusAccessMap.map{ |s, a| s if a == :supplier }.compact,
   }
  
-  # workaround for STI
-  self.table_name = :orders_plugin_orders
-  self.abstract_class = true
-
   attr_accessible :status, :consumer, :profile,
     :supplier_delivery_id, :consumer_delivery_id, :supplier_delivery_data, :consumer_delivery_data
  
@@ -51,17 +48,17 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
   belongs_to :supplier, foreign_key: :profile_id, class_name: 'Profile'
   belongs_to :consumer, class_name: 'Profile'
  
-  belongs_to :session, primary_key: :session_id, foreign_key: :session_id, class_name: 'ActiveRecord::SessionStore::Session'
+  belongs_to :session, primary_key: :session_id, foreign_key: :session_id, class_name: 'Session'
  
-  has_many :items, class_name: 'OrdersPlugin::Item', foreign_key: :order_id, dependent: :destroy, order: 'name ASC'
+  has_many :items, -> { order 'name ASC' }, class_name: 'OrdersPlugin::Item', foreign_key: :order_id, dependent: :destroy
   has_many :products, through: :items
  
   belongs_to :supplier_delivery, class_name: 'DeliveryPlugin::Method'
   belongs_to :consumer_delivery, class_name: 'DeliveryPlugin::Method'
  
-  scope :alphabetical, -> { joins(:consumer).order 'profiles.name ASC' }
-  scope :latest, -> { order 'code ASC' }
-  scope :default_order, -> { order 'code DESC' }
+  scope :alphabetical, -> { joins(:consumer).reorder 'profiles.name ASC' }
+  scope :latest, -> { reorder 'code ASC' }
+  scope :default_order, -> { reorder 'code DESC' }
  
   scope :of_session, -> session_id { where session_id: session_id }
   scope :of_user, -> session_id, consumer_id=nil do
@@ -73,53 +70,50 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
  
   scope :latest, order: 'created_at DESC'
  
-  scope :draft,     conditions: {status: 'draft'}
-  scope :planned,   conditions: {status: 'planned'}
-  scope :cancelled, conditions: {status: 'cancelled'}
-  scope :not_cancelled, conditions: ["status <> 'cancelled'"]
-  scope :ordered,   conditions: ['ordered_at IS NOT NULL']
-  scope :confirmed, conditions: ['ordered_at IS NOT NULL']
-  scope :accepted,  conditions: ['accepted_at IS NOT NULL']
-  scope :separated, conditions: ['separated_at IS NOT NULL']
-  scope :delivered, conditions: ['delivered_at IS NOT NULL']
-  scope :received,  conditions: ['received_at IS NOT NULL']
-
-  scope :for_profile, lambda{ |profile| {conditions: {profile_id: profile.id}} }
-  scope :for_profile_id, lambda{ |profile_id| {conditions: {profile_id: profile_id}} }
-  scope :for_supplier, lambda{ |profile| {conditions: {profile_id: profile.id}} }
-  scope :for_supplier_id, lambda{ |profile_id| {conditions: {profile_id: profile_id}} }
-  scope :for_consumer, lambda{ |consumer| {conditions: {consumer_id: (consumer.id rescue nil)}} }
-  scope :for_consumer_id, lambda{ |consumer_id| {conditions: {consumer_id: consumer_id}} }
-
-  scope :months, select: 'DISTINCT(EXTRACT(months FROM orders_plugin_orders.created_at)) as month', order: 'month DESC'
-  scope :years, select: 'DISTINCT(EXTRACT(YEAR FROM orders_plugin_orders.created_at)) as year', order: 'year DESC'
-
-  scope :by_month, lambda { |month|
-    where 'EXTRACT(month FROM orders_plugin_orders.created_at) <= :month AND EXTRACT(month FROM orders_plugin_orders.created_at) >= :month',{ month: month }
+  scope :draft,     -> { where status: 'draft' }
+  scope :planned,   -> { where status: 'planned' }
+  scope :cancelled, -> { where status: 'cancelled' }
+  scope :not_cancelled, -> { where "status <> 'cancelled'" }
+  scope :ordered,   -> { where 'ordered_at IS NOT NULL' }
+  scope :confirmed, -> { where 'ordered_at IS NOT NULL' }
+  scope :accepted,  -> { where 'accepted_at IS NOT NULL' }
+  scope :separated, -> { where 'separated_at IS NOT NULL' }
+  scope :delivered, -> { where 'delivered_at IS NOT NULL' }
+  scope :received,  -> { where 'received_at IS NOT NULL' }
+
+  scope :for_profile, -> (profile) { where profile_id: profile.id }
+  scope :for_profile_id, -> (profile_id) { where profile_id: profile_id }
+  scope :for_supplier, -> (profile) { where profile_id: profile.id }
+  scope :for_supplier_id, -> (profile_id) { where profile_id: profile_id }
+  scope :for_consumer, -> (consumer) { where consumer_id: (consumer.id rescue nil) }
+  scope :for_consumer_id, -> (consumer_id) { where consumer_id: consumer_id }
+
+  scope :months, -> { select('DISTINCT(EXTRACT(months FROM orders_plugin_orders.created_at)) as month').order('month DESC') }
+  scope :years, -> { select('DISTINCT(EXTRACT(YEAR FROM orders_plugin_orders.created_at)) as year').order('year DESC') }
+
+  scope :by_month, -> (month) {
+    where 'EXTRACT(month FROM orders_plugin_orders.created_at) <= :month AND EXTRACT(month FROM orders_plugin_orders.created_at) >= :month', month: month
   }
-  scope :by_year, lambda { |year|
-    where 'EXTRACT(year FROM orders_plugin_orders.created_at) <= :year AND EXTRACT(year FROM orders_plugin_orders.created_at) >= :year', { year: year }
+  scope :by_year, -> (year) {
+    where 'EXTRACT(year FROM orders_plugin_orders.created_at) <= :year AND EXTRACT(year FROM orders_plugin_orders.created_at) >= :year', year: year
   }
-  scope :by_range, lambda { |start_time, end_time|
-    where 'orders_plugin_orders.created_at >= :start AND orders_plugin_orders.created_at <= :end', { start: start_time, end: end_time }
+  scope :by_range, -> (start_time, end_time) {
+    where 'orders_plugin_orders.created_at >= :start AND orders_plugin_orders.created_at <= :end', start: start_time, end: end_time
   }
  
-  scope :with_status, lambda { |status|
-    where status: status
-  }
-  scope :with_code, lambda { |code|
-    where code: code
-  }
+  scope :with_status, -> (status) { where status: status }
+  scope :with_code, -> (code) { where code: code }
  
   validates_presence_of :profile
   # consumer is optional, as orders can be made by unlogged users
   validates_inclusion_of :status, in: DbStatuses
  
   before_validation :check_status
+  before_validation :change_status
   after_save :send_notifications
  
   extend CodeNumbering::ClassMethods
-  code_numbering :code, scope: proc{ self.profile.orders }
+  code_numbering :code, scope: -> { self.profile.orders }
  
   serialize :data
  
@@ -165,17 +159,17 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
   #         / Items
   #        /       \ OfferedProduct (column product_id)
   # Order /         \ SourceProduct from DistributedProduct (quantity=1, always)
-  #                  \ SourceProduct from Product* (quantity be more than 1 if DistributedProduct is an agregate product)
+  #                  \ SourceProduct from Product* (multiple for each if is an aggregate product)
   # for order outside cycle we have
   #         / Items
   #        /       \ SourceProduct from DistributedProduct (quantity=1, always)
-  # Order /         \ SourceProduct from Product* (quantity be more than 1 if DistributedProduct is an agregate product)
+  # Order /         \ SourceProduct from Product* (multiple for each if is an aggregate product)
   #
   # *suppliers usually don't distribute using cycles, so they only have Product
   #
   def self.supplier_products_by_suppliers orders
     products_by_supplier = {}
-    items = OrdersPlugin::Item.where(order_id: orders.map(&:id)).includes({sources_supplier_products: [:supplier, :from_product]})
+    items = self.parent::Item.where(order_id: orders.map(&:id)).includes(sources_supplier_products: [:supplier, :from_product])
     items.each do |item|
       if item.sources_supplier_products.present?
         item.sources_supplier_products.each do |source_sp|
@@ -358,15 +352,14 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
  
   # total_price considering last state
   def total_price actor_name = :consumer, admin = false
-    if not self.pre_order? and admin and status = self.next_status(actor_name)
-      self.fill_items_data self.status, status
+    # for admins, we want the next_status while we concluded the finish status change
+    if admin
+      price = :status_price
     else
-      status = self.status
+      data = StatusDataMap[self.status] || StatusDataMap[Statuses.first]
+      price = "price_#{data}".to_sym
     end
  
-    data = StatusDataMap[status] || StatusDataMap[Statuses.first]
-    price = "price_#{data}".to_sym
-
     items ||= (self.ordered_items rescue nil) || self.items
     items.collect(&price).inject(0){ |sum, p| sum + p.to_f }
   end
@@ -379,7 +372,8 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
   end
   has_currency :total
  
-  def fill_items_data from_status, to_status, save = false
+  def fill_items from_status, to_status, save = false
+    # check for status advance
     return if (Statuses.index(to_status) <= Statuses.index(from_status) rescue true)
  
     from_data = StatusDataMap[from_status]
@@ -405,15 +399,22 @@ class OrdersPlugin::Order &lt; ActiveRecord::Base
     self.status ||= 'draft'
     # backwards compatibility
     self.status = 'ordered' if self.status == 'confirmed'
+  end
+
+  def change_status
+    return if self.status_was == self.status
  
-    self.fill_items_data self.status_was, self.status, true
+    self.fill_items self.status_was, self.status, true
+    self.items.update_all status: self.status
+    self.building_next_status = false
  
+    # fill dates on status advance
     if self.status_on? 'ordered'
       Statuses.each do |status|
         self.send "#{self.status}_at=", Time.now if self.status_was != status and self.status == status
       end
     else
-      # for draft, planned, forgotten, cancelled, etc
+      # status rewind for draft, planned, forgotten, cancelled, etc
       Statuses.each do |status|
         self.send "#{status}_at=", nil
       end
 class OrdersPlugin::Sale < OrdersPlugin::Order
  
+  before_validation :fill_default_supplier_delivery
+
   def orders_name
     'sales'
   end
@@ -19,6 +21,17 @@ class OrdersPlugin::Sale &lt; OrdersPlugin::Order
   has_number_with_locale :purchase_quantity_total
   has_currency :purchase_price_total
  
+  def supplier_delivery
+    super || (self.delivery_methods.first rescue nil)
+  end
+  def supplier_delivery_id
+    self[:supplier_delivery_id] || (self.supplier_delivery.id rescue nil)
+  end
+
+  def fill_default_supplier_delivery
+    self[:supplier_delivery_id] ||= self.supplier_delivery.id if self.supplier_delivery
+  end
+
   protected
  
 end
@@ -0,0 +1 @@
+/home/braulio/Projects/noosfero-ecosol/noosfero/plugins/orders
 \ No newline at end of file
@@ -139,21 +139,12 @@ orders = {
     },
   },
  
-  set_orders_container_max_height: function()
+  setOrderMaxHeight: function()
   {
     ordersH = $(window).height();
-    ordersH -= 100
     ordersH -= $('#cirandas-top-bar').outerHeight()
-    ordersH -= $('.order-status-message').outerHeight()
-    ordersH -= $('.order-message-title').outerHeight()
-    ordersH -= $('#order-column .order-items .table-header').last().outerHeight()
-    ordersH -= $('#order-column .order-total').last().outerHeight()
-    ordersH -= $('#order-column #actor-data-box').last().outerHeight()
-    ordersH -= $('#order-column .delivery-box').outerHeight()
-    ordersH -= $('#order-column .order-message-text').outerHeight()
-    ordersH -= $('#order-column .order-message-actions').outerHeight()
-    ordersH -= $('#order-column .actions').outerHeight()
-    $('.order-items-container .order-items-scroll').css('max-height', ordersH);
+    ordersH -= $('.order-view form > .actions').outerHeight(true)
+    $('.order-view .order-data').css('max-height', ordersH);
   },
  
   daterangepicker: {
@@ -180,6 +171,7 @@ orders = {
   },
 };
  
-$(document).ready(orders.set_orders_container_max_height);
-$(window).resize(orders.set_orders_container_max_height);
+$(document).ready(orders.setOrderMaxHeight);
+$(window).resize(orders.setOrderMaxHeight);
+$('#order_supplier_delivery_id').change(orders.setOrderMaxHeight);
  
@@ -0,0 +1 @@
+/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/orders/public
 \ No newline at end of file
@@ -25,9 +25,8 @@
     float: left;
     width: 100%;
   }
-  .field-help {
+  .help-block {
     clear: both;
-    margin-bottom: $half-margin;
     font-size: 10px;
   }
  
@@ -102,9 +102,6 @@
  
   .table-content {
  
-    .order-items-scroll {
-      max-height: 350px;
-    }
     .item {
  
       &.product-unavailable {
@@ -9,10 +9,10 @@
 @import 'items';
  
 .controller-profile_editor a.control-panel-orders-purchases-sales {
-  background-image: url("/plugins/orders/images/control-panel/purchases-sales.png")
+  background-image: url("/plugins/orders/images/control-panel/purchases-sales.png");
 }
 .controller-profile_editor .msie6 a.control-panel-orders-purchases-sales {
-  background-image: url("/plugins/orders/images/control-panel/purchases-sales.gif")
+  background-image: url("/plugins/orders/images/control-panel/purchases-sales.gif");
 }
  
 .orders-admin-index {
@@ -125,14 +125,13 @@
 }
  
 .order-view {
-
-  &, .order-items-scroll, .order-items, .item {
+  &, .order-items, .item {
     width: $order-items-width;
   }
   &.admin {
     width: $order-items-admin-width;
  
-    .order-items-scroll, .order-items, .item {
+    .order-items, .item {
       width: $order-items-admin-width - 2*$border;
     }
   }
@@ -160,16 +159,14 @@
  
     margin: 0;
     border: none;
+
+    overflow: hidden;
+    overflow-y: auto;
+
     &.admin {
       border: $border solid black;
     }
  
-    .order-items-scroll {
-      overflow-y: auto;
-      padding-right: $intercolumn;
-      box-sizing: content-box;
-    }
-
     .order-header {
       padding: $half-padding $padding;
       border-bottom: $border solid black;
@@ -223,7 +220,10 @@
   padding-bottom: 200px;
 }
  
-.action-orders_cycle_plugin_order-edit .purechat {
-  left: 40px;
-  right: none;
+.controller-orders_cycle_plugin_order,
+.controller-consumers_coop_plugin_order {
+  .purechat {
+    left: 40px;
+    right: none;
+  }
 }
@@ -0,0 +1 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+
+class OrdersPlugin::ItemTest < ActiveSupport::TestCase
+
+  def setup
+    @item = build(OrdersPlugin::Item,
+     :quantity_shipped => 1.0, :quantity_consumer_ordered => 2.0, :quantity_accepted => 3.0,
+     :price_shipped => 10.0, :price_consumer_ordered => 20.0, :price_accepted => 30.0)
+  end
+
+  should 'calculate prices' do
+  end
+
+end
@@ -0,0 +1,121 @@
+require "test_helper"
+
+class OrdersPlugin::OrderTest < ActiveSupport::TestCase
+
+  def setup
+    @order = build(OrdersPlugin::Order)
+  end
+
+  should 'report supplier products when distributing aggregate products' do
+    env = Environment.create! name: 'megacoop'
+    supplier = Enterprise.create! identifier: 'supplier', name: 'supplier', environment: env
+    p1 = supplier.products.create! product_category: ProductCategory.create!(name: 'banana', environment: env)
+    p2 = supplier.products.create! product_category: ProductCategory.create!(name: 'aipim', environment: env)
+
+    coop = Community.create! identifier: 'blah', name: 'blah', environment: env
+    coop.suppliers.create! profile: supplier, consumer: coop
+    aggregate_product = SuppliersPlugin::DistributedProduct.new profile: coop
+    aggregate_product.sources_from_products.build quantity: 1, from_product: p1, to_product: aggregate_product
+    aggregate_product.sources_from_products.build quantity: 5, from_product: p2, to_product: aggregate_product
+    aggregate_product.save!
+
+    # hack
+    person = coop
+
+    # this also create offered products
+    cycle = OrdersCyclePlugin::Cycle.create! name: 'blah', profile: coop, start: Time.now, finish: Time.now+1.day, delivery_start: Time.now+2.days, delivery_finish: Time.now+3.days, status: 'orders'
+    sale = cycle.sales.create! profile: person
+    sale.items.create! quantity_consumer_ordered: 3, product: aggregate_product
+
+    r = OrdersPlugin::Order.supplier_products_by_suppliers [sale]
+    quantities = r.first.last.map(&:quantity_ordered).map(&:to_i)
+    assert_equal [3*1,3*5], quantities
+  end
+
+  should 'format code with cycle code' do
+    @order.save!
+    assert_equal "#{@order.cycle.code}.#{@order.attributes['code']}", @order.code
+  end
+
+  should 'use as draft default status' do
+    @order = create(OrdersPlugin::Order, status: nil)
+    assert_equal 'draft', @order.status
+  end
+
+  ###
+  # Status
+  ###
+
+  should 'define and validate list of statuses' do
+    @order.status = 'blah'
+    @order.valid?
+    assert @order.errors.invalid?('status')
+
+    ['draft', 'planned', 'ordered', 'cancelled'].each do |i|
+      @order.status = i
+      @order.valid?
+      assert !@order.errors.invalid?('status')
+    end
+  end
+
+  should 'define status question methods' do
+    ['draft', 'planned', 'ordered', 'cancelled'].each do |i|
+      @order.status = i
+      assert @order.send("#{@order.status}?")
+    end
+  end
+
+  should 'define forgotten and open status' do
+    @order.status = 'draft'
+    assert @order.draft?
+    assert @order.cycle.orders?
+    assert @order.open?
+    @order.cycle.status = 'closed'
+    assert !@order.open?
+    assert @order.forgotten?
+  end
+
+  should 'return current status using forgotten and open too' do
+    @order.status = 'draft'
+    assert @order.open?
+    assert_equal 'open', @order.current_status
+    @order.cycle.status = 'closed'
+    assert @order.forgotten?
+    assert_equal 'forgotten', @order.current_status
+  end
+
+  should 'define status_message method' do
+    assert @order.respond_to?(:status_message)
+  end
+
+  ###
+  # Delivery
+  ###
+
+  should 'give default value to supplier delivery if not present' do
+    @order.save!
+    @order.profile.save!
+
+    @order.cycle.delivery_methods = []
+    @order.supplier_delivery = nil
+    assert_nil @order.supplier_delivery
+
+    default = @order.cycle.delivery_methods.create! profile: @order.profile, name: 'method', delivery_type: 'deliver'
+    assert_equal default, @order.supplier_delivery
+    assert_equal default.id, @order.supplier_delivery_id
+  end
+
+  ###
+  # Totals
+  ###
+
+  should 'give total price and quantity asked' do
+    @order.cycle.profile.save!
+    product = create(SuppliersPlugin::DistributedProduct, price: 2.0, profile: @order.cycle.profile, supplier: @order.cycle.profile.self_supplier)
+    @order.save!
+    @order.item.create! product: @order.cycle.products.first, quantity_consumer_ordered: 2.0
+    assert_equal 2.0, @order.total_quantity_consumer_ordered
+    assert_equal 4.0, @order.total_price_consumer_ordered
+  end
+
+end
@@ -0,0 +1,30 @@
+doctype html
+html
+  head
+    meta content=("text/html; charset=utf-8") http-equiv="Content-Type"
+    = stylesheet_link_tag 'plugins/responsive/bootstrap/all.css' if defined? ResponsivePlugin
+    = stylesheet_link_tag 'plugins/orders/style.css'
+  body
+    p= t'orders_plugin.views.mailer.order_confirmation.dear_name', name: @consumer.name
+
+    p= t'orders_plugin.views.mailer.order_confirmation.your_order_made_on_co',
+      name: @profile.name, date: day_time(@order.updated_at)
+
+    - if @order.respond_to? :cycle
+      p= t'orders_plugin.views.mailer.order_confirmation.the_delivery_period_w',
+        date: datetime_period_with_from(@order.cycle.delivery_start, @order.cycle.delivery_finish)
+
+    p= t'orders_plugin.views.mailer.order_confirmation.order_data_confirmed'
+
+    = render "orders_plugin_order/show_simple", order: @order, actor_name: :consumer
+
+    p
+      = t('orders_plugin.views.mailer.order_confirmation.your_order_can_be_che')
+      br
+      = link_to t('orders_plugin.views.mailer.order_confirmation.order_code_of_profile') % {code: @order.code, name: @profile.name },
+        {controller: :orders_cycle_plugin_order, action: :edit, profile: @profile.identifier, id: @order.id, protocol: "http"}
+
+    p
+      |--
+      br
+      = t'orders_plugin.views.mailer.order_confirmation.greetings'
 = content_for :head do
   = stylesheet_link_tag '/assets/plugins/orders/stylesheets/daterangepicker-bs3.css'
   / in case it is not loaded for this theme
-  = stylesheet_link_tag '/assets/designs/icons/awesome/scss/font-awesome.css'
+  = stylesheet_link_tag 'designs/icons/awesome/scss/font-awesome.css'
   = javascript_include_tag '/assets/plugins/orders/javascripts/moment-with-locales.js'
   = javascript_include_tag '/assets/plugins/orders/javascripts/daterangepicker.js'
  
@@ -3,21 +3,21 @@
 div= render 'orders_plugin/shared/daterangepicker/init'
  
 .field.state
-  label for="status" = t'views.filter.status'
+  label= t'views.filter.status'
   div= select_tag :status,
     options_for_select([[t('views.filter.all'), ""]] + OrdersPlugin::Order::StatusText.map{ |id, name| [t(name), id] }, params[:status])
  
 .field.code
-  label for="code" = t'views.filter.code'
+  label= t'views.filter.code'
   div= text_field_tag :code, params[:code]
  
 div class="field #{actor_name}"
-  label for="#{actor_name}_id" = t"terms.#{actor_name}.singular", transformation: :capitalize
+  label= t"terms.#{actor_name}.singular", transformation: :capitalize
   div= select_tag "#{actor_name}_id",
     options_for_select([[t('views.filter.all'), ""]] + actors.map{ |a| [a.name, a.id] }, params["#{actor_name}_id"])
  
 .field.delivery
-  label for="delivery_method_id" = t'views.filter.delivery'
+  label= t'views.filter.delivery'
   div= select_tag :delivery_method_id,
     options_for_select([[t('views.filter.all'), ""]] + orders_owner.delivery_methods.map{ |dm| [dm.name, dm.id] }, params[:delivery_method_id])
  
@@ -12,14 +12,14 @@
  
   <% if @purchases.present? %>
     <div id='purchases' class="tab-pane">
-      <%= render 'orders_plugin_admin/purchases', actors: profile.purchases_all_suppliers,
+      <%= render 'orders_plugin_admin/purchases', actors: profile.sales_all_consumers,
         orders_owner: profile, orders: @purchases, month: @purchases_month, year: @purchases_year, wireframe_size: false %>
     </div>
   <% end %>
  
   <% if @sales.present? %>
     <div id='sales' class="tab-pane">
-      <%= render 'orders_plugin_admin/sales', actors: profile.sales_all_consumers,
+      <%= render 'orders_plugin_admin/sales', actors: profile.purchases_all_consumers,
         orders_owner: profile, orders: @sales, month: @sales_month, year: @purchases_year, wireframe_size: false %>
     </div>
   <% end %>
@@ -0,0 +1,21 @@
+- other_actor_name = if actor_name == :supplier then :consumer else :supplier end
+- edit = true if edit.nil?
+
+div class="order value-row #{order.status}" data-id=order.id id="order-row-#{order.id}" onclick="orders.admin.load_edit(this, '#{url_for action: :edit, id: order.id, actor_name: actor_name}')" toggle-edit="orders.admin.toggle_edit();"
+
+  .box-view.with-inner
+    .box-field.select toggle-ignore="" = check_box_tag "order_ids[]", order.id
+    .box-view-inner
+      span.box-field.code= order.code
+      span.box-field.actor-name= order.send("#{other_actor_name}_data")[:name]
+      span.box-field.order-date= datetime_full order.created_at
+      span.box-field.last-update= datetime_full order.updated_at
+      span.box-field.total= order.total_price_as_currency_number actor_name
+      span.box-field.situation= order_situation order
+    = edit_arrow "#order-row-#{order.id}", true, class: 'actions'
+    .clean
+
+  div class="box-edit #{'loading' if not edit}"
+    = render 'orders_plugin_admin/edit', order: order, actor_name: actor_name, other_actor_name: other_actor_name if edit
+
+  .clean
@@ -4,7 +4,7 @@
   .box-field.product title=item.name = item.name
   .box-field.quantity-price-table
     - item_data[:statuses].each do |status, status_data|
-      - next if status_data[:flags][:not_modified] and not status_data[:flags][:admin]
+      - next if status_data[:flags][:not_modified] and not status_data[:flags][:editable]
       = render 'orders_plugin_item/quantity_price', item: item, order: order, status: status, data: item_data, status_data: status_data, actor_name: actor_name
  
 .more
@@ -12,12 +12,15 @@
     / actionmailer doesn't have an user, rescue error
     - if (order.may_edit? user, @admin rescue false)
       - if @admin
-        = link_to_function t('views.item._edit.remove_from_order'), "orders.item.admin_remove(this, '#{url_for(controller: :orders_plugin_admin_item, action: :edit, id: item.id, actor_name: actor_name)}')", class: 'action-button'
-        = link_to_function t('views.item._edit.submit'), "orders.item.submit(this, '#{url_for(controller: :orders_plugin_admin_item, action: :edit, id: item.id, actor_name: actor_name)}')", class: 'submit action-button'
+        = link_to_function t('views.item._edit.remove_from_order'),
+          "orders.item.admin_remove(this, '#{url_for(controller: :orders_plugin_admin_item, action: :edit, id: item.id, actor_name: actor_name)}')"
+        = link_to_function t('views.item._edit.submit'),
+          "orders.item.submit(this, '#{url_for(controller: :orders_plugin_admin_item, action: :edit, id: item.id, actor_name: actor_name)}')", class: 'submit action-button'
       - else
         = link_to t('views.item._edit.remove_from_order'), {controller: :orders_plugin_item, action: :destroy, id: item.id},
           remote: true, data: {loading: "#item-#{item.id}"}
         = link_to_function t('views.item._edit.submit'), "orders.item.submit(this, '#{url_for(controller: :orders_plugin_item, action: :edit, id: item.id)}')", class: 'submit action-button'
-  = price_with_unit_span item.price_as_currency_number, (item.product.unit rescue item.price_as_currency_number), nil, class: 'box-field' unless @simple
+
+  = price_with_unit_span item.price_as_currency_number, (item.product.unit rescue item.price_as_currency_number), nil, class: 'box-field' unless @view
  
 .clean
@@ -13,12 +13,11 @@ div class=&quot;order-items-container #{&quot;empty&quot; if order.items.size == 0} #{&quot;admin&quot; i
         - if @admin
           .box-field.status= t'views.item._index.status'
       .table-content
-        .order-items-scroll
-          - order.items.each do |item|
-            = render "orders_plugin_item/edit", order: order, item: item, product: item.product, actor_name: actor_name
+        - order.items.each do |item|
+          = render "orders_plugin_item/edit", order: order, item: item, product: item.product, actor_name: actor_name
     .order-total
       .title= t'views.consumer._total.total'
-      .value= price_span order.total_price_as_currency_number actor_name
+      .value= price_span order.total_price_as_currency_number actor_name, @admin
  
   - else
     = t'views.item._index.empty_order'
@@ -6,7 +6,7 @@ div class=&quot;quantity-price-row #{status} #{status_data[:flags].keys.join &#39; &#39;}&quot;
         = t'views.item._edit.removed'
       - else
         = quantity_localized
-    - if not @simple and status_data[:flags][:editable]
+    - if not @view and status_data[:flags][:editable]
       = number_field_tag "item[quantity_#{status_data[:field]}]", status_data[:quantity], step: 'any', onkeydown: 'orders.item.quantity_keydown(this, event)'
     - unless status_data[:flags][:removed]
       |&nbsp;
@@ -0,0 +1,6 @@
+= render "orders_plugin_item/index", order: order, actor_name: actor_name, f: f
+
+= render 'orders_plugin_order/actor_data', order: order, f: f, actor_name: other_actor_name if @admin
+= render 'orders_plugin_order/delivery', order: order, f: f, actor_name: actor_name
+= render 'orders_plugin_order/payment', order: order
+
@@ -0,0 +1,8 @@
+/ read as: selectable or visualizable
+- if order.delivery_methods.size > 0 or order.supplier_delivery_data.present?
+  .delivery-box.order-section
+    h3= _'Delivery or pickup method'
+
+    - edition = order.may_edit?(user, @admin) && order.delivery_methods.size > 0 if edition.nil?
+    = render 'delivery_plugin/order_select', f: f, order: order, methods: order.delivery_methods, edition: edition
+
@@ -30,8 +30,11 @@ div class=&quot;order-view #{&quot;editable&quot; if order.may_edit? user, @admin rescue false}
       - elsif order.open?
         div
           = hidden_field_tag "order[status]", 'ordered'
-          = f.submit t('views.order._show.confirm_order'), confirm: t('views.order._show.confirming_this_order')
+          = f.submit t('views.order._show.confirm_order'), data: {confirm: t('views.order._show.confirming_this_order')}
           |&emsp;
  
           = link_to_function t('views.order._show.cancel_order'), "orders.order.reload(this, '#{url_for controller: :orders_plugin_order, action: :cancel, id: @order.id}')"
  
+javascript:
+  orders.setOrderMaxHeight()
+
@@ -0,0 +1,12 @@
+- actor_name ||= :consumer
+- other_actor_name = if actor_name == :supplier then :consumer else :supplier end
+- @view = true
+
+.order-view id="order-#{order.id}"
+  = form_for order, as: :order, url: '', html: {onsubmit: 'return false'} do |f|
+    .order-data
+      = render "orders_plugin_item/index", order: order, actor_name: actor_name
+      = render 'orders_plugin_order/delivery', order: order, actor_name: actor_name, edition: false, f: f
+
+javascript:
+  orders.setOrderMaxHeight()
@@ -22,23 +22,24 @@ class OrdersCyclePluginCycleController &lt; OrdersPluginAdminController
   end
  
   def new
-    if request.put?
+    if request.patch?
+      # can't use profile.orders_cycle here
       @cycle = OrdersCyclePlugin::Cycle.find params[:id]
  
       params[:cycle][:status] = 'orders' if @open = params[:open] == '1'
-      @success = @cycle.update_attributes params[:cycle]
+      @success = @cycle.update params[:cycle]
  
       if @success
         session[:notice] = t('controllers.myprofile.cycle_controller.cycle_created')
         if params[:sendmail]
           OrdersCyclePlugin::Mailer.delay(run_at: @cycle.start).open_cycle(
-            @cycle.profile, @cycle ,t('controllers.myprofile.cycle_controller.new_open_cycle')+": "+@cycle.name, @cycle.opening_message)
+            @cycle.profile, @cycle, "#{t'controllers.myprofile.cycle_controller.new_open_cycle'}: #{@cycle.name}", @cycle.opening_message)
         end
       else
         render action: :edit
       end
     else
-      count = OrdersCyclePlugin::Cycle.count conditions: {profile_id: profile}
+      count = profile.orders_cycles.maximum(:code) || 1
       @cycle = OrdersCyclePlugin::Cycle.create! profile: profile, status: 'new',
         name: t('controllers.myprofile.cycle_controller.cycle_n_n') % {n: count+1}
     end
@@ -48,13 +49,13 @@ class OrdersCyclePluginCycleController &lt; OrdersPluginAdminController
     # editing an order
     return super if params[:actor_name]
  
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @products = products
  
     if request.xhr?
       if params[:commit]
         params[:cycle][:status] = 'orders' if @open = params[:open] == '1'
-        @success = @cycle.update_attributes params[:cycle]
+        @success = @cycle.update params[:cycle]
  
         if params[:sendmail]
           OrdersCyclePlugin::Mailer.delay(run_at: @cycle.start).open_cycle(@cycle.profile,
@@ -65,7 +66,7 @@ class OrdersCyclePluginCycleController &lt; OrdersPluginAdminController
   end
  
   def products_load
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @products = products
  
     if @cycle.add_products_job
@@ -76,34 +77,34 @@ class OrdersCyclePluginCycleController &lt; OrdersPluginAdminController
   end
  
   def destroy
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @cycle.destroy
     redirect_to action: :index
   end
  
   def step
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @cycle.step
     @cycle.save!
     redirect_to action: :edit, id: @cycle.id
   end
  
   def step_back
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @cycle.step_back
     @cycle.save!
     redirect_to action: :edit, id: @cycle.id
   end
  
   def add_missing_products
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     @cycle.add_products
     render partial: 'suppliers_plugin/shared/pagereload'
   end
  
   def report_products
     return super if params[:ids].present?
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     report_file = report_products_by_supplier @cycle.supplier_products_by_suppliers(@cycle.sales.ordered)
  
     send_file report_file, type: 'application/xlsx',
@@ -114,7 +115,7 @@ class OrdersCyclePluginCycleController &lt; OrdersPluginAdminController
  
   def report_orders
     return super if params[:ids].present?
-    @cycle = OrdersCyclePlugin::Cycle.find params[:id]
+    @cycle = profile.orders_cycles.find params[:id]
     report_file = report_orders_by_consumer @cycle.sales.ordered
  
     send_file report_file, type: 'application/xlsx',
@@ -31,12 +31,12 @@ class OrdersCyclePluginItemController &lt; OrdersPluginItemController
     @item.sale = @order
     @item.product = @offered_product
     if set_quantity_consumer_ordered(params[:quantity_consumer_ordered] || 1)
-      @item.update_attributes! quantity_consumer_ordered: @quantity_consumer_ordered
+      @item.update! quantity_consumer_ordered: @quantity_consumer_ordered
     end
   end
  
   def edit
-    return redirect_to params.merge(action: :admin_edit) if @admin_edit
+    return redirect_to url_for(params.merge action: :admin_edit) if @admin_edit
     super
     @offered_product = @item.product
     @cycle = @order.cycle
@@ -50,7 +50,7 @@ class OrdersCyclePluginItemController &lt; OrdersPluginItemController
     #update on association for total
     @order.items.each{ |i| i.attributes = params[:item] if i.id == @item.id }
  
-    @item.update_attributes = params[:item]
+    @item.update params[:item]
   end
  
   def destroy
@@ -25,7 +25,7 @@ class OrdersCyclePluginProductController &lt; SuppliersPlugin::ProductController
   def cycle_edit
     @product = OrdersCyclePlugin::OfferedProduct.find params[:id]
     if request.xhr?
-      @product.update_attributes! params[:product]
+      @product.update! params[:product]
       respond_to do |format|
         format.js
       end
@@ -38,7 +38,7 @@ class OrdersCyclePluginOrderController &lt; OrdersPluginOrderController
       @order.consumer = @consumer
       @order.cycle = @cycle
       @order.save!
-      redirect_to params.merge(action: :edit, id: @order.id)
+      redirect_to url_for(params.merge action: :edit, id: @order.id)
     end
   end
  
@@ -55,7 +55,7 @@ class OrdersCyclePluginOrderController &lt; OrdersPluginOrderController
       end
       @repeat_order.supplier_delivery = @order.supplier_delivery
       @repeat_order.save!
-      redirect_to params.merge(action: :edit, id: @repeat_order.id)
+      redirect_to url_for(params.merge action: :edit, id: @repeat_order.id)
     else
       @orders = @cycle.consumer_previous_orders(@consumer).last(5).reverse
       @orders.each{ |o| o.enable_product_diff }
@@ -72,7 +72,7 @@ class OrdersCyclePluginOrderController &lt; OrdersPluginOrderController
       if status == 'ordered'
         if @order.items.size > 0
           @order.to_yaml # most strange workaround to avoid a crash in the next line
-          @order.update_attributes! params[:order]
+          @order.update! params[:order]
           session[:notice] = t('orders_plugin.controllers.profile.consumer.order_confirmed')
         else
           session[:notice] = t('orders_plugin.controllers.profile.consumer.can_not_confirm_your_')
@@ -117,12 +117,12 @@ class OrdersCyclePluginOrderController &lt; OrdersPluginOrderController
   end
  
   def reopen
-    @order.update_attributes! status: 'draft'
+    @order.update! status: 'draft'
     render 'edit'
   end
  
   def cancel
-    @order.update_attributes! status: 'cancelled'
+    @order.update! status: 'cancelled'
     session[:notice] = t('orders_plugin.controllers.profile.consumer.order_cancelled')
     render 'edit'
   end
@@ -162,7 +162,7 @@ class OrdersCyclePluginOrderController &lt; OrdersPluginOrderController
   end
  
   def supplier_balloon
-    @supplier = SuppliersPlugin::Supplier.find params[:id]
+    @supplier = profile.suppliers.find params[:id]
   end
   def product_balloon
     @product = OrdersCyclePlugin::OfferedProduct.find params[:id]
@@ -4,9 +4,7 @@ class RefactorOrdersCyclePluginCycleOrder &lt; ActiveRecord::Migration
     rename_column :orders_cycle_plugin_cycle_orders, :order_id, :sale_id
     add_column :orders_cycle_plugin_cycle_orders, :purchase_id, :integer
  
-    add_index :orders_cycle_plugin_cycle_orders, :sale_id
     add_index :orders_cycle_plugin_cycle_orders, :purchase_id
-    add_index :orders_cycle_plugin_cycle_orders, [:cycle_id, :sale_id]
     add_index :orders_cycle_plugin_cycle_orders, [:cycle_id, :purchase_id], name: :index_orders_cycle_plugin_cycle_orders_cycle_purchase
   end
  
@@ -2,7 +2,8 @@ require_dependency &#39;delivery_plugin/option&#39;
  
 class DeliveryPlugin::Option
  
-  belongs_to :cycle, class_name: 'OrdersCyclePlugin::Cycle',
-    foreign_key: :owner_id, conditions: ["delivery_plugin_options.owner_type = 'OrdersCyclePlugin::Cycle'"]
+  belongs_to :cycle, -> {
+    where "delivery_plugin_options.owner_type = 'OrdersCyclePlugin::Cycle'"
+  }, class_name: 'OrdersCyclePlugin::Cycle', foreign_key: :owner_id
  
 end
 require_dependency 'profile'
+require_dependency 'community'
  
-class Profile
+([Profile] + Profile.descendants).each do |subclass|
+subclass.class_eval do
+
+  has_many :orders_cycles, -> {
+    order('created_at DESC').
+    where "orders_cycle_plugin_cycles.status <> 'new'"
+  }, foreign_key: :profile_id, class_name: 'OrdersCyclePlugin::Cycle', dependent: :destroy
  
-  has_many :orders_cycles, class_name: 'OrdersCyclePlugin::Cycle', dependent: :destroy, order: 'created_at DESC',
-    conditions: ["orders_cycle_plugin_cycles.status <> 'new'"]
-  has_many :orders_cycles_without_order, class_name: 'OrdersCyclePlugin::Cycle',
-    conditions: ["orders_cycle_plugin_cycles.status <> 'new'"]
+  has_many :orders_cycles_without_order, -> {
+    where "orders_cycle_plugin_cycles.status <> 'new'"
+  }, foreign_key: :profile_id, class_name: 'OrdersCyclePlugin::Cycle'
  
   has_many :orders_cycles_sales, through: :orders_cycles, source: :sales
   has_many :orders_cycles_purchases, through: :orders_cycles, source: :purchases
  
-  has_many :offered_products, class_name: 'OrdersCyclePlugin::OfferedProduct', order: 'products.name ASC'
+  has_many :offered_products, -> { reorder 'products.name ASC' }, class_name: 'OrdersCyclePlugin::OfferedProduct'
+
+end
+end
+
+class Profile
  
   def orders_cycles_closed_date_range
-    list = self.orders_cycles.closing.all order: 'start ASC'
+    list = self.orders_cycles.closing.order('start ASC').all
     return DateTime.now..DateTime.now if list.blank?
     list.first.start.to_date..list.last.finish.to_date
   end
@@ -32,30 +32,32 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
  
   belongs_to :profile
  
-  has_many :delivery_options, class_name: 'DeliveryPlugin::Option', dependent: :destroy,
-    as: :owner, conditions: ["delivery_plugin_options.owner_type = 'OrdersCyclePlugin::Cycle'"]
+  has_many :delivery_options, -> {
+    where "delivery_plugin_options.owner_type = 'OrdersCyclePlugin::Cycle'"
+  }, class_name: 'DeliveryPlugin::Option', dependent: :destroy, as: :owner
   has_many :delivery_methods, through: :delivery_options, source: :delivery_method
  
-  has_many :cycle_orders, class_name: 'OrdersCyclePlugin::CycleOrder', foreign_key: :cycle_id, dependent: :destroy, order: 'id ASC'
+  has_many :cycle_orders, -> { order 'id ASC' }, class_name: 'OrdersCyclePlugin::CycleOrder', foreign_key: :cycle_id, dependent: :destroy
  
   # cannot use :order because of months/years named_scope
   has_many :sales, through: :cycle_orders, source: :sale
   has_many :purchases, through: :cycle_orders, source: :purchase
  
   has_many :cycle_products, foreign_key: :cycle_id, class_name: 'OrdersCyclePlugin::CycleProduct', dependent: :destroy
-  has_many :products, through: :cycle_products, source: :product, order: 'products.name ASC',
-    include: [ :from_2x_products, :from_products, {profile: :domains}, ]
+  has_many :products, -> {
+    includes(:from_2x_products, :from_products, {profile: :domains})
+  }, through: :cycle_products, class_name: 'OrdersCyclePlugin::OfferedProduct', source: :product
  
-  has_many :consumers, through: :sales, source: :consumer, order: 'name ASC', uniq: true
-  has_many :suppliers, through: :products, source: :suppliers, order: 'suppliers_plugin_suppliers.name ASC', uniq: true
-  has_many :orders_suppliers, through: :sales, source: :profile, order: 'name ASC'
+  has_many :consumers, -> { distinct.reorder 'name ASC' }, through: :sales, source: :consumer
+  has_many :suppliers, -> { group 'suppliers_plugin_suppliers.id' }, through: :products
+  has_many :orders_suppliers, -> { reorder 'name ASC' }, through: :sales, source: :profile
  
-  has_many :from_products, through: :products, order: 'name ASC', uniq: true
-  has_many :supplier_products, through: :products, order: 'name ASC', uniq: true
-  has_many :product_categories, through: :products, order: 'name ASC', uniq: true
+  has_many :from_products, -> { distinct.reorder 'name ASC' }, through: :products
+  has_many :supplier_products, -> { distinct.reorder 'name ASC' }, through: :products
+  has_many :product_categories, -> { distinct.reorder 'name ASC' }, through: :products
  
-  has_many :orders_confirmed, through: :cycle_orders, source: :sale, order: 'id ASC',
-    conditions: ['orders_plugin_orders.ordered_at IS NOT NULL']
+  has_many :orders_confirmed, -> { reorder('id ASC').where 'orders_plugin_orders.ordered_at IS NOT NULL' },
+    through: :cycle_orders, source: :sale
  
   has_many :items_selled, through: :sales, source: :items
   has_many :items_purchased, through: :purchases, source: :items
@@ -64,16 +66,16 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
  
   has_many :ordered_suppliers, through: :orders_confirmed, source: :suppliers
  
-  has_many :ordered_offered_products, through: :orders_confirmed, source: :offered_products, uniq: true, include: [:suppliers]
-  has_many :ordered_distributed_products, through: :orders_confirmed, source: :distributed_products, uniq: true, include: [:suppliers]
-  has_many :ordered_supplier_products, through: :orders_confirmed, source: :supplier_products, uniq: true, include: [:suppliers]
+  has_many :ordered_offered_products, -> { distinct.includes :suppliers }, through: :orders_confirmed, source: :offered_products
+  has_many :ordered_distributed_products, -> { distinct.includes :suppliers }, through: :orders_confirmed, source: :distributed_products
+  has_many :ordered_supplier_products, -> { distinct.includes :suppliers }, through: :orders_confirmed, source: :supplier_products
  
   has_many :volunteers_periods, class_name: 'VolunteersPlugin::Period', as: :owner
   has_many :volunteers, through: :volunteers_periods, source: :profile
   attr_accessible :volunteers_periods_attributes
   accepts_nested_attributes_for :volunteers_periods, allow_destroy: true
  
-  scope :has_volunteers_periods, -> {uniq.joins [:volunteers_periods]}
+  scope :has_volunteers_periods, -> { distinct.joins :volunteers_periods }
  
   # status scopes
   scope :on_edition, -> { where status: 'edition' }
@@ -83,33 +85,29 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
   scope :on_delivery, -> { where status: 'delivery' }
   scope :on_closing, -> { where status: 'closing' }
  
-  scope :defuncts, conditions: ["status = 'new' AND created_at < ?", 2.days.ago]
-  scope :not_new, conditions: ["status <> 'new'"]
-  scope :on_orders, lambda {
-    {conditions: ["status = 'orders' AND ( (start <= :now AND finish IS NULL) OR (start <= :now AND finish >= :now) )",
-      {now: DateTime.now}]}
+  scope :defuncts, -> { where "status = 'new' AND created_at < ?", 2.days.ago }
+  scope :not_new, -> { where "status <> 'new'" }
+  scope :on_orders, -> {
+    where "status = 'orders' AND ( (start <= :now AND finish IS NULL) OR (start <= :now AND finish >= :now) )", now: DateTime.now
   }
-  scope :not_on_orders, lambda {
-    {conditions: ["NOT (status = 'orders' AND ( (start <= :now AND finish IS NULL) OR (start <= :now AND finish >= :now) ) )",
-      {now: DateTime.now}]}
+  scope :not_on_orders, -> {
+    where "NOT (status = 'orders' AND ( (start <= :now AND finish IS NULL) OR (start <= :now AND finish >= :now) ) )", now: DateTime.now
   }
-  scope :opened, conditions: ["status <> 'new' AND status <> 'closing'"]
-  scope :closing, conditions: ["status = 'closing'"]
-  scope :by_status, lambda { |status| { conditions: {status: status} } }
+  scope :opened, -> { where "status <> 'new' AND status <> 'closing'" }
+  scope :closing, -> { where "status = 'closing'" }
+  scope :by_status, -> (status) { where status: status }
  
-  scope :months, select: 'DISTINCT(EXTRACT(months FROM start)) as month', order: 'month DESC'
-  scope :years, select: 'DISTINCT(EXTRACT(YEAR FROM start)) as year', order: 'year DESC'
+  scope :months, -> { order('month DESC').select 'DISTINCT(EXTRACT(months FROM start)) as month' }
+  scope :years, -> { order('year DESC').select 'DISTINCT(EXTRACT(YEAR FROM start)) as year' }
  
-  scope :by_month, lambda { |month| {
-    conditions: [ 'EXTRACT(month FROM start) <= :month AND EXTRACT(month FROM finish) >= :month', { month: month } ]}
+  scope :by_month, -> (month) {
+    where 'EXTRACT(month FROM start) <= :month AND EXTRACT(month FROM finish) >= :month', month: month
   }
-  scope :by_year, lambda { |year| {
-    conditions: [ 'EXTRACT(year FROM start) <= :year AND EXTRACT(year FROM finish) >= :year', { year: year } ]}
+  scope :by_year, -> (year) {
+    where 'EXTRACT(year FROM start) <= :year AND EXTRACT(year FROM finish) >= :year', year: year
   }
-  scope :by_range, lambda { |range| {
-    conditions: [ 'start BETWEEN :start AND :finish OR finish BETWEEN :start AND :finish',
-      { start: range.first, finish: range.last }
-    ]}
+  scope :by_range, -> (range) {
+    where 'start BETWEEN :start AND :finish OR finish BETWEEN :start AND :finish', start: range.first, finish: range.last
   }
  
   validates_presence_of :profile
@@ -122,7 +120,7 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
   validate :validate_orders_dates, if: :not_new?
   validate :validate_delivery_dates, if: :not_new?
  
-  before_validation :step_new
+  before_save :step_new
   before_validation :update_orders_status
   before_save :add_products_on_edition_state
   after_create :delay_purge_profile_defuncts
@@ -212,9 +210,7 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
   end
  
   def products_for_order
-    # FIXME name alias conflict
-    #self.products.unarchived.with_price.order('products.name ASC')
-    self.products.unarchived.with_price
+    self.products.unarchived.alphabetically.with_price
   end
  
   def supplier_products_by_suppliers orders = self.sales.ordered
@@ -261,27 +257,27 @@ class OrdersCyclePlugin::Cycle &lt; ActiveRecord::Base
   end
  
   def step_new
-    return if new_record?
+    return if self.new_record?
     self.step if self.new?
   end
  
   def update_sales_status from, to
     sales = self.sales.where(status: from.to_s)
     sales.each do |sale|
-      sale.update_attributes status: to.to_s
+      sale.update status: to.to_s
     end
   end
  
   def update_purchases_status from, to
     purchases = self.purchases.where(status: from.to_s)
     purchases.each do |purchase|
-      purchase.update_attributes status: to.to_s
+      purchase.update status: to.to_s
     end
   end
  
   def update_orders_status
-    # step orders to next_status on status change
-    return if self.new? or self.status_was == "new" or self.status_was == self.status
+    return if self.new? or self.status_was == "new"
+    return if self.status_was == self.status
  
     # Don't rewind confirmed sales
     unless self.status_was == 'orders' and self.status == 'edition'
 class OrdersCyclePlugin::OfferedProduct < SuppliersPlugin::BaseProduct
  
+  # we work use frozen attributes
+  self.default_delegate_enable = false
+
   # FIXME: WORKAROUND for https://github.com/rails/rails/issues/6663
   # OrdersCyclePlugin::Sale.find(3697).cycle.suppliers returns empty without this
   def self.finder_needs_type_condition?
@@ -19,10 +22,10 @@ class OrdersCyclePlugin::OfferedProduct &lt; SuppliersPlugin::BaseProduct
   has_one  :sources_supplier_product,  through: :from_product,  source: :sources_from_product
   # necessary only due to the override of sources_supplier_products, as rails somehow caches the old reference
   # copied from suppliers/lib/ext/product
-  has_many :supplier_products, through: :sources_supplier_products, source: :from_product, order: 'id ASC'
-  has_one  :supplier_product,  through: :sources_supplier_product,  source: :from_product, order: 'id ASC', autosave: true
-  has_many :suppliers, through: :sources_supplier_products, uniq: true, order: 'id ASC'
-  has_one  :supplier,  through: :sources_supplier_product, order: 'id ASC'
+  has_many :supplier_products, -> { order 'id ASC' }, through: :sources_supplier_products, source: :from_product
+  has_one  :supplier_product, -> { order 'id ASC' },  through: :sources_supplier_product,  source: :from_product, autosave: true
+  has_many :suppliers, -> { distinct.order 'id ASC' }, through: :sources_supplier_products
+  has_one  :supplier, -> { order 'id ASC' }, through: :sources_supplier_product
  
   instance_exec &OrdersPlugin::Item::DefineTotals
   extend CurrencyHelper::ClassMethods
@@ -31,9 +34,7 @@ class OrdersCyclePlugin::OfferedProduct &lt; SuppliersPlugin::BaseProduct
   # test this before use!
   #validates_presence_of :cycle
  
-  # remove on rails4
-  scope :with_price, conditions: 'products.price > 0'
-  scope :with_product_category_id, lambda { |id| { conditions: {product_category_id: id} } }
+  # override SuppliersPlugin::BaseProduct
   def self.search_scope scope, params
     scope = scope.from_supplier_id params[:supplier_id] if params[:supplier_id].present?
     scope = scope.with_available(if params[:available] == 'true' then true else false end) if params[:available].present?
@@ -50,19 +51,20 @@ class OrdersCyclePlugin::OfferedProduct &lt; SuppliersPlugin::BaseProduct
     op.profile = product.profile
     op.type = self.name
  
-    op.from_products << product
+    op.from_product = product
     cycle.products << op if cycle
  
     op
   end
  
   # always recalculate in case something has changed
+  # FIXME: really? it is already copied!
   def margin_percentage
-    return self['margin_percentage'] if price.nil? or buy_price.nil? or price.zero? or buy_price.zero?
+    return super if price.nil? or buy_price.nil? or price.zero? or buy_price.zero?
     ((price / buy_price) - 1) * 100
   end
   def margin_percentage= value
-    self['margin_percentage'] = value
+    super value
     self.price = self.price_with_margins buy_price
   end
  
@@ -71,22 +73,15 @@ class OrdersCyclePlugin::OfferedProduct &lt; SuppliersPlugin::BaseProduct
   end
  
   # reimplement to don't destroy this, keeping history in cycles
-  # offered products copy attributes
+  # as offered products copy attributes.
   def dependent?
     false
   end
  
-  # cycle products freezes properties and don't use the original
-  DEFAULT_ATTRIBUTES.each do |a|
-    define_method "default_#{a}" do
-      nil
-    end
-  end
-
   FROOZEN_DEFAULT_ATTRIBUTES = DEFAULT_ATTRIBUTES
   def freeze_default_attributes from_product
     FROOZEN_DEFAULT_ATTRIBUTES.each do |attr|
-      self[attr] = from_product.send(attr) if from_product[attr] or from_product.respond_to? attr
+      self.send "#{attr}=", from_product.send(attr) if from_product[attr] or from_product.respond_to? attr
     end
   end
  
@@ -14,26 +14,18 @@ module OrdersCyclePlugin::OrderBase
       self.cycle_sales.includes(:cycle).map(&:cycle) + self.cycle_purchases.includes(:cycle).map(&:cycle)
     end
  
-    # TODO: test if the has_one defined on Sale/Purchase works and these are not needed
-    def cycle
-      self.cycles.first
-    end
-    def cycle= cycle
-      self.cycles = [cycle]
-    end
-
     scope :for_cycle, -> (cycle) {
       where('orders_cycle_plugin_cycles.id = ?', cycle.id).
       joins(:cycles)
     }
  
-    has_many :items, class_name: 'OrdersCyclePlugin::Item', foreign_key: :order_id, dependent: :destroy, order: 'name ASC'
+    has_many :items, -> { order 'name ASC' }, class_name: 'OrdersCyclePlugin::Item', foreign_key: :order_id, dependent: :destroy
  
-    has_many :offered_products, through: :items, source: :offered_product, uniq: true
-    has_many :distributed_products, through: :offered_products, source: :from_products, uniq: true
-    has_many :supplier_products, through: :distributed_products, source: :from_products, uniq: true
+    has_many :offered_products, -> { distinct }, through: :items, source: :offered_product
+    has_many :distributed_products, -> { distinct }, through: :offered_products, source: :from_products
+    has_many :supplier_products, -> { distinct }, through: :distributed_products, source: :from_products
  
-    has_many :suppliers, through: :supplier_products, uniq: true
+    has_many :suppliers, -> { distinct }, through: :supplier_products
  
     extend CodeNumbering::ClassMethods
     code_numbering :code, scope: (proc do
@@ -24,10 +24,6 @@ class OrdersCyclePlugin::Sale &lt; OrdersPlugin::Sale
     super and self.cycle.orders?
   end
  
-  def supplier_delivery
-    super || (self.cycle.delivery_methods.first rescue nil)
-  end
-
   def change_purchases
     return unless self.status_was.present?
     if self.ordered_at_was.nil? and self.ordered_at.present?
@@ -0,0 +1,57 @@
+module OrdersCyclePlugin::Factory
+
+  def defaults_for_suppliers_plugin_supplier
+    {:profile => build(Profile),
+     :consumer => build(Profile)}
+  end
+
+  def defaults_for_suppliers_plugin_distributed_product attrs = {}
+    profile = attrs[:profile] || build(Profile)
+    {:profile => profile, :name => "product-#{factory_num_seq}", :price => 2.0,
+     :product => build(Product, :enterprise => profile.profile, :price => 2.0),
+     :supplier => build(SuppliersPlugin::Supplier, :profile => profile, :consumer => profile)}
+  end
+
+  def defaults_for_orders_cycle_plugin_offered_product attrs = {}
+    hash = defaults_for_orders_cycle_plugin_product(attrs)
+    profile = hash[:profile]
+    hash.merge({
+      :from_products => [build(SuppliersPlugin::DistributedProduct, :profile => profile)]})
+  end
+
+  def defaults_for_delivery_plugin_method
+    {:profile => build(OrdersCyclePlugin::Profile),
+     :name => "My delivery #{factory_num_seq.to_s}",
+     :delivery_type => 'deliver'}
+  end
+
+  def defaults_for_delivery_plugin_option
+    {:cycle => build(OrdersCyclePlugin::Cycle),
+     :delivery_method => build(DeliveryPlugin::Method)}
+  end
+
+  def defaults_for_orders_plugin_order attrs = {}
+    profile = attrs[:profile] || build(OrdersCyclePlugin::Profile)
+    {:status => 'ordered',
+     :cycle => build(OrdersCyclePlugin::Cycle, :profile => profile),
+     :consumer => build(OrdersCyclePlugin::Profile),
+     :supplier_delivery => build(DeliveryPlugin::Method, :profile => profile),
+     :consumer_delivery => build(DeliveryPlugin::Method, :profile => profile)}
+  end
+
+  def defaults_for_orders_plugin_items
+    {:order => build(OrdersPlugin::Order),
+     :product => build(OrdersCyclePlugin::OfferedProduct),
+     :quantity_shipped => 1.0, :quantity_ordered => 2.0, :quantity_accepted => 3.0,
+     :price_shipped => 10.0, :price_ordered => 20.0, :price_accepted => 30.0}
+  end
+
+  def defaults_for_orders_cycle_plugin_cycle
+    {:profile => build(OrdersCyclePlugin::Profile), :status => 'orders',
+     :name => 'weekly', :start => Time.now, :finish => Time.now+1.days}
+  end
+
+end
+
+Noosfero::Factory.register_extension OrdersCyclePlugin::Factory
+
@@ -0,0 +1,12 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class OrdersCyclePlugin::OrderControllerTest < Test::Unit::TestCase
+
+  def setup
+    @controller = OrdersCyclePluginOrderController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+
+end
@@ -0,0 +1,14 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class OrdersCyclePlugin::CycleControllerTest < Test::Unit::TestCase
+
+  def setup
+    @controller = OrdersCyclePluginCycleController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+
+  should 'create a new cycle' do
+  end
+
+end
@@ -0,0 +1,6 @@
+require File.dirname(__FILE__) + '/../../../test/test_helper'
+require 'spec'
+
+class ActiveRecord::TestCase < ActiveSupport::TestCase
+  include OrdersCyclePluginFactory
+end
@@ -0,0 +1,27 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class OrdersCyclePlugin::CycleTest < ActiveSupport::TestCase
+
+  def setup
+    @profile = Enterprise.create!(:name => "trocas verdes", :identifier => "trocas-verdes")
+    @pc = ProductCategory.create!(:name => 'frutas', :environment_id => 1)
+    @profile.products = [Product.create!(:name => 'banana', :product_category => @pc),
+      Product.new(:name => 'mandioca', :product_category => @pc), Product.new(:name => 'alface', :product_category => @pc)]
+
+    profile.offered_products = @profile.products.map{ |p| OrdersCyclePlugin::OfferedProduct.create!(:product => p) }
+    DeliveryPlugin::Method.create! :name => 'at home', :delivery_type => 'pickup', :profile => @profile
+    @cycle = OrdersCyclePlugin::Cycle.create!(:profile => @profile)
+  end
+
+  should 'add products from profile after create' do
+    assert_equal @cycle.products.collect(&:product_id), @profile.products.collect(&:id)
+  end
+
+  should 'have at least one delivery method unless in edition status' do
+    cycle = OrdersCyclePlugin::Cycle.create! :profile => @profile, :name => "Testes batidos", :start => DateTime.now, :status => 'edition'
+    assert cycle
+    cycle.status = 'orders'
+    assert_nil cycle.save!
+  end
+
+end
@@ -0,0 +1,6 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class OrdersCyclePlugin::OfferedProductTest < ActiveSupport::TestCase
+
+
+end
@@ -0,0 +1,127 @@
+require "#{File.dirname(__FILE__)}/../../test_helper"
+
+class OrdersCyclePlugin::ProfileTest < ActiveRecord::TestCase
+
+  def setup
+    @profile = build(Profile)
+    @invisible_profile = build(Enterprise, :visible => false)
+    @other_profile = build(Enterprise)
+    @profile = build(OrdersCyclePlugin::profile, :profile => @profile)
+    @self_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @profile)
+    @dummy_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @dummy_profile)
+    @other_supplier = build(OrdersCyclePlugin::Supplier, :consumer => @profile, :profile => @other_profile)
+  end
+
+  attr_accessor :profile, :invisible_profile, :other_profile,
+    :self_supplier, :dummy_supplier, :other_supplier
+
+  should 'respond to name methods' do
+    profile.expects(:name).returns('name')
+    assert_equal 'name', profile.name
+  end
+
+  should 'respond to dummy methods' do
+    profile.dummy = true
+    assert_equal true, profile.dummy?
+    profile.dummy = false
+    assert_equal false, profile.dummy
+  end
+
+  should "return closed cycles' date range" do
+    DateTime.expects(:now).returns(1).at_least_once
+    assert_equal 1..1, profile.orders_cycles_closed_date_range
+    s1 = create(OrdersCyclePlugin::Cycle, :profile => profile, :start => Time.now-1.days, :finish => nil)
+    s2 = create(OrdersCyclePlugin::Cycle, :profile => profile, :finish => Time.now+1.days, :start => Time.now)
+    assert_equal (s1.start.to_date..s2.finish.to_date), profile.orders_cycles_closed_date_range
+  end
+
+  should 'return abbreviation or the name' do
+    profile.name_abbreviation = 'coll.'
+    profile.profile.name = 'collective'
+    assert_equal 'coll.', profile.abbreviation_or_name
+    profile.name_abbreviation = nil
+    assert_equal 'collective', profile.abbreviation_or_name
+  end
+
+  ###
+  # Products
+  ###
+
+  should "default products's margins when asked" do
+    profile.update! :margin_percentage => 10
+    product = create(SuppliersPlugin::DistributedProduct, :profile => profile, :supplier => profile.self_supplier,
+                     :price => 10, :default_margin_percentage => false)
+    cycle = create(OrdersCyclePlugin::Cycle, :profile => profile)
+    sproduct = cycle.products.first
+    sproduct.update! :margin_percentage => 5
+    cycleclosed = create(OrdersCyclePlugin::Cycle, :profile => profile, :status => 'closed')
+
+    profile.orders_cycles_products_default_margins
+    product.reload
+    sproduct.reload
+    assert_equal true, product.default_margin_percentage
+    assert_equal sproduct.margin_percentage, profile.margin_percentage
+  end
+
+  should 'return not yet distributed products' do
+    profile.save!
+    other_profile.save!
+    other_supplier.save!
+    product = create(SuppliersPlugin::DistributedProduct, :profile => other_profile, :supplier => other_profile.self_supplier)
+    profile.add_supplier_products other_supplier
+    product2 = create(SuppliersPlugin::DistributedProduct, :profile => other_profile, :supplier => other_profile.self_supplier)
+    assert_equal [product2], profile.not_distributed_products(other_supplier)
+  end
+
+  ###
+  # Suppliers
+  ###
+
+  should 'add supplier' do
+    @profile.save!
+    @other_profile.save!
+
+    assert_difference OrdersCyclePlugin::Supplier, :count do
+      @profile.add_supplier @other_profile
+    end
+    assert @profile.suppliers_profiles.include?(@other_profile)
+    assert @other_profile.consumers_profiles.include?(@profile)
+  end
+
+  should "add all supplier's products when supplier is added" do
+    @profile.save!
+    @other_profile.save!
+    product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
+    @profile.add_supplier @other_profile
+    assert_equal [product], @profile.from_products
+  end
+
+  should 'remove supplier' do
+    @profile.save!
+    @other_profile.save!
+
+    @profile.add_supplier @other_profile
+    assert_difference OrdersCyclePlugin::Supplier, :count, -1 do
+      assert_difference RoleAssignment, :count, -1 do
+        @profile.remove_supplier @other_profile
+      end
+    end
+    assert !@profile.suppliers_profiles.include?(@other_profile)
+  end
+
+  should "archive supplier's products when supplier is removed" do
+    @profile.save!
+    @other_profile.save!
+    product = create(SuppliersPlugin::DistributedProduct, :profile => @other_profile)
+    @profile.add_supplier @other_profile
+    @profile.remove_supplier @other_profile
+    assert_equal [product], @profile.from_products
+    assert_equal 1, @profile.distributed_products.archived.count
+  end
+
+  should 'create self supplier automatically' do
+    profile = create(OrdersCyclePlugin::profile, :profile => @profile)
+    assert_equal 1, profile.suppliers.count
+  end
+
+end
 = render 'orders_plugin_admin/sales', actors: @cycle.consumers, orders_owner: @cycle, owner_id: @cycle.id,
   orders: @cycle.sales.default_order.paginate(per_page: 30, page: params[:page])
+
@@ -53,6 +53,5 @@ h3= t(&#39;views.cycle._edit_fields.general_settings&#39;)
   = link_to t('views.cycle._edit_fields.cancel_changes'), @cycle.new? ? {action: :index} : params
   - unless @cycle.new?
     |&nbsp;
-    = link_to t('views.cycle._edit_fields.remove'), {action: :destroy, id: @cycle.id}, confirm: t('views.cycle._edit_fields.confirm_remove')
-
+    = link_to t('views.cycle._edit_fields.remove'), {action: :destroy, id: @cycle.id}, data: {confirm: t('views.cycle._edit_fields.confirm_remove')}
  
 <div class="cycle-products-table sortable-table">
   <%= pagination_links @products %>
   <div id="result-count">
-    <small><%= t('views.cycle._product_lines.showing_pcount_produc') % {:pcount => @products.length, :allpcount => @cycle.products.count} %></small>
+    <small><%= t('views.cycle._product_lines.showing_pcount_produc') % {pcount: @products.length, allpcount: @cycle.products.count} %></small>
   </div>
   <div class='table-header'>
     <span class='box-field category'><%= t('views.cycle._product_lines.category') %></span>
@@ -17,7 +17,7 @@
   <div class='table-content'>
     <% @products.each do |p| %>
       <div id="cycle-product-<%=p.id%>" class='cycle-product value-row' toggle-edit="orders_cycle.offered_product.edit();">
-        <%= render 'orders_cycle_plugin_product/cycle_edit', :p => p %>
+        <%= render 'orders_cycle_plugin_product/cycle_edit', p: p %>
       </div>
     <% end %>
     <%= javascript_tag do %>
@@ -3,7 +3,7 @@
   <%= t('views.cycle._products_loading') %>
  
   <%= javascript_tag do %>
-    orders_cycle.cycle.products.load_url = <%= url_for(:action => :products_load, :id => @cycle.id).to_json %>
+    orders_cycle.cycle.products.load_url = <%= url_for(action: :products_load, id: @cycle.id).to_json %>
     orders_cycle.cycle.products.load()
   <% end %>
 </div>
@@ -0,0 +1,30 @@
+- actions = true if actions.nil? and @admin
+- listing = false if listing.nil?
+- view_status = if OrdersCyclePlugin::Cycle::Statuses.index(params[:view]) then params[:view] else cycle.status end
+- status_text = t"models.cycle.statuses.#{view_status}"
+
+.cycle-timeline
+  - OrdersCyclePlugin::Cycle::UserStatuses.each do |status|
+    - klass = "cycle-timeline-item #{timeline_class cycle, status, view_status}"
+    - name = t("models.cycle.statuses.#{status}")
+    = link_to name, params.merge(action: :edit, id: cycle.id, view: status), class: klass
+
+- if listing
+  .dates-brief
+    .date
+      span.field-title= t'views.cycle._brief.orders'
+      |&emsp;
+      span= datetime_period_short cycle.start, cycle.finish
+    .date
+      span.field-title= t'views.cycle._brief.delivery'
+      |&emsp;
+      span= datetime_period_short cycle.delivery_start, cycle.delivery_finish
+
+- if actions
+  .actions-bar
+    - if cycle.status == view_status and cycle.status != 'closing'
+      = link_to t('views.cycle._timeline.close_status') % {status: status_text},
+        {action: :step, id: cycle.id, method: :post},
+        {confirm: t('views.cycle._timeline.are_you_sure_you_want_to_close') % {status: status_text}, class: 'action-button'}
+    = render "orders_cycle_plugin_cycle/actions/#{view_status}", cycle: cycle rescue nil
+
@@ -0,0 +1,4 @@
+- if cycle.status == 'closing'
+  = link_to t('views.cycle._timeline.reopen_orders_period'), {action: :step_back, id: cycle.id, method: :post},
+    id: 'cycle-open-cycle', class: 'action-button', data: {confirm: t('views.cycle._timeline.are_you_sure_you_want_to_reopen')}
+
 <% if params[:commit] %>
   <% if @success and @open %>
-    window.location = <%= url_for(:action => :edit, :id => @cycle.id).to_json %>
+    window.location = <%= url_for(action: :edit, id: @cycle.id).to_json %>
   <% else %>
-    noosfero.modal.html(<%= render('edit_popin', :cycle => @cycle).to_json %>)
+    noosfero.modal.html(<%= render('edit_popin', cycle: @cycle).to_json %>)
   <% end %>
 <% else %>
   jQuery("#cycle-products .table").replaceWith('<%= escape_javascript render('product_lines') %>')
@@ -2,11 +2,11 @@
  
 <div id="cycles-gadget">
   <% profile.orders_cycles.on_orders.each do |cycle| %>
-    <%= render :partial => 'orders_cycle_plugin_gadgets/cycle', :locals => {:cycle => cycle} %>
+    <%= render 'orders_cycle_plugin_gadgets/cycle', cycle: cycle %>
   <% end %>
  
   <div>
-    <%= link_to t('views.gadgets.cycles.all_cycles'), {:controller => :orders_cycle_plugin_order, :profile => profile.identifier, :action => :index}, :id => "all-cycles" %>
+    <%= link_to t('views.gadgets.cycles.all_cycles'), {controller: :orders_cycle_plugin_order, profile: profile.identifier, action: :index}, id: "all-cycles" %>
     <div class='clean'></div>
   </div>
 </div>
-page.replace_html "order-#{@order.id}", :partial => 'cycle_edit', :locals => {:order => @order}
-page.replace_html "cycle-products-sums", :partial => 'orders_cycle_plugin_cycle/orders_suppliers', :locals => {:cycle => @order.cycle}
+page.replace_html "order-#{@order.id}", partial: 'cycle_edit', locals: {order: @order}
+page.replace_html "cycle-products-sums", partial: 'orders_cycle_plugin_cycle/orders_suppliers', locals: {cycle: @order.cycle}
 page << "toggle_edit.value_row.reload();"
@@ -119,7 +119,8 @@ class ShoppingCartPluginController &lt; OrdersPluginController
     @settings = cart_profile.shopping_cart_settings
     @cart = cart
     @profile = cart_profile
-    @order = profile.sales.build consumer: user
+    supplier_delivery = profile.delivery_methods.first
+    @order = build_order self.cart[:items], supplier_delivery
  
     last_delivery_option_id = session[:cart][:last_delivery_option_id] if session[:cart]
     @order.supplier_delivery = profile.delivery_methods.where(id: last_delivery_option_id).first if last_delivery_option_id
@@ -192,7 +193,8 @@ class ShoppingCartPluginController &lt; OrdersPluginController
     @profile = cart_profile
     supplier_delivery = @profile.delivery_methods.where(id: params[:order][:supplier_delivery_id]).first
     order = build_order self.cart[:items], supplier_delivery
-    total_price = order.total_price
+    order.supplier_delivery = supplier_delivery
+    total_price = order.total
     render json: {
       ok: true,
       delivery_price: float_to_currency_cart(supplier_delivery.cost(total_price), environment, unit: ''),
 class MoveFieldsIncludedOnProfilesTableToSettings < ActiveRecord::Migration
   def self.up
-    Profile.find_each do |profile|
+    Enterprise.find_each do |profile|
       settings = profile.shopping_cart_settings
       settings.enabled = profile.shopping_cart
       settings.delivery = profile.shopping_cart_delivery
@@ -2,7 +2,7 @@ OrdersPlugin.send :remove_const, :Item if defined? OrdersPlugin::Item
 OrdersPlugin.send :remove_const, :Order if defined? OrdersPlugin::Order
  
 class ShoppingCartPlugin::PurchaseOrder < ActiveRecord::Base
-  acts_as_having_settings :field => :data
+  acts_as_having_settings field: :data
  
   module Status
     OPENED = 0
@@ -13,17 +13,17 @@ class ShoppingCartPlugin::PurchaseOrder &lt; ActiveRecord::Base
 end
  
 class Profile
-  has_many :orders, :class_name => 'OrdersPlugin::Order'
+  has_many :orders, class_name: 'OrdersPlugin::Order'
 end
  
 class OrdersPlugin::Item < ActiveRecord::Base
-  belongs_to :order, :class_name => 'OrdersPlugin::Order'
+  belongs_to :order, class_name: 'OrdersPlugin::Order'
 end
 class OrdersPlugin::Order < ActiveRecord::Base
-  has_many :items, :class_name => 'OrdersPlugin::Item', :foreign_key => :order_id
+  has_many :items, class_name: 'OrdersPlugin::Item', foreign_key: :order_id
  
   extend CodeNumbering::ClassMethods
-  code_numbering :code, :scope => proc{ self.profile.orders }
+  code_numbering :code, scope: proc{ self.profile.orders }
 end
  
 StatusTransform = {
@@ -37,10 +37,10 @@ class MoveShoppingCartPurchaseOrderToOrdersPluginOrder &lt; ActiveRecord::Migration
   def self.up
     OrdersPlugin::Order.record_timestamps = false
  
-    ShoppingCartPlugin::PurchaseOrder.all(:order => 'created_at ASC').each do |purchase_order|
+    ShoppingCartPlugin::PurchaseOrder.order('created_at ASC').find_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 = 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|
@@ -58,7 +58,7 @@ class MoveShoppingCartPurchaseOrderToOrdersPluginOrder &lt; ActiveRecord::Migration
       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.items.build product_id: id, name: data[:name], quantity_consumer_ordered: data[:quantity], price: data[:price]
         item.order = order
       end
  
@@ -36,7 +36,6 @@ Feature: delivery administration
     And I follow "New delivery or pickup"
     And I select "Deliver" from "Type"
     And I fill in "Name" with "Bike"
-    And I fill in "Description" with "Beers delivered with my old bike."
     And I fill in "Fixed cost" with "8.00"
     And I fill in "Order's minimum price for free delivery" with "35.50"
     When I press "Add"
@@ -49,7 +48,6 @@ Feature: delivery administration
     And I follow "New delivery or pickup"
     And I select "Pickup" from "Type"
     And I fill in "Name" with "Bar"
-    And I fill in "Description" with "Come to my bar and pick it yourself."
     And I fill in "Fixed cost" with "0.00"
     When I press "Add"
     Then I should see "Bar"
@@ -0,0 +1 @@
+/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/shopping_cart/features
 \ No newline at end of file
 class ShoppingCartPlugin < Noosfero::Plugin
-  include ModalHelper
-  include ActionView::Helpers::UrlHelper
  
   def self.plugin_name
     "Shopping Basket"
@@ -34,10 +32,6 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
     buttons
   end
  
-  def controller
-    context
-  end
-
   def add_to_cart_button item, options = {}
     profile = item.profile
     return unless profile.shopping_cart_enabled and item.available
@@ -61,7 +61,8 @@ module ShoppingCartPlugin::CartHelper
  
   def items_table(items, 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}
+    order = @order || build_order(items, delivery_method)
+    render partial: 'shopping_cart_plugin/items', locals: {order: order, by_mail: by_mail}
   end
  
   def float_to_currency_cart value, environment, _options = {}
@@ -13,7 +13,7 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: 1.3~rc2-1-ga15645d\n"
 "POT-Creation-Date: 2015-10-30 16:34-0300\n"
-"PO-Revision-Date: 2015-09-29 20:23-0300\n"
+"PO-Revision-Date: 2015-11-15 18:17-0300\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/noosfero/"
 "plugin-shopping-cart/pt/>\n"
@@ -32,6 +32,48 @@ msgstr &quot;Funcionalidade de cesto de compras para empreendimentos&quot;
 msgid "Shopping basket"
 msgstr "Cesto de compras"
  
+#: plugins/shopping_cart/lib/shopping_cart_plugin.rb:63
+msgid "Purchase reports"
+msgstr "Relatórios de compras"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:40
+msgid "Opened"
+msgstr "Aberto"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:40
+msgid "Confirmed"
+msgstr "Confirmado"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb:40
+msgid "Shipped"
+msgstr "Enviado"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:41
+msgid "Free delivery"
+msgstr "Frete grátis"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:43
+#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/edit.html.erb:7
+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/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"
+msgstr "Item"
+
+#: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:76
+#: plugins/shopping_cart/views/cart.html.erb:7
+msgid "Total:"
+msgstr "Total:"
+
 #: plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb:11
 msgid "Add to basket"
 msgstr "Adicionar ao cesto"
@@ -112,9 +154,8 @@ msgid &quot;Shopping checkout&quot;
 msgstr "Finalizar pedido"
  
 #: plugins/shopping_cart/views/public/_cart.html.erb:8
-#, fuzzy
 msgid "Basket is empty"
-msgstr "Cesto exibido."
+msgstr "Cesto vazio."
  
 #: plugins/shopping_cart/views/public/_cart.html.erb:14
 msgid "Basket"
@@ -124,11 +165,6 @@ msgstr &quot;Cesto&quot;
 msgid "Clean basket"
 msgstr "Limpar cesto"
  
-#: plugins/shopping_cart/views/public/_cart.html.erb:20
-#: plugins/shopping_cart/views/shopping_cart_plugin/_items.html.erb:42
-msgid "Total:"
-msgstr "Total:"
-
 #: plugins/shopping_cart/views/public/_cart.html.erb:23
 msgid "Show basket"
 msgstr "Mostrar cesto"
@@ -163,7 +199,8 @@ msgstr &quot;Tem certeza que quer limpar seu cesto?&quot;
  
 #: plugins/shopping_cart/views/public/_cart.html.erb:54
 msgid "repeat order"
-msgstr ""
+msgstr "repetir pedido"
+
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/_items.html.erb:7
 msgid "Item name"
@@ -179,39 +216,37 @@ msgid &quot;Hi %s!&quot;
 msgstr "Olá %s!"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:10
-#, fuzzy
-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 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
-#, fuzzy
 msgid ""
 "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."
+
 "confirmação."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:12
-#, fuzzy
 msgid "If you have any doubts about your order, write to us at: %s."
-msgstr "Se você tem alguma dúvida, nos contacte em: %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 "Review below the informations of your order:"
-msgstr ""
+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 ""
  
+#: 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/buy.html.erb:22
-#, fuzzy
 msgid "Payment's method"
-msgstr "Pagamento"
+msgstr "Forma de pagamento"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:24
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:22
@@ -219,31 +254,30 @@ msgstr &quot;Pagamento&quot;
 msgid "shopping_cart|Change"
 msgstr "Troco para"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:28
-msgid "Delivery or pickup"
-msgstr "Forma de retirada ou entrega"
+#: plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb:7
+msgid "Quantity"
+msgstr "Quantidade"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:63
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:47
 msgid "Here are the products you bought:"
-msgstr ""
+msgstr "Aqui estão os produtos que você pediu:"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:67
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:51
 msgid "Thanks for buying with us!"
-msgstr ""
+msgstr "Obrigado por comprar conosco!"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:70
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:61
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb:54
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:51
 msgid "A service of %s."
-msgstr ""
+msgstr "Um serviço de %s."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:10
-#, fuzzy
 msgid "This is a buy request made by %s."
-msgstr "[%s] Você tem um novo pedido de compra de %s."
+msgstr "Esse é um pedido de compra feito por %s."
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:11
 msgid "Below follows the customer informations:"
-msgstr ""
+msgstr "Abaixo seguem as informações do consumidor:"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:20
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:25
@@ -251,20 +285,18 @@ msgid &quot;Payment&quot;
 msgstr "Pagamento"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:55
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:45
 msgid "And here are the items bought by this customer:"
-msgstr ""
+msgstr "E aqui estão os itens pedidos por esse consumidor:"
  
-#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:59
+#: plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb:49
 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:4
-msgid "haven't finished yet: back to shopping"
-msgstr ""
-
-#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:12
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:9
 msgid "Personal identification"
-msgstr ""
+msgstr "Identificação pessoal"
  
 #: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15
 msgid "Name"
@@ -290,36 +322,21 @@ msgstr &quot;Seu Pedido&quot;
 msgid "Send buy request"
 msgstr "Enviar pedido de compra"
  
-#~ msgid "Purchase reports"
-#~ msgstr "Relatórios de compras"
-
-#~ msgid "Opened"
-#~ msgstr "Aberto"
-
-#~ msgid "Canceled"
-#~ msgstr "Cancelado"
-
-#~ msgid "Confirmed"
-#~ msgstr "Confirmado"
-
-#~ msgid "Shipped"
-#~ msgstr "Enviado"
-
-#~ msgid "Free delivery"
-#~ msgstr "Frete grátis"
-
-#~ msgid "Delivery"
-#~ msgstr "Entrega"
-
-#~ msgid "Instructions"
-#~ msgstr "Instruções"
+#: plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb:15
+msgid "Address completion"
+msgstr "Complemento (p.ex. apto)"
  
-#~ msgid "Option wasn't updated successfully."
-#~ msgstr "Opção não foi atualizada com sucesso."
+#: 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"
  
-#~ msgid "Request sent successfully. Check your email."
-#~ msgstr "Requisição enviada com sucesso. Cheque seu email."
+#: plugins/shopping_cart/views/shopping_cart_plugin/_items.html.erb
+msgid "Qtty"
+msgstr "Qtde"
  
+#: plugins/shopping_cart/views/shopping_cart_plugin/_items.html.erb
+msgid "Unit price"
+msgstr "Preço unitário"
 #~ msgid "Can't join items from different enterprises."
 #~ msgstr "Não é possível juntar itens de empreendimentos diferentes."
  
@@ -63,12 +63,6 @@ function Cart(config) {
       var input = $("input", li)[0];
       input.lastValue = input.value;
       input.productId = item.id;
-      input.ajustSize = function() {
-        var len = this.value.toString().length;
-        if(len > 2) len--;
-        this.style.width = len+"em";
-      };
-      input.ajustSize();
       input.onchange = function() {
         me.updateQuantity(this, this.productId, this.value);
       };
@@ -0,0 +1 @@
+/home/braulio/Projects/noosfero-ecosol/noosfero/config/plugins/shopping_cart/public
 \ No newline at end of file
@@ -0,0 +1 @@
+/home/braulio/Projects/noosfero-ecosol/noosfero/plugins/shopping_cart
 \ No newline at end of file
@@ -16,7 +16,7 @@
       <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' %>
+      <%= button 'cart',  _('Shopping checkout'), "/plugin/shopping_cart/buy", class: 'cart-buy' %>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
     </div>
       <a href="#" onclick="cart.toggle(); return false" class="cart-toggle">
@@ -31,7 +31,7 @@
 	      <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}}
+	        <input value="{{item.quantity}}" />{{item.priceTxt}}
 	      </div>
       </li>
   </script>
@@ -3,45 +3,51 @@
   style="<%= 'border-collapse: collapse' if by_mail %>">
  
   <tr>
-    <th>
-      <%= _('Item name') %>
+    <th class='cart-table-item' <%= "align='center'" if by_mail %>>
+      <%= _('Item') %>
     </th>
-    <th>
-      <%= if by_mail then '&nbsp;#&nbsp;' else '#' end %>
+    <th class='cart-table-quantity' <%= "align='center'" if by_mail %>>
+      <%= if by_mail then '&nbsp;'+_('Qtty')+'&nbsp;' else _('Qtty') end %>
     </th>
-    <th>
-      <%= _('Price') + " (#{@environment.currency_unit})" %>
+    <th class='cart-table-price' <%= "align='center'" if by_mail %>>
+      <%= _('Unit price') + " (#{@environment.currency_unit})" %>
+    </th>
+    <th class='cart-table-price' <%= "align='center'" if by_mail %>>
+      <%= _('Total') + " (#{@environment.currency_unit})" %>
     </th>
   </tr>
  
   <% order.items.each do |item| %>
     <tr>
-      <td>
+      <td class='cart-table-item' <%= "align='left'" if by_mail %>>
         <%= item.name %>
       </td>
-      <td class='cart-table-quantity' align="<%= 'center' if by_mail %>">
-        <%= item.quantity_consumer_ordered %>
+      <td class='cart-table-quantity' <%= "align='center'" if by_mail %>>
+        <%= "%03d" % item.quantity_consumer_ordered %>
+      </td>
+      <td class='cart-table-price' <%= "align='right'" if by_mail %>>
+        <%= get_price item.product, @environment, 1, unit: '' %>
       </td>
-      <td class='cart-table-price' align="<%= 'right' if by_mail %>">
+      <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'>
+  <tr class='delivery-costs'>
+    <td colspan=3 id='delivery-name'>
       <%= order.supplier_delivery.name if order.supplier_delivery %>
     </td>
-    <td id='delivery-price' class="cart-table-price">
+    <td id='delivery-price' class="cart-table-price" <%= "align='right'" if by_mail %>>
       <%= 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">
+  <th colspan=3 class="cart-table-total-label" <%= "align='right'" if by_mail %>>
     <%= _('Total:') %>
   </th>
-  <th class="cart-table-total-value">
+  <th class="cart-table-total-value" <%= "align='right'" if by_mail %>>
     <%= float_to_currency_cart order.total, @environment %>
   </th>
 </table>
 <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>
+  <h1><%= _('Shopping checkout') %></h1>
+  <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()', class: 'cart-go-back' %>
  
   <%= 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">
+    <div class="col-lg-6 col-md-6 col-sm-6 col-lg-push-6 col-md-push-6 col-sm-push-6">
+      <fieldset>
+        <legend><%=s_('Your Order')%></legend>
+        <% supplier_delivery = @order.supplier_delivery || profile.delivery_methods.first %>
+        <%= items_table @cart[:items], @profile, supplier_delivery %>
+      </fieldset>
+    </div>
+
+    <div class="col-lg-6 col-md-6 col-sm-6 col-lg-pull-6 col-md-pull-6 col-sm-pull-6">
       <fieldset>
         <legend><%=_('Personal identification')%></legend>
  
@@ -30,21 +36,15 @@
       <% 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>
  
-    <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], supplier_delivery %>
-      </fieldset>
-    </div>
-
     <div id="cart-form-actions" class="row">
-      <%= submit_button(:send, _('Send buy request')) %>
+      <%= button :back, _("haven't finished yet: back to shopping"), 'javascript:history.back()' %>
+      <%= submit_button(:send, _('Send buy request'), option:"success") %>
     </div>
   <% end %>
 </div>
@@ -52,10 +52,12 @@ class SuppliersPlugin::BasketController &lt; MyProfileController
   extend HMVC::ClassMethods
   hmvc SuppliersPlugin
  
-  def default_url_options
-    # avoid rails' use_relative_controller!
-    {use_route: '/'}
+  # inherit routes from core skipping use_relative_controller!
+  def url_for options
+    options[:controller] = "/#{options[:controller]}" if options.is_a? Hash and options[:controller] and not options[:controller].to_s.starts_with? '/'
+    super options
   end
+  helper_method :url_for
  
   def set_allowed_user
     @allowed_user = true
@@ -32,7 +32,7 @@ class SuppliersPlugin::ProductController &lt; MyProfileController
  
   def edit
     @product = profile.products.supplied.find params[:id]
-    @product.update_attributes params["product_#{@product.id}"]
+    @product.update params["product_#{@product.id}"]
   end
  
   def import
@@ -79,6 +79,7 @@ class SuppliersPlugin::ProductController &lt; MyProfileController
  
     @supplier = SuppliersPlugin::Supplier.where(id: params[:supplier_id]).first if params[:supplier_id].present?
  
+    # FIXME: joins(:from_products) is hiding own products (except baskets)
     @scope = profile.products.unarchived.joins :from_products, :suppliers
     @scope = SuppliersPlugin::BaseProduct.search_scope @scope, params
     @products_count = @scope.supplied_for_count.count
@@ -95,9 +96,11 @@ class SuppliersPlugin::ProductController &lt; MyProfileController
   extend HMVC::ClassMethods
   hmvc SuppliersPlugin
  
-  def default_url_options
-    # avoid rails' use_relative_controller!
-    {use_route: '/'}
+  # inherit routes from core skipping use_relative_controller!
+  def url_for options
+    options[:controller] = "/#{options[:controller]}" if options.is_a? Hash and options[:controller] and not options[:controller].to_s.starts_with? '/'
+    super options
   end
+  helper_method :url_for
  
 end
@@ -21,7 +21,7 @@ class SuppliersPluginMyprofileController &lt; MyProfileController
   end
  
   def new
-    @new_supplier.update_attributes! params[:supplier]
+    @new_supplier.update! params[:supplier]
     @supplier = @new_supplier
     session[:notice] = t('controllers.myprofile.supplier_created')
   end
@@ -33,7 +33,7 @@ class SuppliersPluginMyprofileController &lt; MyProfileController
  
   def edit
     @supplier = profile.suppliers.find params[:id]
-    @supplier.update_attributes params[:supplier]
+    @supplier.update params[:supplier]
   end
  
   def margin_change
@@ -58,8 +58,8 @@ class SuppliersPluginMyprofileController &lt; MyProfileController
  
   def search
     @query = params[:query].downcase
-    @enterprises = environment.enterprises.enabled.public.all limit: 12, order: 'name ASC',
-      conditions: ['LOWER(name) LIKE ? OR LOWER(name) LIKE ? OR identifier LIKE ?', "#{@query}%", "% #{@query}%", "#{@query}%"]
+    @enterprises = environment.enterprises.enabled.is_public.limit(12).order('name ASC').
+      where('name ILIKE ? OR name ILIKE ? OR identifier LIKE ?', "#{@query}%", "% #{@query}%", "#{@query}%")
     @enterprises -= profile.suppliers.collect(&:profile)
   end
  
@@ -15,6 +15,9 @@ module DefaultDelegate
  
     # TODO: add some documentation about the methods being added
     def default_delegate field, options = {}
+      class_attribute :default_delegate_enable unless respond_to? :default_delegate_enable
+      self.default_delegate_enable = true if self.default_delegate_enable.nil?
+
       # rake db:migrate run?
       return unless self.table_exists?
  
@@ -91,6 +94,8 @@ module DefaultDelegate
       end
  
       define_method "#{field}_with_default" do
+        return self.send own_field unless self.default_delegate_enable
+
         if self.send default_setting
           # delegated_field may return nil, so use own instead
           # this is the case with some associations (e.g. Product#product_qualifiers)
@@ -101,6 +106,8 @@ module DefaultDelegate
         end
       end
       define_method "#{field}_with_default=" do |*args|
+        return self.send "#{own_field}=", *args unless self.default_delegate_enable
+
         own = self.send "#{own_field}=", *args
         # break/set the default setting automatically, used for interfaces
         # that don't have the default setting (e.g. manage_products)
...	...	@@ -14,7 +14,7 @@ class DeliveryPlugin::AdminMethodController < MyProfileController
14	14
15	15	def edit
16	16	@delivery_method \|\|= profile.delivery_methods.find_by_id params[:id]
17		- if params[:delivery_method].present? and @delivery_method.update_attributes params[:delivery_method]
	17	+ if params[:delivery_method].present? and @delivery_method.update params[:delivery_method]
18	18	render partial: 'list'
19	19	else
20	20	render partial: 'edit', locals: {delivery_method: @delivery_method}
...	...
...	...	@@ -8,7 +8,13 @@ class DeliveryPlugin::AdminOptionsController < DeliveryPlugin::AdminMethodContro
8	8	before_filter :load_owner
9	9
10	10	def select
	11	+ end
11	12
	13	+ def select_all
	14	+ missing_methods = profile.delivery_methods - @owner.delivery_methods
	15	+ missing_methods.each do \|dm\|
	16	+ DeliveryPlugin::Option.create! owner_id: @owner.id, owner_type: @owner.class.name, delivery_method: dm
	17	+ end
12	18	end
13	19
14	20	def new
...	...
...	...	@@ -0,0 +1,8 @@
	1	+class AddDistributionMarginToDeliveryPluginMethod < ActiveRecord::Migration
	2	+
	3	+ def change
	4	+ add_column :delivery_plugin_methods, :distribution_margin_fixed, :decimal
	5	+ add_column :delivery_plugin_methods, :distribution_margin_percentage, :decimal
	6	+ end
	7	+
	8	+end
...	...
...	...	@@ -9,15 +9,24 @@ module DeliveryPlugin::DisplayHelper
9	9	methods = options[:methods] \|\| profile.delivery_methods
10	10
11	11	options = methods.map do \|method\|
12		- cost = if method.fixed_cost.present? and method.fixed_cost > 0 then float_to_currency_cart(method.fixed_cost, environment) else nil end
	12	+ cost = if method.fixed_cost.present? and method.fixed_cost > 0 then method.fixed_cost_as_currency else nil end
13	13	text = if cost.present? then "#{method.name} (#{cost})" else method.name end
14	14
15	15	content_tag :option, text, value: method.id,
16		- data: {label: method.name, type: method.delivery_type, instructions: method.description.to_s},
17		- selected: if method == selected then 'selected' else nil end
	16	+ data: {label: method.name, type: method.delivery_type, instructions: CGI::escapeHTML(method.description.to_s)},
	17	+ selected: if method.id == selected then 'selected' else nil end
18	18	end.join
19	19	end
20	20
	21	+ def consumer_delivery_field_value order, field
	22	+ # BLACK OR WHITE: do not mix existing delivery data with user's location
	23	+ if order.consumer_delivery_data.present?
	24	+ order.consumer_delivery_data[field]
	25	+ elsif user
	26	+ user.send field
	27	+ end
	28	+ end
	29	+
21	30	def delivery_context
22	31	@delivery_context \|\| 'delivery_plugin/admin_method'
23	32	end
...	...
1	1	require_dependency 'profile'
2	2
3		-class Profile
	3	+([Profile] + Profile.descendants).each do \|subclass\|
	4	+subclass.class_eval do
4	5
5		- has_many :delivery_methods, class_name: 'DeliveryPlugin::Method', foreign_key: :profile_id, dependent: :destroy, order: 'id ASC'
	6	+ has_many :delivery_methods, -> { order 'id ASC' }, class_name: 'DeliveryPlugin::Method', foreign_key: :profile_id, dependent: :destroy
6	7
7	8	end
	9	+end
...	...
...	...	@@ -12,16 +12,23 @@
12	12	delivery_type: 'Type'
13	13	delivery_type_help: 'Pickup: the products will be delivered in the consumption place.<br>Delivery: the products will be delivered in the address asked by the consumer.'
14	14	name: Name
15		- name_help: Write the name of the Consumption Place or the
16		- fixed_cost: Fixed cost
17		- free_over_price: Order's minimum price for free delivery
	15	+ name_help: Write the name of the Consumption Place or the
	16	+
	17	+ costs_legend: Delivery's costs
	18	+ fixed_cost: Fixed cost of delivery
	19	+ free_over_price: Order's minimum value for free delivery
	20	+
	21	+ distribution_legend: Distribution's costs
	22	+ distribution_margin_percentage: Distribution's margin
	23	+ distribution_margin_fixed: Distribution's margin (fixed)
	24	+
18	25	instructions: Description
19	26	instructions_help: "Write the address and other important informations about the place of this consumption place.<br> This text will be available"
20	27	views:
21		- delivery_option:
22		- select:
	28	+ delivery_option:
	29	+ select:
23	30	add: Add selected
24		- _select_content:
	31	+ _select_content:
25	32	add: Add option
26	33	add_new: "add new"
27	34	are_you_sure_you_want: "Are you sure you want to remove?"
...	...	@@ -29,14 +36,14 @@
29	36	choose_a_delivery_met: "Choose a delivery method from the list"
30	37	edit_this: "Edit"
31	38	remove_method: "Remove"
32		- _show:
	39	+ _show:
33	40	x: X
34		- select:
	41	+ select:
35	42	add_a_delivery_method: "Add a delivery method to the Orders' Cycle"
36	43	method:
37	44	index:
38	45	new: "New delivery or pickup"
39		- edit:
	46	+ edit:
40	47	add: Add
41	48	back: back
42	49	save: Save
...	...
...	...	@@ -13,15 +13,21 @@
13	13	delivery_type_help: "Retirada: os produtos serão buscados pela(o) consumidor(a), por exemplo, no empreendimento, numa feira ou num Núcleo de Consumo.<br>Entrega: os produtos serão entregues no endereço solicitado pelo(a) consumidor(a)."
14	14	name: Nome
15	15	name_help: "Para opção Retirada: escreva o nome do local onde os produtos deverão ser retirados pela(o) consumidor(a), por exemplo o nome do Núcleo de Consumo, da feira ou do próprio empreendimento.<br>Para a opção Entrega: escreva o nome do local, (uma cidade ou região) ou a forma de entrega (Correios, transportadora)"
16		- fixed_cost: Custo
17		- free_over_price: "Preço mínimo do pedido para Entrega Grátis"
	16	+
	17	+ costs_legend: Custos de entrega
	18	+ fixed_cost: Custo de entrega
	19	+ free_over_price: "Valor mínimo do pedido para Entrega Grátis"
	20	+ distribution_legend: Custos de distribuição
	21	+ distribution_margin_percentage: Margem de distribuição
	22	+ distribution_margin_fixed: Margem de distribuição (valor fixo)
	23	+
18	24	instructions: Descrição
19	25	instructions_help: "Escreva informações importantes sobre esta opção de Retirada ou Entrega.<br>Por exemplo, o endereço completo do Núcleo de Consumo, a abrangência da região de entrega.<br> Este texto estará disponível no \"Finalizar pedido\" e, ao confirmar a compra, o(a) consumidor(a) receberá um email com o pedido realizado e as informações deste campo."
20	26	views:
21		- delivery_option:
22		- select:
	27	+ delivery_option:
	28	+ select:
23	29	add: "Adicionar selecionados"
24		- _select_content:
	30	+ _select_content:
25	31	add: Adicionar opção
26	32	add_new: "adicionar novo"
27	33	are_you_sure_you_want: "Tem certeza de que quer remover?"
...	...	@@ -29,14 +35,14 @@
29	35	choose_a_delivery_met: "Escolha um método de entrega da lista"
30	36	edit_this: Editar
31	37	remove_method: "Remover"
32		- _show:
	38	+ _show:
33	39	x: X
34		- select:
	40	+ select:
35	41	add_a_delivery_method: "Adicionar um método de entrega ao ciclo de pedidos"
36	42	method:
37	43	index:
38	44	new: "Nova forma de entrega ou retirada"
39		- edit:
	45	+ edit:
40	46	add: Adicionar
41	47	back: voltar
42	48	save: Salvar
...	...
1	1	class DeliveryPlugin::Method < ActiveRecord::Base
2	2
3		- extend CurrencyHelper::ClassMethods
4		-
5	3	Types = ['pickup', 'deliver']
6	4
7	5	# see also: Profile::LOCATION_FIELDS
...	...	@@ -10,7 +8,7 @@ class DeliveryPlugin::Method < ActiveRecord::Base
10	8	].map(&:to_sym)
11	9
12	10	attr_accessible :profile, :delivery_type, :name, :description,
13		- :fixed_cost, :free_over_price
	11	+ :fixed_cost, :free_over_price, :distribution_margin_percentage, :distribution_margin_fixed
14	12
15	13	belongs_to :profile
16	14
...	...	@@ -20,8 +18,14 @@ class DeliveryPlugin::Method < ActiveRecord::Base
20	18	validates_presence_of :name
21	19	validates_inclusion_of :delivery_type, in: Types
22	20
23		- scope :pickup, conditions: {delivery_type: 'pickup'}
24		- scope :delivery, conditions: {delivery_type: 'deliver'}
	21	+ scope :pickup, -> { where delivery_type: 'pickup' }
	22	+ scope :delivery, -> { where delivery_type: 'deliver'}
	23	+
	24	+ extend CurrencyHelper::ClassMethods
	25	+ has_currency :fixed_cost
	26	+ has_currency :free_over_price
	27	+ has_currency :distribution_margin_percentage
	28	+ has_currency :distribution_margin_fixed
25	29
26	30	def pickup?
27	31	self.delivery_type == 'pickup'
...	...	@@ -30,22 +34,40 @@ class DeliveryPlugin::Method < ActiveRecord::Base
30	34	self.delivery_type == 'deliver'
31	35	end
32	36
33		- def has_cost? order_price=nil
	37	+ def has_distribution_margin?
	38	+ (self.distribution_margin_percentage.present? and self.distribution_margin_percentage.nonzero?) or
	39	+ (self.distribution_margin_fixed.present? and self.distribution_margin_fixed.nonzero?)
	40	+ end
	41	+
	42	+ def has_fixed_cost? order_price=nil
34	43	if order_price.present? and order_price.nonzero? and self.free_over_price.present? and self.free_over_price.nonzero?
35	44	order_price <= self.free_over_price
36	45	else
37	46	self.fixed_cost.present? and self.fixed_cost.nonzero?
38	47	end
39	48	end
	49	+
	50	+ def distribution_margin order_price
	51	+ value = 0
	52	+ value += self.distribution_margin_fixed if self.distribution_margin_fixed.present?
	53	+ value += order_price * (self.distribution_margin_percentage/100) if self.distribution_margin_percentage.present?
	54	+ value
	55	+ end
	56	+
	57	+ def has_cost? order_price=nil
	58	+ has_cost = self.has_distribution_margin?
	59	+ has_cost \|\|= self.has_fixed_cost? order_price
	60	+ end
40	61	def free? order_price=nil
41	62	!self.has_cost?
42	63	end
43	64
44	65	def cost order_price=nil
45		- if self.has_cost?(order_price) then self.fixed_cost.to_f else 0 end
	66	+ value = 0
	67	+ value += self.fixed_cost if self.has_fixed_cost? order_price
	68	+ value += self.distribution_margin order_price if self.has_distribution_margin?
	69	+ value
46	70	end
47		- has_currency :fixed_cost
48		- has_currency :free_over_price
49	71	has_currency :cost
50	72
51	73	protected
...	...
...	...	@@ -3,7 +3,7 @@
3	3	#delivery-method-edition {
4	4	@extend .container-clean;
5	5
6		- .field-help {
	6	+ .help-block {
7	7	font-size: 10px;
8	8	}
9	9	}
...	...
...	...	@@ -0,0 +1 @@
	1	+require File.dirname(__FILE__) + '/../../../test/test_helper'
...	...