From f71c2edbffe26ad50268305b773b846164653d10 Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Mon, 5 Sep 2011 18:13:06 -0300
Subject: [PATCH] [purchase-order] Adding test for reports

---
 plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb | 20 ++++++++++++++++++++
 plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb        |  2 +-
 plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb      |  2 +-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
index ae87820..c60b6e3 100644
--- a/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
+++ b/plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
@@ -83,6 +83,26 @@ class ShoppingCartPluginMyprofileControllerTest < Test::Unit::TestCase
     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)
 
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb
index c2cda44..6524afd 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb
@@ -34,7 +34,7 @@
           <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) %>
+                <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
               <% end %>
             </ul>
             <ul class="order-products">
diff --git a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb
index f3f33aa..f6c3ddb 100644
--- a/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb
+++ b/plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_products_list.html.erb
@@ -8,7 +8,7 @@
     </tr>
     <% @products.each do |id, quantity|%>
       <tr>
-        <td><%= Product.find(id).name %></td>
+        <td><%= link_to(Product.find(id).name, Product.find(id).url) %></td>
         <td style="text-align: center"><%= quantity %></td>
       </tr>
     <% end %>
--
libgit2 0.21.2