Merge pull request #4172 from spaghetticode/spaghetticode/update-cart-fix

Recalculate promotions after destroying/refreshing shipments

Author: waiting-for-dev

core/app/models/spree/order_contents.rb

@@ -42,8 +42,8 @@ def update_cart(params)
           # If we do not update first, then the item total will be wrong and ItemTotal
           # promotion rules would not be triggered.
           reload_totals
-          PromotionHandler::Cart.new(order).activate
           order.ensure_updated_shipments
+          PromotionHandler::Cart.new(order).activate
         end
         reload_totals
         true