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

…into merge-requests/177

Merge commit 'refs/merge-requests/177' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/177
Daniela Feitosa
2 parents 2db73350 dbf169ee
Showing 6 changed files with 45 additions and 15 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/lib/shopping_cart_plugin/line_item.rb
plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_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
@@ -33,9 +33,9 @@ class ShoppingCartPluginMyprofileController &lt; MyProfileController
     @products = {}
     @orders.each do |order|
-      order.products_list.each do |id, qp| 
-        @products[id] ||= 0
-        @products[id] += qp[:quantity]
+      order.products_list.each do |id, qp|
+        @products[id] ||= ShoppingCartPlugin::LineItem.new(id, qp[:name])
+        @products[id].quantity += qp[:quantity]
       end
     end
   end
@@ -228,7 +228,8 @@ class ShoppingCartPluginProfileController &lt; ProfileController
   def register_order(custumer, items)
     new_items = {}
     items.each do |id, quantity|
-      new_items[id] = {:quantity => quantity, :price => Product.find(id).price}
+      product = Product.find(id)
+      new_items[id] = {:quantity => quantity, :price => product.price, :name => product.name}
     end
     ShoppingCartPlugin::PurchaseOrder.create!(
       :seller => profile,
@@ -0,0 +1,23 @@
+class ShoppingCartPlugin::LineItem
+
+  attr_accessor :product_id, :quantity
+
+  def initialize(product_id, name)
+    @product_id = product_id
+    @name = name
+    @quantity = 0
+  end
+
+  def product
+    @product ||= Product.find_by_id(product_id)
+  end
+
+  def name
+    product && product.name || @name
+  end
+
+  def ==(other)
+    self.product == other.product && self.name == other.name && self.quantity == other.quantity
+  end
+
+end
@@ -77,11 +77,11 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
   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 }}
+    p1 = fast_create(Product, :enterprise_id => enterprise.id, :price => 1, :name => 'p1')
+    p2 = fast_create(Product, :enterprise_id => enterprise.id, :price => 2, :name => 'p2')
+    p3 = fast_create(Product, :enterprise_id => enterprise.id, :price => 3, :name => 'p3')
+    po1_products = {p1.id => {:quantity => 1, :price => p1.price, :name => p1.name}, p2.id => {:quantity => 2, :price => p2.price, :name => p2.name }}
+    po2_products = {p2.id => {:quantity => 1, :price => p2.price, :name => p2.name }, p3.id => {:quantity => 2, :price => p3.price, :name => p3.name}}
     po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => 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)
@@ -91,7 +91,13 @@ class ShoppingCartPluginMyprofileControllerTest &lt; ActionController::TestCase
       :to => (Time.now + 1.day).strftime(TIME_FORMAT),
       :filter_status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED
-    hash = {p1.id => 1, p2.id => 3, p3.id => 2}
+    lineitem1 = ShoppingCartPlugin::LineItem.new(p1.id, p1.name)
+    lineitem1.quantity = 1
+    lineitem2 = ShoppingCartPlugin::LineItem.new(p2.id, p2.name)
+    lineitem2.quantity = 3
+    lineitem3 = ShoppingCartPlugin::LineItem.new(p3.id, p3.name)
+    lineitem3.quantity = 2
+    hash = {p1.id => lineitem1, p2.id => lineitem2, p3.id => lineitem3}
     assert_equal hash, assigns(:products)
   end
@@ -38,14 +38,14 @@
             </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")%>
+                <li><%= product ? link_to(product.name, product.url) : qp[:name]%>
                 &times; <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>
               <% end %>
             </ul>
@@ -6,10 +6,10 @@
       <th><%= _('Product') %></th>
       <th><%= _('Quantity') %></th>
     </tr>
-    <% @products.each do |id, quantity|%>
+    <% @products.each do |id, item|%>
       <tr>
-        <td><%= link_to(Product.find(id).name, Product.find(id).url) %></td>
-        <td style="text-align: center"><%= quantity %></td>
+        <td><%= item.product ? link_to(item.name, item.product.url) : item.name %></td>
+        <td style="text-align: center"><%= item.quantity %></td>
       </tr>
     <% end %>
   </table>
@@ -0,0 +1,23 @@		@@ -0,0 +1,23 @@
	1	+class ShoppingCartPlugin::LineItem
	2	+
	3	+ attr_accessor :product_id, :quantity
	4	+
	5	+ def initialize(product_id, name)
	6	+ @product_id = product_id
	7	+ @name = name
	8	+ @quantity = 0
	9	+ end
	10	+
	11	+ def product
	12	+ @product \|\|= Product.find_by_id(product_id)
	13	+ end
	14	+
	15	+ def name
	16	+ product && product.name \|\| @name
	17	+ end
	18	+
	19	+ def ==(other)
	20	+ self.product == other.product && self.name == other.name && self.quantity == other.quantity
	21	+ end
	22	+
	23	+end
	@@ -38,14 +38,14 @@		@@ -38,14 +38,14 @@
38	</ul>	38	</ul>
39	<ul class="order-products">	39	<ul class="order-products">
40	<% order.products_list.each do \|id, qp\| %>	40	<% order.products_list.each do \|id, qp\| %>
41	- <%	41	+ <%
42	begin	42	begin
43	product = Product.find(id)	43	product = Product.find(id)
44	rescue	44	rescue
45	product = nil	45	product = nil
46	end	46	end
47	%>	47	%>
48	- <li><%= product ? link_to(product.name, product.url) : _("Pruduct unavailable")%>	48	+ <li><%= product ? link_to(product.name, product.url) : qp[:name]%>
49	× <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>	49	× <%= qp[:quantity] %> = <%= float_to_currency_cart( qp[:quantity] * qp[:price], environment ) %></li>
50	<% end %>	50	<% end %>
51	</ul>	51	</ul>