Merge commit 'refs/merge-requests/40' of git://gitorious.org/noosfero/noosfero

Joenio Costa
2 parents becdcf37 71bb0aab
Showing 16 changed files with 1022 additions and 3 deletions Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb
plugins/shopping_cart/controllers/shopping_cart_plugin_profile_controller.rb
plugins/shopping_cart/db/migrate/20110825173657_create_purchase_order.rb
plugins/shopping_cart/lib/ext/enterprise.rb
plugins/shopping_cart/lib/ext/person.rb
plugins/shopping_cart/lib/shopping_cart_plugin.rb
plugins/shopping_cart/lib/shopping_cart_plugin/cart_helper.rb
plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb
plugins/shopping_cart/public/images/control-panel/purchase-report.png
plugins/shopping_cart/public/images/control-panel/purchase-report.svg
plugins/shopping_cart/public/style.css
plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
plugins/shopping_cart/test/functional/shopping_cart_plugin_profile_controller_test.rb
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb
plugins/shopping_cart/views/shopping_cart_plugin_myprofile/reports.html.erb
+include ShoppingCartPlugin::CartHelper
+
 class ShoppingCartPluginMyprofileController < MyProfileController
   append_view_path File.join(File.dirname(__FILE__) + '/../views')
@@ -13,4 +15,35 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
     end
   end
+  def reports
+    utc_string = ' 00:00:00 UTC'
+    @from = params[:from] ? Time.parse(params[:from] + utc_string) : Time.now.utc.at_beginning_of_month
+    @to = params[:to] ? Time.parse(params[:to] + utc_string) : Time.now.utc
+    @status = !params[:filter_status].blank? ? params[:filter_status].to_i : nil
+
+    condition = 'created_at >= ? AND created_at <= ?'
+    condition_parameters = [@from, @to+1.day]
+    if @status
+      condition += ' AND status == ?'
+      condition_parameters << @status
+    end
+
+    conditions = [condition] + condition_parameters
+    @orders = profile.orders.find(:all, :conditions => conditions)
+
+    @products = {}
+    @orders.each do |order|
+      order.products_list.each do |id, qp| 
+        @products[id] ||= 0
+        @products[id] += qp[:quantity]
+      end
+    end
+  end
+
+  def update_order_status
+    order = ShoppingCartPlugin::PurchaseOrder.find(params[:order_id].to_i)
+    order.status = params[:order_status].to_i
+    order.save!
+    redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
+  end
 end
@@ -89,6 +89,7 @@ class ShoppingCartPluginProfileController &lt; ProfileController
   end
   def send_request
+      register_order(params[:customer], session[:cart][:items])
     begin
       ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])
       ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])
@@ -223,4 +224,23 @@ class ShoppingCartPluginProfileController &lt; ProfileController
     end
     true
   end
+
+  def register_order(custumer, items)
+    new_items = {}
+    items.each do |id, quantity|
+      new_items[id] = {:quantity => quantity, :price => Product.find(id).price}
+    end
+    ShoppingCartPlugin::PurchaseOrder.create!(
+      :seller => profile,
+      :customer => user,
+      :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
+      :products_list => new_items,
+      :customer_name => params[:customer][:name],
+      :customer_email => params[:customer][:email],
+      :customer_contact_phone => params[:customer][:contact_phone],
+      :customer_address => params[:customer][:address],
+      :customer_city => params[:customer][:city],
+      :customer_zip_code => params[:customer][:zip_code]
+    )
+  end
 end
@@ -0,0 +1,15 @@
+class CreatePurchaseOrder < ActiveRecord::Migration
+  def self.up
+    create_table :shopping_cart_plugin_purchase_orders do |t|
+      t.references :customer
+      t.references :seller
+      t.text :data
+      t.integer :status
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :shopping_cart_plugin_purchase_order
+  end
+end
@@ -0,0 +1,5 @@
+require_dependency 'enterprise'
+
+class Enterprise
+  has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
+end
@@ -0,0 +1,5 @@
+require_dependency 'person'
+
+class Person
+  has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
+end
+require_dependency 'ext/enterprise'
+require_dependency 'ext/person'
+
 class ShoppingCartPlugin < Noosfero::Plugin
   def self.plugin_name
@@ -42,8 +45,14 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
   end
   def control_panel_buttons
+    buttons = []
     if context.profile.enterprise?
-      { :title => 'Shopping cart', :icon => 'shopping_cart_icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
+      buttons << { :title => 'Shopping cart', :icon => 'shopping_cart_icon', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'edit'} }
+    end
+    if context.profile.enterprise? && context.profile.shopping_cart
+      buttons << { :title => 'Purchase reports', :icon => 'shopping-cart-purchase-report', :url => {:controller => 'shopping_cart_plugin_myprofile', :action => 'reports'} }
     end
+
+    buttons
   end
 end
@@ -54,8 +54,6 @@ module ShoppingCartPlugin::CartHelper
     '</table>'
   end
-  private
-
   def float_to_currency_cart(value, environment)
     number_to_currency(value, :unit => environment.currency_unit, :separator => environment.currency_separator, :delimiter => environment.currency_delimiter, :format => "%u %n")
   end
@@ -0,0 +1,37 @@
+class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
+
+  belongs_to :customer, :class_name => "Profile"
+  belongs_to :seller, :class_name => "Profile"
+
+  validates_presence_of :status, :seller
+
+  acts_as_having_settings :field => :data
+
+  settings_items :products_list, :type => Array, :default => {}
+  settings_items :customer_name, :type => String
+  settings_items :customer_email, :type => String
+  settings_items :customer_contact_phone, :type => String
+  settings_items :customer_address, :type => String
+  settings_items :customer_city, :type => String
+  settings_items :customer_zip_code, :type => String
+
+  before_create do |order|
+    order.created_at = Time.now.utc
+    order.updated_at = Time.now.utc
+  end
+
+  before_update do |order|
+    order.updated_at = Time.now.utc
+  end
+
+  module Status
+    OPENED = 0
+    CANCELED = 1
+    CONFIRMED = 2
+    SHIPPED = 3
+
+    def self.name
+      [_('Opened'), _('Canceled'), _('Confirmed'), _('Shipped')]
+    end
+  end
+end
@@ -0,0 +1,648 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="purchase-report.svg"
+   inkscape:export-filename="/home/aurium/purchase-report.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4980">
+      <stop
+         style="stop-color:#2e3436;stop-opacity:1;"
+         offset="0"
+         id="stop4982" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:0"
+         offset="1"
+         id="stop4984" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4962"
+       inkscape:collect="always">
+      <stop
+         id="stop4964"
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:0" />
+      <stop
+         id="stop4966"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4952">
+      <stop
+         style="stop-color:#555753;stop-opacity:1;"
+         offset="0"
+         id="stop4954" />
+      <stop
+         style="stop-color:#888a85;stop-opacity:1"
+         offset="1"
+         id="stop4956" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4944">
+      <stop
+         style="stop-color:#888a85;stop-opacity:1;"
+         offset="0"
+         id="stop4946" />
+      <stop
+         style="stop-color:#555753;stop-opacity:1"
+         offset="1"
+         id="stop4948" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4914">
+      <stop
+         style="stop-color:#cccccc;stop-opacity:1"
+         offset="0"
+         id="stop4916" />
+      <stop
+         style="stop-color:#4d4d4d;stop-opacity:1"
+         offset="1"
+         id="stop4918" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4853">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4855" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop4857" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+    <inkscape:perspective
+       id="perspective3634"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3659"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4618"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       id="linearGradient2251">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2253" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2255" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2224"
+       id="linearGradient4602"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(3.2628514,1006.5776)"
+       x1="36.237148"
+       y1="41.284599"
+       x2="33.664921"
+       y2="37.770721" />
+    <linearGradient
+       id="linearGradient2224">
+      <stop
+         style="stop-color:#7c7c7c;stop-opacity:1;"
+         offset="0"
+         id="stop2226" />
+      <stop
+         style="stop-color:#b8b8b8;stop-opacity:1;"
+         offset="1"
+         id="stop2228" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient2259"
+       id="linearGradient4605"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.999421,0,0,1,-5.0089689,998.39565)"
+       x1="26.076092"
+       y1="26.696676"
+       x2="30.811172"
+       y2="42.007351" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient2259">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop2261" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop2263" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient15218"
+       id="linearGradient4608"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.067236,0,0,0.989276,4.391684,4.035227)"
+       x1="22.308331"
+       y1="18.99214"
+       x2="35.785294"
+       y2="39.498238" />
+    <linearGradient
+       id="linearGradient15218">
+      <stop
+         style="stop-color:#f0f0ef;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop15220" />
+      <stop
+         id="stop2269"
+         offset="0.59928656"
+         style="stop-color:#e8e8e8;stop-opacity:1;" />
+      <stop
+         id="stop2267"
+         offset="0.82758623"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d8d8d3;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop15222" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective4722"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <linearGradient
+       y2="-968.28137"
+       x2="46.01725"
+       y1="-987.48724"
+       x1="31.962252"
+       gradientTransform="matrix(1.067236,0,0,0.989276,-9.611267,2002.7597)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4644-0"
+       xlink:href="#linearGradient15218-5"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient15218-5">
+      <stop
+         style="stop-color:#f0f0ef;stop-opacity:1.0000000;"
+         offset="0.0000000"
+         id="stop15220-1" />
+      <stop
+         id="stop2269-8"
+         offset="0.59928656"
+         style="stop-color:#e8e8e8;stop-opacity:1;" />
+      <stop
+         id="stop2267-9"
+         offset="0.82758623"
+         style="stop-color:#ffffff;stop-opacity:1;" />
+      <stop
+         style="stop-color:#d8d8d3;stop-opacity:1.0000000;"
+         offset="1.0000000"
+         id="stop15222-1" />
+    </linearGradient>
+    <linearGradient
+       y2="39.498238"
+       x2="35.785294"
+       y1="18.99214"
+       x1="22.308331"
+       gradientTransform="matrix(1.067236,0,0,0.989276,-11.611266,-5.9647499)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4733"
+       xlink:href="#linearGradient15218-5"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4853"
+       id="linearGradient4870"
+       gradientUnits="userSpaceOnUse"
+       x1="32.5"
+       y1="1026.8622"
+       x2="36.5"
+       y2="1026.8622"
+       gradientTransform="translate(0,15)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4914"
+       id="linearGradient4926"
+       gradientUnits="userSpaceOnUse"
+       x1="21.5"
+       y1="16.5"
+       x2="32.5"
+       y2="38.5"
+       gradientTransform="translate(0,1004.3622)" />
+    <mask
+       maskUnits="userSpaceOnUse"
+       id="mask4922">
+      <rect
+         style="color:#000000;fill:url(#linearGradient4926);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="rect4924"
+         width="34"
+         height="41"
+         x="7.5"
+         y="1006.8622" />
+    </mask>
+    <filter
+       inkscape:collect="always"
+       id="filter4938"
+       x="-0.063571429"
+       width="1.1271429"
+       y="-1.0679999"
+       height="3.1359998">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.1124999"
+         id="feGaussianBlur4940" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4944"
+       id="linearGradient4950"
+       x1="5.5"
+       y1="1015.8622"
+       x2="11.5"
+       y2="1049.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4962"
+       id="linearGradient4958"
+       x1="36.5"
+       y1="1047.8622"
+       x2="31.5"
+       y2="1038.8622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4952"
+       id="linearGradient4960"
+       gradientUnits="userSpaceOnUse"
+       x1="34.5"
+       y1="1046.8622"
+       x2="29.5"
+       y2="1039.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4962"
+       id="linearGradient4968"
+       gradientUnits="userSpaceOnUse"
+       x1="37.420265"
+       y1="1044.8622"
+       x2="36.5"
+       y2="1043.8622" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4980"
+       id="linearGradient4986"
+       x1="38.5"
+       y1="41.5"
+       x2="41.5"
+       y2="44.5"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="12.541667"
+     inkscape:cx="24"
+     inkscape:cy="24"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1440"
+     inkscape:window-height="827"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2816"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       originx="0.5px"
+       originy="0.5px" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Camada 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1004.3622)">
+    <rect
+       style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;filter:url(#filter4938);opacity:0.7"
+       id="rect4928"
+       width="41.999996"
+       height="2.5"
+       x="3.5"
+       y="43.5"
+       transform="translate(0,1004.3622)"
+       ry="1" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient4644-0);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4950);stroke-width:1.00000024000000010;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect4699"
+       width="38"
+       height="45"
+       x="5.5"
+       y="1004.8622"
+       ry="1" />
+    <path
+       style="fill:url(#linearGradient4986);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1;opacity:0.59999999999999998"
+       d="M 33.5,45 43,36.5 43,45 33.5,45 z"
+       id="path4970"
+       transform="translate(0,1004.3622)"
+       sodipodi:nodetypes="cccc" />
+    <rect
+       style="fill:none;stroke:url(#linearGradient4605);stroke-width:1.00000083;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect15244"
+       width="35.997337"
+       height="43.000019"
+       x="6.5026627"
+       y="1005.8622"
+       rx="0"
+       ry="0" />
+    <g
+       id="g4873"
+       mask="url(#mask4922)">
+      <g
+         transform="translate(6,1)"
+         id="g4757">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
+           id="path2839"
+           transform="translate(0,1004.3622)"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="cccccc"
+           id="path3619"
+           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
+           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" />
+        <path
+           transform="translate(7.5,1000.8622)"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="1.5"
+           sodipodi:cy="16"
+           sodipodi:cx="7"
+           id="path3647"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4776"
+           sodipodi:cx="7"
+           sodipodi:cy="16"
+           sodipodi:rx="1.5"
+           sodipodi:ry="1.5"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           transform="translate(-1,1000.8622)" />
+      </g>
+      <g
+         id="g4778"
+         transform="translate(6,15)">
+        <path
+           sodipodi:nodetypes="ccccc"
+           transform="translate(0,1004.3622)"
+           id="path4780"
+           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+        <path
+           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0"
+           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
+           id="path4782"
+           sodipodi:nodetypes="cccccc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4784"
+           sodipodi:cx="7"
+           sodipodi:cy="16"
+           sodipodi:rx="1.5"
+           sodipodi:ry="1.5"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           transform="translate(7.5,1000.8622)" />
+        <path
+           transform="translate(-1,1000.8622)"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="1.5"
+           sodipodi:cy="16"
+           sodipodi:cx="7"
+           id="path4786"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+      </g>
+      <g
+         transform="translate(6,29)"
+         id="g4788">
+        <path
+           style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+           d="m 2.5,2.5 2,0 0,8 12,0 0,-6"
+           id="path4790"
+           transform="translate(0,1004.3622)"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           sodipodi:nodetypes="cccccc"
+           id="path4792"
+           style="fill:none;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:1, 1;stroke-dashoffset:0"
+           d="m 15,1012.8622 -9.5,0 m 9.5,-2 -9.5,0 m 9.5,-2 -9.5,0" />
+        <path
+           transform="translate(7.5,1000.8622)"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           sodipodi:ry="1.5"
+           sodipodi:rx="1.5"
+           sodipodi:cy="16"
+           sodipodi:cx="7"
+           id="path4794"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           sodipodi:type="arc" />
+        <path
+           sodipodi:type="arc"
+           style="color:#000000;fill:#000000;stroke:none;stroke-width:1px;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           id="path4796"
+           sodipodi:cx="7"
+           sodipodi:cy="16"
+           sodipodi:rx="1.5"
+           sodipodi:ry="1.5"
+           d="m 8.5,16 c 0,0.828427 -0.6715729,1.5 -1.5,1.5 -0.8284271,0 -1.5,-0.671573 -1.5,-1.5 0,-0.828427 0.6715729,-1.5 1.5,-1.5 0.8284271,0 1.5,0.671573 1.5,1.5 z"
+           transform="translate(-1,1000.8622)" />
+      </g>
+      <path
+         sodipodi:nodetypes="cccccc"
+         d="m 29.5,1015.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         id="path4802" />
+      <path
+         transform="translate(0,1004.3622)"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="5.5"
+         sodipodi:cx="26.5"
+         id="path4804"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4806"
+         sodipodi:cx="26.5"
+         sodipodi:cy="5.5"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         transform="translate(0,1007.3622)" />
+      <path
+         transform="translate(0,1010.3622)"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="5.5"
+         sodipodi:cx="26.5"
+         id="path4808"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         id="path4811"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 29.5,1029.8622 11,0 m -11,-3 11,0 m -11,-3 11,0"
+         sodipodi:nodetypes="cccccc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4813"
+         sodipodi:cx="26.5"
+         sodipodi:cy="5.5"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         transform="translate(0,1018.3622)" />
+      <path
+         transform="translate(0,1021.3622)"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="5.5"
+         sodipodi:cx="26.5"
+         id="path4815"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4817"
+         sodipodi:cx="26.5"
+         sodipodi:cy="5.5"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         transform="translate(0,1024.3622)" />
+      <path
+         id="path4827"
+         style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 29.5,1038.8622 11,0 m -11,3 11,0 m -11,3 9,0" />
+      <path
+         transform="translate(0,1033.3622)"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="5.5"
+         sodipodi:cx="26.5"
+         id="path4829"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path4831"
+         sodipodi:cx="26.5"
+         sodipodi:cy="5.5"
+         sodipodi:rx="1"
+         sodipodi:ry="1"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         transform="translate(0,1036.3622)" />
+      <path
+         transform="translate(0,1039.3622)"
+         d="m 27.5,5.5 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z"
+         sodipodi:ry="1"
+         sodipodi:rx="1"
+         sodipodi:cy="5.5"
+         sodipodi:cx="26.5"
+         id="path4833"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </g>
+    <g
+       id="g4835"
+       style="stroke:url(#linearGradient4958)">
+      <path
+         sodipodi:nodetypes="csccc"
+         id="path2210"
+         d="m 30.5,1049.8622 c 3,0 4.031657,-1.3115 7,-4 2.357963,-2.1356 6,-4 6,-8 0,5 -5,4 -10,4 0,4 1,8 -3,8 z"
+         style="color:#000000;fill:url(#linearGradient4602);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4960);stroke-width:1.00000024000000010;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible" />
+      <path
+         style="opacity:0.50000000000000000;color:#000000;fill:none;stroke:url(#linearGradient4968);stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+         d="m 39.5,1042.8622 -5,0 0,4"
+         id="path2247"
+         sodipodi:nodetypes="ccc" />
+    </g>
+  </g>
+</svg>
@@ -168,3 +168,47 @@ label.error {
   padding-left: .5em;
   vertical-align: top;
 }
+
+.controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)}
+.controller-profile_editor a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.png)}
+.controller-profile_editor .msie6 a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.gif)}
+
+.action-shopping_cart_plugin_myprofile-reports td.order-info {
+  padding: 0px;
+  height: auto;
+}
+
+.action-shopping_cart_plugin_myprofile-reports .customer-details,
+.action-shopping_cart_plugin_myprofile-reports .order-products {
+  list-style-position: inside;
+  float: left;
+  width: 49%;
+  margin: 0px;
+  padding: 10px 0px;
+}
+
+.action-shopping_cart_plugin_myprofile-reports .order-products {
+  float: right;
+}
+
+.action-shopping_cart_plugin_myprofile-reports .customer-details li,
+.action-shopping_cart_plugin_myprofile-reports .order-products li {
+  padding-left: 5px;
+}
+
+#order-filter {
+  background-color: #ccc;
+  border: 1px solid #aaa;
+  border-radius: 5px;
+  padding: 3px 8px;
+  margin-bottom: 10px;
+}
+
+th {
+  text-align: center;
+}
+
+td {
+  text-align: left;
+}
@@ -6,6 +6,8 @@ class ShoppingCartPluginMyprofileController; def rescue_action(e) raise e end; e
 class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase
+  TIME_FORMAT = '%Y-%m-%d'
+
   def setup
     @controller = ShoppingCartPluginMyprofileController.new
     @request    = ActionController::TestRequest.new
@@ -59,4 +61,56 @@ class ShoppingCartPluginMyprofileControllerTest &lt; Test::Unit::TestCase
     enterprise.reload
     assert enterprise.shopping_cart_delivery_price == price
   end
+
+  should 'filter the reports correctly' do
+    another_enterprise = fast_create(Enterprise)
+    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED)
+    po3 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po3.created_at = 1.year.ago
+    po3.save!
+    po4 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => another_enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+
+    post :reports,
+      :profile => enterprise.identifier,
+      :from => (Time.now - 1.day).strftime(TIME_FORMAT),
+      :to => (Time.now + 1.day).strftime(TIME_FORMAT),
+      :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
+
+    assert_includes assigns(:orders), po1
+    assert_not_includes assigns(:orders), po2
+    assert_not_includes assigns(:orders), po3
+    assert_not_includes assigns(:orders), po4
+  end
+
+  should 'group filtered orders products and quantities' do
+    p1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1)
+    p2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2)
+    p3 = fast_create(Product, :enterprise_id => enterprise.id, :price => 3)
+    po1_products = {p1.id => {:quantity => 1, :price => p1.price}, p2.id => {:quantity => 2, :price => p2.price }}
+    po2_products = {p2.id => {:quantity => 1, :price => p2.price}, p3.id => {:quantity => 2, :price => p3.price }}
+    po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po1_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+    po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po2_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+
+    post :reports,
+      :profile => enterprise.identifier,
+      :from => (Time.now - 1.day).strftime(TIME_FORMAT),
+      :to => (Time.now + 1.day).strftime(TIME_FORMAT),
+      :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
+
+    hash = {p1.id => 1, p2.id => 3, p3.id => 2}
+
+    assert_equal hash, assigns(:products)
+  end
+
+  should 'be able to update the order status' do
+    po = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
+
+    post :update_order_status,
+      :profile => enterprise.identifier,
+      :order_id => po.id,
+      :order_status => ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED
+    po.reload
+    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED, po.status
+  end
 end
@@ -144,6 +144,25 @@ class ShoppingCartPluginProfileControllerTest &lt; Test::Unit::TestCase
     assert_nothing_raised {  get :clean, :profile => enterprise.identifier }
   end
+  should 'register order on send request' do
+    product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
+    product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
+    @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1, product2.id => 2}}})
+    assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
+      post :send_request,
+        :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
+        :profile => enterprise.identifier
+    end
+
+    order = ShoppingCartPlugin::PurchaseOrder.last
+
+    assert_equal 1.99, order.products_list[product1.id][:price]
+    assert_equal 1, order.products_list[product1.id][:quantity]
+    assert_equal 2.23, order.products_list[product2.id][:price]
+    assert_equal 2, order.products_list[product2.id][:quantity]
+    assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
+  end
+
   private
   def json_response
@@ -0,0 +1,59 @@
+<% if @orders.empty? %>
+  <p><i><%= _("No results.") %></i></p>
+<% else %>
+  <table>
+    <tr>
+      <th><%= _('Date') %></th>
+      <th><%= _('Customer') %></th>
+      <th><%= _('Purchase value') %></th>
+      <th><%= _('Status')%></th>
+      <th>&nbsp;</th>
+    </tr>
+    <% status_collection.delete_at(0) %>
+    <% @orders.each do |order|%>
+      <tr>
+        <td><%= order.created_at.strftime("%Y-%m-%d")%></td>
+        <td><%= order.customer_name %></td>
+        <td style="text-align: right"><%= float_to_currency_cart(order.products_list.sum {|id, qp| qp[:price]*qp[:quantity]}, environment) %></td>
+        <td>
+          <% form_tag :action => 'update_order_status' do %>
+            <%= hidden_field_tag(:order_id, order.id) +
+              hidden_field_tag(:context_from, @from) +
+              hidden_field_tag(:context_to, @to) +
+              hidden_field_tag(:context_status, @status) +
+              select_tag( :order_status, options_from_collection_for_select(status_collection, :first, :last, order.status),
+                         :onchange => "this.form.submit()" )
+            %>
+          <% end %>
+        </td>
+        <td><button class="view-order-details" data-order="<%=order.id%>"><%=_('View details')%></button></td>
+      </tr>
+      <tr id="order-details-<%=order.id%>" style="display:none">
+        <td class="order-info" colspan="5">
+          <div style="display:none">
+            <ul class="customer-details">
+              <% { 'name' =>_('Name'), 'email' => _('E-mail'), 'contact_phone' => _('Contact phone'), 'address' => _('Address'), 'city' => _('City'), 'zip_code' => _('Zip code')}.each do |attribute, name| %>
+                <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
+              <% end %>
+            </ul>
+            <ul class="order-products">
+              <% order.products_list.each do |id, qp| %>
+                <% 
+                  begin
+                    product = Product.find(id)
+                  rescue
+                    product = nil
+                  end
+                %>
+                <li><%= product ? link_to(product.name, product.url) : _("Pruduct unavailable")%>
+                &times; <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>
+              <% end %>
+            </ul>
+            <br style="clear:both"/>
+          </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
@@ -0,0 +1,17 @@
+<% if @products.empty? %>
+  <p><i><%= _("No results.") %></i></p>
+<% else %>
+  <table>
+    <tr>
+      <th><%= _('Product') %></th>
+      <th><%= _('Quantity') %></th>
+    </tr>
+    <% @products.each do |id, quantity|%>
+      <tr>
+        <td><%= link_to(Product.find(id).name, Product.find(id).url) %></td>
+        <td style="text-align: center"><%= quantity %></td>
+      </tr>
+    <% end %>
+  </table>
+<% end %>
+
@@ -0,0 +1,56 @@
+<h1> <%= _('Purchase Reports') %> </h1>
+
+<% extend ProfileHelper %>
+
+<% status = ShoppingCartPlugin::PurchaseOrder::Status.name; pos=-1 %>
+<% status_collection = [[nil, _('All')]] %>
+<% status_collection += status.map{|s| [pos+=1, s] } %>
+
+<% form_tag({}, {:id => 'order-filter'}) do %>
+  <%= labelled_text_field(_('From')+' ', :from, @from.strftime("%Y-%m-%d"), :id => 'from', :size => 9) %>
+  <%= labelled_text_field(_('to')+' ', :to, @to.strftime("%Y-%m-%d"), :id => 'to', :size => 9) %>
+  <span style="white-space:nowrap"><%= labelled_select(_('Status')+' ', :filter_status, :first, :last, @status,  status_collection)%></span>
+  &nbsp;
+  <%= submit_button('save',  _('Filter')) %>
+<% end %>
+
+<% tabs = [] %>
+<% tabs << {:title => _('Products list'), :id => 'products_list', :content => (render :partial => 'products_list')} %>
+<% tabs << {:title => _('Orders list'), :id => 'orders_list', :content => (render :partial => 'orders_list', :locals => {:status_collection => status_collection})} %>
+<%= render_tabs(tabs) %>
+
+<script>
+	var dates = jQuery( "#from, #to" ).datepicker({
+		defaultDate: "+1w",
+		changeMonth: true,
+    dateFormat: 'yy-mm-dd',
+		onSelect: function( selectedDate ) {
+			var option = this.id == "from" ? "minDate" : "maxDate",
+				instance = jQuery( this ).data( "datepicker" ),
+				date = jQuery.datepicker.parseDate(
+					instance.settings.dateFormat ||
+					jQuery.datepicker._defaults.dateFormat,
+					selectedDate, instance.settings );
+			dates.not( this ).datepicker( "option", option, date );
+		}
+	});
+  jQuery(".view-order-details").each(function(index, bt){
+    jQuery(bt).button({
+      icons: {
+        primary: "ui-icon-info"
+      },
+      text: false
+    });
+    bt.onclick = function(){
+      var orderId = this.getAttribute("data-order");
+      var tr = jQuery("#order-details-"+orderId);
+      var div = jQuery("#order-details-"+orderId+" div");
+      if ( tr[0].style.display == "none" ) {
+        tr.show();
+        div.slideDown('fast');
+      } else {
+        div.slideUp("fast", function(){tr.hide()});
+      }
+    }
+  });
+</script>
		1	+include ShoppingCartPlugin::CartHelper
		2	+
1	class ShoppingCartPluginMyprofileController < MyProfileController	3	class ShoppingCartPluginMyprofileController < MyProfileController
2	append_view_path File.join(File.dirname(__FILE__) + '/../views')	4	append_view_path File.join(File.dirname(__FILE__) + '/../views')
3		5
	@@ -13,4 +15,35 @@ class ShoppingCartPluginMyprofileController < MyProfileController		@@ -13,4 +15,35 @@ class ShoppingCartPluginMyprofileController < MyProfileController
13	end	15	end
14	end	16	end
15		17
		18	+ def reports
		19	+ utc_string = ' 00:00:00 UTC'
		20	+ @from = params[:from] ? Time.parse(params[:from] + utc_string) : Time.now.utc.at_beginning_of_month
		21	+ @to = params[:to] ? Time.parse(params[:to] + utc_string) : Time.now.utc
		22	+ @status = !params[:filter_status].blank? ? params[:filter_status].to_i : nil
		23	+
		24	+ condition = 'created_at >= ? AND created_at <= ?'
		25	+ condition_parameters = [@from, @to+1.day]
		26	+ if @status
		27	+ condition += ' AND status == ?'
		28	+ condition_parameters << @status
		29	+ end
		30	+
		31	+ conditions = [condition] + condition_parameters
		32	+ @orders = profile.orders.find(:all, :conditions => conditions)
		33	+
		34	+ @products = {}
		35	+ @orders.each do \|order\|
		36	+ order.products_list.each do \|id, qp\|
		37	+ @products[id] \|\|= 0
		38	+ @products[id] += qp[:quantity]
		39	+ end
		40	+ end
		41	+ end
		42	+
		43	+ def update_order_status
		44	+ order = ShoppingCartPlugin::PurchaseOrder.find(params[:order_id].to_i)
		45	+ order.status = params[:order_status].to_i
		46	+ order.save!
		47	+ redirect_to :action => 'reports', :from => params[:context_from], :to => params[:context_to], :filter_status => params[:context_status]
		48	+ end
16	end	49	end
	@@ -89,6 +89,7 @@ class ShoppingCartPluginProfileController < ProfileController		@@ -89,6 +89,7 @@ class ShoppingCartPluginProfileController < ProfileController
89	end	89	end
90		90
91	def send_request	91	def send_request
		92	+ register_order(params[:customer], session[:cart][:items])
92	begin	93	begin
93	ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])	94	ShoppingCartPlugin::Mailer.deliver_customer_notification(params[:customer], profile, session[:cart][:items])
94	ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])	95	ShoppingCartPlugin::Mailer.deliver_supplier_notification(params[:customer], profile, session[:cart][:items])
	@@ -223,4 +224,23 @@ class ShoppingCartPluginProfileController < ProfileController		@@ -223,4 +224,23 @@ class ShoppingCartPluginProfileController < ProfileController
223	end	224	end
224	true	225	true
225	end	226	end
		227	+
		228	+ def register_order(custumer, items)
		229	+ new_items = {}
		230	+ items.each do \|id, quantity\|
		231	+ new_items[id] = {:quantity => quantity, :price => Product.find(id).price}
		232	+ end
		233	+ ShoppingCartPlugin::PurchaseOrder.create!(
		234	+ :seller => profile,
		235	+ :customer => user,
		236	+ :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
		237	+ :products_list => new_items,
		238	+ :customer_name => params[:customer][:name],
		239	+ :customer_email => params[:customer][:email],
		240	+ :customer_contact_phone => params[:customer][:contact_phone],
		241	+ :customer_address => params[:customer][:address],
		242	+ :customer_city => params[:customer][:city],
		243	+ :customer_zip_code => params[:customer][:zip_code]
		244	+ )
		245	+ end
226	end	246	end
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class CreatePurchaseOrder < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :shopping_cart_plugin_purchase_orders do \|t\|
	4	+ t.references :customer
	5	+ t.references :seller
	6	+ t.text :data
	7	+ t.integer :status
	8	+ t.timestamps
	9	+ end
	10	+ end
	11	+
	12	+ def self.down
	13	+ drop_table :shopping_cart_plugin_purchase_order
	14	+ end
	15	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+require_dependency 'enterprise'
	2	+
	3	+class Enterprise
	4	+ has_many :orders, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'seller_id'
	5	+end
@@ -0,0 +1,5 @@		@@ -0,0 +1,5 @@
	1	+require_dependency 'person'
	2	+
	3	+class Person
	4	+ has_many :purchases, :class_name => "ShoppingCartPlugin::PurchaseOrder", :foreign_key => 'customer_id'
	5	+end
@@ -0,0 +1,37 @@		@@ -0,0 +1,37 @@
	1	+class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
	2	+
	3	+ belongs_to :customer, :class_name => "Profile"
	4	+ belongs_to :seller, :class_name => "Profile"
	5	+
	6	+ validates_presence_of :status, :seller
	7	+
	8	+ acts_as_having_settings :field => :data
	9	+
	10	+ settings_items :products_list, :type => Array, :default => {}
	11	+ settings_items :customer_name, :type => String
	12	+ settings_items :customer_email, :type => String
	13	+ settings_items :customer_contact_phone, :type => String
	14	+ settings_items :customer_address, :type => String
	15	+ settings_items :customer_city, :type => String
	16	+ settings_items :customer_zip_code, :type => String
	17	+
	18	+ before_create do \|order\|
	19	+ order.created_at = Time.now.utc
	20	+ order.updated_at = Time.now.utc
	21	+ end
	22	+
	23	+ before_update do \|order\|
	24	+ order.updated_at = Time.now.utc
	25	+ end
	26	+
	27	+ module Status
	28	+ OPENED = 0
	29	+ CANCELED = 1
	30	+ CONFIRMED = 2
	31	+ SHIPPED = 3
	32	+
	33	+ def self.name
	34	+ [_('Opened'), _('Canceled'), _('Confirmed'), _('Shipped')]
	35	+ end
	36	+ end
	37	+end
	@@ -168,3 +168,47 @@ label.error {		@@ -168,3 +168,47 @@ label.error {
168	padding-left: .5em;	168	padding-left: .5em;
169	vertical-align: top;	169	vertical-align: top;
170	}	170	}
		171	+
		172	+.controller-profile_editor a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.png)}
		173	+.controller-profile_editor .msie6 a.control-panel-shopping-cart-purchase-report {background-image: url(images/control-panel/purchase-report.gif)}
		174	+.controller-profile_editor a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.png)}
		175	+.controller-profile_editor .msie6 a.control-panel-shopping-cart {background-image: url(/images/control-panel/shopping-cart.gif)}
		176	+
		177	+.action-shopping_cart_plugin_myprofile-reports td.order-info {
		178	+ padding: 0px;
		179	+ height: auto;
		180	+}
		181	+
		182	+.action-shopping_cart_plugin_myprofile-reports .customer-details,
		183	+.action-shopping_cart_plugin_myprofile-reports .order-products {
		184	+ list-style-position: inside;
		185	+ float: left;
		186	+ width: 49%;
		187	+ margin: 0px;
		188	+ padding: 10px 0px;
		189	+}
		190	+
		191	+.action-shopping_cart_plugin_myprofile-reports .order-products {
		192	+ float: right;
		193	+}
		194	+
		195	+.action-shopping_cart_plugin_myprofile-reports .customer-details li,
		196	+.action-shopping_cart_plugin_myprofile-reports .order-products li {
		197	+ padding-left: 5px;
		198	+}
		199	+
		200	+#order-filter {
		201	+ background-color: #ccc;
		202	+ border: 1px solid #aaa;
		203	+ border-radius: 5px;
		204	+ padding: 3px 8px;
		205	+ margin-bottom: 10px;
		206	+}
		207	+
		208	+th {
		209	+ text-align: center;
		210	+}
		211	+
		212	+td {
		213	+ text-align: left;
		214	+}
	@@ -6,6 +6,8 @@ class ShoppingCartPluginMyprofileController; def rescue_action(e) raise e end; e		@@ -6,6 +6,8 @@ class ShoppingCartPluginMyprofileController; def rescue_action(e) raise e end; e
6		6
7	class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase	7	class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase
8		8
		9	+ TIME_FORMAT = '%Y-%m-%d'
		10	+
9	def setup	11	def setup
10	@controller = ShoppingCartPluginMyprofileController.new	12	@controller = ShoppingCartPluginMyprofileController.new
11	@request = ActionController::TestRequest.new	13	@request = ActionController::TestRequest.new
	@@ -59,4 +61,56 @@ class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase		@@ -59,4 +61,56 @@ class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase
59	enterprise.reload	61	enterprise.reload
60	assert enterprise.shopping_cart_delivery_price == price	62	assert enterprise.shopping_cart_delivery_price == price
61	end	63	end
		64	+
		65	+ should 'filter the reports correctly' do
		66	+ another_enterprise = fast_create(Enterprise)
		67	+ po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		68	+ po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::SHIPPED)
		69	+ po3 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		70	+ po3.created_at = 1.year.ago
		71	+ po3.save!
		72	+ po4 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => another_enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		73	+
		74	+ post :reports,
		75	+ :profile => enterprise.identifier,
		76	+ :from => (Time.now - 1.day).strftime(TIME_FORMAT),
		77	+ :to => (Time.now + 1.day).strftime(TIME_FORMAT),
		78	+ :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
		79	+
		80	+ assert_includes assigns(:orders), po1
		81	+ assert_not_includes assigns(:orders), po2
		82	+ assert_not_includes assigns(:orders), po3
		83	+ assert_not_includes assigns(:orders), po4
		84	+ end
		85	+
		86	+ should 'group filtered orders products and quantities' do
		87	+ p1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1)
		88	+ p2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2)
		89	+ p3 = fast_create(Product, :enterprise_id => enterprise.id, :price => 3)
		90	+ po1_products = {p1.id => {:quantity => 1, :price => p1.price}, p2.id => {:quantity => 2, :price => p2.price }}
		91	+ po2_products = {p2.id => {:quantity => 1, :price => p2.price}, p3.id => {:quantity => 2, :price => p3.price }}
		92	+ po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po1_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		93	+ po2 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :products_list => po2_products, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		94	+
		95	+ post :reports,
		96	+ :profile => enterprise.identifier,
		97	+ :from => (Time.now - 1.day).strftime(TIME_FORMAT),
		98	+ :to => (Time.now + 1.day).strftime(TIME_FORMAT),
		99	+ :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
		100	+
		101	+ hash = {p1.id => 1, p2.id => 3, p3.id => 2}
		102	+
		103	+ assert_equal hash, assigns(:products)
		104	+ end
		105	+
		106	+ should 'be able to update the order status' do
		107	+ po = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)
		108	+
		109	+ post :update_order_status,
		110	+ :profile => enterprise.identifier,
		111	+ :order_id => po.id,
		112	+ :order_status => ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED
		113	+ po.reload
		114	+ assert_equal ShoppingCartPlugin::PurchaseOrder::Status::CONFIRMED, po.status
		115	+ end
62	end	116	end
	@@ -144,6 +144,25 @@ class ShoppingCartPluginProfileControllerTest < Test::Unit::TestCase		@@ -144,6 +144,25 @@ class ShoppingCartPluginProfileControllerTest < Test::Unit::TestCase
144	assert_nothing_raised { get :clean, :profile => enterprise.identifier }	144	assert_nothing_raised { get :clean, :profile => enterprise.identifier }
145	end	145	end
146		146
		147	+ should 'register order on send request' do
		148	+ product1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1.99)
		149	+ product2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2.23)
		150	+ @controller.stubs(:session).returns({:cart => {:items => {product1.id => 1, product2.id => 2}}})
		151	+ assert_difference ShoppingCartPlugin::PurchaseOrder, :count, 1 do
		152	+ post :send_request,
		153	+ :customer => {:name => "Manuel", :email => "manuel@ceu.com"},
		154	+ :profile => enterprise.identifier
		155	+ end
		156	+
		157	+ order = ShoppingCartPlugin::PurchaseOrder.last
		158	+
		159	+ assert_equal 1.99, order.products_list[product1.id][:price]
		160	+ assert_equal 1, order.products_list[product1.id][:quantity]
		161	+ assert_equal 2.23, order.products_list[product2.id][:price]
		162	+ assert_equal 2, order.products_list[product2.id][:quantity]
		163	+ assert_equal ShoppingCartPlugin::PurchaseOrder::Status::OPENED, order.status
		164	+ end
		165	+
147	private	166	private
148		167
149	def json_response	168	def json_response
@@ -0,0 +1,59 @@		@@ -0,0 +1,59 @@
	1	+<% if @orders.empty? %>
	2	+ <p><i><%= _("No results.") %></i></p>
	3	+<% else %>
	4	+ <table>
	5	+ <tr>
	6	+ <th><%= _('Date') %></th>
	7	+ <th><%= _('Customer') %></th>
	8	+ <th><%= _('Purchase value') %></th>
	9	+ <th><%= _('Status')%></th>
	10	+ <th> </th>
	11	+ </tr>
	12	+ <% status_collection.delete_at(0) %>
	13	+ <% @orders.each do \|order\|%>
	14	+ <tr>
	15	+ <td><%= order.created_at.strftime("%Y-%m-%d")%></td>
	16	+ <td><%= order.customer_name %></td>
	17	+ <td style="text-align: right"><%= float_to_currency_cart(order.products_list.sum {\|id, qp\| qp[:price]*qp[:quantity]}, environment) %></td>
	18	+ <td>
	19	+ <% form_tag :action => 'update_order_status' do %>
	20	+ <%= hidden_field_tag(:order_id, order.id) +
	21	+ hidden_field_tag(:context_from, @from) +
	22	+ hidden_field_tag(:context_to, @to) +
	23	+ hidden_field_tag(:context_status, @status) +
	24	+ select_tag( :order_status, options_from_collection_for_select(status_collection, :first, :last, order.status),
	25	+ :onchange => "this.form.submit()" )
	26	+ %>
	27	+ <% end %>
	28	+ </td>
	29	+ <td><button class="view-order-details" data-order="<%=order.id%>"><%=_('View details')%></button></td>
	30	+ </tr>
	31	+ <tr id="order-details-<%=order.id%>" style="display:none">
	32	+ <td class="order-info" colspan="5">
	33	+ <div style="display:none">
	34	+ <ul class="customer-details">
	35	+ <% { 'name' =>_('Name'), 'email' => _('E-mail'), 'contact_phone' => _('Contact phone'), 'address' => _('Address'), 'city' => _('City'), 'zip_code' => _('Zip code')}.each do \|attribute, name\| %>
	36	+ <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
	37	+ <% end %>
	38	+ </ul>
	39	+ <ul class="order-products">
	40	+ <% order.products_list.each do \|id, qp\| %>
	41	+ <%
	42	+ begin
	43	+ product = Product.find(id)
	44	+ rescue
	45	+ product = nil
	46	+ end
	47	+ %>
	48	+ <li><%= product ? link_to(product.name, product.url) : _("Pruduct unavailable")%>
	49	+ × <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>
	50	+ <% end %>
	51	+ </ul>
	52	+ <br style="clear:both"/>
	53	+ </div>
	54	+ </td>
	55	+ </tr>
	56	+ <% end %>
	57	+ </table>
	58	+<% end %>
	59	+