Download as
Browse Code »

Commit f280b3cabd855ed3daf87e5b2c39fe44b5fa9511

Authored by Braulio Bhavamitra
1 parent 8cb63032
Exists in staging and in 41 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, user_mention, webfinger_server

shopping_cart: fix regression on orders repetition

Showing 1 changed file with 2 additions and 1 deletions   Show diff stats
plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
  Diff comments   View file @f280b3c
... ... @@ -121,7 +121,8 @@ class ShoppingCartPluginController < OrdersPluginController
121 121 @profile = cart_profile
122 122 @order = profile.sales.build consumer: user
123 123  
124   - @order.supplier_delivery = profile.delivery_methods.where(id: session[:cart][:last_delivery_option_id]).first
  124 + last_delivery_option_id = session[:cart][:last_delivery_option_id] if session[:cart]
  125 + @order.supplier_delivery = profile.delivery_methods.where(id: last_delivery_option_id).first if last_delivery_option_id
125 126 if repeat_order_id = self.cart[:repeat_order_id]
126 127 repeat_order = cart_profile.orders.where(id: repeat_order_id).first
127 128 @order.consumer_delivery_data = repeat_order.consumer_delivery_data if repeat_order
... ...