Download as
Browse Code »

Commit df0c3fbed341711668bdb8e73393edef6ebfb646

Authored by Vinicius Cubas Brand
Committed by Rodrigo Souto
1 parent f60a0173
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

shopping_cart delivery: fix delivery options not saving 

(ActionItem2893)
Showing 2 changed files with 9 additions and 1 deletions   Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_myprofile_controller.rb
  Diff comments   View file @df0c3fb
@@ -63,7 +63,7 @@ class ShoppingCartPluginMyprofileController < MyProfileController @@ -63,7 +63,7 @@ class ShoppingCartPluginMyprofileController < MyProfileController
63 63
64 def treat_delivery_options(params) 64 def treat_delivery_options(params)
65 result = {} 65 result = {}
66 - return result if params.nil? || params[:delivery_options].nil? 66 + return result if params.nil? || params[:options].nil?
67 params[:options].size.times do |counter| 67 params[:options].size.times do |counter|
68 if params[:options][counter].present? && params[:prices][counter].present? 68 if params[:options][counter].present? && params[:prices][counter].present?
69 result[params[:options][counter]] = params[:prices][counter] 69 result[params[:options][counter]] = params[:prices][counter]
plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
  Diff comments   View file @df0c3fb
@@ -51,6 +51,14 @@ class ShoppingCartPluginMyprofileControllerTest < ActionController::TestCase @@ -51,6 +51,14 @@ class ShoppingCartPluginMyprofileControllerTest < ActionController::TestCase
51 assert settings.delivery_price == price 51 assert settings.delivery_price == price
52 end 52 end
53 53
  54 + should 'be able to choose delivery_options' do
  55 + delivery_options = {:options => ['car', 'bike'], :prices => ['20', '5']}
  56 + post :edit, :profile => enterprise.identifier, :settings => {:delivery_options => delivery_options}
  57 +
  58 + assert_equal '20', settings.delivery_options['car']
  59 + assert_equal '5', settings.delivery_options['bike']
  60 + end
  61 +
54 should 'filter the reports correctly' do 62 should 'filter the reports correctly' do
55 another_enterprise = fast_create(Enterprise) 63 another_enterprise = fast_create(Enterprise)
56 po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED) 64 po1 = ShoppingCartPlugin::PurchaseOrder.create!(:seller => enterprise, :status => ShoppingCartPlugin::PurchaseOrder::Status::OPENED)