Adding new fields to shopping_cart

Rodrigo Souto
1 parent 05d3db06
Showing 10 changed files with 47 additions and 11 deletions Show diff stats
app/models/organization.rb
app/models/person.rb
app/models/profile.rb
app/views/profile_editor/_person_form.rhtml
app/views/shared/_organization_custom_fields.rhtml
plugins/shopping_cart/public/buy.js
plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb
plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
plugins/shopping_cart/views/shopping_cart_plugin_profile/buy.html.erb
test/unit/person_test.rb
@@ -78,6 +78,8 @@ class Organization &lt; Profile
     country
     tag_list
     template_id
+    district
+    address_reference
   ]
   def self.fields
@@ -96,8 +98,8 @@ class Organization &lt; Profile
     []
   end
-  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list')
-  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information
+  N_('Display name'); N_('Description'); N_('Contact person'); N_('Contact email'); N_('Acronym'); N_('Foundation year'); N_('Legal form'); N_('Economic activity'); N_('Management information'); N_('Tag list'); N_('District'); N_('Address reference')
+  settings_items :display_name, :description, :contact_person, :contact_email, :acronym, :foundation_year, :legal_form, :economic_activity, :management_information, :district, :address_reference
   validates_format_of :foundation_year, :with => Noosfero::Constants::INTEGER_FORMAT
   validates_format_of :contact_email, :with => Noosfero::Constants::EMAIL_FORMAT, :if => (lambda { |org| !org.contact_email.blank? })
@@ -148,6 +148,8 @@ class Person &lt; Profile
   contact_information
   description
   image
+  district
+  address_reference
   ]
   validates_multiparameter_assignments
@@ -201,8 +203,8 @@ class Person &lt; Profile
   N_('Education'); N_('Custom education'); N_('Custom area of study');
   settings_items :formation, :custom_formation, :custom_area_of_study
-  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code')
-  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code
+  N_('Contact information'); N_('City'); N_('State'); N_('Country'); N_('Sex'); N_('Zip code'); N_('District'); N_('Address reference')
+  settings_items :photo, :contact_information, :sex, :city, :state, :country, :zip_code, :district, :address_reference
   extend SetProfileRegionFromCityState::ClassMethods
   set_profile_region_from_city_state
@@ -231,7 +231,7 @@ class Profile &lt; ActiveRecord::Base
     if myregion
       myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
     else
-      %w[address city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
+      %w[address district city state country_name zip_code ].map {|item| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
     end
   end
@@ -696,7 +696,7 @@ private :generate_url, :url_options
   def custom_footer_expanded
     footer = custom_footer
     if footer
-      %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do |att|
+      %w[contact_person contact_email contact_phone location address district address_reference economic_activity city state country zip_code].each do |att|
         if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
           if !self.send(att).nil? && !self.send(att).blank?
             footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))
@@ -21,6 +21,8 @@
 <%= optional_field(@person, 'city', f.text_field(:city, :rel => _('City'))) %>
 <%= optional_field(@person, 'zip_code', labelled_form_field(_('ZIP code'), text_field(:profile_data, :zip_code, :rel => _('ZIP code')))) %>
 <%= optional_field(@person, 'address', labelled_form_field(_('Address (street and number)'), text_field(:profile_data, :address, :rel => _('Address')))) %>
+<%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference, :rel => _('Address reference')))) %>
+<%= optional_field(@person, 'district', labelled_form_field(_('District'), text_field(:profile_data, :district, :rel => _('District')))) %>
 <% optional_field(@person, 'schooling') do %>
   <div class="formfieldline">
@@ -10,6 +10,8 @@
 <%= optional_field(profile, 'economic_activity', f.text_field(:economic_activity)) %>
 <%= optional_field(profile, 'management_information', f.text_area(:management_information, :rows => 5)) %>
 <%= optional_field(profile, 'address', labelled_form_field(_('Address (street and number)'), text_field(object_name, :address))) %>
+<%= optional_field(profile, 'address_reference', labelled_form_field(_('Address reference'), text_field(object_name, :address_reference))) %>
+<%= optional_field(profile, 'district', labelled_form_field(_('District'), text_field(object_name, :district))) %>
 <%= optional_field(profile, 'zip_code', labelled_form_field(_('ZIP code'), text_field(object_name, :zip_code))) %>
 <%= optional_field(profile, 'city', f.text_field(:city)) %>
 <%= optional_field(profile, 'state', f.text_field(:state)) %>
@@ -28,3 +28,7 @@ jQuery(&#39;#delivery_option&#39;).change(function(){
     },
   });
 });
+
+jQuery('#customer_payment').change(function(){
+  jQuery(this).closest('.formfieldline').next().slideToggle('fast');
+});
@@ -17,19 +17,29 @@
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
       <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li>
+      <% if @customer[:payment] == 'money' %>
+        <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         <li><b><%= _('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
       <% end %>
+      <% if !@customer[:district].blank? %>
+        <%= @customer[:district] %><br \>
+      <% end %>
       <% if !@customer[:city].blank? %>
         <%= @customer[:city] %><br \>
       <% end %>
       <% if !@customer[:zip_code].blank? %>
         <%= @customer[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <% if !@customer[:address_reference].blank? %>
+        <%= @customer[:address_reference] %><br \>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
@@ -15,19 +15,29 @@
       <li><b><%= _('Full name') %>: </b><%= @customer[:name] %></li>
       <li><b><%= _('Email') %>: </b><%= @customer[:email] %></li>
       <li><b><%= _('Phone number') %>: </b><%= @customer[:contact_phone] %></li>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <li><b><%= _('Payment') %>: </b><%= @customer[:payment] == 'money' ? _('Money') : _('Check') %></li>
+      <% if @customer[:payment] == 'money' %>
+        <li><b><%= _('Change') %>: </b><%= @customer[:change] %></li>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         <li><b><%= _('Address') %>:</b>
       <% end %>
       <% if !@customer[:address].blank? %>
         <%= @customer[:address] %><br \>
       <% end %>
+      <% if !@customer[:district].blank? %>
+        <%= @customer[:district] %><br \>
+      <% end %>
       <% if !@customer[:city].blank? %>
         <%= @customer[:city] %><br \>
       <% end %>
       <% if !@customer[:zip_code].blank? %>
         <%= @customer[:zip_code] %>
       <% end %>
-      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? %>
+      <% if !@customer[:address_reference].blank? %>
+        <%= @customer[:address_reference] %><br \>
+      <% end %>
+      <% if !@customer[:address].blank? || !@customer[:city].blank? || !@customer[:zip_code].blank? || !@customer[:district].blank? || !@customer[:address_reference].blank? %>
         </li>
       <% end %>
     </ul>
@@ -7,10 +7,14 @@
       <%= labelled_form_field('* ' +  _("Email"), f.text_field(:email, :class => 'required email') ) %>
       <%= labelled_form_field('* ' +  _("Contact phone"), f.text_field(:contact_phone, :class => 'required') ) %>
       <%= labelled_form_field(_('Delivery option'), select_tag(:delivery_option, options_for_select(select_delivery_options(@settings.delivery_options, environment)), 'data-profile-identifier' => profile.identifier)) unless !@settings.delivery || (@settings.free_delivery_price && get_total(session[:cart][:items]) >= @settings.free_delivery_price) %>
+      <%= labelled_form_field(_('Payment'), select_tag('customer[payment]', options_for_select([[_("Money"), :money],[_('Check'), :check]]))) %>
+      <%= labelled_form_field(_('Change'), text_field_tag('customer[change]')) %>
     </div>
     <% if @settings.delivery %>
       <fieldset><legend><%=_('Delivery Address')%></legend>
         <%= labelled_form_field(_('Address (street and number)'), f.text_field(:address)) %>
+        <%= labelled_form_field(_('Address reference'), f.text_field(:address_reference)) %>
+        <%= labelled_form_field(_('District'), f.text_field(:district)) %>
         <%= labelled_form_field( _("City"), f.text_field(:city)) %>
         <%= labelled_form_field(_('ZIP code'), f.text_field(:zip_code)) %>
       </fieldset>
@@ -64,7 +64,7 @@ class PersonTest &lt; ActiveSupport::TestCase
   should "have person info fields" do
     p = Person.new(:environment => Environment.default)
-    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image ].each do |i|
+    [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image, :district, :address_reference ].each do |i|
       assert_respond_to p, i
     end
   end
	@@ -231,7 +231,7 @@ class Profile < ActiveRecord::Base		@@ -231,7 +231,7 @@ class Profile < ActiveRecord::Base
231	if myregion	231	if myregion
232	myregion.hierarchy.reverse.first(2).map(&:name).join(separator)	232	myregion.hierarchy.reverse.first(2).map(&:name).join(separator)
233	else	233	else
234	- %w[address city state country_name zip_code ].map {\|item\| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)	234	+ %w[address district city state country_name zip_code ].map {\|item\| (self.respond_to?(item) && !self.send(item).blank?) ? self.send(item) : nil }.compact.join(separator)
235	end	235	end
236	end	236	end
237		237
	@@ -696,7 +696,7 @@ private :generate_url, :url_options		@@ -696,7 +696,7 @@ private :generate_url, :url_options
696	def custom_footer_expanded	696	def custom_footer_expanded
697	footer = custom_footer	697	footer = custom_footer
698	if footer	698	if footer
699	- %w[contact_person contact_email contact_phone location address economic_activity city state country zip_code].each do \|att\|	699	+ %w[contact_person contact_email contact_phone location address district address_reference economic_activity city state country zip_code].each do \|att\|
700	if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)	700	if self.respond_to?(att) && footer.match(/\{[^{]*#{att}\}/)
701	if !self.send(att).nil? && !self.send(att).blank?	701	if !self.send(att).nil? && !self.send(att).blank?
702	footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))	702	footer = footer.gsub(/\{([^{]*)#{att}\}/, '\1' + self.send(att))
	@@ -28,3 +28,7 @@ jQuery('#delivery_option').change(function(){		@@ -28,3 +28,7 @@ jQuery('#delivery_option').change(function(){
28	},	28	},
29	});	29	});
30	});	30	});
		31	+
		32	+jQuery('#customer_payment').change(function(){
		33	+ jQuery(this).closest('.formfieldline').next().slideToggle('fast');
		34	+});
	@@ -64,7 +64,7 @@ class PersonTest < ActiveSupport::TestCase		@@ -64,7 +64,7 @@ class PersonTest < ActiveSupport::TestCase
64		64
65	should "have person info fields" do	65	should "have person info fields" do
66	p = Person.new(:environment => Environment.default)	66	p = Person.new(:environment => Environment.default)
67	- [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image ].each do \|i\|	67	+ [ :name, :photo, :contact_information, :birth_date, :sex, :address, :city, :state, :country, :zip_code, :image, :district, :address_reference ].each do \|i\|
68	assert_respond_to p, i	68	assert_respond_to p, i
69	end	69	end
70	end	70	end