From f836413359c86ac1c6692580520736980e2d1dac Mon Sep 17 00:00:00 2001
From: Rodrigo Souto <rodrigo@colivre.coop.br>
Date: Thu, 17 Jan 2013 00:57:06 +0000
Subject: [PATCH] Adding new attributes to purchase order

---
 plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb             | 4 ++++
 plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb                 | 4 ++++
 plugins/shopping_cart/views/shopping_cart_plugin_myprofile/_orders_list.html.erb | 4 +++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
index 8bad37c..28da890 100644
--- a/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
+++ b/plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
@@ -274,10 +274,14 @@ class ShoppingCartPluginController < PublicController
       :customer => user,
       :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED,
       :products_list => new_items,
+      :customer_delivery_option => params[:delivery_option],
+      :customer_payment => params[:customer][:payment],
+      :customer_change => params[:customer][:change],
       :customer_name => params[:customer][:name],
       :customer_email => params[:customer][:email],
       :customer_contact_phone => params[:customer][:contact_phone],
       :customer_address => params[:customer][:address],
+      :customer_district => params[:customer][:district],
       :customer_city => params[:customer][:city],
       :customer_zip_code => params[:customer][:zip_code]
     )
diff --git a/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb b/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb
index 7e16fa9..ab05bd9 100644
--- a/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb
+++ b/plugins/shopping_cart/lib/shopping_cart_plugin/purchase_order.rb
@@ -12,8 +12,12 @@ class ShoppingCartPlugin::PurchaseOrder < Noosfero::Plugin::ActiveRecord
   settings_items :customer_email, :type => String
   settings_items :customer_contact_phone, :type => String
   settings_items :customer_address, :type => String
+  settings_items :customer_district, :type => String
   settings_items :customer_city, :type => String
   settings_items :customer_zip_code, :type => String
+  settings_items :customer_delivery_option, :type => String
+  settings_items :customer_payment, :type => String
+  settings_items :customer_change, :type => String
 
   before_create do |order|
     order.created_at = Time.now.utc
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 88e3295..8b42627 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
@@ -32,7 +32,9 @@
         <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| %>
+              <% [['name', _('Name')], ['email', _('E-mail')], ['contact_phone', _('Contact phone')], ['address', _('Address')], ['district', _('District')], ['city', _('City')], ['zip_code', _('Zip code')], ['delivery_option', _('Delivery option')], ['payment', _('Payment')], ['change', _('Change')]].each do |field| %>
+                <% attribute = field.first %>
+                <% name = field.last %>
                 <%= content_tag('li', content_tag('strong', name+': ') + order.send('customer_'+attribute)) if !order.send('customer_'+attribute).blank? %>
               <% end %>
             </ul>
--
libgit2 0.21.2